octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-01-12 09:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into 3.0

Browse Source
This commit is contained in:
terrafrost 2024-12-07 14:41:29 -06:00
commit b59d7be9ce
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
phpseclib/Net/SSH2.php
View File

@ -1157,6 +1157,19 @@ class SSH2
*/ */
private $kex_buffer = []; private $kex_buffer = [];
/**
* Strict KEX Flag
*
* If kex-strict-s-v00@openssh.com is present in the first KEX packet it need not
* be present in subsequent packet
*
* @see self::_key_exchange()
* @see self::exec()
* @var array
* @access private
*/
private $strict_kex_flag = false;
/** /**
* Default Constructor. * Default Constructor.
* *
@ -1689,8 +1702,13 @@ class SSH2
$first_kex_packet_follows $first_kex_packet_follows
) = Strings::unpackSSH2('L10C', $response); ) = Strings::unpackSSH2('L10C', $response);
if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) { if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
if ($this->session_id === false && count($this->kex_buffer)) { if ($this->session_id === false) {
throw new \UnexpectedValueException('Possible Terrapin Attack detected'); // [kex-strict-s-v00@openssh.com is] only valid in the initial SSH2_MSG_KEXINIT and MUST be ignored
// if [it is] present in subsequent SSH2_MSG_KEXINIT packets
$this->strict_kex_flag = true;
if (count($this->kex_buffer)) {
throw new \UnexpectedValueException('Possible Terrapin Attack detected');
}
} }
} }
@ -1926,11 +1944,11 @@ class SSH2
$packet = pack('C', NET_SSH2_MSG_NEWKEYS); $packet = pack('C', NET_SSH2_MSG_NEWKEYS);
$this->send_binary_packet($packet); $this->send_binary_packet($packet);
$response = $this->get_binary_packet_or_close(NET_SSH2_MSG_NEWKEYS); $this->get_binary_packet_or_close(NET_SSH2_MSG_NEWKEYS);
$this->keyExchangeInProgress = false; $this->keyExchangeInProgress = false;
if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) { if ($this->strict_kex_flag) {
$this->get_seq_no = $this->send_seq_no = 0; $this->get_seq_no = $this->send_seq_no = 0;
} }