Commit Graph

2819 Commits

Author SHA1 Message Date
terrafrost
a3d3dbd957 Merge branch '1.0' into 2.0 2016-05-07 02:39:17 -05:00
terrafrost
bf31e976c7 RSA: fix PHP4 compatability issue 2016-05-06 22:18:12 -05:00
terrafrost
43d68c6619 Merge branch '2.0' 2016-05-06 12:23:35 -05:00
terrafrost
700338beed Merge branch '1.0' into 2.0 2016-05-06 11:58:07 -05:00
terrafrost
27d9bde6d2 Merge branch 'sftp_readable_writable-1.0' into 1.0 2016-05-06 11:55:50 -05:00
terrafrost
1b92fd84f9 Merge branch '2.0' 2016-05-06 11:50:26 -05:00
terrafrost
c76b18b869 Merge branch '1.0' into 2.0 2016-05-06 11:50:15 -05:00
artyhedgehog
0dd04d1e9b Fixed confusing SSH2::getErrors return type 2016-05-06 11:49:24 -05:00
terrafrost
e762b0dc29 SFTP: add is_writable, is_writeable and is_readable 2016-05-05 16:41:15 -05:00
terrafrost
e4c4824ddb Hash: throw exceptions if hash isn't explicitly supported 2016-05-05 14:20:24 -05:00
terrafrost
305dc1967a Tests/X509: fix bad merge 2016-05-04 00:16:08 -05:00
terrafrost
538b48c346 Merge branch 'x509-constructed-dns' into x509-constructed-dns-2.0 2016-05-03 20:06:48 -05:00
terrafrost
52a7aee1f5 X509: add support for constructed DNs and non-strict DN checks 2016-05-03 18:22:53 -05:00
terrafrost
e47af2bd88 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-04-30 16:26:53 -05:00
terrafrost
398a795e1f Revert "undo merging of master to 2.0 branch"
This reverts commit 8fb4c3363d.
2016-04-30 16:23:35 -05:00
terrafrost
8fb4c3363d undo merging of master to 2.0 branch 2016-04-28 15:34:10 -05:00
terrafrost
a25ac1cd10 undo merging of master to 2.0 branch 2016-04-28 10:59:53 -05:00
terrafrost
a521bd405f Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2016-04-28 10:29:11 -05:00
terrafrost
b4743df277 Revert "Merge branch 'master' of https://github.com/phpseclib/phpseclib"
This reverts commit 638fe6971c, reversing
changes made to c46e8aeec6.
2016-04-28 09:35:49 -05:00
terrafrost
e40d6cc1cc Hash: small tweaks per Joey3000 2016-04-12 11:32:40 -05:00
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
Andreas Fischer
29659f877d Add bootstrap.php checking environment (MB_OVERLOAD_STRING). 2016-04-09 17:40:25 -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