danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2025-01-05 20:28:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source
This commit is contained in:
terrafrost 2021-05-15 22:41:27 -05:00
commit ab64bc3a63
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpseclib/Net/SSH2.php
View File

@ -1410,6 +1410,7 @@ class SSH2
private function key_exchange($kexinit_payload_server = false) private function key_exchange($kexinit_payload_server = false)
{ {
$preferred = $this->preferred; $preferred = $this->preferred;
$send_kex = true;
$kex_algorithms = isset($preferred['kex']) ? $kex_algorithms = isset($preferred['kex']) ?
$preferred['kex'] : $preferred['kex'] :
@ -1473,7 +1474,7 @@ class SSH2
0 // reserved for future extension 0 // reserved for future extension
); );
if ($this->send_kex_first) { if ($kexinit_payload_server === false) {
$this->send_binary_packet($kexinit_payload_client); $this->send_binary_packet($kexinit_payload_client);
$kexinit_payload_server = $this->get_binary_packet(); $kexinit_payload_server = $this->get_binary_packet();
@ -1486,6 +1487,8 @@ class SSH2
$this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR); $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
throw new \UnexpectedValueException('Expected SSH_MSG_KEXINIT'); throw new \UnexpectedValueException('Expected SSH_MSG_KEXINIT');
} }
$send_kex = false;
} }
$response = $kexinit_payload_server; $response = $kexinit_payload_server;
@ -1506,7 +1509,7 @@ class SSH2
$first_kex_packet_follows $first_kex_packet_follows
) = Strings::unpackSSH2('L10C', $response); ) = Strings::unpackSSH2('L10C', $response);
if (!$this->send_kex_first) { if ($send_kex) {
$this->send_binary_packet($kexinit_payload_client); $this->send_binary_packet($kexinit_payload_client);
} }