Commit Graph

2727 Commits

Author SHA1 Message Date
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
terrafrost
84d40ad8e0 Merge branch '2.0' 2017-05-07 13:26:39 -05:00
terrafrost
64dd2e064b Merge branch '1.0' into 2.0 2017-05-07 13:26:27 -05:00
terrafrost
35a1102c0b SFTP: fix put() with php://input as source 2017-05-07 13:25:43 -05:00
terrafrost
3fe35a4976 Merge pull request #1115 from langemeijer/master
Refactor create_function() into anonymous function
2017-04-18 00:15:03 -05:00
Casper Langemeijer
4a0118bae6 Refactor create_function() into anonymous function 2017-04-17 15:35:00 +02:00
terrafrost
4a069f7c85 rm redundant files 2017-04-15 19:35:07 -05:00
terrafrost
4058e3e217 Merge pull request #1090 from terrafrost/dsa-test-2
add DSA implementation
2017-04-15 15:49:04 -05:00
terrafrost
0a6fe37285 Merge branch '2.0' 2017-04-09 10:30:23 -05:00
terrafrost
f4ae2cf3d3 Merge branch '1.0' into 2.0 2017-04-09 10:23:20 -05:00
Moritz Fain
7fd1eefd66 Fixed ASN.1 UTCTime parsing 2017-04-09 10:15:40 -05:00
terrafrost
22bf2339d7 Merge branch '2.0' 2017-03-07 22:20:21 -06:00
terrafrost
b646d5739c Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0 2017-03-07 21:55:37 -06:00
terrafrost
91a0866fdc Tests/X509: add unit test for issue involving multiple domain names 2017-03-07 21:54:41 -06:00
terrafrost
52dcabb279 Merge pull request #1104 from metaclassing/fix-array-map-namespace
namespacing the array_map function
2017-03-07 21:50:41 -06:00
Metaclassing
42a7ff61ff namespacing the array_map function 2017-03-07 15:22:44 -06:00
terrafrost
9cbf357ac5 Merge branch '2.0' 2017-03-01 22:27:31 -06:00
terrafrost
ecb92ad25c Merge branch '1.0' into 2.0 2017-03-01 22:27:00 -06:00
terrafrost
8abc0ee60c SSH2: include <pre> tags in getLog result when SAPI isn't CLI 2017-03-01 22:26:29 -06:00
terrafrost
9f4f288005 Merge branch '1.0' into 2.0 2017-03-01 22:24:59 -06:00
terrafrost
b8ceb96bd4 SSH2: include <pre> tags in getLog result when SAPI isn't CLI 2017-03-01 22:18:38 -06:00