octoleo
/
phpseclib
mirror of https://github.com/phpseclib/phpseclib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,030 Commits 4 Branches 116 Tags 20 MiB
Commit Graph

884 Commits

Author SHA1 Message Date
terrafrost 9fb26d478a Merge branch '1.0' into 2.0 2021-11-03 22:16:57 -05:00
terrafrost 29c8591cb2 SSH2: add "smart multi factor" login mode (enabled by default) 2021-11-03 22:16:14 -05:00
terrafrost 878526d7c9 SSH2: CS adjustments 2021-10-30 18:16:23 -05:00
terrafrost 13b9663ac6 Merge branch '1.0' into 3.0 2021-10-30 18:15:28 -05:00
terrafrost 895cf85dff Merge branch '0.0' into 2.0 2021-10-30 18:04:25 -05:00
vgogolin 1a942620b3 Backward compatibility with old PHP versions 
Fix for PHP Parse error:  syntax error, unexpected '[' in /vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php on line 3558
 2021-10-30 18:04:19 -05:00
terrafrost 7a739d75fe Merge branch '2.0' into 3.0 2021-10-26 20:48:46 -05:00
terrafrost 2de84fba24 Merge branch '1.0' into 2.0 2021-10-26 20:14:31 -05:00
terrafrost da6c1b06bf SSH2: add support for zlib and zlib@openssh.com compression 2021-10-26 20:04:53 -05:00
terrafrost a2c30f9d33 Merge branch '2.0' into 3.0 2021-10-11 09:15:37 -05:00
terrafrost eacb9f8614 Merge branch '1.0' into 2.0 2021-10-11 09:02:22 -05:00
terrafrost 74f1c9ed7b SSH2: CS adjustments 2021-10-11 08:58:43 -05:00
terrafrost 9a61525f44 SSH2: rm unnecessary code 2021-10-11 08:53:21 -05:00
terrafrost 0fe328936c SSH2: implement a different fix for #1613 2021-10-11 08:47:51 -05:00
terrafrost 2564032e6f Merge branch '2.0' into 3.0 2021-10-09 13:32:07 -05:00
terrafrost 2f3ca7123d SSH2: fix channel constant 2021-10-09 13:31:14 -05:00
terrafrost b3e39538b8 Merge branch '2.0' into 3.0 2021-10-09 13:27:40 -05:00
terrafrost 7b2097c6bd Merge branch '1.0' into 2.0 2021-10-09 13:24:22 -05:00
terrafrost 1fab947f01 SSH2: fixes for noisy channels 2021-10-09 13:21:09 -05:00
terrafrost 644af71b6c SSH2: readd public for 3.0 branch 2021-10-09 13:00:30 -05:00
terrafrost 025b8beb8f Merge branch '2.0' into 3.0 2021-10-09 13:00:03 -05:00
terrafrost fe6e2b9bfe Merge branch '1.0' into 2.0 2021-10-09 12:59:56 -05:00
terrafrost b29f134c24 SSH2: CS adjustments 2021-10-09 12:59:48 -05:00
terrafrost cd80f98788 Merge branch '2.0' into 3.0 2021-10-09 07:51:17 -05:00
terrafrost 7c14eedbfd Merge branch '1.0' into 2.0 2021-10-09 07:50:36 -05:00
terrafrost e4d2416bdc SSH2: SSH-2.0-CoreFTP is 15 bytes long - not 13 2021-10-09 07:50:10 -05:00
terrafrost defd5d23b1 fix bad merge 2021-09-18 10:35:21 -05:00
terrafrost 418035c404 SSH2: use weakreference when available to stop memory leak 2021-06-19 11:17:23 -05:00
terrafrost 9b1f8a260a SSH2: NET_SSH2_CHANNEL_KEEP_ALIVE -> self::CHANNEL_KEEP_ALIVE 2021-06-16 08:12:09 -05:00
terrafrost c98b163e76 SSH2: rm unneeded false checks (for which exceptions are now used) 2021-05-21 16:36:53 -05:00
terrafrost 4b2bdfa408 Merge branch '2.0' into 3.0 2021-05-18 22:02:48 -05:00
terrafrost fe6a84a58b Merge branch '1.0' into 2.0 2021-05-18 22:02:39 -05:00
terrafrost 915d1d8ca9 SSH2: fix PHP7.4 errors about accessing bool as string 2021-05-18 22:00:59 -05:00
terrafrost c1c233e907 Merge branch '2.0' into 3.0 2021-05-15 22:28:36 -05:00
terrafrost 94abf563ad Merge branch '1.0' into 2.0 2021-05-15 22:22:35 -05:00
terrafrost 8204273978 SSH2: fix issue with key re-exchange 2021-05-15 22:22:14 -05:00
terrafrost 574382e06a Merge branch '2.0' into 3.0 2021-05-14 12:56:16 -05:00
terrafrost 0b4484a107 Merge branch '1.0' into 2.0 2021-05-14 12:56:09 -05:00
terrafrost 9a7cfafc8d SSH2: timeout would occasionally infinitely loop 
this was changed from !$this->curTimeout to $this->curTimeout <= 0
in commit 96c4c3bc58
 2021-05-14 12:55:06 -05:00
