deon
/
openpgp-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
198 Commits 2 Branches 5 Tags 471 KiB
Commit Graph

198 Commits

Author SHA1 Message Date
Deon George 358f28273c Updates to pass unit testing 2020-06-18 22:03:56 +10:00
Deon George 7d259b251f Move to more PSR-4 standards. 2020-06-17 22:44:51 +10:00
Deon George d458fecff6 Renamed to leenooks/openpgp-php for composer 2020-06-04 21:28:48 +10:00
Stephen Paul Weber 8ab0a21c68
Merge branch 'encryptSecretKey' 
* encryptSecretKey:
  Implement encryptSecretKey
 2019-09-14 13:15:08 -05:00
Stephen Paul Weber d27d30a352
Implement encryptSecretKey 
Allow encrypting a decrypted secret key, which is especially useful for
generating a new encrypted secret key.  Defaults to AES256, S2K
iter+salt SHA512, always uses s2k_useage 254 with sha1 integrity
protection of the encrypted key material.

Also add an example to parallel keygen.php that generates a key and then
encrypts it with a passphrase.
 2019-09-10 21:31:06 -05:00
Stephen Paul Weber 67aba78699
Bump to 0.4.0 2019-08-01 13:11:09 -05:00
Stephen Paul Weber c0e6aeb163
Remove support for hhvm 
Closes #79
 2019-04-30 19:05:28 -05:00
Stephen Paul Weber 5e6a097677
Merge pull request #76 from meitar/docs 
Provide more guidance for understanding the examples.
 2019-03-28 21:19:25 -05:00
Meitar M f8e0e997fc
Provide more guidance for understanding examples, update `.travis.yml`. 
This commit adds an `example/README.md` file with a little bit of
guidance for running the examples themselves. This is helpful because
the examples all rely on the presence of a `phpseclib` installation
available to the PHP interpreter, and while there is a `composer.json`
file to this effect, none of the examples included the Composer
`autoload.php` file.

This commit makes no modifications to the example code itself, but does
`include_once()` the Composer autoload script so that `phpseclib` loads
and avoids causing a fatal error when a new user attempts to run the
examples to learn how to use the library.

This commit also updates the Travis `before_script` build script, dropping
the `--dev` argument to the `composer install` command. Current versions
of Composer emit a deprecation notice when `--dev` is passed.
 2018-12-20 13:42:15 -07:00
Stephen Paul Weber fb671e183d Wordwrap enarmor output 
Closes #74
 2018-11-20 20:22:24 -05:00
Stephen Paul Weber f43fbdc053 Put version into code 
In case anyone wants to check it, I guess?

Closes #12
 2018-07-25 20:18:44 -05:00
Stephen Paul Weber cd33ba1af1 Upstream isn't coming back 2018-07-25 19:26:57 -05:00
Stephen Paul Weber 34ffc765ec
Merge pull request #62 from Rotzbua/patch-2 
add travis build status to readme
 2018-07-25 19:13:50 -05:00
Stephen Paul Weber 752d80f14a S2K salt is *always* 8 bytes 
Closes #33
 2018-07-25 15:04:49 -05:00
Stephen Paul Weber 575baaf3f2 Set up Travis to check combinations that all work 2018-07-25 14:45:16 -05:00
Stephen Paul Weber aeb919abc3 Whitespace 2018-07-25 14:37:07 -05:00
Stephen Paul Weber cba1ecce8a Do not rely on asserts for behaviour 
Closes #35
 2018-07-25 14:35:51 -05:00
Stephen Paul Weber f2e1710da5 Tell composer what versions of PHP we test against 
Closes #61
 2018-07-25 14:16:18 -05:00
Stephen Paul Weber 44e1bb2902 Do not throw when CAST5 unsupported 
While this message may be more helpful, it will break some cases, such
as when there are multiple ciphers that could be used and we can just
skip CAST5 and move on.  Return NULL when CAST5 unsupported, just like
for other unsupported ciphers.
 2018-07-25 14:08:00 -05:00
Stephen Paul Weber 43497a15c0 Use OpenSSL for CAST5 
Mcrypt is deprecated, so use OpenSSL when we can, mcrypt when we can't.
 2018-07-25 14:08:00 -05:00
Stephen Paul Weber 5a6b605710 Support Twofish and Blowfish 2018-07-25 14:07:16 -05:00
Stephen Paul Weber d756110821 Test support for all newer versions of phpseclib 
It seems only 2.0.8 is broken
 2018-07-25 11:06:11 -05:00
