Commit Graph

3158 Commits

Author SHA1 Message Date
terrafrost
48aa55b7f6 Merge branch '1.0' into 2.0 2018-09-17 00:27:25 -05:00
Michiel Brandenburg
b4e66d343e Fixes #1296 parsing invalid certificate 2018-09-17 00:25:55 -05:00
terrafrost
f381b1feb1 Merge branch '1.0' into 2.0 2018-09-08 14:42:17 -05:00
terrafrost
f48d85ced9 SSH2: setEngine -> setPreferredEngine 2018-09-08 14:41:28 -05:00
terrafrost
6189452f1b Merge branch '1.0' into 2.0 2018-08-20 21:41:18 -05:00
terrafrost
bee6183bd7 SSH2: remove utf8_decode calls 2018-08-20 20:50:07 -05:00
terrafrost
82967a40d4 Merge branch '1.0-dsas' into 2.0 2018-08-18 15:03:25 -05:00
terrafrost
f7f156b537 SFTP: use lstat in rawlist instead of stat 2018-08-18 15:02:42 -05:00
Dean Sas
6fcd8f3a6e Remove needless assertion in rawlist test 2018-08-18 08:36:40 -05:00
Dean Sas
426dbdbfcd Ensure SFTP::rawlist gives same results regardless of statcache
Previously SFTP::rawlist gave different results depending on whether the
stat cache was enabled or not. With the stat cache turned off it did not
treat directories correctly, as it relied on the stat cache even though
it was not populated.
2018-08-18 08:36:16 -05:00
terrafrost
49e0b860de Merge branch '1.0' into 2.0 2018-07-16 00:56:57 -05:00
terrafrost
66f6d517da X509: teak validateDate 2018-07-16 00:54:16 -05:00
terrafrost
6b275cdcd5 SSH/Agent: CS adjustment 2018-05-27 11:33:37 -05:00
terrafrost
04f62f9e9c SSH2: adjustments for 2.0 branch 2018-05-27 10:48:03 -05:00
terrafrost
b8bb23c9f1 Merge branch '1.0' into 2.0 2018-05-27 10:44:17 -05:00
terrafrost
39a0b652b3 SSH/Agent: add dummy setHash() method 2018-05-27 10:29:56 -05:00
terrafrost
2113ffb72c Merge branch '1.0' into 2.0 2018-05-27 09:52:52 -05:00
terrafrost
b57976ec5f SSH2: add support for rsa-sha2-256 / rsa-sha2-512 (RFC8332) 2018-05-27 09:48:44 -05:00
terrafrost
08768998de add appveyor.yml 2018-05-19 13:46:14 -05:00
terrafrost
bf71150433 Merge branch '1.0' into 2.0 2018-05-19 07:48:33 -05:00
terrafrost
9b49d3c590 SSH2: fixes relating to delayed global requests 2018-05-19 07:45:44 -05:00
Bilge
8c299f865f
Fixed some RSA docblock types. 2018-04-25 21:18:51 +01:00
terrafrost
7053f06f91 Merge branch '1.0' into 2.0 2018-04-15 11:55:05 -05:00
terrafrost
fd33675e48 1.0.11 release 2018-04-15 11:51:35 -05:00
terrafrost
bbc651f0b6 Merge branch '1.0' into 2.0 2018-04-15 10:27:46 -05:00
terrafrost
3f226be600 Merge branch 'asn1-class-fix' into asn1-class-fix-test 2018-04-15 08:34:15 -05:00
terrafrost
7fc3cf69f8 Tests/ASN1: add test for commit 6dc7b3e 2018-04-15 08:30:02 -05:00
terrafrost
6bfca3df72 X509: CS adjustment 2018-04-14 23:41:00 -05:00
terrafrost
6dc7b3e6b9 ASN1: class is never set as key in _decode_ber 2018-04-14 23:39:05 -05:00
terrafrost
c2eb8436a9 CHANGELOG: validateLogic -> validateSignature 2018-04-10 18:58:51 -05:00
terrafrost
59047eabd2 Merge branch '1.0' into 2.0 2018-04-10 18:56:54 -05:00
terrafrost
038fbb1203 CHANGELOG: validateLogic -> validateSignature 2018-04-10 18:56:01 -05:00
terrafrost
4548b45b9e Merge branch '1.0' into 2.0 2018-04-09 23:57:25 -05:00
terrafrost
c63c223972 BigInteger: fix for (new BigInteger(48))->toString(true) 2018-04-09 23:47:38 -05:00
terrafrost
48e50fe8fa Tests/BigInteger: add test for conversion of 48 to signed hex 2018-04-09 23:36:36 -05:00
terrafrost
3dae376e9c Merge remote-tracking branch 'J5lx/2.0-cfb8' into 2.0 2018-03-27 11:06:11 -05:00
Jakob Gahde
8e6948fdd2
Backport CFB8 support from master 2018-03-27 04:32:16 +02:00
Wes
d4a98457bc Check phpinfo() is available before using
Fixes an issue I raised at https://github.com/phpseclib/phpseclib/issues/1255

Proof of logic at https://3v4l.org/RqrHt

I ended up moving more code than discussed in the issue - initially to avoid `$content` being undefined when it came to `preg_match_all()`, but also as it made sense grouping the code that way. Also, initialising `$versions` outside the check, right at the start ensures it's always defined for the `switch` code further down.
2018-03-24 11:05:16 +00:00
terrafrost
fc90c58f7f X509: update disable/enableURLFetch to work with 2.0 branch 2018-03-03 13:44:11 -06:00
terrafrost
e3a1e47824 Merge branch '1.0' into 2.0 2018-03-03 13:42:46 -06:00
terrafrost
ea47574317 X509: add methods to enable / disable URL fetching 2018-03-03 13:42:17 -06:00
terrafrost
40730d2977 X509: update intermediate cert changes to work on 2.0 branch 2018-03-03 07:46:03 -06:00
terrafrost
87decbe94b Merge branch 'authority-info-access-1.0' into authority-info-access-2.0 2018-03-03 00:15:29 -06:00
terrafrost
4438336d44 Tests/X509: add unit test for itermediate cert additions 2018-03-02 13:15:46 -06:00
terrafrost
f5807e1d4e X509: auto download intermediate certs 2018-03-02 12:53:15 -06:00
terrafrost
d305b78082 Merge branch '1.0' into 2.0 2018-02-18 22:29:13 -06:00
terrafrost
894ac25e17 1.0.10 release 2018-02-18 22:25:41 -06:00
terrafrost
473c980d0c Merge branch '1.0' into 2.0 2018-02-07 21:23:21 -06:00
terrafrost
1468ef1a23 SFTP: fix issue with extended attribute on 64-bit PHP installs 2018-02-07 21:22:54 -06:00
terrafrost
2165445f39 Merge branch '1.0' into 2.0 2018-01-30 00:39:52 -06:00