Merge branch '3.0'

This commit is contained in:
terrafrost 2023-11-22 08:21:55 -06:00
commit d88db1afea
1 changed files with 2 additions and 2 deletions

View File

@ -2343,9 +2343,9 @@ class SSH2
$privatekey = $privatekey->withPadding(RSA::SIGNATURE_PKCS1);
$algos = ['rsa-sha2-256', 'rsa-sha2-512', 'ssh-rsa'];
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'])) {
$algos = array_intersect($this->preferred['hostkey'], $algos);
$algos = array_intersect($algos, $this->preferred['hostkey']);
}
$algo = self::array_intersect_first($algos, $this->supported_private_key_algorithms);
switch ($algo) {