1
0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-12 09:09:50 +01:00
Commit Graph

603 Commits

Author SHA1 Message Date
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
terrafrost
b57976ec5f SSH2: add support for rsa-sha2-256 / rsa-sha2-512 (RFC8332) 2018-05-27 09:48:44 -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
luz.paz
380517ef00 Misc. trivial typos
Found via `codespell -q 3`
2018-03-03 07:07:14 -05:00
terrafrost
3c96ca9fd1 Merge branch '2.0-channel-request-updates' into master-channel-request-updates 2017-12-25 19:12:57 -06:00
terrafrost
2a09816088 Merge branch '1.0-channel-request-updates' into 2.0-channel-request-updates 2017-12-25 19:11:13 -06:00
terrafrost
46b5bd413a SSH2: more channel handling updates 2017-12-25 19:09:20 -06:00
terrafrost
56a644faa8 replace user_error with exceptions in a few more places 2017-12-23 14:32:22 -06:00
terrafrost
239a32ff06
Merge pull request #1222 from rrran/extract_func_phpdoc
Add PhpDoc @var for extract() functions
2017-12-23 14:18:28 -06:00
Sokolovskyy Roman
62ee1a5747 Multiline phpdoc for extract to one liner 2017-12-21 10:14:53 +01:00
Sokolovskyy Roman
c705e7d9c6 Add PhpDoc @var for extract() functions 2017-12-04 11:11:43 +01:00
Sokolovskyy Roman
966ee7f170 Long array() to short [] syntax 2017-11-27 09:30:14 +01:00
terrafrost
2314b638c7
Merge pull request #1212 from rrran/func_get_args_to_tripple_dots
Get rid of func_get_args()
2017-11-23 10:02:59 -06:00
terrafrost
e2e719ee29 Merge branch '2.0' 2017-11-23 09:37:26 -06:00
terrafrost
6e9ece958b Merge branch '1.0' into 2.0 2017-11-23 09:33:35 -06:00
terrafrost
309fa0af44 SSH/SFTP: more adustments to channel handling 2017-11-23 09:31:34 -06:00
Sokolovskyy Roman
ee8f5e9769 Get rid of func_get_args() 2017-11-21 09:36:28 +01:00
terrafrost
3065d24b0d
$this->_string_shift -> Strings::shift 2017-11-13 09:27:11 -06:00
terrafrost
e91da39098 Merge branch '2.0' 2017-11-11 23:16:23 -06:00
terrafrost
6a65ea28ec Merge branch '1.0' into 2.0 2017-11-11 23:15:00 -06:00
terrafrost
b50dde76f5 SSH2: update channel handling in a few more places 2017-11-11 23:08:08 -06:00
terrafrost
c66b31e698 Merge branch '2.0' 2017-11-11 16:13:48 -06:00
terrafrost
1f7e03b43d Merge branch '1.0-multi-channel-adjustment' into 2.0 2017-11-11 16:00:05 -06:00
terrafrost
0afde6ea43 SSH2: updates to dealing with extraneous channel packets 2017-11-11 15:14:04 -06:00
terrafrost
ec579bd9ed revisions to rrran's PHPDoc changes 2017-11-05 14:35:27 -06:00
Sokolovskyy Roman
f40ea062c2 Lots of PHPDoc fixes 2017-10-25 11:44:14 +02:00
terrafrost
4f2ece4d7d Merge remote-tracking branch 'rrran/Bugfixes2' 2017-09-30 22:50:06 +01:00
terrafrost
fc6a97083c Merge branch '2.0' 2017-09-29 21:34:51 +01:00
Martijn Smit
b3add4491d Replace extension_loaded with forward compatible function exists check 2017-09-29 21:33:57 +01:00
Sokolovskyy Roman
4f399d5c33 Merge remote-tracking branch 'origin/master' into Bugfixes2 2017-09-11 11:13:03 +02:00
terrafrost
1fafe157d6 SSH2: fix bad merge 2017-09-06 00:44:38 -05:00
terrafrost
e50d8ea51c Merge branch '1.0' into ssh2-fix-multi-channel-1.0 2017-09-06 00:30:11 -05:00
terrafrost
ac19043c8b Merge branch 'ssh2-fix-multi-channel-2.0' into ssh2-fix-multi-channel-master 2017-09-05 23:42:05 -05:00
terrafrost
eeaef39827 Merge branch 'ssh2-fix-multi-channel-1.0' into 2.0 2017-09-05 23:22:09 -05:00
terrafrost
ee3fd38682 SSH2: fix typo in comment found by Iewa 2017-08-29 07:42:51 -05:00
terrafrost
a3325d102e SSH2: don't choke when getting response from diff channel in exec() 2017-08-29 00:17:48 -05:00
terrafrost
ae210871e3 Merge branch '2.0' 2017-08-28 22:45:18 -05:00
terrafrost
e669624ef5 Merge branch '1.0' into 2.0 2017-08-28 22:45:09 -05:00
terrafrost
c7e67721a2 SSH2: CS adjustment 2017-08-28 22:44:58 -05:00
terrafrost
ee5172ece5 Merge branch 'arcfour256-fix-2.0' 2017-08-27 12:33:19 -05:00
terrafrost
c4be683936 Merge branch 'arcfour256-fix-1.0' into 2.0 2017-08-27 02:43:31 -05:00
terrafrost
e5b4eef91f SSH2: workaround for bad arcfour256 implementations 2017-08-26 20:17:59 -05:00
terrafrost
b27655a262 Merge branch '2.0' 2017-08-24 23:56:08 -05:00
terrafrost
4202f653ef Merge branch '1.0' into 2.0 2017-08-24 23:55:27 -05:00
terrafrost
9cbfd23cb6 SSH2: assume any SSH server >= 1.99 supports SSH2 2017-08-24 23:52:27 -05:00
Sokolovskyy Roman
25c1ae6e00 Merge remote-tracking branch 'origin/master' into Bugfixes2 2017-08-09 12:28:02 +02:00
terrafrost
3fcce89f78 Merge remote-tracking branch 'rrran/Bugfixes' 2017-08-07 21:47:06 -05:00
terrafrost
93a3139475 Merge branch 'pre-1157-changes' 2017-08-07 21:46:28 -05:00
terrafrost
520c56a797 Merge branch 'send-kex-and-id-first-or-last-2.0' 2017-08-07 20:09:26 -05:00
terrafrost
dfb6770891 Merge branch 'send-kex-and-id-first-or-last-1.0' into 2.0 2017-08-07 18:37:11 -05:00
terrafrost
7ccb0d0b02 SSH2: send KEXINIT packet and identification string first or last 2017-08-07 00:34:58 -05:00
terrafrost
9f540a82e6 minor fixes to X509 and SSH2 2017-08-06 17:29:30 -05:00
Sokolovskyy Roman
55cacdf7cd More PHPDOC fixes 2017-08-04 12:06:25 +02:00
Sokolovskyy Roman
0fd58aeb7e Set of PHPDOC fixes
Fixed methods visibility
2017-08-03 09:19:11 +02:00
terrafrost
4171262b9e SymmetricKey: use strings for constructor and setPreferredEngine 2017-06-28 06:54:10 -05:00
terrafrost
0bbac3ebed Merge branch '2.0' 2017-06-19 22:37:21 -05:00
terrafrost
3cbb9516ef Merge branch '1.0' into 2.0 2017-06-19 22:35:22 -05:00
terrafrost
b6eb7b2009 Merge branch '2.0' 2017-06-19 22:34:28 -05:00
terrafrost
9814140055 Merge branch '1.0' into 2.0 2017-06-19 22:34:20 -05:00
Moritz Kornher
7606f81279 Add new mode READ_NEXT to only ready the next packet from the channel. 2017-06-19 22:33:08 -05:00
terrafrost
8ea3edf0d2 Merge branch '2.0' 2017-06-12 22:37:06 -05:00
terrafrost
9d0c924cbd Merge branch '1.0' into 2.0 2017-06-12 22:36:58 -05:00
Sidney Souza
4d36e67bee Fix Invalid HMAC for D-link DES-3028
When I tried connect to a dlink switch the Net_SSH2 does not choose
the correct algorithms for hmac causing an Invalid HMAC error. However,
after I commented the line 1280 everything work magnificently
2017-06-12 22:36:30 -05:00
terrafrost
a312a1d4f0 SSH2: update a few function calls to work with renamed methods 2017-05-28 09:44:38 -05:00
terrafrost
9cbf357ac5 Merge branch '2.0' 2017-03-01 22:27:31 -06:00
terrafrost
ecb92ad25c Merge branch '1.0' into 2.0 2017-03-01 22:27:00 -06:00
terrafrost
8abc0ee60c SSH2: include <pre> tags in getLog result when SAPI isn't CLI 2017-03-01 22:26:29 -06:00
terrafrost
9f4f288005 Merge branch '1.0' into 2.0 2017-03-01 22:24:59 -06:00
terrafrost
b8ceb96bd4 SSH2: include <pre> tags in getLog result when SAPI isn't CLI 2017-03-01 22:18:38 -06:00
terrafrost
a25c841108 Merge remote-tracking branch 'upstream/master' into php5-updates 2017-01-17 22:40:24 -06:00
terrafrost
b9b4f67a0f Net: add public / private / protected 2017-01-17 10:23:28 -06:00
terrafrost
c8c61055d1 Merge branch '2.0' 2016-12-24 21:34:30 -06:00
terrafrost
95335f9560 SSH2: update PTY changes for 2.0 branch 2016-12-24 21:20:13 -06:00
terrafrost
6aa31b2cd1 Merge branch '1.0' into 2.0 2016-12-24 21:10:50 -06:00
terrafrost
785b477605 Merge branch 'pty-enhancement' into 1.0 2016-12-24 20:28:19 -06:00
terrafrost
2a7c99ef1b ... 2016-12-17 17:22:11 -06:00
terrafrost
a72a168400 Merge branch '1.0' into 2.0 2016-12-17 17:03:08 -06:00
vladimirghetau
d80794b1d9 exec authentication, code reuse 2016-12-17 16:37:04 -06:00
terrafrost
b26f14e5fe SSH2: make it so disabling PTY closes exec() channel if it's open 2016-12-17 16:09:48 -06:00