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

SSH2: CS adjustments

Browse Source
This commit is contained in:
terrafrost 2024-05-25 12:21:51 -05:00
parent 8a79979641
commit da7b2398d6
1 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
phpseclib/Net/SSH2.php
View File

@ -2366,20 +2366,6 @@ class SSH2
} }
list($type) = Strings::unpackSSH2('C', $response); list($type) = Strings::unpackSSH2('C', $response);
if ($type == NET_SSH2_MSG_EXT_INFO) {
list($nr_extensions) = Strings::unpackSSH2('N', $response);
for ($i = 0; $i < $nr_extensions; $i++) {
list($extension_name, $extension_value) = Strings::unpackSSH2('ss', $response);
if ($extension_name == 'server-sig-algs') {
$this->supported_private_key_algorithms = explode(',', $extension_value);
}
}
$response = $this->get_binary_packet();
list($type) = Strings::unpackSSH2('C', $response);
}
list($service) = Strings::unpackSSH2('s', $response); list($service) = Strings::unpackSSH2('s', $response);
if ($type != NET_SSH2_MSG_SERVICE_ACCEPT || $service != 'ssh-userauth') { if ($type != NET_SSH2_MSG_SERVICE_ACCEPT || $service != 'ssh-userauth') {
@ -3852,26 +3838,15 @@ class SSH2
} }
break; break;
case NET_SSH2_MSG_EXT_INFO: case NET_SSH2_MSG_EXT_INFO:
$this->_string_shift($payload, 1); Strings::shift($payload, 1);
if (strlen($payload) < 4) { list($nr_extensions) = Strings::unpackSSH2('N', $payload);
return false; for ($i = 0; $i < $nr_extensions; $i++) {
} list($extension_name, $extension_value) = Strings::unpackSSH2('ss', $payload);
$nr_extensions = unpack('Nlength', $this->_string_shift($payload, 4));
for ($i = 0; $i < $nr_extensions['length']; $i++) {
if (strlen($payload) < 4) {
return false;
}
$temp = unpack('Nlength', $this->_string_shift($payload, 4));
$extension_name = $this->_string_shift($payload, $temp['length']);
if ($extension_name == 'server-sig-algs') { if ($extension_name == 'server-sig-algs') {
if (strlen($payload) < 4) { $this->supported_private_key_algorithms = explode(',', $extension_value);
return false;
}
$temp = unpack('Nlength', $this->_string_shift($payload, 4));
$this->supported_private_key_algorithms = explode(',', $this->_string_shift($payload, $temp['length']));
} }
} }
$payload = $this->_get_binary_packet($skip_channel_filter); $payload = $this->get_binary_packet($skip_channel_filter);
} }
// see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in // see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in