diff options
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 1bbd47f25..08338121b 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.64 2018/08/10 01:35:49 dtucker Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.65 2019/01/27 06:30:53 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | #SUDO=sudo | 4 | #SUDO=sudo |
@@ -12,10 +12,6 @@ OSF1*) | |||
12 | BIN_SH=xpg4 | 12 | BIN_SH=xpg4 |
13 | export BIN_SH | 13 | export BIN_SH |
14 | ;; | 14 | ;; |
15 | CYGWIN_NT-5.0) | ||
16 | os=cygwin | ||
17 | TEST_SSH_IPV6=no | ||
18 | ;; | ||
19 | CYGWIN*) | 15 | CYGWIN*) |
20 | os=cygwin | 16 | os=cygwin |
21 | ;; | 17 | ;; |
@@ -469,11 +465,11 @@ fi | |||
469 | 465 | ||
470 | rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER | 466 | rm -f $OBJ/known_hosts $OBJ/authorized_keys_$USER |
471 | 467 | ||
472 | SSH_KEYTYPES="rsa ed25519" | 468 | SSH_KEYTYPES=`$SSH -Q key-plain` |
473 | 469 | ||
474 | trace "generate keys" | ||
475 | for t in ${SSH_KEYTYPES}; do | 470 | for t in ${SSH_KEYTYPES}; do |
476 | # generate user key | 471 | # generate user key |
472 | trace "generating key type $t" | ||
477 | if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then | 473 | if [ ! -f $OBJ/$t ] || [ ${SSHKEYGEN_BIN} -nt $OBJ/$t ]; then |
478 | rm -f $OBJ/$t | 474 | rm -f $OBJ/$t |
479 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ | 475 | ${SSHKEYGEN} -q -N '' -t $t -f $OBJ/$t ||\ |