Commit Graph

5434 Commits

Author SHA1 Message Date
terrafrost
dc15f18bc6 fix bad merge 2024-07-25 00:16:43 -05:00
terrafrost
0d8ec30267 Merge branch '3.0' 2024-07-24 23:17:25 -05:00
terrafrost
38b617210d
Merge pull request #2017 from rposky/ssh-binary-packet-uniform-retval
SSH2: Consolidate get_binary_packet error handling
2024-07-24 20:06:20 -05:00
Robert
e5d94c817c Remove trailing commas in modified method calls 2024-07-24 09:27:44 -04:00
Robert
cc7fdd59e0 Improve get binary packet helper with variadic argument 2024-07-24 09:25:45 -04:00
Robert
c1e69ddb79 Remove use of master MessageType 2024-07-12 17:14:54 -04:00
Robert
e401ee05f5 Introduce buffering to send channel packet for capability to resume across timeout 2024-07-12 17:09:21 -04:00
Robert
18d4c79bd4 Revert risky while-loop change, too fancy 2024-07-12 15:30:43 -04:00
Robert
d9d2ba59cd Reset is_timeout when sending and receiving SFTP packets 2024-07-12 15:01:35 -04:00
Robert
35fcd1984b Remove yet another remaining boolean retval, relocating window adjust recv packet handling to get_channel_packet. Ensuring window is adjusted for empty channel prior to send. 2024-07-12 15:00:22 -04:00
Robert
51a3c5f050 Remove remaining boolean retval and runtime exception handling in filter() 2024-07-09 15:56:49 -04:00
Robert
1617746239 Check packet size before extracting channel 2024-07-09 15:04:40 -04:00
Robert
d5bb57ecca Refactor to added helper enforcing message type expectation on retrieved packets, connection close on timeout 2024-07-09 14:09:17 -04:00
terrafrost
a2b8c1fef4 fix bad merge 2024-06-30 07:46:15 -05:00
terrafrost
cddea87362 Merge branch '3.0' 2024-06-30 07:36:55 -05:00
terrafrost
d8e3448584
Merge pull request #2012 from rposky/ssh-keepalive-timeout
Correction to stream timeout for keep alive
2024-06-30 07:09:49 -05:00
Robert
c9eb03423f Correct unit test failures 2024-06-28 10:25:07 -04:00
Robert
89e07e811a Restore property annotation 2024-06-28 09:52:57 -04:00
Robert
71a9fc7915 Correction to stream timeout for keep alive, wait for time remaining in interval. Reflect total wait time on packet in logging. 2024-06-28 09:39:06 -04:00
terrafrost
b63f7407c5 Merge branch '3.0' 2024-06-24 01:27:56 -05:00
terrafrost
211ebc399c CHANGELOG: add 3.0.39 release 2024-06-24 01:27:33 -05:00
terrafrost
cb5331cfc9 Merge branch '3.0' 2024-06-22 14:13:43 -05:00
terrafrost
cde532435e SSH2: fix when keep alive packets are sent 2024-06-22 13:41:35 -05:00
terrafrost
8a44423d32 Merge branch '3.0' 2024-06-22 13:31:51 -05:00
terrafrost
6737e99550
Merge pull request #2011 from timmit-nl/bugfix-undefined-variable-stop-for-master
fix #2010 back-ported for master of phpseclib
2024-06-22 13:30:22 -05:00
terrafrost
76e81b5348
Merge pull request #2010 from timmit-nl/bugfix-undefined-variable-stop
instead of $stop - $start use the defined $elapsed var
2024-06-22 13:30:03 -05:00
Tim Schoondergang
827c3333c1 fix gebackport for master of phpseclib 2024-06-21 12:48:11 +02:00
Tim Schoondergang
049601353c instead of $stop - $start use the defined $elapsed var as the var $stop isn't set. 2024-06-21 11:44:13 +02:00
terrafrost
d934e84e58 Merge branch '3.0' 2024-06-18 21:40:08 -05:00
terrafrost
a3ca80c433 Blowfish: use little endian byte order vs machine byte order 2024-06-18 21:39:44 -05:00
terrafrost
881c0a6282 Merge branch '3.0' 2024-06-17 05:12:01 -05:00
terrafrost
b18b8788e5 CHANGELOG: add 3.0.38 release 2024-06-17 05:11:32 -05:00
terrafrost
0fe8c8b7eb Merge branch '3.0' 2024-06-12 23:08:19 -05:00
terrafrost
d5654324d4 Merge branch '2.0' into 3.0 2024-06-12 23:08:13 -05:00
terrafrost
d64fbe1ef1 Merge branch '1.0' into 2.0 2024-06-12 23:08:06 -05:00
terrafrost
088803a9e3 BACKERS: add blakemckeeby - thanks!! 2024-06-12 23:07:52 -05:00
terrafrost
7e21068964 CS adjustments 2024-05-29 09:37:34 -05:00
terrafrost
b686baf782 fix bad merge 2024-05-29 09:30:32 -05:00
terrafrost
141e0c8c74 Merge branch '3.0' 2024-05-29 09:23:07 -05:00
terrafrost
38de2d9e55
Merge pull request #2006 from rposky/ssh-binary-packet-buffer
SSH2: Reorganize get_binary_packet to fetch entire packet before processing
2024-05-29 08:53:00 -05:00
Robert
962cfa607d Make data provider static 2024-05-28 12:08:32 -04:00
Robert
69c70cfc03 Correct to PHP 5.6 syntax. Remove remaining reference to removed skip_channel_filter 2024-05-28 11:38:23 -04:00
Robert
6fc9a98d42 Reorganize get_binary_packet to fetch entire payload before decrypt processing, buffering for graceful handling across timeouts.
Remove skip filter parameter from method signatures, now technically defunct as all requests through get_binary_packet incorporate the same timeout during blocking IO calls.
Introduce InvalidPacketLength exception and employ to detect OpenSSL 0.9.8e flaw at higher logical level than binary packet processing.
Removing case logic in binary packet filtering for channel message types, made extraneous by use of get_channel_packet, and possibly leading to discarded data packets.
Reset connection properties during disconnect. Rework callers of reset_connection to use disconnect_helper.
Bugfix for no encyrption algorithms negotiated with server.
2024-05-28 11:23:48 -04:00
terrafrost
4cdcb74b8c CS adjustments 2024-05-25 15:20:57 -05:00
terrafrost
0db8742630 Merge branch '3.0' 2024-05-25 14:53:05 -05:00
terrafrost
b718a63aae EC/Keys/PKCS8: code reduction 2024-05-25 14:43:40 -05:00
terrafrost
541887c33a
Merge pull request #2003 from LeonMelis/3.0
Fix support for Ed448 private keys in PKCS#8 format
2024-05-25 14:42:46 -05:00
terrafrost
9ea1b59ab6 Merge branch '3.0' 2024-05-25 12:45:20 -05:00
terrafrost
da7b2398d6 SSH2: CS adjustments 2024-05-25 12:21:51 -05:00
terrafrost
8a79979641 Merge branch '2.0' into 3.0 2024-05-25 12:20:59 -05:00