summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-12-03 10:09:04 +1100
committerDamien Miller <djm@mindrot.org>2012-12-03 10:09:04 +1100
commit6618e92509bc0362352de1386ee0d70e785a9bb5 (patch)
treed0ff0d289dfc77a21cb17962ed7a0199b06153d5
parentfa51d8b6b2151c47c08ee54a0ece8173a4c465c3 (diff)
- djm@cvs.openbsd.org 2012/10/19 05:10:42
[regress/cert-userkey.sh] include a serial number when generating certs
-rw-r--r--ChangeLog3
-rw-r--r--regress/cert-userkey.sh7
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 517e9c470..ed4a60c7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
21 - dtucker@cvs.openbsd.org 2012/10/05 02:20:48 21 - dtucker@cvs.openbsd.org 2012/10/05 02:20:48
22 [regress/cipher-speed.sh regress/try-ciphers.sh] 22 [regress/cipher-speed.sh regress/try-ciphers.sh]
23 Add umac-128@openssh.com to the list of MACs to be tested 23 Add umac-128@openssh.com to the list of MACs to be tested
24 - djm@cvs.openbsd.org 2012/10/19 05:10:42
25 [regress/cert-userkey.sh]
26 include a serial number when generating certs
24 27
2520121114 2820121114
26 - (djm) OpenBSD CVS Sync 29 - (djm) OpenBSD CVS Sync
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index 6700db274..aa85cd6cb 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: cert-userkey.sh,v 1.8 2011/05/17 07:13:31 djm Exp $ 1# $OpenBSD: cert-userkey.sh,v 1.9 2012/10/19 05:10:42 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="certified user keys" 4tid="certified user keys"
@@ -22,9 +22,8 @@ for ktype in rsa dsa $ecdsa ; do
22 ${SSHKEYGEN} -q -N '' -t ${ktype} \ 22 ${SSHKEYGEN} -q -N '' -t ${ktype} \
23 -f $OBJ/cert_user_key_${ktype} || \ 23 -f $OBJ/cert_user_key_${ktype} || \
24 fail "ssh-keygen of cert_user_key_${ktype} failed" 24 fail "ssh-keygen of cert_user_key_${ktype} failed"
25 ${SSHKEYGEN} -q -s $OBJ/user_ca_key -I \ 25 ${SSHKEYGEN} -q -s $OBJ/user_ca_key -I "regress user key for $USER" \
26 "regress user key for $USER" \ 26 -z $$ -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}" 27 fail "couldn't sign cert_user_key_${ktype}"
29 # v00 ecdsa certs do not exist 28 # v00 ecdsa certs do not exist
30 test "${ktype}" = "ecdsa" && continue 29 test "${ktype}" = "ecdsa" && continue