Commit Graph

583 Commits

Author SHA1 Message Date
terrafrost
e629271f7d SSH2: add getMethodsNegotiated() method 2019-03-28 18:53:26 -05:00
terrafrost
aa4c6e686a Merge branch 'master' into chacha20 2019-03-26 08:36:07 -05:00
terrafrost
16abd15089 SSH2: micro-optimization for AES-GCM 2019-03-23 21:41:52 -05:00
terrafrost
70f5eb4bf7 SSH2: Rijndael -> AES (for consistency) 2019-03-23 20:53:20 -05:00
terrafrost
539fc1a9b0 SSH2: CS adjustments 2019-03-23 19:20:06 -05:00
terrafrost
7d41903846 Merge branch '2.0' 2019-03-23 19:18:31 -05:00
terrafrost
b9f7f0c021 Merge branch '1.0' into 2.0 2019-03-23 18:43:04 -05:00
terrafrost
f111bf94b6 SSH2: fix issue with reconnecting via ping() 2019-03-23 18:42:40 -05:00
terrafrost
494d20efc8 add Salsa20 / ChaCha20 stream ciphers 2019-03-22 15:45:36 -05:00
terrafrost
0f87a0e026 SSH2: CS adjustment 2019-01-20 09:39:12 -06:00
terrafrost
c03753e3c7 Merge branch '2.0' 2019-01-20 09:17:57 -06:00
terrafrost
004a71ce19 Merge branch '1.0' into 2.0 2019-01-20 09:15:53 -06:00
terrafrost
e5ff894d4b SSH2: add missing constant 2019-01-20 09:12:43 -06:00
terrafrost
ea3c8dbd9a Merge branch '2.0' 2019-01-16 21:17:18 -06:00
terrafrost
f8ff1aa27f Merge branch '1.0' into 2.0 2019-01-16 21:16:17 -06:00
terrafrost
b0d63fbfb5 SSH2: ssh-rsa is sometimes incorrectly used instead of rsa-sha2-256 2019-01-16 21:15:11 -06:00
terrafrost
3f6eb2012a Merge branch '2.0' 2019-01-15 23:50:33 -06:00
terrafrost
31fbdb96e0 Merge branch '1.0' into 2.0 2019-01-15 23:48:54 -06:00
terrafrost
055d6097af SSH2: more strictly adhere to RFC8332 for rsa-sha2-256/512 2019-01-15 23:41:49 -06:00
terrafrost
835b1207fa SSH2: replace "$this->object !== false" with "$this->object" 2018-12-31 14:14:43 -06:00
terrafrost
17e6938fba updates to Exceptions 2018-12-31 09:55:32 -06:00
terrafrost
97d41fd3aa SSH2: make bad_algorithm_candidate method static 2018-12-29 20:54:18 -06:00
terrafrost
01c92a59f8 add support for Galois/Counter Mode (GCM) 2018-12-27 08:31:35 -06:00
terrafrost
b76a67dfb4 Merge branch '2.0' 2018-12-16 11:45:37 -06:00
terrafrost
42603ce3f4 Merge branch '1.0' into 2.0 2018-12-16 11:45:25 -06:00
terrafrost
a9c0e2d430 SSH2: setTimeout(0) didn't work as intended 2018-12-16 11:44:58 -06:00
terrafrost
669ba5224f SSH2: rm debug code 2018-11-23 00:50:56 -06:00
terrafrost
e006f5b326 Merge branch '2.0' 2018-11-22 21:55:51 -06:00
Sebastiaan Andeweg
396b9f1a0a fix order of user_error() and bitmap reset 2018-11-11 16:04:30 +01:00
Sebastiaan Andeweg
ca695f5bdd fix order of user_error() and bitmap reset 2018-11-09 16:36:50 +01:00
terrafrost
edc51aac63 Merge branch 'master' of https://github.com/phpseclib/phpseclib 2018-10-06 14:17:30 -05:00
terrafrost
8705f4b31e SSH2: update ping method to work with exceptions 2018-10-06 11:41:15 -05:00
terrafrost
c1493a8063 Merge branch '2.0' 2018-10-06 08:02:59 -05:00
terrafrost
0a379a5386 Merge branch '1.0' into 2.0 2018-10-06 01:19:33 -05:00
terrafrost
25c930cc40 SSH2: add ping() method 2018-10-06 01:19:14 -05:00
terrafrost
422533c978 Merge branch '2.0' 2018-10-05 23:01:03 -05:00
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
Jakub Chábek
bee5fd70d8 Fix invalid method name + usages in comments 2018-09-10 17:20:48 +02: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
Simon Podlipsky
d598204874
Fix return type for Read() 2018-07-22 14:17:15 +03: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
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