Commit Graph

2774 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
6c0575f8db ASN1: update code to use 2.0-style constants 2016-07-20 00:17:24 -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
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
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
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
b4c7505148 Travis: a dev dep broke bc by upping the php reqs 2016-06-22 12:36:35 -05:00
terrafrost
0c6c223134 Merge branch '1.0' into 2.0 2016-06-22 10:16:58 -05:00
terrafrost
c788ec574f Hash: CS adjustment 2016-06-22 10:10:32 -05:00
terrafrost
0e235a1331 Merge branch '2.0' of https://github.com/terrafrost/phpseclib into 2.0 2016-06-22 09:57:24 -05:00
terrafrost
fadefe5594 Merge branch '1.0' of https://github.com/terrafrost/phpseclib into 1.0 2016-06-22 09:57:11 -05:00
terrafrost
9ce8a39204 Tests/RSA: update unit test to work on 2.0 branch 2016-06-21 22:39:33 -05:00
terrafrost
b08f17f514 Merge branch '1.0' into 2.0 2016-06-21 22:39:05 -05:00
terrafrost
5b8985447c Tests/RSA: update unit test to work with 1.0 branch 2016-06-21 22:38:37 -05:00
andrewbelcher
dd754283bb Fix zero salt length RSA signatures. 2016-06-21 22:33:47 -05:00
terrafrost
eeb65b2341 Merge branch '1.0' into 2.0 2016-06-19 19:45:00 -05:00
Mathieu Pipet
6c8affcf11 fixed sending stream resulting in a zero byte file 2016-06-19 19:44:06 -05:00
terrafrost
0121b45011 Merge branch '1.0' into 2.0 2016-06-19 10:53:45 -05:00
terrafrost
b6801c837c X509: set parameter fields to null for CSR's / RSA 2016-06-19 10:53:20 -05:00
terrafrost
7bdb09c4bd Merge branch '1.0' into 2.0 2016-06-18 23:29:33 -05:00
terrafrost
6ff421d354 BigInteger/RSA: don't compare openssl versions > 1.0 2016-06-18 23:28:33 -05:00
terrafrost
97c8d9eff3 Merge branch '1.0' into 2.0 2016-06-12 14:19:42 -05:00
terrafrost
a2e77a7728 Merge branch 'x509-constructed-dns-2.0' into 2.0 2016-06-12 14:19:39 -05:00
terrafrost
002a927746 Merge branch 'x509-constructed-dns' into 1.0 2016-06-12 14:19:08 -05:00
terrafrost
8bb4592225 Merge branch 'stream-get-contents-1.0' into 2.0 2016-06-06 23:05:15 -05:00