Commit Graph

2398 Commits

Author SHA1 Message Date
terrafrost
b3171cc63f SFTP: fix logging constants 2016-04-11 19:30:45 -05:00
terrafrost
076c69fa1b Merge branch '1.0' into 2.0 2016-04-11 15:18:50 -05:00
terrafrost
d22bcd63cc SFTP: nlist() on a non-existent directory resulted in error 2016-04-11 15:18:06 -05:00
terrafrost
4bfeeee5a0 Merge branch '2.0' 2016-04-10 11:58:07 -05:00
terrafrost
8556b20220 Travis: rm 5.3.3 support 2016-04-10 11:57:58 -05:00
terrafrost
ceb6dc0255 System/SSH/Agent: fix namespacing on BadConfigurationException 2016-04-10 11:48:08 -05:00
terrafrost
324a973ec1 Merge branch '2.0' 2016-04-10 11:39:55 -05:00
terrafrost
4e4397afc9 Merge branch '1.0' into 2.0 2016-04-10 11:38:03 -05:00
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
6a97ddfa72 SSH/Agent: if comment is empty don't include it 2016-04-10 10:58:49 -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
c46e8aeec6 Bootstrap: CS adjustments 2016-04-09 18:06:01 -05:00
terrafrost
ef04c870e9 Merge remote-tracking branch 'bantu/bootstrap' 2016-04-09 13:04:34 -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
a3000aac28 Tests/RSA: CS adjustment 2016-04-03 22:56:48 -05:00
terrafrost
383bceb1a9 Tests/RSA: fix bad merge 2016-04-03 22:07:49 -05:00
terrafrost
9cf93a02b3 Merge branch '2.0' 2016-04-03 21:37:52 -05:00
terrafrost
8f614a0538 RSA: update macdabby's changes to work on 2.0 branch 2016-04-03 21:35:33 -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
terrafrost
0d92ef31af Update composer.lock file 2016-03-29 12:21:27 -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
Scott
bdb9935e35 Update composer.json 2016-03-24 17:10:07 -04: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
56acb6723c Tests/BigInteger: add unit test for abhishektaneja's sliding window fix 2016-03-19 12:06:12 -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
18ef9eae61 Merge branch '2.0' 2016-03-18 12:01:26 -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