octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-08 06:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
terrafrost 2024-07-24 23:57:54 -05:00
parent 0d8ec30267
commit dc15f18bc6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Net/SSH2.php
View File

@ -1523,7 +1523,7 @@ class SSH2
$this->updateLogHistory('UNKNOWN (32)', 'SSH_MSG_KEXDH_GEX_INIT'); $this->updateLogHistory('UNKNOWN (32)', 'SSH_MSG_KEXDH_GEX_INIT');
} }
$response = $this->get_binary_packet_or_close(constant($serverKexReplyMessage)); $response = $this->get_binary_packet_or_close($serverKexReplyMessage);
[ [
$type, $type,
@ -2394,7 +2394,7 @@ class SSH2
$response = $this->get_binary_packet_or_close( $response = $this->get_binary_packet_or_close(
MessageType::USERAUTH_SUCCESS, MessageType::USERAUTH_SUCCESS,
MessageType::USERAUTH_FAILURE, MessageType::USERAUTH_FAILURE,
MessageType::USERAUTH_PK_OK MessageTypeExtra::USERAUTH_PK_OK
); );
[$type] = Strings::unpackSSH2('C', $response); [$type] = Strings::unpackSSH2('C', $response);

6
tests/Unit/Net/SSH2UnitTest.php
View File

@ -287,7 +287,7 @@ class SSH2UnitTest extends PhpseclibTestCase
}); });
$ssh->expects($this->once()) $ssh->expects($this->once())
->method('send_binary_packet') ->method('send_binary_packet')
->with(Strings::packSSH2('CNs', NET_SSH2_MSG_CHANNEL_DATA, 1, 'hello world')); ->with(Strings::packSSH2('CNs', SSH2\MessageType::CHANNEL_DATA, 1, 'hello world'));
self::setVar($ssh, 'server_channels', [1 => 1]); self::setVar($ssh, 'server_channels', [1 => 1]);
self::setVar($ssh, 'packet_size_client_to_server', [1 => 0x7FFFFFFF]); self::setVar($ssh, 'packet_size_client_to_server', [1 => 0x7FFFFFFF]);
self::setVar($ssh, 'window_size_client_to_server', [1 => 0]); self::setVar($ssh, 'window_size_client_to_server', [1 => 0]);
@ -314,7 +314,7 @@ class SSH2UnitTest extends PhpseclibTestCase
}); });
$ssh->expects($this->once()) $ssh->expects($this->once())
->method('send_binary_packet') ->method('send_binary_packet')
->with(Strings::packSSH2('CNs', NET_SSH2_MSG_CHANNEL_DATA, 1, ' world')); ->with(Strings::packSSH2('CNs', SSH2\MessageType::CHANNEL_DATA, 1, ' world'));
self::setVar($ssh, 'channel_buffers_write', [1 => 'hello']); self::setVar($ssh, 'channel_buffers_write', [1 => 'hello']);
self::setVar($ssh, 'server_channels', [1 => 1]); self::setVar($ssh, 'server_channels', [1 => 1]);
self::setVar($ssh, 'packet_size_client_to_server', [1 => 0x7FFFFFFF]); self::setVar($ssh, 'packet_size_client_to_server', [1 => 0x7FFFFFFF]);
@ -345,7 +345,7 @@ class SSH2UnitTest extends PhpseclibTestCase
}); });
$ssh->expects($this->once()) $ssh->expects($this->once())
->method('send_binary_packet') ->method('send_binary_packet')
->with(Strings::packSSH2('CNs', NET_SSH2_MSG_CHANNEL_DATA, 1, 'hello')); ->with(Strings::packSSH2('CNs', SSH2\MessageType::CHANNEL_DATA, 1, 'hello'));
self::setVar($ssh, 'server_channels', [1 => 1]); self::setVar($ssh, 'server_channels', [1 => 1]);
self::setVar($ssh, 'packet_size_client_to_server', [1 => 0x7FFFFFFF]); self::setVar($ssh, 'packet_size_client_to_server', [1 => 0x7FFFFFFF]);
self::setVar($ssh, 'window_size_client_to_server', [1 => 5]); self::setVar($ssh, 'window_size_client_to_server', [1 => 5]);