terrafrost
|
b4cf10fc94
|
Revert "Merge branch '2.0'"
This reverts commit be5f4ef6b19c82f6c898708cc8e1828b05e3d4e8, reversing
changes made to 638fe6971c .
|
2016-04-10 11:30:59 -05:00 |
|
terrafrost
|
2cc5dcdc89
|
Merge branch '2.0'
|
2016-04-10 11:30:34 -05:00 |
|
terrafrost
|
4b69dcb1ca
|
Revert "Merge remote-tracking branch 'bantu/bootstrap'"
This reverts commit ef04c870e9 , reversing
changes made to cd57bf31ae .
|
2016-04-10 11:25:31 -05:00 |
|
terrafrost
|
638fe6971c
|
Merge branch 'master' of https://github.com/phpseclib/phpseclib
|
2016-04-10 10:18:49 -05:00 |
|
terrafrost
|
7dffbfde04
|
RSA/OpenSSH: savePublicKey() method should have been static
|
2016-04-10 10:18:15 -05:00 |
|
terrafrost
|
263564a2ee
|
Merge branch 'master' of https://github.com/phpseclib/phpseclib
|
2016-04-09 13:00:51 -05:00 |
|
terrafrost
|
272d447b65
|
Merge branch 'sha512/x'
|
2016-04-09 12:57:34 -05:00 |
|
terrafrost
|
86646fdf40
|
RSA: PKCS1 v2.2 also added sha224
|
2016-04-09 12:57:23 -05:00 |
|
terrafrost
|
9cf93a02b3
|
Merge branch '2.0'
|
2016-04-03 21:37:52 -05:00 |
|
terrafrost
|
a7f2a5d9c9
|
Merge branch '1.0' into 2.0
|
2016-04-03 21:34:45 -05:00 |
|
terrafrost
|
ac97ce5d69
|
RSA: backport macdabby's changes
|
2016-04-03 21:34:11 -05:00 |
|
terrafrost
|
3b37619279
|
Tests/RSA: add unit test for setPrivateKey
|
2016-04-03 21:16:37 -05:00 |
|
terrafrost
|
2a1ee1107a
|
Merge remote-tracking branch 'macdabby/master'
|
2016-04-03 21:10:42 -05:00 |
|
Scott
|
b7218aee28
|
Update Random.php
|
2016-03-27 10:54:39 -04:00 |
|
Scott
|
827e42222e
|
Update Random.php
|
2016-03-27 10:49:03 -04:00 |
|
DAB
|
89a73161cb
|
set publicExponent to false instead of unsetting
|
2016-03-25 22:10:36 -05:00 |
|
Paragon Initiative Enterprises
|
1ca62c2c33
|
Use random_compat
|
2016-03-24 16:44:56 -04:00 |
|
terrafrost
|
be0aed43cf
|
RSA: bring PKCS1 compliancy to v2.2
|
2016-03-24 13:38:51 -05:00 |
|
terrafrost
|
a757584630
|
Hash: add sha512/224 and sha512/256
|
2016-03-24 12:49:27 -05:00 |
|
terrafrost
|
23f237a743
|
Merge branch '2.0'
|
2016-03-18 16:37:02 -05:00 |
|
terrafrost
|
75dee927b9
|
Merge branch '1.0' into 2.0
|
2016-03-18 16:34:58 -05:00 |
|
terrafrost
|
d74bfb73e4
|
RC2: getKeyLength didn't always return key length
|
2016-03-18 16:34:22 -05:00 |
|
terrafrost
|
a4cb29ee97
|
Merge branch '1.0' into 2.0
|
2016-03-18 12:00:46 -05:00 |
|
terrafrost
|
123eee7150
|
RC4: key wasn't being truncated correctly
|
2016-03-18 12:00:41 -05:00 |
|
terrafrost
|
574d36fb7d
|
Merge branch 'cipher-revamp'
|
2016-03-14 23:00:21 -05:00 |
|
terrafrost
|
fa88ed5ff4
|
Merge branch 'cipher-revamp' of https://github.com/terrafrost/phpseclib into cipher-revamp
|
2016-03-14 23:00:08 -05:00 |
|
terrafrost
|
ea7d647612
|
Merge branch 'cipher-revamp'
|
2016-03-14 22:42:51 -05:00 |
|
terrafrost
|
ac8960d049
|
Merge branch '2.0'
|
2016-03-02 10:13:28 -06:00 |
|
terrafrost
|
e666562569
|
Merge branch '1.0' into 2.0
|
2016-03-02 10:13:15 -06:00 |
|
terrafrost
|
da36b5c91e
|
RC2: fix issue with decrypting
|
2016-03-01 16:30:36 -06:00 |
|
terrafrost
|
698efd030a
|
RSA: fix namespacing for caught exceptions
|
2016-02-20 23:54:19 -06:00 |
|
terrafrost
|
ae1e5c13f9
|
Merge branch 'master' into cipher-revamp
|
2016-02-20 21:44:00 -06:00 |
|
terrafrost
|
abed3b4c28
|
AES/Twofish: updates based on feedback
|
2016-02-20 20:01:52 -06:00 |
|
terrafrost
|
82ab57e14c
|
Merge branch '2.0'
|
2016-02-19 15:19:30 -06:00 |
|
terrafrost
|
6d3c04ef4d
|
Merge branch '1.0' into 2.0
|
2016-02-19 15:19:20 -06:00 |
|
terrafrost
|
1e93192721
|
Merge branch 'continuous-buffer-1.0' into 1.0
|
2016-02-19 15:14:12 -06:00 |
|
terrafrost
|
554dea27dd
|
Merge branch '2.0'
|
2016-02-19 06:33:48 -06:00 |
|
terrafrost
|
4f0d3e4128
|
Merge branch '1.0' into 2.0
|
2016-02-19 06:33:34 -06:00 |
|
Joey3000
|
94b669d7ed
|
Reorder array checks
Make sure that `if (isset($arr['__phpseclib_marker']))` is done on an array only.
|
2016-02-16 20:45:05 +01:00 |
|
Joey3000
|
062aa41ba0
|
Fixing Uncaught Error: Cannot use object of type test as array
Refs https://github.com/phpseclib/phpseclib/pull/934/files#r53035721
|
2016-02-16 19:41:41 +01:00 |
|
terrafrost
|
6eb35eb42c
|
Random: a few more tweaks
|
2016-02-16 09:45:04 -06:00 |
|
Joey3000
|
047f2617f1
|
Circular reference handling improvement
Refs https://github.com/phpseclib/phpseclib/pull/934/files#r52838650
This does the following:
* Addresses the comments to 102d53bd27
* Fixes an "Allowed memory size of ... bytes exhausted" issue and simplifies the implementation, bringing it closer to the example in https://stackoverflow.com/questions/9042142/detecting-infinite-array-recursion-in-php/9293146#9293146
|
2016-02-14 13:40:58 +01:00 |
|
terrafrost
|
102d53bd27
|
Random: fix for issues with serialize()
|
2016-02-14 00:44:03 -06:00 |
|
terrafrost
|
bfd467532b
|
Crypt/Base: fix continuous mode in CBC / decryption / OpenSSL
|
2016-02-06 08:59:05 -06:00 |
|
terrafrost
|
e74841477f
|
Crypt: become a lot less tolerant of bad parameters
|
2016-02-03 08:56:25 -06:00 |
|
terrafrost
|
73a4221988
|
Crypt: become a lot less tolerant of bad parameters
|
2016-01-31 12:37:38 -06:00 |
|
terrafrost
|
750f7652c7
|
Merge remote-tracking branch 'joey3000/use_cleanup'
|
2016-01-25 17:00:30 -06:00 |
|
terrafrost
|
cd700ce8b3
|
Merge branch '2.0'
|
2016-01-25 16:58:48 -06:00 |
|
Joey3000
|
bdc28b9453
|
Cherry-picking cleanup of use operator usage
Picked c9a80ff748 to the 2.0 branch and resolved conflicts.
|
2016-01-21 19:41:41 +01:00 |
|
terrafrost
|
977a4ebeaa
|
Merge pull request #925 from terrafrost/rsa-revamp-part-3
RSA: error out when encrypting strings that are too long
|
2016-01-21 10:20:53 -06:00 |
|