upstream commit

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

Upstream-Regress-ID: 188cb7d9031cdbac3a0fa58b428b8fa2b2482bba

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