diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-12-16 02:39:05 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-12-21 13:35:42 +1100 |
| commit | e5b7cf8edca7e843adc125621e1dab14507f430a (patch) | |
| tree | 3b7fd4a0558e25b422d64b341f8c5fd50d15c013 /regress/cert-hostkey.sh | |
| parent | 40be78f503277bd91c958fa25ea9ef918a2ffd3d (diff) | |
| download | openssh-git-e5b7cf8edca7e843adc125621e1dab14507f430a.tar.gz | |
upstream: test security key host keys in addition to user keys
OpenBSD-Regress-ID: 9fb45326106669a27e4bf150575c321806e275b1
Diffstat (limited to 'regress/cert-hostkey.sh')
| -rw-r--r-- | regress/cert-hostkey.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh index 67a9795d..95d7c176 100644 --- a/regress/cert-hostkey.sh +++ b/regress/cert-hostkey.sh @@ -1,4 +1,4 @@ -# $OpenBSD: cert-hostkey.sh,v 1.21 2019/12/11 18:47:14 djm Exp $ +# $OpenBSD: cert-hostkey.sh,v 1.22 2019/12/16 02:39:05 djm Exp $ # Placed in the Public Domain. tid="certified host keys" @@ -9,7 +9,7 @@ rm -f $OBJ/cert_host_key* $OBJ/host_krl_* # Allow all hostkey/pubkey types, prefer certs for the client rsa=0 types="" -for i in `$SSH -Q key | filter_sk`; do +for i in `$SSH -Q key | maybe_filter_sk`; do if [ -z "$types" ]; then types="$i" continue @@ -70,7 +70,7 @@ touch $OBJ/host_revoked_plain touch $OBJ/host_revoked_cert cat $OBJ/host_ca_key.pub $OBJ/host_ca_key2.pub > $OBJ/host_revoked_ca -PLAIN_TYPES=`$SSH -Q key-plain | filter_sk | sed 's/^ssh-dss/ssh-dsa/g;s/^ssh-//'` +PLAIN_TYPES=`echo "$SSH_KEYTYPES" | sed 's/^ssh-dss/ssh-dsa/g;s/^ssh-//'` if echo "$PLAIN_TYPES" | grep '^rsa$' >/dev/null 2>&1 ; then PLAIN_TYPES="$PLAIN_TYPES rsa-sha2-256 rsa-sha2-512" |