diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-01-19 17:31:13 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-20 09:45:56 +1100 |
| commit | d3716ca19e510e95d956ae14d5b367e364bff7f1 (patch) | |
| tree | 460c273fc610e07477511607fe1d68287b17d32b /regress/krl.sh | |
| parent | 3f797653748e7c2b037dacb57574c01d9ef3b4d3 (diff) | |
| download | openssh-git-d3716ca19e510e95d956ae14d5b367e364bff7f1.tar.gz | |
upstream commit
this test was broken in at least two ways, such that it
wasn't checking that a KRL was not excluding valid keys
Diffstat (limited to 'regress/krl.sh')
| -rw-r--r-- | regress/krl.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/regress/krl.sh b/regress/krl.sh index a672e0da..799f9d09 100644 --- a/regress/krl.sh +++ b/regress/krl.sh @@ -1,4 +1,4 @@ -# $OpenBSD: krl.sh,v 1.4 2014/11/17 00:21:40 djm Exp $ +# $OpenBSD: krl.sh,v 1.5 2015/01/19 17:31:13 djm Exp $ # Placed in the Public Domain. tid="key revocation lists" @@ -47,6 +47,7 @@ EOF # A specification that revokes some certificated by key ID. touch $OBJ/revoked-keyid for n in 1 2 3 4 10 15 30 50 `jot 500 300` 999 1000 1001 1002; do + test "x$n" = "x499" && continue # Fill in by-ID revocation spec. echo "id: revoked $n" >> $OBJ/revoked-keyid done @@ -58,7 +59,7 @@ keygen() { keytype=$ECDSA case $N in 2 | 10 | 510 | 1001) keytype=rsa;; - 4 | 30 | 520 | 1002) keytype=dsa;; + 4 | 30 | 520 | 1002) keytype=ed25519;; esac $SSHKEYGEN -t $keytype -f $f -C "" -N "" > /dev/null \ || fatal "$SSHKEYGEN failed" @@ -76,11 +77,12 @@ for n in $REVOKED_SERIALS ; do REVOKED_KEYS="$REVOKED_KEYS ${f}.pub" REVOKED_CERTS="$REVOKED_CERTS ${f}-cert.pub" done -NOTREVOKED_SERIALS="5 9 14 16 29 30 49 51 499 800 1000 1001" -NOTREVOKED="" -for n in $NOTREVOKED_SERIALS ; do - NOTREVOKED_KEYS="$NOTREVOKED_KEYS ${f}.pub" - NOTREVOKED_CERTS="$NOTREVOKED_CERTS ${f}-cert.pub" +UNREVOKED_SERIALS="5 9 14 16 29 49 51 499 800 1010 1011" +UNREVOKED="" +for n in $UNREVOKED_SERIALS ; do + f=`keygen $n` + UNREVOKED_KEYS="$UNREVOKED_KEYS ${f}.pub" + UNREVOKED_CERTS="$UNREVOKED_CERTS ${f}-cert.pub" done genkrls() { |