Stephen Paul Weber 724d5b16f3 Newer phpunit can't support older PHP 
They're very old, and 5.6 is available in Debian stable and oldstable,
so drop support.
 2018-07-25 10:31:52 -05:00
Stephen Paul Weber 26560f7bca Upgrade phpunit version to use in Travis 2018-07-25 10:27:30 -05:00
Stephen Paul Weber 498e60602b If session decryption fails, return NULL 
Otherwise it returns false, we try to unpack that, and generally bad
things happen.
 2018-07-25 09:57:33 -05:00
Stephen Paul Weber 413741fa84 Throw more helpful exception when already decrypted 2018-07-25 09:56:57 -05:00
Stephen Paul Weber a9fc3f9322
Merge pull request #64 from Rotzbua/Rotzbua-patch-2 
add suggestion to composer
 2018-07-25 09:00:09 -05:00
Stephen Paul Weber facaaa4dbb
Merge pull request #63 from Rotzbua/Rotzbua-patch-1 
add php 7.1 7.2 to travis
 2017-12-26 18:11:29 -05:00
Rotzbua ba3c3fd42d
add suggestion to composer 2017-12-26 21:53:31 +01:00
Rotzbua ebce9c014c
add travis build status to reamde 2017-12-15 16:37:53 +01:00
Rotzbua f42afa0ca3
Update .travis.yml 2017-12-15 16:35:33 +01:00
Rotzbua e8a56241a5
Update .travis.yml 2017-12-15 16:30:18 +01:00
Rotzbua 69d935435c
add php 7.1 7.2 2017-12-15 16:10:39 +01:00
Stephen Paul Weber 541328576a
Merge pull request #60 from Rotzbua/patch-1 
[doc] change links to https
 2017-12-15 09:28:05 -05:00
Rotzbua a8e7690a69
change links to https 2017-12-15 15:23:00 +01:00
Stephen Paul Weber c9ae8251b6 New list of supported PHPs on Travis 2017-07-22 17:03:04 -05:00
Stephen Paul Weber 95facfb57f Travis wants trusty for HHVM now 2017-07-18 19:35:20 -05:00
Stephen Paul Weber 6006111bbc Bump version number 2017-04-12 16:23:15 -05:00
Stephen Paul Weber 2561004fcd Merge pull request #46 from jasekiw/master 
https://github.com/phpseclib/phpseclib/issues/1113
 2017-04-11 09:19:35 -05:00
Jason Gallavin cea5b176fc https://github.com/phpseclib/phpseclib/issues/1113 
Add compatibility with phpseclib 2.0.3 - 2.0.4
 2017-04-10 22:28:54 -04:00
Stephen Paul Weber a61fb279c3 Merge pull request #45 from singpolyma/new-phpseclib-breaks-us 
Seems phpseclib 2.0.3 breaks us
 2017-04-08 11:38:02 -05:00
Stephen Paul Weber 7538c62edd Seems phpseclib 2.0.3 breaks us 2017-04-08 11:25:33 -05:00
Stephen Paul Weber 741fec24a6 These coefficients go in the other order 2016-07-26 20:09:15 -05:00
Stephen Paul Weber 4531815ef2 The code in fact expects an array of OR'd bytes 
As the spec specifies.

Closes #32
 2016-07-26 19:21:57 -05:00
Stephen Paul Weber 46ec5079e8 Only env can matrix 2016-07-26 19:10:18 -05:00
Stephen Paul Weber 02fbcbf7e6 nightly not working, can't find docs on the deprecation yet 2016-07-26 18:59:02 -05:00
Stephen Paul Weber 6d9ed34224 Less strict phpseclib requirement 
Still test against 2.0.0 as well as latest
 2016-07-26 18:58:16 -05:00
Stephen Paul Weber de41f143e6 Throw exception if using CAST5 without mcrypt 2016-07-26 18:44:49 -05:00
Stephen Paul Weber 859efcbee3 Merge pull request #28 from DanielRuf/patch-2 
use $cipher->key_length
 2016-03-15 08:23:47 -04:00
Stephen Paul Weber 15baf1db70 Merge pull request #29 from DanielRuf/patch-3 
added more PHP versions to the travis file
 2016-03-15 08:23:18 -04:00