octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-11-16 10:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 2.0

Browse Source
This commit is contained in:
terrafrost 2023-11-22 08:14:20 -06:00
commit 70c7ffe42c
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

@ -2818,9 +2818,9 @@ class SSH2
$algos = array('rsa-sha2-256', 'rsa-sha2-512', 'ssh-rsa'); $algos = array('rsa-sha2-256', 'rsa-sha2-512', 'ssh-rsa');
if ($this->server_sig_algs) { if ($this->server_sig_algs) {
$algos = array_intersect($this->server_sig_algs, $algos); $algos = array_intersect($algos, $this->server_sig_algs);
} elseif (isset($this->preferred['hostkey'])) { } elseif (isset($this->preferred['hostkey'])) {
$algos = array_intersect($this->preferred['hostkey'], $algos); $algos = array_intersect($algos, $this->preferred['hostkey']);
} }
$algo = $this->_array_intersect_first($algos, $this->supported_private_key_algorithms); $algo = $this->_array_intersect_first($algos, $this->supported_private_key_algorithms);