From: djm <djm@openbsd.org>
Date: Mon, 30 Aug 2021 01:15:45 +0000 (+0000)
Subject: adapt to RSA/SHA1 deprectation
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2240178a189db078c974ab61669d9071808a18f9;p=openbsd

adapt to RSA/SHA1 deprectation
---

diff --git a/regress/usr.bin/ssh/knownhosts-command.sh b/regress/usr.bin/ssh/knownhosts-command.sh
index f15df670b0c..8472ec8121c 100644
--- a/regress/usr.bin/ssh/knownhosts-command.sh
+++ b/regress/usr.bin/ssh/knownhosts-command.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: knownhosts-command.sh,v 1.2 2020/12/22 06:47:24 djm Exp $
+#	$OpenBSD: knownhosts-command.sh,v 1.3 2021/08/30 01:15:45 djm Exp $
 #	Placed in the Public Domain.
 
 tid="known hosts command "
@@ -39,7 +39,9 @@ chmod a+x $OBJ/knownhosts_command
 ${SSH} -F $OBJ/ssh_proxy x true && fail "ssh connect succeeded with bad exit"
 
 for keytype in ${SSH_HOSTKEY_TYPES} ; do
+	algs=$keytype
 	test "x$keytype" = "xssh-dss" && continue
+	test "x$keytype" = "xssh-rsa" && algs=ssh-rsa,rsa-sha2-256,rsa-sha2-512
 	verbose "keytype $keytype"
 	cat > $OBJ/knownhosts_command << _EOF
 #!/bin/sh
@@ -48,6 +50,6 @@ test "x\$1" = "x$keytype" || die "wrong keytype \$1 (expected $keytype)"
 test "x\$3" = "x$LOGNAME" || die "wrong username \$3 (expected $LOGNAME)"
 grep -- "\$1.*\$2" $OBJ/known_hosts
 _EOF
-	${SSH} -F $OBJ/ssh_proxy -oHostKeyAlgorithms=$keytype x true ||
+	${SSH} -F $OBJ/ssh_proxy -oHostKeyAlgorithms=$algs x true ||
 	    fail "ssh connect failed for keytype $x"
 done