diff options
Diffstat (limited to 'regress/keyscan.sh')
-rw-r--r-- | regress/keyscan.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/regress/keyscan.sh b/regress/keyscan.sh index 8940d24b6..75a14ee0e 100644 --- a/regress/keyscan.sh +++ b/regress/keyscan.sh | |||
@@ -1,10 +1,9 @@ | |||
1 | # $OpenBSD: keyscan.sh,v 1.9 2019/01/28 03:50:39 dtucker Exp $ | 1 | # $OpenBSD: keyscan.sh,v 1.13 2020/01/22 07:31:27 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="keyscan" | 4 | tid="keyscan" |
5 | 5 | ||
6 | KEYTYPES=`${SSH} -Q key-plain` | 6 | for i in $SSH_KEYTYPES; do |
7 | for i in $KEYTYPES; do | ||
8 | if [ -z "$algs" ]; then | 7 | if [ -z "$algs" ]; then |
9 | algs="$i" | 8 | algs="$i" |
10 | else | 9 | else |
@@ -15,9 +14,9 @@ echo "HostKeyAlgorithms $algs" >> $OBJ/sshd_config | |||
15 | 14 | ||
16 | start_sshd | 15 | start_sshd |
17 | 16 | ||
18 | for t in $KEYTYPES; do | 17 | for t in $SSH_KEYTYPES; do |
19 | trace "keyscan type $t" | 18 | trace "keyscan type $t" |
20 | ${SSHKEYSCAN} -t $t -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \ | 19 | ${SSHKEYSCAN} -t $t -T 15 -p $PORT 127.0.0.1 127.0.0.1 127.0.0.1 \ |
21 | > /dev/null 2>&1 | 20 | > /dev/null 2>&1 |
22 | r=$? | 21 | r=$? |
23 | if [ $r -ne 0 ]; then | 22 | if [ $r -ne 0 ]; then |