diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-11-26 23:43:10 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-11-27 11:02:49 +1100 |
| commit | ad44ca81bea83657d558aaef5a1d789a9032bac3 (patch) | |
| tree | c4143c62227e817790c3362d409cdef93b5b52da /regress/hostkey-rotate.sh | |
| parent | c6efa8a91af1d4fdb43909a23a0a4ffa012155ad (diff) | |
| download | openssh-git-ad44ca81bea83657d558aaef5a1d789a9032bac3.tar.gz | |
upstream: test FIDO2/U2F key types; ok markus@
OpenBSD-Regress-ID: 367e06d5a260407619b4b113ea0bd7004a435474
Diffstat (limited to 'regress/hostkey-rotate.sh')
| -rw-r--r-- | regress/hostkey-rotate.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/regress/hostkey-rotate.sh b/regress/hostkey-rotate.sh index 707e3290..c3e100c3 100644 --- a/regress/hostkey-rotate.sh +++ b/regress/hostkey-rotate.sh @@ -1,11 +1,8 @@ -# $OpenBSD: hostkey-rotate.sh,v 1.7 2019/11/01 01:55:41 djm Exp $ +# $OpenBSD: hostkey-rotate.sh,v 1.8 2019/11/26 23:43:10 djm Exp $ # Placed in the Public Domain. tid="hostkey rotate" -# Need full names here since they are used in HostKeyAlgorithms -HOSTKEY_TYPES="`${SSH} -Q key-plain | grep -v ^sk-`" - rm -f $OBJ/hkr.* $OBJ/ssh_proxy.orig grep -vi 'hostkey' $OBJ/sshd_proxy > $OBJ/sshd_proxy.orig @@ -20,7 +17,7 @@ secondary="$primary" trace "prepare hostkeys" nkeys=0 all_algs="" -for k in $HOSTKEY_TYPES; do +for k in $SSH_HOSTKEY_TYPES; 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` @@ -67,12 +64,12 @@ verbose "learn additional hostkeys" dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$all_algs # Check that other keys learned expect_nkeys $nkeys "learn hostkeys" -for k in $HOSTKEY_TYPES; do +for k in $SSH_HOSTKEY_TYPES; do check_key_present $k || fail "didn't learn keytype $k" done # Check each key type -for k in $HOSTKEY_TYPES; do +for k in $SSH_HOSTKEY_TYPES; do verbose "learn additional hostkeys, type=$k" dossh -oStrictHostKeyChecking=yes -oHostKeyAlgorithms=$k,$all_algs expect_nkeys $nkeys "learn hostkeys $k" |