diff options
Diffstat (limited to 'regress/hostkey-rotate.sh')
-rw-r--r-- | regress/hostkey-rotate.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/regress/hostkey-rotate.sh b/regress/hostkey-rotate.sh index b5d542d12..cde6008f4 100644 --- a/regress/hostkey-rotate.sh +++ b/regress/hostkey-rotate.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: hostkey-rotate.sh,v 1.2 2015/03/03 17:53:40 djm Exp $ | 1 | # $OpenBSD: hostkey-rotate.sh,v 1.3 2015/03/24 20:22:17 markus Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="hostkey rotate" | 4 | tid="hostkey rotate" |
@@ -15,7 +15,7 @@ rm $OBJ/known_hosts | |||
15 | trace "prepare hostkeys" | 15 | trace "prepare hostkeys" |
16 | nkeys=0 | 16 | nkeys=0 |
17 | all_algs="" | 17 | all_algs="" |
18 | for k in `ssh -Q key-plain` ; do | 18 | for k in `${SSH} -Q key-plain` ; do |
19 | ${SSHKEYGEN} -qt $k -f $OBJ/hkr.$k -N '' || fatal "ssh-keygen $k" | 19 | ${SSHKEYGEN} -qt $k -f $OBJ/hkr.$k -N '' || fatal "ssh-keygen $k" |
20 | echo "Hostkey $OBJ/hkr.${k}" >> $OBJ/sshd_proxy.orig | 20 | echo "Hostkey $OBJ/hkr.${k}" >> $OBJ/sshd_proxy.orig |
21 | nkeys=`expr $nkeys + 1` | 21 | nkeys=`expr $nkeys + 1` |
@@ -62,7 +62,7 @@ expect_nkeys $nkeys "learn hostkeys" | |||
62 | check_key_present ssh-rsa || fail "didn't learn keys" | 62 | check_key_present ssh-rsa || fail "didn't learn keys" |
63 | 63 | ||
64 | # Check each key type | 64 | # Check each key type |
65 | for k in `ssh -Q key-plain` ; do | 65 | for k in `${SSH} -Q key-plain` ; do |
66 | verbose "learn additional hostkeys, type=$k" | 66 | verbose "learn additional hostkeys, type=$k" |
67 | dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$k,$all_algs | 67 | dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$k,$all_algs |
68 | expect_nkeys $nkeys "learn hostkeys $k" | 68 | expect_nkeys $nkeys "learn hostkeys $k" |
@@ -109,7 +109,7 @@ dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=ssh-rsa | |||
109 | expect_nkeys 1 "learn hostkeys" | 109 | expect_nkeys 1 "learn hostkeys" |
110 | check_key_present ssh-rsa || fail "didn't learn changed key" | 110 | check_key_present ssh-rsa || fail "didn't learn changed key" |
111 | 111 | ||
112 | # $OpenBSD: hostkey-rotate.sh,v 1.2 2015/03/03 17:53:40 djm Exp $ | 112 | # $OpenBSD: hostkey-rotate.sh,v 1.3 2015/03/24 20:22:17 markus Exp $ |
113 | # Placed in the Public Domain. | 113 | # Placed in the Public Domain. |
114 | 114 | ||
115 | tid="hostkey rotate" | 115 | tid="hostkey rotate" |