Skip to content

Commit 8ad776e

Browse files
anhuanhu
committed
Regenerate test certificates. Might be expired.
1 parent 25a330e commit 8ad776e

File tree

2 files changed

+119
-0
lines changed

2 files changed

+119
-0
lines changed

‎openssl_patches/1.1.1b/tests/mksmime_certs.txt_111b.patch‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
diff --git a/test/smime-certs/mksmime-certs.sh b/test/smime-certs/mksmime-certs.sh
2+
index c98e164b..8fad96c2
3+
--- a/test/smime-certs/mksmime-certs.sh
4+
+++ b/test/smime-certs/mksmime-certs.sh
5+
@@ -9,76 +9,75 @@
6+
7+
# Utility to recreate S/MIME certificates
8+
9+
-OPENSSL=../../apps/openssl
10+
OPENSSL_CONF=./ca.cnf
11+
export OPENSSL_CONF
12+
13+
# Root CA: create certificate directly
14+
-CN="Test S/MIME RSA Root" $OPENSSL req -config ca.cnf -x509 -nodes \
15+
+CN="Test S/MIME RSA Root" openssl req -config ca.cnf -x509 -nodes \
16+
-keyout smroot.pem -out smroot.pem -newkey rsa:2048 -days 3650
17+
18+
# EE RSA certificates: create request first
19+
-CN="Test S/MIME EE RSA #1" $OPENSSL req -config ca.cnf -nodes \
20+
+CN="Test S/MIME EE RSA #1" openssl req -config ca.cnf -nodes \
21+
-keyout smrsa1.pem -out req.pem -newkey rsa:2048
22+
# Sign request: end entity extensions
23+
-$OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \
24+
+openssl x509 -req -in req.pem -CA smroot.pem -days 3600 \
25+
-extfile ca.cnf -extensions usr_cert -CAcreateserial >>smrsa1.pem
26+
27+
-CN="Test S/MIME EE RSA #2" $OPENSSL req -config ca.cnf -nodes \
28+
+CN="Test S/MIME EE RSA #2" openssl req -config ca.cnf -nodes \
29+
-keyout smrsa2.pem -out req.pem -newkey rsa:2048
30+
-$OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \
31+
+openssl x509 -req -in req.pem -CA smroot.pem -days 3600 \
32+
-extfile ca.cnf -extensions usr_cert -CAcreateserial >>smrsa2.pem
33+
34+
-CN="Test S/MIME EE RSA #3" $OPENSSL req -config ca.cnf -nodes \
35+
+CN="Test S/MIME EE RSA #3" openssl req -config ca.cnf -nodes \
36+
-keyout smrsa3.pem -out req.pem -newkey rsa:2048
37+
-$OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \
38+
+openssl x509 -req -in req.pem -CA smroot.pem -days 3600 \
39+
-extfile ca.cnf -extensions usr_cert -CAcreateserial >>smrsa3.pem
40+
41+
# Create DSA parameters
42+
43+
-$OPENSSL dsaparam -out dsap.pem 2048
44+
+openssl dsaparam -out dsap.pem 2048
45+
46+
-CN="Test S/MIME EE DSA #1" $OPENSSL req -config ca.cnf -nodes \
47+
+CN="Test S/MIME EE DSA #1" openssl req -config ca.cnf -nodes \
48+
-keyout smdsa1.pem -out req.pem -newkey dsa:dsap.pem
49+
-$OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \
50+
+openssl x509 -req -in req.pem -CA smroot.pem -days 3600 \
51+
-extfile ca.cnf -extensions usr_cert -CAcreateserial >>smdsa1.pem
52+
-CN="Test S/MIME EE DSA #2" $OPENSSL req -config ca.cnf -nodes \
53+
+CN="Test S/MIME EE DSA #2" openssl req -config ca.cnf -nodes \
54+
-keyout smdsa2.pem -out req.pem -newkey dsa:dsap.pem
55+
-$OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \
56+
+openssl x509 -req -in req.pem -CA smroot.pem -days 3600 \
57+
-extfile ca.cnf -extensions usr_cert -CAcreateserial >>smdsa2.pem
58+
-CN="Test S/MIME EE DSA #3" $OPENSSL req -config ca.cnf -nodes \
59+
+CN="Test S/MIME EE DSA #3" openssl req -config ca.cnf -nodes \
60+
-keyout smdsa3.pem -out req.pem -newkey dsa:dsap.pem
61+
-$OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \
62+
+openssl x509 -req -in req.pem -CA smroot.pem -days 3600 \
63+
-extfile ca.cnf -extensions usr_cert -CAcreateserial >>smdsa3.pem
64+
65+
# Create EC parameters
66+
67+
-$OPENSSL ecparam -out ecp.pem -name P-256
68+
-$OPENSSL ecparam -out ecp2.pem -name K-283
69+
+openssl ecparam -out ecp.pem -name P-256
70+
+openssl ecparam -out ecp2.pem -name K-283
71+
72+
-CN="Test S/MIME EE EC #1" $OPENSSL req -config ca.cnf -nodes \
73+
+CN="Test S/MIME EE EC #1" openssl req -config ca.cnf -nodes \
74+
-keyout smec1.pem -out req.pem -newkey ec:ecp.pem
75+
-$OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \
76+
+openssl x509 -req -in req.pem -CA smroot.pem -days 3600 \
77+
-extfile ca.cnf -extensions usr_cert -CAcreateserial >>smec1.pem
78+
-CN="Test S/MIME EE EC #2" $OPENSSL req -config ca.cnf -nodes \
79+
+CN="Test S/MIME EE EC #2" openssl req -config ca.cnf -nodes \
80+
-keyout smec2.pem -out req.pem -newkey ec:ecp2.pem
81+
-$OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \
82+
+openssl x509 -req -in req.pem -CA smroot.pem -days 3600 \
83+
-extfile ca.cnf -extensions usr_cert -CAcreateserial >>smec2.pem
84+
-CN="Test S/MIME EE EC #3" $OPENSSL req -config ca.cnf -nodes \
85+
+CN="Test S/MIME EE EC #3" openssl req -config ca.cnf -nodes \
86+
-keyout smec3.pem -out req.pem -newkey ec:ecp.pem
87+
-$OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \
88+
+openssl x509 -req -in req.pem -CA smroot.pem -days 3600 \
89+
-extfile ca.cnf -extensions usr_cert -CAcreateserial >>smec3.pem
90+
# Create X9.42 DH parameters.
91+
-$OPENSSL genpkey -genparam -algorithm DH -pkeyopt dh_paramgen_type:2 \
92+
+openssl genpkey -genparam -algorithm DH -pkeyopt dh_paramgen_type:2 \
93+
-out dhp.pem
94+
# Generate X9.42 DH key.
95+
-$OPENSSL genpkey -paramfile dhp.pem -out smdh.pem
96+
-$OPENSSL pkey -pubout -in smdh.pem -out dhpub.pem
97+
+openssl genpkey -paramfile dhp.pem -out smdh.pem
98+
+openssl pkey -pubout -in smdh.pem -out dhpub.pem
99+
# Generate dummy request.
100+
-CN="Test S/MIME EE DH #1" $OPENSSL req -config ca.cnf -nodes \
101+
+CN="Test S/MIME EE DH #1" openssl req -config ca.cnf -nodes \
102+
-keyout smtmp.pem -out req.pem -newkey rsa:2048
103+
# Sign request but force public key to DH
104+
-$OPENSSL x509 -req -in req.pem -CA smroot.pem -days 3600 \
105+
+openssl x509 -req -in req.pem -CA smroot.pem -days 3600 \
106+
-force_pubkey dhpub.pem \
107+
-extfile ca.cnf -extensions usr_cert -CAcreateserial >>smdh.pem
108+
# Remove temp files.

‎scripts/openssl-unit-tests.sh‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,17 @@ setup_openssl_111b() {
261261

262262
patch_openssl
263263

264+
#update the certificates so they are not expired.
265+
cd test
266+
cd certs
267+
./setup.sh
268+
cd ..
269+
cd smime-certs
270+
chmod a+x mksmime-certs.sh
271+
./mksmime-certs.sh
272+
cd ..
273+
cd ..
274+
264275
if [ -z "${OPENSSL_NO_CONFIG}" ]; then
265276
printf "\tConfiguring.\n"
266277
# Configure for debug.

0 commit comments

Comments
 (0)