terrafrost 05828a8759 SFTP: reopen channel on channel closure 2021-05-09 01:07:09 -05:00
nickyb b53f54d953 Implemented auth_methods_to_continue property and getter. 2021-05-02 08:44:02 -05:00
terrafrost f1c7946b72 Merge branch '1.0' into 2.0 2021-05-02 08:37:28 -05:00
terrafrost 0e3ef812c3 CS adjustments 2021-05-02 08:37:19 -05:00
terrafrost f1b0708446 Merge branch '1.0' into 2.0 2021-05-02 08:15:00 -05:00
nickyb aa8138a330 Support for continue auth methods. 2021-05-02 08:12:24 -05:00
terrafrost 5b6024b409 CS adjustment 2021-04-13 08:05:55 -05:00
terrafrost 4e1093fc22 CS adjustments 2021-04-12 06:17:04 -05:00
terrafrost c1ea063c63 Merge branch 'nexans-1.0' into nexans-2.0 2021-03-30 22:44:05 -05:00
terrafrost 2d6705dfbd SSH2: don't close channel on unexpected response to channel request 2021-03-30 22:43:34 -05:00
terrafrost 5cb4e29555 Merge branch 'nexans-2.0' into nexans-3.0 2021-03-30 22:41:43 -05:00
terrafrost 111852d7c0 Merge branch 'nexans-1.0' into nexans-2.0 2021-03-30 22:41:03 -05:00
terrafrost b18714c248 ... 2021-03-30 22:39:46 -05:00
terrafrost f0f8d80073 SSH2: use type boolean for want reply instead of character 2021-03-29 08:15:16 -05:00
terrafrost dfb71b4fc7 Merge branch '2.0' into 3.0 2021-03-27 10:33:46 -05:00
terrafrost fecdb6b1aa Merge branch '1.0' into 2.0 2021-03-27 10:03:23 -05:00
terrafrost 098cb69039 SSH2: don't close channel on unexpected response to channel request 2021-03-27 10:01:37 -05:00
terrafrost 624f514e88 SSH2: add setTerminal() method 2021-03-16 21:18:56 -05:00
terrafrost d74340a41c more CS adjustments 2021-03-16 06:55:20 -05:00
terrafrost eeabad1ed3 SFTP: mkdir on streams didn't work 2021-02-23 05:14:25 -06:00
terrafrost 9b24cc87d0 Merge branch 'ssh-auth-alteration-2.0' into ssh-auth-alteration-3.0 2021-01-12 23:23:26 -06:00
terrafrost 2eae2989f4 SSH2: adjustments for 2.0 branch 2021-01-12 23:20:47 -06:00
terrafrost dc7f8dafbc Merge branch 'ssh-auth-alteration-1.0' into ssh-auth-alteration-2.0 2021-01-12 23:18:16 -06:00
terrafrost 7f1b53fb67 SSH2: behave like putty with broken publickey auth 2021-01-12 23:12:19 -06:00
terrafrost 7b7d254a6c rm docblock templates 2020-12-30 09:08:05 -06:00
terrafrost b14caee559 Merge branch '2.0' into 3.0 2020-12-30 05:25:02 -06:00
terrafrost d2cadfd329 Merge branch '1.0' into 2.0 2020-12-30 05:24:54 -06:00
terrafrost a19b5b4ca8 update how @internal phpdoc attributes are used 2020-12-30 05:05:54 -06:00
terrafrost 7a9418e4e0 SSH2: suppress errors on stream_select calls 2020-12-23 10:39:00 -06:00
William Desportes 1f66009c1b
Fix a Doctum 5.3.0-dev phpdoc reported error 2020-12-19 21:28:29 +01:00
terrafrost 20852adf78 SSH2/Stream: stream_select needs to be able to access $fsock 2020-12-18 16:12:14 -06:00
terrafrost 91ab47e4a5 Merge branch 'keepalive-2.0' into 2.0 2020-12-16 23:14:58 -06:00
terrafrost 2b5e205aec Merge branch 'keepalive-1.0' into 1.0 2020-12-16 23:14:49 -06:00
terrafrost 47e1ce60b3 SSH2: syntax error 2020-12-16 09:13:05 -06:00
terrafrost 0399faa86b SSH2: syntax error 2020-12-16 09:10:35 -06:00
terrafrost 32bfbcd7d2 Merge branch 'keepalive-2.0' into keepalive-3.0 2020-12-16 08:36:43 -06:00
terrafrost 07a7c19407 Merge branch 'keepalive-1.0' into keepalive-2.0 2020-12-16 08:27:50 -06:00
terrafrost 8d567cdf29 SSH2: keepalive tweak 2020-12-16 08:26:03 -06:00
terrafrost 0ddcff753f Merge branch 'keepalive-2.0' into keepalive-3.0 2020-12-15 23:52:53 -06:00
terrafrost 43b2708254 Merge branch 'keepalive-1.0' into keepalive-2.0 2020-12-15 23:36:42 -06:00
terrafrost f0501ff72b SSH2: get_binary_packet() doesn't know about channel type 2020-12-15 23:11:54 -06:00
terrafrost a4af48c7a6 Merge branch 'keepalive-2.0' into keepalive-3.0 2020-12-15 08:52:43 -06:00
terrafrost d904f08a46 SSH2: last merge should have used microtime(true) but didn't 2020-12-15 08:43:21 -06:00
terrafrost a35535e9c6 Merge branch 'keepalive-1.0' into keepalive-2.0 2020-12-15 08:39:38 -06:00
terrafrost 194e642448 SSH2: handle keepalive@openssh.com packets 2020-12-15 08:25:42 -06:00
terrafrost c08683402e Merge branch '2.0' into 3.0 2020-12-07 08:04:12 -06:00
terrafrost 07e1160108 Merge branch '1.0' into 2.0 2020-12-07 08:01:58 -06:00
terrafrost ee4af462b6 SSH2: end connection faster for algorithm mismatch 2020-12-07 08:00:44 -06:00
terrafrost e81b31948b Merge branch '1.0' into 2.0 2020-09-28 06:20:16 -05:00
terrafrost 96c4c3bc58 SSH2: add setKeepAlive() method 2020-09-28 06:17:49 -05:00
William Desportes 480af6b980
Merge branch '2.0' into 3.0 2020-09-09 10:46:22 +02:00
William Desportes 05f6467b1d
Merge branch '1.0' into 2.0 2020-09-09 09:56:23 +02:00
William Desportes 2ae683479a
Fix phpdoc errors 2020-09-09 09:43:26 +02:00
terrafrost dcc85b795d Merge branch '2.0' into 3.0 2020-08-17 07:30:46 -05:00
terrafrost f0710fc77e Merge branch '1.0' into 2.0 2020-08-17 07:29:12 -05:00
terrafrost ded9b3043f SSH2: suppress 'broken pipe' errors 2020-08-17 07:28:17 -05:00
terrafrost 92a67a03aa Merge branch '2.0' into 3.0 2020-07-31 21:27:38 -05:00
terrafrost 5369b86808 Merge branch '1.0' into 2.0 2020-07-31 08:06:58 -05:00
terrafrost 40b4f1d557 SSH2: when building algo list look at if crypto engine is set 2020-07-31 08:05:31 -05:00
terrafrost 5fbdb8b582 Merge branch '2.0' into 3.0 2020-07-31 04:11:26 -05:00
terrafrost 4eb477051c Merge branch '1.0' into 2.0 2020-07-31 02:50:00 -05:00
terrafrost c7d7b36018 SSH2: don't try to login as none auth method for CoreFTP server 2020-07-31 02:49:21 -05:00
terrafrost e2fa9f3925 Revert "..." 
This reverts commit 827607575a.
 2020-07-08 08:48:48 -05:00
