Import openssh_8.0p1.orig.tar.gz

1 files changed, 3 insertions, 7 deletions

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 40d46e3cd..b8e2009de 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
@@ -12,10 +12,6 @@ OSF1*)
         BIN_SH=xpg4
         export BIN_SH
         ;;
-CYGWIN_NT-5.0)
-        os=cygwin
-        TEST_SSH_IPV6=no
-        ;;
 CYGWIN*)
         os=cygwin
         ;;
@@ -469,11 +465,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 ||\