octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-25 03:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2024-12-07 14:40:01 -06:00
commit 0a142733b5
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

@ -1140,6 +1140,19 @@ class SSH2
*/
var $kex_buffer = array();
/**
* 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
*/
var $strict_kex_flag = false;
/**
* Default Constructor.
*
@ -1644,9 +1657,14 @@ class SSH2
$temp = unpack('Nlength', $this->_string_shift($response, 4));
$this->kex_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
if ($this->session_id === false && count($this->kex_buffer)) {
user_error('Possible Terrapin Attack detected');
return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
if ($this->session_id === false) {
// [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)) {
user_error('Possible Terrapin Attack detected');
return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
}
}
}
@ -2057,7 +2075,7 @@ class SSH2
$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;
}