terrafrost 827607575a ... 2020-07-03 13:31:37 -05:00
terrafrost 97ab584c63 Merge branch '2.0' into 3.0 2020-05-31 12:22:45 -05:00
terrafrost ee278f3062 Merge branch 'timeout-alt-1.0' into timeout-alt-2.0 2020-05-29 08:10:36 -05:00
terrafrost 9651d075e3 SSH2: timeout after 5s for channel closures 2020-05-29 08:10:03 -05:00
terrafrost 995bf77315 SSH2: rm format_log_helper method 2020-05-12 08:35:45 -05:00
terrafrost 3b99d23220 Merge branch '1.0' into 2.0 2020-04-28 22:07:45 -05:00
Simon Podlipsky e29f5bda14 Fix return type hint of SSH2::read() 2020-04-28 22:07:39 -05:00
terrafrost ceff4cfbbc rm call_user_func() calls 2020-04-05 15:04:22 -05:00
terrafrost d37dffdb81 SSH: use an anonymous function for logging callback 2020-04-05 10:29:57 -05:00
terrafrost ef04a176dd Merge branch '2.0' into 3.0 2020-03-09 20:02:17 -05:00
terrafrost b1a1fb5a08 Merge branch '2.0' into 3.0 2020-03-07 21:36:06 -06:00
terrafrost 21c5aa3de3 Merge branch '1.0' into 2.0 2020-03-07 21:35:34 -06:00
terrafrost 95d189ca72 SSH2: try logging in with none as an auth method first 2020-03-07 21:34:38 -06:00
terrafrost ddd5a08c5f SSH2: update identifier to 3.0 2020-03-07 21:19:00 -06:00
terrafrost 59a7b1166b SSH2: use RFC8332 auth even if host key algo isn't RSA 2020-02-24 19:43:32 -06:00
terrafrost ee10846cac SSH2: more consistent exception handling 2020-02-24 18:16:31 -06:00
terrafrost 7387d79a4f Merge branch '2.0' into 3.0 2020-02-01 22:50:28 -06:00
terrafrost 8a761b5265 Merge branch '1.0' into 2.0 2020-02-01 20:14:46 -06:00
terrafrost c2be7e6480 return early if fread() response is bool(false) 2020-02-01 17:30:52 -06:00
terrafrost d0856357ea SSH2: don't adjust ssh-ed25519 signatures 2020-01-19 08:05:55 -06:00
terrafrost 6470d1c80e SSH2: @stream_select -> stream_select 2020-01-17 06:38:54 -06:00
terrafrost cb87d1885b
Merge pull request #1444 from tomsommer/patch-2 
Remove error suppression from stream_select()
 2020-01-17 06:37:44 -06:00
