octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2025-02-09 23:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into 3.0

Browse Source
This commit is contained in:
terrafrost 2024-09-04 21:28:07 -05:00
commit 301ef6bd18
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpseclib/Net/SSH2.php
View File

@ -5093,14 +5093,14 @@ class SSH2
if (isset($preferred['kex'])) { if (isset($preferred['kex'])) {
$preferred['kex'] = array_intersect( $preferred['kex'] = array_intersect(
$preferred['kex'], is_string($preferred['kex']) ? [$preferred['kex']] : $preferred['kex'],
static::getSupportedKEXAlgorithms() static::getSupportedKEXAlgorithms()
); );
} }
if (isset($preferred['hostkey'])) { if (isset($preferred['hostkey'])) {
$preferred['hostkey'] = array_intersect( $preferred['hostkey'] = array_intersect(
$preferred['hostkey'], is_string($preferred['hostkey']) ? [$preferred['hostkey']] : $preferred['hostkey'],
static::getSupportedHostKeyAlgorithms() static::getSupportedHostKeyAlgorithms()
); );
} }
@ -5111,19 +5111,19 @@ class SSH2
$a = &$preferred[$key]; $a = &$preferred[$key];
if (isset($a['crypt'])) { if (isset($a['crypt'])) {
$a['crypt'] = array_intersect( $a['crypt'] = array_intersect(
$a['crypt'], is_string($a['crypt']) ? [$a['crypt']] : $a['crypt'],
static::getSupportedEncryptionAlgorithms() static::getSupportedEncryptionAlgorithms()
); );
} }
if (isset($a['comp'])) { if (isset($a['comp'])) {
$a['comp'] = array_intersect( $a['comp'] = array_intersect(
$a['comp'], is_string($a['comp']) ? [$a['comp']] : $a['comp'],
static::getSupportedCompressionAlgorithms() static::getSupportedCompressionAlgorithms()
); );
} }
if (isset($a['mac'])) { if (isset($a['mac'])) {
$a['mac'] = array_intersect( $a['mac'] = array_intersect(
$a['mac'], is_string($a['mac']) ? [$a['mac']] : $a['mac'],
static::getSupportedMACAlgorithms() static::getSupportedMACAlgorithms()
); );
} }