Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2020-07-31 08:06:58 -05:00
commit 5369b86808

View File

@ -4605,11 +4605,15 @@ class SSH2
//'none' // OPTIONAL no encryption; NOT RECOMMENDED //'none' // OPTIONAL no encryption; NOT RECOMMENDED
); );
if ($this->crypto_engine) {
$engines = array($this->crypto_engine);
} else {
$engines = array( $engines = array(
Base::ENGINE_OPENSSL, Base::ENGINE_OPENSSL,
Base::ENGINE_MCRYPT, Base::ENGINE_MCRYPT,
Base::ENGINE_INTERNAL Base::ENGINE_INTERNAL
); );
}
$ciphers = array(); $ciphers = array();
foreach ($engines as $engine) { foreach ($engines as $engine) {