summaryrefslogtreecommitdiffstats
path: root/regress
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2024-06-14 02:23:55 +0200
committerDamien Miller <djm@mindrot.org>2024-06-14 02:25:51 +0200
commitabfd1f7a3cbd0a92581a0febba254b2f6649c0d9 (patch)
treeccb886ba35b4cde764d8c36f10672fc3e21e8c05 /regress
parentsshd: don't use argv[0] as PAM service name (diff)
downloadopenssh-abfd1f7a3cbd0a92581a0febba254b2f6649c0d9.tar.xz
openssh-abfd1f7a3cbd0a92581a0febba254b2f6649c0d9.zip
upstream: specify an algorithm for ssh-keyscan, otherwise it will make
multiple attempts simultaneously and confuse the test OpenBSD-Regress-ID: 6e910f3315c4345053db1bf5cbf61826b194d0b9
Diffstat (limited to 'regress')
-rw-r--r--regress/penalty.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/penalty.sh b/regress/penalty.sh
index 5ac7ef67e..ae37aaef8 100644
--- a/regress/penalty.sh
+++ b/regress/penalty.sh
@@ -44,8 +44,8 @@ sleep 8
${SSH} -F $OBJ/ssh_config somehost true || fail "authfail not expired"
verbose "penalty for no authentication"
-${SSHKEYSCAN} -p $PORT 127.0.0.1 >/dev/null 2>&1 || fatal "keyscan failed"
+${SSHKEYSCAN} -t ssh-ed25519 -p $PORT 127.0.0.1 >/dev/null 2>&1 || fatal "keyscan failed"
# Repeat attempt should be penalised
-${SSHKEYSCAN} -p $PORT 127.0.0.1 >/dev/null 2>&1 && fail "keyscan not rejected"
+${SSHKEYSCAN} -t ssh-ed25519 -p $PORT 127.0.0.1 >/dev/null 2>&1 && fail "keyscan not rejected"