octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-29 04:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

SSH2: make bad_algorithm_candidate method static

Browse Source
This commit is contained in:
terrafrost 2018-12-29 20:54:18 -06:00
parent 5126937d40
commit 97d41fd3aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpseclib/Net/SSH2.php
View File

@ -2059,7 +2059,7 @@ class SSH2
*/ */
private function encryption_algorithm_to_key_size($algorithm) private function encryption_algorithm_to_key_size($algorithm)
{ {
if ($this->bad_key_size_fix && $this->bad_algorithm_candidate($algorithm)) { if ($this->bad_key_size_fix && self::bad_algorithm_candidate($algorithm)) {
return 16; return 16;
} }
@ -2151,7 +2151,7 @@ class SSH2
* @return bool * @return bool
* @access private * @access private
*/ */
private function bad_algorithm_candidate($algorithm) private static function bad_algorithm_candidate($algorithm)
{ {
switch ($algorithm) { switch ($algorithm) {
case 'arcfour256': case 'arcfour256':
@ -3445,7 +3445,7 @@ class SSH2
// PuTTY uses 0x9000 as the actual max packet size and so to shall we // PuTTY uses 0x9000 as the actual max packet size and so to shall we
// don't do this when GCM mode is used since GCM mode doesn't encrypt the length // don't do this when GCM mode is used since GCM mode doesn't encrypt the length
if ($remaining_length < -$this->decrypt_block_size || $remaining_length > 0x9000 || $remaining_length % $this->decrypt_block_size != 0) { if ($remaining_length < -$this->decrypt_block_size || $remaining_length > 0x9000 || $remaining_length % $this->decrypt_block_size != 0) {
if (!$this->bad_key_size_fix && $this->bad_algorithm_candidate($this->decrypt ? $this->decrypt->name : '') && !($this->bitmap & SSH2::MASK_LOGIN)) { if (!$this->bad_key_size_fix && self::bad_algorithm_candidate($this->decrypt ? $this->decrypt->name : '') && !($this->bitmap & SSH2::MASK_LOGIN)) {
$this->bad_key_size_fix = true; $this->bad_key_size_fix = true;
$this->reset_connection(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED); $this->reset_connection(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
return false; return false;