terrafrost 500e3225a8 SSH2: logging enhancements 2020-01-17 06:06:01 -06:00
terrafrost 81152288f8 Merge branch '1.0' into 2.0 2020-01-17 06:05:12 -06:00
terrafrost 3f448d0904 ... 2020-01-17 05:54:42 -06:00
terrafrost f1772cbf7a ... 2020-01-17 05:42:29 -06:00
terrafrost 0a1c10386a ... 2020-01-17 05:10:12 -06:00
terrafrost b4bff90106 Merge branch '2.0' into 3.0 2020-01-17 04:09:49 -06:00
terrafrost 2b08c31fb7 Merge branch '1.0' into 2.0 2020-01-17 03:59:18 -06:00
terrafrost 88568b8020 SSH2: logging enhancements 2020-01-17 03:37:25 -06:00
Tom Sommer 40bd4192fc
Update SSH2.php 2020-01-17 09:41:45 +01:00
Tom Sommer e2841212cb
Remove error suppression from stream_select() 
Suppressing errors from stream_select() makes debugging timeouts extremely hard.
 2020-01-10 11:58:36 +01:00
terrafrost 61ffe1a147 SSH2: fix rare key exchange issue 2020-01-07 00:20:47 -06:00
terrafrost 653dbd7f94 rename phpseclib/phpseclib to phpseclib/phpseclib3 for 3.0 branch 2019-11-21 19:38:03 -06:00
terrafrost e3557220d7 SSH2: sodium_compat doesn't support memzero 2019-11-13 23:47:16 -06:00
terrafrost 8ad4743364 Merge branch '2.0' into 3.0 2019-11-02 12:44:34 -05:00
terrafrost 53dcc19441 Merge branch '1.0' into 2.0 2019-11-02 12:43:08 -05:00
terrafrost a4ed6b80f3 SSH2: make window resizing behave more consistently with PuTTY 2019-11-02 12:42:34 -05:00
terrafrost f36b4686c9 SSH2: fix E_NOTICE for diffie-hellman key exchange 2019-10-09 23:59:32 -05:00
terrafrost bd534c9271 Merge branch '2.0' into 3.0 2019-09-28 13:05:42 -05:00
terrafrost d8b8275282 Merge branch '1.0' into 2.0 2019-09-28 13:03:14 -05:00
terrafrost a34a4edac5 SSH2: arcfour128 / arcfour256 was being included twice 2019-09-28 12:57:33 -05:00
terrafrost ee2ac9f818 SSH2: rm code that is never called 2019-09-28 08:32:32 -05:00
terrafrost 72fe2540ab readd visibility for 3.0 branch 2019-09-24 22:21:07 -05:00
terrafrost 52203748de Merge branch '2.0' into 3.0 2019-09-24 22:20:39 -05:00
terrafrost c00a199484 Merge branch '1.0' into 2.0 2019-09-24 22:20:26 -05:00
terrafrost d26850e56f SSH2: fix PHP4 compatability issue 2019-09-24 22:18:01 -05:00
terrafrost c14557ec8b SSH2: fix typo in exception 2019-09-18 08:26:07 -05:00