diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-03-24 20:19:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-04-01 10:02:56 +1100 |
| commit | 9e1777a0d1c706714b055811c12ab8cc21033e4a (patch) | |
| tree | b244b19f5e17c70b306ff21aa1d60b4d4e27e4dd /regress/hostkey-rotate.sh | |
| parent | ce1b358ea414a2cc88e4430cd5a2ea7fecd9de57 (diff) | |
| download | openssh-git-9e1777a0d1c706714b055811c12ab8cc21033e4a.tar.gz | |
upstream commit
use ${SSH} for -Q instead of installed ssh
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 b5d542d1..cde6008f 100644 --- a/regress/hostkey-rotate.sh +++ b/regress/hostkey-rotate.sh @@ -1,4 +1,4 @@ -# $OpenBSD: hostkey-rotate.sh,v 1.2 2015/03/03 17:53:40 djm Exp $ +# $OpenBSD: hostkey-rotate.sh,v 1.3 2015/03/24 20:22:17 markus Exp $ # Placed in the Public Domain. tid="hostkey rotate" @@ -15,7 +15,7 @@ rm $OBJ/known_hosts trace "prepare hostkeys" nkeys=0 all_algs="" -for k in `ssh -Q key-plain` ; do +for k in `${SSH} -Q key-plain` ; do ${SSHKEYGEN} -qt $k -f $OBJ/hkr.$k -N '' || fatal "ssh-keygen $k" echo "Hostkey $OBJ/hkr.${k}" >> $OBJ/sshd_proxy.orig nkeys=`expr $nkeys + 1` @@ -62,7 +62,7 @@ expect_nkeys $nkeys "learn hostkeys" check_key_present ssh-rsa || fail "didn't learn keys" # Check each key type -for k in `ssh -Q key-plain` ; do +for k in `${SSH} -Q key-plain` ; do verbose "learn additional hostkeys, type=$k" dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$k,$all_algs expect_nkeys $nkeys "learn hostkeys $k" @@ -109,7 +109,7 @@ dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=ssh-rsa expect_nkeys 1 "learn hostkeys" check_key_present ssh-rsa || fail "didn't learn changed key" -# $OpenBSD: hostkey-rotate.sh,v 1.2 2015/03/03 17:53:40 djm Exp $ +# $OpenBSD: hostkey-rotate.sh,v 1.3 2015/03/24 20:22:17 markus Exp $ # Placed in the Public Domain. tid="hostkey rotate" |