summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-20 19:06:48 +1000
committerDamien Miller <djm@mindrot.org>2011-05-20 19:06:48 +1000
commitf67188fe13d3ac96493c9cd67e87f64fd07f20e5 (patch)
treeda006605603d95f35b3fd969e4a78e632ee0ab73
parentf2e407e2dd83addc26b68b4218d8b6ceaceca54b (diff)
- djm@cvs.openbsd.org 2011/05/17 07:13:31
[regress/cert-userkey.sh] fatal() if asked to generate a legacy ECDSA cert (these don't exist) and fix the regress test that was trying to generate them :)
-rw-r--r--ChangeLog4
-rw-r--r--regress/cert-userkey.sh4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cb2dce0c..80947351e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,10 @@
30 code locations in perfect sync and ordering 30 code locations in perfect sync and ordering
31 31
32 "this is at once beautiful and horrible" + ok dtucker@ 32 "this is at once beautiful and horrible" + ok dtucker@
33 - djm@cvs.openbsd.org 2011/05/17 07:13:31
34 [regress/cert-userkey.sh]
35 fatal() if asked to generate a legacy ECDSA cert (these don't exist)
36 and fix the regress test that was trying to generate them :)
33 37
3420110515 3820110515
35 - (djm) OpenBSD CVS Sync 39 - (djm) OpenBSD CVS Sync
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index fcca3708b..6700db274 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: cert-userkey.sh,v 1.7 2010/08/31 12:24:09 djm Exp $ 1# $OpenBSD: cert-userkey.sh,v 1.8 2011/05/17 07:13:31 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="certified user keys" 4tid="certified user keys"
@@ -27,7 +27,7 @@ for ktype in rsa dsa $ecdsa ; do
27 -n ${USER},mekmitasdigoat $OBJ/cert_user_key_${ktype} || 27 -n ${USER},mekmitasdigoat $OBJ/cert_user_key_${ktype} ||
28 fail "couldn't sign cert_user_key_${ktype}" 28 fail "couldn't sign cert_user_key_${ktype}"
29 # v00 ecdsa certs do not exist 29 # v00 ecdsa certs do not exist
30 test "{ktype}" = "ecdsa" && continue 30 test "${ktype}" = "ecdsa" && continue
31 cp $OBJ/cert_user_key_${ktype} $OBJ/cert_user_key_${ktype}_v00 31 cp $OBJ/cert_user_key_${ktype} $OBJ/cert_user_key_${ktype}_v00
32 cp $OBJ/cert_user_key_${ktype}.pub $OBJ/cert_user_key_${ktype}_v00.pub 32 cp $OBJ/cert_user_key_${ktype}.pub $OBJ/cert_user_key_${ktype}_v00.pub
33 ${SSHKEYGEN} -q -t v00 -s $OBJ/user_ca_key -I \ 33 ${SSHKEYGEN} -q -t v00 -s $OBJ/user_ca_key -I \