Commit Graph

3276 Commits

Author SHA1 Message Date
terrafrost
c88abcb777 Merge branch '1.0' into 2.0 2018-10-05 22:49:24 -05:00
terrafrost
0c26415f93 SSH2: reset $this->bitmap when the connection fails 2018-10-05 21:27:59 -05:00
terrafrost
44c2003d4b
Merge pull request #1295 from grongor/fix-wrong-method-name
Fix invalid method name + usages in comments
2018-09-17 00:45:19 -05:00
terrafrost
4bc53f1251 Merge branch '2.0' 2018-09-17 00:29:24 -05:00
terrafrost
32ce6a0d3e Tests/ASN1: update unit test to work on 2.0 2018-09-17 00:27:42 -05:00
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
Jakub Chábek
bee5fd70d8 Fix invalid method name + usages in comments 2018-09-10 17:20:48 +02:00
terrafrost
640fb24ab3 Merge branch '2.0' 2018-09-08 14:42:26 -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
086afadf1b Merge branch '2.0' 2018-08-20 21:42:00 -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
6021e74a79 Merge branch '2.0-dsas' 2018-08-18 15:04:51 -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
6973285758 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2018-08-11 23:56:15 -05:00
terrafrost
7740d9c0c0 Hash: add sha3 support 2018-08-11 23:55:41 -05:00
terrafrost
f434acc167
Merge pull request #1284 from simPod/fix-types
Fix return type for Read()
2018-07-24 15:51:33 -05:00
Simon Podlipsky
d598204874
Fix return type for Read() 2018-07-22 14:17:15 +03:00
terrafrost
790b9cb22c Merge branch '2.0' 2018-07-16 00:57:08 -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
383e4e73a7 Merge branch '2.0' 2018-05-27 11:34:32 -05:00
terrafrost
6b275cdcd5 SSH/Agent: CS adjustment 2018-05-27 11:33:37 -05:00
terrafrost
ffb21d7622 SSH/Agent: fix bad merge 2018-05-27 11:27:19 -05:00
terrafrost
03f9a4dc7e Merge branch '2.0' 2018-05-27 10:54:36 -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
0b2eb54a29 Merge branch '2.0' 2018-05-27 09:55:45 -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
8da15ab19b Merge branch '2.0' 2018-05-19 07:48:42 -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
terrafrost
4b6a26acda
Merge pull request #1269 from henk23/patch-1
Fix composer require syntax in readme
2018-05-10 10:29:10 -05:00
henk23
cc6131a329
Fix composer require syntax in readme
According to https://getcomposer.org/doc/03-cli.md#require
2018-05-10 15:51:30 +02:00
terrafrost
78eb98311f Merge branch '2.0' 2018-04-29 16:56:35 -05:00
Bilge
8c299f865f
Fixed some RSA docblock types. 2018-04-25 21:18:51 +01:00
terrafrost
03d59d73c0 Merge branch '2.0' 2018-04-15 11:55:13 -05: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
28b26b50df Merge branch '2.0' 2018-04-15 10:31:12 -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