octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-28 12:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2018-09-08 14:42:17 -05:00
commit f381b1feb1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/Net/SSH2.php
View File

@ -1842,7 +1842,7 @@ class SSH2
$this->encrypt = $this->_encryption_algorithm_to_crypt_instance($encrypt); $this->encrypt = $this->_encryption_algorithm_to_crypt_instance($encrypt);
if ($this->encrypt) { if ($this->encrypt) {
if ($this->crypto_engine) { if ($this->crypto_engine) {
$this->encrypt->setEngine($this->crypto_engine); $this->encrypt->setPreferredEngine($this->crypto_engine);
} }
if ($this->encrypt->block_size) { if ($this->encrypt->block_size) {
$this->encrypt_block_size = $this->encrypt->block_size; $this->encrypt_block_size = $this->encrypt->block_size;
@ -1866,7 +1866,7 @@ class SSH2
$this->decrypt = $this->_encryption_algorithm_to_crypt_instance($decrypt); $this->decrypt = $this->_encryption_algorithm_to_crypt_instance($decrypt);
if ($this->decrypt) { if ($this->decrypt) {
if ($this->crypto_engine) { if ($this->crypto_engine) {
$this->decrypt->setEngine($this->crypto_engine); $this->decrypt->setPreferredEngine($this->crypto_engine);
} }
if ($this->decrypt->block_size) { if ($this->decrypt->block_size) {
$this->decrypt_block_size = $this->decrypt->block_size; $this->decrypt_block_size = $this->decrypt->block_size;