tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: select all RSA hostkey algorithms for UpdateHostkeys tests, 

not just RSA-SHA1

OpenBSD-Regress-ID: b40e62b65863f2702a0c10aca583b2fe76772bd8
This commit is contained in:
djm@openbsd.org 2022-01-05 08:25:05 +00:00 committed by Damien Miller
parent 2ea1108c30
commit 294c11b1c7
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
regress/hostkey-rotate.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: hostkey-rotate.sh,v 1.9 2020/10/07 06:38:16 djm Exp $
# $OpenBSD: hostkey-rotate.sh,v 1.10 2022/01/05 08:25:05 djm Exp $
# Placed in the Public Domain.
tid="hostkey rotate"
@ -44,9 +44,14 @@ for k in $SSH_HOSTKEY_TYPES; do
echo "Hostkey $OBJ/hkr.${k}" >> $OBJ/sshd_proxy.orig
nkeys=`expr $nkeys + 1`
test "x$all_algs" = "x" || all_algs="${all_algs},"
all_algs="${all_algs}$k"
case "$k" in
ssh-rsa) secondary="ssh-rsa" ;;
ssh-rsa)
secondary="ssh-rsa"
all_algs="${all_algs}rsa-sha2-256,rsa-sha2-512,$k"
;;
*)
all_algs="${all_algs}$k"
;;
esac
done
@ -92,8 +97,12 @@ done
# Check each key type
for k in $SSH_HOSTKEY_TYPES; do
case "$k" in
ssh-rsa) alg="rsa-sha2-256,rsa-sha2-512,ssh-rsa" ;;
*) alg="$k" ;;
esac
verbose "learn additional hostkeys, type=$k"
dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$k,$all_algs
dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$alg,$all_algs
expect_nkeys $nkeys "learn hostkeys $k"
check_key_present $k || fail "didn't learn $k correctly"
done