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

2532 Commits

Author SHA1 Message Date
terrafrost
5416b9eddc Merge branch '2.0' 2016-08-28 10:45:37 -05:00
terrafrost
6dc50cc5c9 ASN1: update unit test for 2.0 branch 2016-08-28 10:45:31 -05:00
terrafrost
281cfcdcea Merge branch '1.0' into 2.0 2016-08-28 10:45:04 -05:00
terrafrost
5c2ffd2544 ASN1: fix infinite loop during ASN1 decode process 2016-08-28 10:43:33 -05:00
terrafrost
41f85e9c25 Merge branch '1.0' into 2.0 2016-08-18 13:49:14 -05:00
terrafrost
c27fd2e66f updates for 1.0.3 release 2016-08-18 13:43:04 -05:00
terrafrost
da0c41ddac Merge branch '2.0' 2016-08-11 23:10:43 -05:00
terrafrost
c20b661a44 SSH2: don't check for carriage return in version id string 2016-08-11 23:09:38 -05:00
terrafrost
719fb8d7a8 Merge branch '2.0' of https://github.com/phpseclib/phpseclib into 2.0 2016-08-04 07:32:07 -05:00
terrafrost
e6a2ce1d6d Merge branch '1.0' of https://github.com/phpseclib/phpseclib into 1.0 2016-08-04 07:30:46 -05:00
terrafrost
cc75d317a8 Merge branch '2.0' 2016-08-04 01:08:20 -05:00
terrafrost
ffdac88f17 Merge branch '1.0' into 2.0 2016-08-04 01:07:55 -05:00
terrafrost
12f70270cd fix bad cherry pick 2016-08-04 01:06:52 -05:00
terrafrost
676c1982c7 fix bad merge 2016-08-04 01:04:00 -05:00
terrafrost
1a25aefa59 cherry-picking last commit added new file 2016-08-04 00:55:21 -05:00
terrafrost
3a53545eb7 Merge branch '2.0' 2016-08-04 00:52:16 -05:00
klemens
dd23d91d41 spelling fixes 2016-08-04 00:47:52 -05:00
terrafrost
c547ee16c7 Merge branch '1.0' into 2.0 2016-08-04 00:31:15 -05:00
klemens
dca95ac662 spelling fixes 2016-08-04 00:19:27 -05:00
terrafrost
c12500cace RSA: code cleanup 2016-07-28 13:08:47 -05:00
terrafrost
06ed64ef3d Merge branch 'master' of https://github.com/phpseclib/phpseclib 2016-07-28 11:01:44 -05:00
terrafrost
caa7eed299 Merge branch '2.0' 2016-07-28 11:00:33 -05:00
terrafrost
eff01fba0e RSA: update phpdoc for 2.0 branch 2016-07-28 11:00:16 -05:00
terrafrost
61d0326bb6 Merge branch '1.0' into 2.0 2016-07-28 10:59:37 -05:00
terrafrost
b9f072bf03 RSA: phpdoc updates 2016-07-28 10:58:27 -05:00
terrafrost
a5201bf6fc Merge branch '2.0' 2016-07-23 18:55:45 -05:00
terrafrost
e59e544ed8 Merge branch '1.0' into 2.0 2016-07-23 18:55:35 -05:00
terrafrost
62381365c8 Tests/X509: make dn more generic in unit test 2016-07-23 18:54:25 -05:00
terrafrost
f339c5adcc Tests/X509: update test to work with master branch 2016-07-23 18:44:20 -05:00
terrafrost
a9bee37187 Merge branch '2.0' 2016-07-23 18:39:41 -05:00
terrafrost
2c4dcd96b4 fix issue with merge 2016-07-23 18:39:25 -05:00
terrafrost
dbdba0b7ef Merge branch '1.0' into 2.0 2016-07-23 18:16:52 -05:00
terrafrost
dc7f7e4d85 ASN1: fix PHP Warning on PHP 7.1 2016-07-23 11:01:43 -05:00
terrafrost
d31c89a8ae Merge branch '2.0' 2016-07-20 00:18:17 -05:00
terrafrost
6c0575f8db ASN1: update code to use 2.0-style constants 2016-07-20 00:17:24 -05:00
terrafrost
7eb0712a01 Merge branch '2.0' 2016-07-19 23:52:15 -05:00
terrafrost
485b8e0463 Merge branch '1.0' into 2.0 2016-07-19 23:52:09 -05:00
terrafrost
d525aa66f2 ASN1: adjust ordering of SET OF values 2016-07-19 23:48:23 -05:00
terrafrost
f7585d99d1 Merge branch '2.0' 2016-07-10 13:22:09 -05:00
terrafrost
a21f3e5132 Merge branch '1.0' into 2.0 2016-07-10 13:22:03 -05:00
terrafrost
cb4a6df10c SFTP: make symlink support relative target's 2016-07-10 13:11:24 -05:00
terrafrost
3c1985a619 Merge branch '2.0' 2016-07-10 12:56:12 -05:00
terrafrost
97f0b37bd5 Merge branch '1.0' into 2.0 2016-07-10 12:55:56 -05:00
terrafrost
7bc0e61c1d SSH2: fix "Expected SSH_FXP_STATUS or ..." error 2016-06-29 00:30:28 -05:00
terrafrost
8530cbca1a Tests/SFTP: demo "Expected SSH_FXP_STATUS or ..." error 2016-06-29 00:18:35 -05:00
terrafrost
a490e06b48 Merge branch '2.0' 2016-06-26 20:43:33 -05:00
terrafrost
17a14eceb2 Merge branch '1.0' into 2.0 2016-06-26 20:34:15 -05:00
John Sterling
88ce26f8ca Improve performance of File\X509->_mapInExtensions() for large arrays
This avoids passing array references by-value to is_array()
(which would trigger a copy) by refactoring _subArray() into
a separate is_array() check on a by-value var, and a separate
unchecked reference return.
2016-06-26 19:44:48 -05:00
John Sterling
a1e16797ca Improve performance of File\ASN1->_decode_ber() for large data
This removes the use of _string_shift() which copies the (potentially large)
latter part of the input data repeatedly, in favor of maintaining a position var
and using string indexing or substr() to only copy the (relatively small)
current data as it is parsed.
2016-06-26 19:39:44 -05:00
terrafrost
552980b086 Merge branch '2.0' 2016-06-22 12:39:02 -05:00