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
|
9e586e79f1
|
SSH2: update libsodium calls to use 1.0.0 convention
|
2016-03-08 16:57:16 -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
|
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
|
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 |
|
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 |
|
terrafrost
|
bfd467532b
|
Crypt/Base: fix continuous mode in CBC / decryption / OpenSSL
|
2016-02-06 08:59:05 -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 |
|
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
|
b6899d9e79
|
Merge branch '1.0' into 2.0
|
2016-01-13 16:51:33 -06:00 |
|
terrafrost
|
0905143fc1
|
SSH/Agent: fix possible PHP Warning
|
2016-01-13 16:51:12 -06:00 |
|
terrafrost
|
62fc4bbc88
|
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0
|
2016-01-08 10:42:59 -06:00 |
|
terrafrost
|
1e15ef5a55
|
Merge branch 'bitwise-not-1.0' into 2.0
|
2016-01-08 10:42:20 -06:00 |
|
terrafrost
|
7ad9eade2d
|
BigInteger: fix issue with doing bitwise not on 0
|
2016-01-08 10:31:48 -06:00 |
|
terrafrost
|
001ad99d73
|
Merge branch '1.0' into 2.0
|
2015-12-23 23:32:20 -06:00 |
|
terrafrost
|
1be0ac9f7f
|
SFTP/Stream: fix issue with filenames with hash in them
|
2015-12-23 13:13:06 -06:00 |
|
terrafrost
|
600f9c4e4b
|
SSH2: update isAuthenticated to work with 2.0 / master branches
|
2015-12-16 09:21:37 -06:00 |
|
terrafrost
|
d17aeffc04
|
Merge branch 'authenticated-1.0' into authenticated-2.0
|
2015-12-16 09:20:27 -06:00 |
|
terrafrost
|
57063f3604
|
SSH2: add isAuthenticated() method
|
2015-12-15 23:19:05 -06:00 |
|
terrafrost
|
eac8613c75
|
BigInteger: 2.0 specific updates for __debuginfo
|
2015-12-14 13:56:07 -06:00 |
|
terrafrost
|
786cecf309
|
Merge branch '1.0' into identifier-update-1.0
|
2015-12-14 11:07:42 -06:00 |
|
terrafrost
|
b95504ac8f
|
Merge branch 'rsa-pkcs8-fix-2.0-2' into 2.0
|
2015-12-14 11:02:49 -06:00 |
|
terrafrost
|
8448f63d76
|
Merge branch '1.0' into 2.0
|
2015-12-14 11:01:51 -06:00 |
|
terrafrost
|
f17f1b2baf
|
Merge branch '1.0' of https://github.com/phpseclib/phpseclib into small-tweaks-2
|
2015-12-11 13:44:39 -06:00 |
|
terrafrost
|
1c9ee4ef28
|
RSA: fix PKCS8 key handling (again)
|
2015-12-07 23:53:09 -06:00 |
|
terrafrost
|
c655b16f75
|
BigInteger: add engine to __debugInfo output and add unit test
|
2015-12-07 15:22:53 -06:00 |
|
terrafrost
|
ee0f45fea6
|
update identifier to current version
|
2015-12-05 10:33:28 -06:00 |
|
Andreas Fischer
|
d80651738f
|
Merge branch '1.0' into 2.0
* 1.0:
Fix PHP invalid index warning
|
2015-11-24 09:28:00 +01:00 |
|
splitice
|
77d5f8da20
|
Fix PHP invalid index warning
|
2015-11-24 09:13:30 +01:00 |
|
terrafrost
|
37535744b2
|
small tweaks
|
2015-11-21 22:55:20 -05:00 |
|
Andreas Fischer
|
466ad666b8
|
Merge branch '1.0' into 2.0
* 1.0:
|
2015-11-10 10:05:06 +01:00 |
|
terrafrost
|
c34be16c3a
|
Merge branch 'rsa-pkcs8-fix' into rsa-pkcs8-fix-2.0
Conflicts:
phpseclib/Crypt/RSA.php
|
2015-11-09 23:10:21 -06:00 |
|
terrafrost
|
7339112e10
|
RSA: fix issue with loading PKCS8 specific keys
|
2015-11-09 22:53:50 -06:00 |
|
terrafrost
|
96dd14fd6f
|
Merge branch 'extractber-fix' into extractber-fix-2.0
Conflicts:
phpseclib/File/X509.php
|
2015-10-22 09:56:07 -05:00 |
|
terrafrost
|
46bb95a265
|
X509: improve base64-encoded detection rules
|
2015-10-22 09:45:40 -05:00 |
|
Andreas Fischer
|
1cf70d27e8
|
Merge branch '1.0' into 2.0
* 1.0:
Add test case for GitHub Issue 850: Realpath in SFTP chmod().
Fixed a bug in SFTP::chmod not using realpath on the filepath
|
2015-10-19 00:19:07 +02:00 |
|
Bob4ever
|
b67c690498
|
Fixed a bug in SFTP::chmod not using realpath on the filepath
|
2015-10-19 00:05:02 +02:00 |
|
Scott
|
d899b7988d
|
Update random_bytes() to conform to PHP7.0.0-RC3
Fixes #843
|
2015-10-14 10:07:11 -05:00 |
|
terrafrost
|
a9d353d391
|
Merge branch 'phpdoc-2.0' into 2.0
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
|
2015-10-13 09:16:39 -05:00 |
|
terrafrost
|
5321b9b610
|
Merge branch 'phpdoc-1.0' into 1.0
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
|
2015-10-13 08:52:52 -05:00 |
|