From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 11 Sep 2015 03:44:21 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_2_P1~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c06c814aff925e11a5cc592c06929c258a014f6;p=thirdparty%2Fopenssh-portable.git

upstream commit

try all supported key types here; bz#2455 reported by
 Jakub Jelen

Upstream-Regress-ID: 188cb7d9031cdbac3a0fa58b428b8fa2b2482bba
---

diff --git a/regress/keyscan.sh b/regress/keyscan.sh
index 886f3295a..f97364b76 100644
--- a/regress/keyscan.sh
+++ b/regress/keyscan.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: keyscan.sh,v 1.4 2015/03/03 22:35:19 markus Exp $
+#	$OpenBSD: keyscan.sh,v 1.5 2015/09/11 03:44:21 djm Exp $
 #	Placed in the Public Domain.
 
 tid="keyscan"
@@ -8,7 +8,7 @@ rm -f ${OBJ}/host.dsa
 
 start_sshd
 
-KEYTYPES="rsa dsa"
+KEYTYPES=`${SSH} -Q key-plain`
 if ssh_version 1; then
 	KEYTYPES="${KEYTYPES} rsa1"
 fi