upstream: Generate all key supported key types and enable for keyscan

test.

OpenBSD-Regress-ID: 72f72ff49946c61bc949e1692dd9e3d71370891b

2 files changed, 15 insertions, 7 deletions

diff --git a/regress/keyscan.sh b/regress/keyscan.sh
index 3bde1219a..80e7f972a 100644
--- a/regress/keyscan.sh
+++ b/regress/keyscan.sh
@@ -1,14 +1,22 @@
-#       $OpenBSD: keyscan.sh,v 1.6 2017/04/30 23:34:55 djm Exp $
+#       $OpenBSD: keyscan.sh,v 1.7 2019/01/27 06:30:53 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="keyscan"
 
-# remove DSA hostkey
-rm -f ${OBJ}/host.dsa
+KEYTYPES=`${SSH} -Q key-plain`
+for i in $KEYTYPES; do
+        if [ -z "$algs" ]; then
+                algs="$i"
+        else
+                algs="$algs,$i"
+        fi
+done
+echo "HostKeyAlgorithms $algs" >> sshd_config
+
+cat sshd_config
 
 start_sshd
 
-KEYTYPES=`${SSH} -Q key-plain`
 for t in $KEYTYPES; do
         trace "keyscan type $t"
         ${SSHKEYSCAN} -t $t -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 40d46e3cd..e8379e178 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.64 2018/08/10 01:35:49 dtucker Exp $
+#       $OpenBSD: test-exec.sh,v 1.65 2019/01/27 06:30:53 dtucker Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -469,11 +469,11 @@ fi
 
 rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER
 
-SSH_KEYTYPES="rsa ed25519"
+SSH_KEYTYPES=`$SSH -Q key-plain`
 
-trace "generate keys"
 for t in ${SSH_KEYTYPES}; do
         # generate user key
+        trace "generating key type $t"
         if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then
                 rm -f $OBJ/$t
                 ${SSHKEYGEN} -q -N '' -t $t  -f $OBJ/$t ||\