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

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2024-09-04 21:25:34 -05:00
commit a5a3aaa3d4
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

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