1
0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-13 01:27:40 +01:00
Commit Graph

2747 Commits

Author SHA1 Message Date
terrafrost
03ca09a104 Merge branch '2.0' 2017-06-12 21:26:20 -05:00
terrafrost
53acccdb08 Merge branch '1.0' into 2.0 2017-06-12 21:19:18 -05:00
David Hedberg
bbf467babd SFTP: Add enablePathCanonicalization()/disablePathCanonicalization() 2017-06-12 21:17:55 -05:00
terrafrost
f5e0cab82d Merge branch '2.0' 2017-06-05 01:33:15 -05:00
terrafrost
34a7699e6f Merge branch '1.0' into 2.0 2017-06-05 01:31:10 -05:00
terrafrost
0bb6c9b974 SFTP: rm NO_REALPATH changes 2017-06-05 01:30:30 -05:00
terrafrost
6ecf69b201 Merge branch '1.0' into 2.0 2017-06-05 01:25:41 -05:00
terrafrost
55623933f3 1.0.7 release 2017-06-05 01:22:53 -05:00
terrafrost
1564a27f6e SFTP: make NO_REALPATH apply to get() as well 2017-06-05 00:44:29 -05:00
David Hedberg
5979ed571f SFTP: Add a NO_REALPATH option to put() 2017-06-05 00:12:57 -05:00
terrafrost
39b66d512d Tests/RSA: update test for master branch 2017-05-29 06:34:06 -05:00
terrafrost
6ca7323401 Merge branch '2.0' 2017-05-29 06:33:24 -05:00
terrafrost
fe8f1bba7b Tests/RSA: update unit test for 2.0 branch 2017-05-29 06:33:01 -05:00
terrafrost
a4cd384bab Merge branch '1.0' into 2.0 2017-05-29 06:32:23 -05:00
terrafrost
a451dd69f8 RSA: reset variables if bad key was loaded 2017-05-29 06:31:54 -05:00
terrafrost
f089aa4eb9 Tests/RSA: add unit test for loading bad key after loading good key 2017-05-29 06:20:46 -05:00
terrafrost
29b5a4dd25 Merge branch '2.0' 2017-05-28 09:59:18 -05:00
terrafrost
e9d21367fa Merge branch '1.0' into 2.0 2017-05-28 09:57:45 -05:00
terrafrost
228b60cfe5 Random: suppress E_DEPRECATED errors 2017-05-28 09:53:02 -05:00
terrafrost
a312a1d4f0 SSH2: update a few function calls to work with renamed methods 2017-05-28 09:44:38 -05:00
terrafrost
2d226b057c Merge branch '2.0' 2017-05-28 09:11:06 -05:00
terrafrost
5e2afe3a73 Merge branch '1.0' into 2.0 2017-05-28 09:10:58 -05:00
terrafrost
9bccc01b97 Tests/SSH2: add unit test for #1009 2017-05-28 08:58:00 -05:00
terrafrost
e1827f35cf Merge branch '2.0' 2017-05-14 15:36:08 -05:00
terrafrost
9127e9d15a Merge branch '1.0' into 2.0 2017-05-14 15:36:01 -05:00
terrafrost
c25eb3ed9b Merge branch 'master-crypt-fix-old-openssl' 2017-05-14 15:35:22 -05:00
terrafrost
83514e3991 Merge pull request #1127 from terrafrost/crypt-fix-old-openssl
Crypt: fix OpenSSL engine on <= PHP 5.3.6 (1.0 branch)
2017-05-14 15:34:22 -05:00
terrafrost
ae41ac1ac3 Merge pull request #1128 from terrafrost/2.0-crypt-fix-old-openssl
Crypt: fix OpenSSL engine on <= PHP 5.3.6 (2.0 branch)
2017-05-14 15:34:16 -05:00
terrafrost
450d5bd5ce Merge branch '2.0' 2017-05-14 09:44:43 -05:00
terrafrost
126b4f32b4 Merge branch '1.0' into 2.0 2017-05-14 09:44:34 -05:00
terrafrost
c9cfa9ead8 CHANGELOG: add 1.0.6 release 2017-05-14 09:42:10 -05:00
terrafrost
baeb68eb82 Merge branch '2.0' 2017-05-14 08:50:57 -05:00
terrafrost
4b24877a2c Merge branch '1.0' into 2.0 2017-05-14 08:50:13 -05:00
terrafrost
19c71e4a98 X509: include subjectaltname extension even if only one domain name 2017-05-14 08:49:04 -05:00
terrafrost
085d5ed495 Merge branch '2.0-crypt-fix-old-openssl' 2017-05-13 23:24:53 -05:00
terrafrost
9fc9d2fa19 Merge branch 'crypt-fix-old-openssl' into 2.0 2017-05-13 23:21:14 -05:00
terrafrost
a983412ea9 Crypt: fix OpenSSL engine on <= PHP 5.3.6 2017-05-13 23:18:42 -05:00
terrafrost
5c51c2570c Merge branch '2.0' 2017-05-11 07:33:55 -05:00
terrafrost
6f9dae4ec5 Merge pull request #1121 from remicollet/issue-perm
fix permission
2017-05-11 07:33:12 -05:00
terrafrost
e017a0b6c6 Merge branch '2.0' 2017-05-09 21:32:17 -05:00
terrafrost
0c8cfd232a Merge branch '1.0' into 2.0 2017-05-09 21:32:03 -05:00
Remi Collet
d85ee2cb3b fix permission 2017-05-09 21:30:03 -05:00
Remi Collet
9706f37644 fix permission 2017-05-08 17:23:20 +02:00
terrafrost
7882249a14 Merge branch '2.0' 2017-05-08 00:58:42 -05:00
terrafrost
f8dd0e18d2 Merge branch '1.0' into 2.0 2017-05-08 00:58:35 -05:00
terrafrost
aa8368ed12 README: add 1.0.6 release 2017-05-08 00:58:24 -05:00
terrafrost
31f4406b6e Merge branch 'master' of https://github.com/phpseclib/phpseclib 2017-05-07 15:08:36 -05:00
terrafrost
851e662544 Merge branch '2.0' 2017-05-07 15:07:18 -05:00
terrafrost
a647afa8be Merge branch '1.0' into 2.0 2017-05-07 15:07:11 -05:00
terrafrost
73c51d8e6e Travis: rm hhvm 2017-05-07 15:07:04 -05:00