Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2023-06-12 17:15:30 -05:00
commit 68d8f5b4fe

View File

@ -402,6 +402,14 @@ class SSH2
*/
var $decrypt = false;
/**
* Decryption Algorithm Name
*
* @var string|null
* @access private
*/
var $decryptName;
/**
* Client to Server Encryption Object
*
@ -411,6 +419,14 @@ class SSH2
*/
var $encrypt = false;
/**
* Encryption Algorithm Name
*
* @var string|null
* @access private
*/
var $encryptName;
/**
* Client to Server HMAC Object
*
@ -1992,7 +2008,7 @@ class SSH2
}
$this->encrypt->setKey(substr($key, 0, $encryptKeyLength));
$this->encrypt->name = $decrypt;
$this->encryptName = $encrypt;
}
$this->decrypt = $this->_encryption_algorithm_to_crypt_instance($decrypt);
@ -2022,7 +2038,7 @@ class SSH2
}
$this->decrypt->setKey(substr($key, 0, $decryptKeyLength));
$this->decrypt->name = $decrypt;
$this->decryptName = $decrypt;
}
/* The "arcfour128" algorithm is the RC4 cipher, as described in