Commit Graph

2587 Commits

Author SHA1 Message Date
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
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
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
9127e9d15a Merge branch '1.0' into 2.0 2017-05-14 15:36:01 -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
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
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
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
6f9dae4ec5 Merge pull request #1121 from remicollet/issue-perm
fix permission
2017-05-11 07:33:12 -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
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
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
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
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
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
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
terrafrost
062ee6b5b5 Tests: crypt_random_string -> Random::string 2017-01-27 12:35:48 -06:00
terrafrost
ac2b7ef76c Merge branch '1.0' into 2.0 2017-01-27 12:17:04 -06:00
terrafrost
1bde98fc42 Crypt: OpenSSL apparently supports variable size keys 2017-01-27 11:20:22 -06:00
Andreas Fischer
00325a3050 Merge branch '1.0' into 2.0
* 1.0:
  README: Fix typos.
2016-12-25 16:50:17 +01:00
Andreas Fischer
43bbe485cc Merge pull request #1078 from bantu/readme-polishing
README: Fix typos.

* bantu/readme-polishing:
  README: Fix typos.
2016-12-25 16:50:17 +01:00
Andreas Fischer
a0e6bd87f2 README: Fix typos. 2016-12-25 16:09:17 +01:00
terrafrost
95335f9560 SSH2: update PTY changes for 2.0 branch 2016-12-24 21:20:13 -06:00
terrafrost
6aa31b2cd1 Merge branch '1.0' into 2.0 2016-12-24 21:10:50 -06:00
terrafrost
785b477605 Merge branch 'pty-enhancement' into 1.0 2016-12-24 20:28:19 -06:00
terrafrost
f74ba2c581 Merge branch '1.0' into 2.0 2016-12-24 19:49:30 -06:00
terrafrost
a4ac7c99a7 Merge branch 'readme-polishing' into 1.0 2016-12-24 19:14:43 -06:00
Andreas Fischer
c7390e26f5 README: Reword 1.0 PEAR installation instructions. 2016-12-18 11:08:04 +01:00
Andreas Fischer
804cade3c0 README: Add branches section. 2016-12-18 11:02:41 +01:00
Andreas Fischer
bd5b8809e8 README: Merge 'Installing Development Dependencies' into 'Contributing'. 2016-12-18 10:40:25 +01:00