Import openssh_8.0p1.orig.tar.gz

1 files changed, 10 insertions, 4 deletions

diff --git a/regress/keyscan.sh b/regress/keyscan.sh
index 3bde1219a..8940d24b6 100644
--- a/regress/keyscan.sh
+++ b/regress/keyscan.sh
@@ -1,14 +1,20 @@
-#       $OpenBSD: keyscan.sh,v 1.6 2017/04/30 23:34:55 djm Exp $
+#       $OpenBSD: keyscan.sh,v 1.9 2019/01/28 03:50:39 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" >> $OBJ/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 \