terrafrost
698efd030a
RSA: fix namespacing for caught exceptions
2016-02-20 23:54:19 -06:00
terrafrost
5c78bf4c06
Merge branch 'ssh-fix-publickey'
2016-02-20 14:19:31 -06:00
terrafrost
1e50a102ac
Merge branch '2.0'
2016-02-20 14:16:06 -06:00
terrafrost
b566fcaeee
Tests/AES: Crypt_AES -> AES
2016-02-20 14:15:57 -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
terrafrost
517a2c27b3
Merge branch '2.0'
2016-02-16 09:30:04 -06:00
Scott
fc4599985a
Correct Sodium check
...
PECL Libsodium 1.0.x uses `\Sodium\function_name` instead of `\Sodium::method_name`.
2016-02-16 09:29:25 -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
Scott
fee6431bad
Correct Sodium check
...
PECL Libsodium 1.0.x uses `\Sodium\function_name` instead of `\Sodium::method_name`.
2016-02-11 15:54:27 -05:00
terrafrost
b69fa7f2a9
Merge branch '2.0'
2016-02-07 11:54:16 -06:00
terrafrost
c2110f68a0
SSH: fix broken public key auth
2016-02-06 15:59:34 -06:00
terrafrost
bfd467532b
Crypt/Base: fix continuous mode in CBC / decryption / OpenSSL
2016-02-06 08:59:05 -06:00
terrafrost
b972a4b36d
Tests/AES: add unit test for continuous mode
2016-02-05 23:29:20 -06:00
metaclassing
88a04862ae
Added unit test for IPv4 and IPv6 address decoding in X509v3 subject alternative names extended attribute
2016-01-27 05:13:47 -06:00
metaclassing
4735751bf5
Switched out pack/unpack and ip2long/long2ip with inet_pton/ntop for ipv6 encoding support in x509v3 subject alternative names
2016-01-26 17:23:14 -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
terrafrost
e38cc4adb7
Merge pull request #926 from terrafrost/iv-or-exception
...
Crypt/Base: throw an exception if an IV is required but not defined
2016-01-21 10:20:44 -06:00
terrafrost
cea059e9dd
Crypt/Base: updates to IV handling per Joey3000
2016-01-20 10:09:06 -06:00
terrafrost
0f1eca35ac
Merge branch '2.0'
2016-01-18 11:07:26 -06:00
terrafrost
ba6fb78f72
Merge branch '1.0' into 2.0
2016-01-18 11:07:21 -06:00
terrafrost
f60e365be2
README: update download link
2016-01-18 11:07:12 -06:00
terrafrost
91690c773b
Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0
2016-01-18 10:28:48 -06:00
terrafrost
4500b93ba7
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
2016-01-18 10:28:19 -06:00
terrafrost
f451dd28f3
Merge branch '2.0'
2016-01-18 10:28:01 -06:00
terrafrost
7b57a869e9
Merge branch '1.0' into 2.0
2016-01-18 10:27:55 -06:00
Prayag Verma
008b628548
Update license year range to 2016
2016-01-18 10:27:43 -06:00
terrafrost
7b73f96e99
Merge branch '2.0'
2016-01-18 07:45:47 -06:00
terrafrost
9ce04a78d7
Merge branch '1.0' into 2.0
2016-01-18 07:45:38 -06:00
terrafrost
1d1592b6d0
CHANGELOG: add 1.0.1 changes
2016-01-18 07:45:13 -06:00
Joey3000
c9a80ff748
Cleanup of use
operator usage
...
This does the following:
1. Removes superfluous usage of the `use` operator. Specifically, that operator is not needed to use classes in the same `namespace` as the object (see https://secure.php.net/manual/en/language.namespaces.rules.php ).
2. While at it, also sorted the `use` operators alphabetically, for a better overview.
2016-01-18 05:05:31 +01:00
terrafrost
d5a868ed4f
Crypt/Base: throw an exception if an IV is required but not defined
2016-01-17 11:48:07 -06:00
terrafrost
5d85d5eca1
RSA: error out when encrypting strings that are too long
2016-01-17 09:45:13 -06:00
terrafrost
dbf3b7fe1c
Merge branch '2.0'
2016-01-17 09:35:32 -06:00
terrafrost
feb721fa3d
Merge branch '1.0' into 2.0
2016-01-17 09:35:23 -06:00
terrafrost
75cc73f07a
TravisCI: drop 5.3.3 due to compose errors on it
2016-01-17 09:35:18 -06:00
terrafrost
999cc470b1
Merge branch 'master' of https://github.com/phpseclib/phpseclib
2016-01-16 22:59:38 -06:00
terrafrost
ad4c3670d3
Merge branch 'biginteger-revamp'
2016-01-16 22:59:19 -06:00
terrafrost
f8a92a7e40
Merge branch '2.0'
2016-01-13 16:51:48 -06:00
terrafrost
b6899d9e79
Merge branch '1.0' into 2.0
2016-01-13 16:51:33 -06:00