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
2ae82a1bc7
Merge branch '2.0'
2016-03-19 12:23:11 -05:00
terrafrost
6bfbfdbf7e
Merge branch '1.0' into 2.0
2016-03-19 12:23:04 -05:00
Abhishek Taneja
cb2ccea219
changing valid condition order, _slidingWindow biginteger
2016-03-19 12:11:59 -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
6d5ec59f10
SFTP: a few tweaks to the queue'd get() changes raxbg did
2016-03-14 09:57:54 -05:00
terrafrost
815f227897
Merge remote-tracking branch 'raxbg/parallel_download'
2016-03-13 11:57:07 -05:00
terrafrost
54deb16da8
Merge branch '2.0'
2016-03-08 16:58:15 -06:00
terrafrost
9e586e79f1
SSH2: update libsodium calls to use 1.0.0 convention
2016-03-08 16:57:16 -06: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
Ivailo Hristov
75d4c3b09c
Even more memory optimizations
2016-02-25 13:55:49 +02:00
Ivailo Hristov
1af19fbf1b
Fix a memory leak when transferring lots of small files
2016-02-24 17:01:40 +02:00
Ivailo Hristov
56af770943
Changes based on comment 187537999
2016-02-23 19:21:23 +02: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
5c78bf4c06
Merge branch 'ssh-fix-publickey'
2016-02-20 14:19:31 -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
Ivailo Hristov
83b8d0ec0a
Bug fix for SFTP::get()
2016-02-17 14:57:32 +02: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 102d53bd27https://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
Ivailo Hristov
11a539bcbd
Implement parallel download
2016-02-11 16:38:31 +02: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
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
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
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
cea059e9dd
Crypt/Base: updates to IV handling per Joey3000
2016-01-20 10:09:06 -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
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
terrafrost
0905143fc1
SSH/Agent: fix possible PHP Warning
2016-01-13 16:51:12 -06:00
terrafrost
6abbbfdfe3
RSA: change default key size to 2048
2016-01-08 13:58:06 -06:00
terrafrost
f8dc527af5
Merge branch 'master' into biginteger-revamp
2016-01-08 10:43:49 -06:00
terrafrost
232880b0d9
Merge branch '2.0'
2016-01-08 10:43:11 -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
f7efbcbc8e
BigInteger: updates per Joey3000
2016-01-08 10:19:48 -06:00
terrafrost
c85b356b18
RSA: more updates per Joey3000
2016-01-07 22:26:10 -06:00
terrafrost
d5a359b41e
RSA: updates per Joey3000
2016-01-03 13:03:58 -06:00
terrafrost
d86c61de78
BigInteger: add getprecision
2016-01-03 10:42:44 -06:00
terrafrost
a0d21b6321
BigInteger: make select methods static, add type hinting, etc
2015-12-27 10:24:17 -06:00
terrafrost
806249c7e9
RSA: changes to how encryption / signatures work
2015-12-25 11:28:24 -06:00
terrafrost
94fdbba2aa
Merge branch '2.0'
2015-12-23 23:42:23 -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
b1deba5a28
Merge branch '2.0'
2015-12-14 13:56:27 -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
b86497d298
Merge branch '2.0'
2015-12-14 11:02:14 -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
18cc8eb1c3
Merge branch '2.0'
...
* 2.0:
Fix PHP invalid index warning
2015-11-24 09:28:00 +01: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
43165d976c
RSA: changes to OpenSSH and PuTTY plugins
2015-10-24 15:54:34 -05:00
terrafrost
7b1b7c22e2
RSA: throw an exception if the modulo is too small
2015-10-23 13:45:35 -05:00
terrafrost
1522e6606b
RSA: add getSupportedFormats() and getLoadedFormat()
2015-10-22 10:57:05 -05:00
terrafrost
efe36d67ce
Merge branch 'master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-10-22 10:16:52 -05:00
terrafrost
33bf6e42c3
Merge branch '2.0'
2015-10-22 10:14:50 -05: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
terrafrost
e2fcd9d951
RSA: misc fixes to select plugins
2015-10-21 21:24:12 -05:00
terrafrost
6eb5ea3ef7
RSA: add support for the microsoft BLOB key format
2015-10-20 23:17:11 -05:00
Andreas Fischer
a88047f242
Merge branch '2.0'
...
* 2.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:08 +02: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
terrafrost
ad55d3cd75
RSA: fixes to last non-merge commit
2015-10-16 14:04:17 -05:00
terrafrost
a9705fdba7
Merge branch 'master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
2015-10-16 10:01:18 -05:00
terrafrost
31c14063fa
RSA: updates to raw plugin
2015-10-16 09:36:49 -05:00
terrafrost
04a8d784a5
Merge branch 'paragonie'
2015-10-14 10:11:38 -05:00
Scott
d899b7988d
Update random_bytes() to conform to PHP7.0.0-RC3
...
Fixes #843
2015-10-14 10:07:11 -05:00
terrafrost
0e0bdf6210
Merge branch 'phpdoc-master'
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
2015-10-13 09:31:21 -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
terrafrost
177b52088d
Merge branch '2.0'
2015-10-12 23:10:15 -05:00
terrafrost
da1a2df5aa
Merge branch 'getkeylength-2.0-2' into 2.0
2015-10-12 23:09:04 -05:00
terrafrost
666092c889
Merge branch 'getkeylength' into 1.0
2015-10-12 22:59:46 -05:00
terrafrost
0e3fdec56b
Merge branch 'getkeylength' into getkeylength-2.0-2
2015-10-12 22:53:59 -05:00
terrafrost
5f1ff099da
Crypt/Base: one more cs update
2015-10-12 22:52:56 -05:00
terrafrost
8686ced6d3
Merge branch 'phpdoc-2.0' into phpdoc-master
...
Conflicts:
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RSA.php
2015-10-12 21:37:44 -05:00
terrafrost
2b427eb02a
fix merge issues
2015-10-12 14:21:22 -05:00
terrafrost
33ea01f1ac
Merge branch 'phpdoc-1.0' into phpdoc-2.0
...
Conflicts:
phpseclib/Crypt/AES.php
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Hash.php
phpseclib/Crypt/RC2.php
phpseclib/Crypt/RC4.php
phpseclib/Crypt/RSA.php
phpseclib/Crypt/Rijndael.php
phpseclib/Crypt/TripleDES.php
phpseclib/Crypt/Twofish.php
phpseclib/File/ASN1.php
phpseclib/File/X509.php
phpseclib/Math/BigInteger.php
phpseclib/Net/SCP.php
phpseclib/Net/SFTP.php
phpseclib/Net/SSH1.php
phpseclib/Net/SSH2.php
phpseclib/System/SSH/Agent.php
2015-10-12 14:10:26 -05:00
terrafrost
2048a49aac
use self:: in phpdoc comments to reduce merge conflicts
2015-10-11 12:22:07 -05:00
Scott
29b1bb7a58
Update random_bytes() to conform to PHP7.0.0-RC3
...
Fixes #843
2015-10-09 15:19:59 -04:00
terrafrost
19229ed224
phpDoc changes
2015-10-05 13:22:51 -05:00
terrafrost
829ce9a3ec
RSA: make it so plugin names are not case sensitive
2015-10-04 23:18:13 -05:00
terrafrost
49393d1b3a
Merge branch 'getkeylength' into getkeylength-2.0-2
...
Conflicts:
phpseclib/Crypt/Base.php
phpseclib/Crypt/Blowfish.php
phpseclib/Crypt/DES.php
phpseclib/Crypt/Rijndael.php
2015-10-04 21:38:47 -05:00
terrafrost
d91158f6ef
rename key_size -> key_length
2015-10-04 21:06:17 -05:00
terrafrost
26a0a0890c
Merge branch 'getkeylength' into getkeylength-2.0-2
...
Conflicts:
phpseclib/Crypt/RC2.php
phpseclib/Crypt/TripleDES.php
2015-10-04 16:40:15 -05:00
terrafrost
27034825f3
cs changes per bantu
2015-10-04 16:29:48 -05:00
terrafrost
cfcf554531
RSA: changes to putty plugin and rm comment methods from rsa etc
2015-10-01 23:11:55 -05:00
terrafrost
fd99814e79
RSA: CS adjustments
2015-10-01 16:11:23 -05:00
terrafrost
5bddb49c62
RSA: clean up merge
2015-10-01 16:02:28 -05:00
terrafrost
91887c957d
Merge remote-tracking branch 'upstream/master' into rsa-plugins
...
Conflicts:
phpseclib/Crypt/RSA.php
phpseclib/Net/SSH2.php
2015-10-01 15:57:31 -05:00
terrafrost
ec3fe7277b
RSA: move key format handling to plugins
2015-10-01 15:41:11 -05:00
Andreas Fischer
0ba1a04c05
Merge branch '2.0'
...
* 2.0:
SFTP: don't start in local file middle when uploading to middle of the remote file
Tests/SFTP: updates to newly added unit test
SFTP: backport DavidAnderson684's changes to 1.0 branch
add unit test demo'ing issue # 830
2015-09-30 17:28:03 +02:00
terrafrost
0f49fb86bf
Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2
...
Conflicts:
phpseclib/Net/SFTP.php
tests/Functional/Net/SFTPUserStoryTest.php
2015-09-29 21:51:20 -05:00
terrafrost
6688f650f1
SFTP: don't start in local file middle when uploading to middle of
...
the remote file
2015-09-29 21:39:35 -05:00
terrafrost
26ddf02fee
Merge branch 'sftp-endless-loop' into sftp-endless-loop-v2
...
Conflicts:
phpseclib/Net/SFTP.php
2015-09-28 09:20:38 -05:00
terrafrost
e2a2ad8c91
SFTP: backport DavidAnderson684's changes to 1.0 branch
2015-09-27 10:56:05 -05:00
Andreas Fischer
70f55bd156
Merge pull request #825 from terrafrost/rsa-revamp
...
RSA: make createKey static and make it return RSA objects
* terrafrost/rsa-revamp:
RSA: make createKey static and make it return RSA objects
2015-09-25 13:16:56 +02:00
terrafrost
fab5a66fe5
RSA: make createKey static and make it return RSA objects
2015-09-24 09:43:19 -05:00
terrafrost
1f47daede7
Merge branch 'getkeylength' into getkeylength-2.0-2
2015-09-24 09:29:56 -05:00
terrafrost
8691035228
Crypt/Base: add getBlockLength() method
2015-09-24 09:29:00 -05:00
