Skip to content

Commit 58b9497

Browse files
indutnyrvagg
authored andcommittedAug 13, 2018
test: update certificates and private keys
The certificates in test fixtures were set to expire in 999 days since they were generated. That time has passed, and they have to be reissued. Bump expiration time to 99999 days for all of them to prevent this from happening again in near future. PR-URL: #22184 Fixes: #22182 Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
1 parent 9863e11 commit 58b9497

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+842
-894
lines changed
 

‎test/fixtures/keys/Makefile

+19-20
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
all: agent1-cert.pem agent1-pfx.pem agent2-cert.pem agent3-cert.pem agent4-cert.pem agent5-cert.pem agent6-cert.pem agent7-cert.pem agent8-cert.pem agent9-cert.pem ca1-cert.pem ca2-crl.pem ca3-cert.pem ec-cert.pem dh512.pem dh1024.pem dh2048.pem dsa1025.pem dsa_private_1025.pem dsa_public_1025.pem rsa_private_1024.pem rsa_private_2048.pem rsa_private_4096.pem rsa_public_1024.pem rsa_public_2048.pem rsa_public_4096.pem
2-
1+
all: agent1-cert.pem agent1-pfx.pem agent2-cert.pem agent3-cert.pem agent4-cert.pem agent5-cert.pem agent6-cert.pem agent7-cert.pem agent8-cert.pem agent9-cert.pem ca1-cert.pem ca2-crl.pem ca3-cert.pem ec-cert.pem dh512.pem dh1024.pem dh2048.pem dsa1025.pem dsa_private_1025.pem dsa_public_1025.pem rsa_private_1024.pem rsa_private_2048.pem rsa_private_4096.pem rsa_public_1024.pem rsa_public_2048.pem rsa_public_4096.pem ec-pfx.pem
32

43
#
54
# Create Certificate Authority: ca1
65
# ('password' is used for the CA password.)
76
#
87
ca1-cert.pem: ca1.cnf
9-
openssl req -new -x509 -days 9999 -config ca1.cnf -keyout ca1-key.pem -out ca1-cert.pem
8+
openssl req -new -x509 -days 99999 -config ca1.cnf -keyout ca1-key.pem -out ca1-cert.pem
109

1110
#
1211
# Create Certificate Authority: ca2
1312
# ('password' is used for the CA password.)
1413
#
1514
ca2-cert.pem: ca2.cnf
16-
openssl req -new -x509 -days 9999 -config ca2.cnf -keyout ca2-key.pem -out ca2-cert.pem
15+
openssl req -new -x509 -days 99999 -config ca2.cnf -keyout ca2-key.pem -out ca2-cert.pem
1716
echo '01' > ca2-serial
1817
touch ca2-database.txt
1918

@@ -35,7 +34,7 @@ ca3-cert.pem: ca3-csr.pem ca3-key.pem ca3.cnf ca1-cert.pem ca1-key.pem
3534
openssl x509 -req \
3635
-extfile ca3.cnf \
3736
-extensions v3_ca \
38-
-days 9999 \
37+
-days 99999 \
3938
-passin "pass:password" \
4039
-in ca3-csr.pem \
4140
-CA ca1-cert.pem \
@@ -53,7 +52,7 @@ fake-cnnic-root-key.pem:
5352
fake-cnnic-root-cert.pem: fake-cnnic-root.cnf fake-cnnic-root-key.pem
5453
openssl req -x509 -new \
5554
-key fake-cnnic-root-key.pem \
56-
-days 1024 \
55+
-days 99999 \
5756
-out fake-cnnic-root-cert.pem \
5857
-config fake-cnnic-root.cnf
5958

@@ -65,7 +64,7 @@ fake-startcom-root-key.pem:
6564

6665
fake-startcom-root-cert.pem: fake-startcom-root.cnf \
6766
fake-startcom-root-key.pem
68-
openssl req -new -x509 -days 9999 -config \
67+
openssl req -new -x509 -days 99999 -config \
6968
fake-startcom-root.cnf -key fake-startcom-root-key.pem -out \
7069
fake-startcom-root-cert.pem
7170
echo '01' > fake-startcom-root-serial
@@ -85,7 +84,7 @@ agent1-cert.pem: agent1-csr.pem ca1-cert.pem ca1-key.pem
8584
openssl x509 -req \
8685
-extfile agent1.cnf \
8786
-extensions v3_ca \
88-
-days 9999 \
87+
-days 99999 \
8988
-passin "pass:password" \
9089
-in agent1-csr.pem \
9190
-CA ca1-cert.pem \
@@ -120,7 +119,7 @@ agent2-csr.pem: agent2-key.pem agent2.cnf
120119
# Create a Certificate for the agent.
121120
agent2-cert.pem: agent2-csr.pem agent2-key.pem
122121
openssl x509 -req \
123-
-days 9999 \
122+
-days 99999 \
124123
-in agent2-csr.pem \
125124
-signkey agent2-key.pem \
126125
-out agent2-cert.pem
@@ -140,7 +139,7 @@ agent3-csr.pem: agent3.cnf agent3-key.pem
140139

141140
agent3-cert.pem: agent3-csr.pem ca2-cert.pem ca2-key.pem
142141
openssl x509 -req \
143-
-days 9999 \
142+
-days 99999 \
144143
-passin "pass:password" \
145144
-in agent3-csr.pem \
146145
-CA ca2-cert.pem \
@@ -164,7 +163,7 @@ agent4-csr.pem: agent4.cnf agent4-key.pem
164163

165164
agent4-cert.pem: agent4-csr.pem ca2-cert.pem ca2-key.pem
166165
openssl x509 -req \
167-
-days 9999 \
166+
-days 99999 \
168167
-passin "pass:password" \
169168
-in agent4-csr.pem \
170169
-CA ca2-cert.pem \
@@ -206,7 +205,7 @@ agent5-csr.pem: agent5.cnf agent5-key.pem
206205

207206
agent5-cert.pem: agent5-csr.pem ca2-cert.pem ca2-key.pem
208207
openssl x509 -req \
209-
-days 9999 \
208+
-days 99999 \
210209
-passin "pass:password" \
211210
-in agent5-csr.pem \
212211
-CA ca2-cert.pem \
@@ -231,7 +230,7 @@ agent6-csr.pem: agent6.cnf agent6-key.pem
231230

232231
agent6-cert.pem: agent6-csr.pem ca3-cert.pem ca3-key.pem
233232
openssl x509 -req \
234-
-days 9999 \
233+
-days 99999 \
235234
-passin "pass:password" \
236235
-in agent6-csr.pem \
237236
-CA ca3-cert.pem \
@@ -257,7 +256,7 @@ agent7-csr.pem: agent1.cnf agent7-key.pem
257256
agent7-cert.pem: agent7-csr.pem fake-cnnic-root-cert.pem fake-cnnic-root-key.pem
258257
openssl x509 -req \
259258
-extfile agent7.cnf \
260-
-days 9999 \
259+
-days 99999 \
261260
-passin "pass:password" \
262261
-in agent7-csr.pem \
263262
-CA fake-cnnic-root-cert.pem \
@@ -286,7 +285,7 @@ agent8-cert.pem: agent8-csr.pem fake-startcom-root-cert.pem fake-startcom-root-k
286285
-keyfile fake-startcom-root-key.pem \
287286
-cert fake-startcom-root-cert.pem \
288287
-batch \
289-
-days 9999 \
288+
-days 99999 \
290289
-passin "pass:password" \
291290
-in agent8-csr.pem \
292291
-startdate 161020235959Z \
@@ -316,7 +315,7 @@ agent9-cert.pem: agent9-csr.pem
316315
-keyfile fake-startcom-root-key.pem \
317316
-cert fake-startcom-root-cert.pem \
318317
-batch \
319-
-days 9999 \
318+
-days 99999 \
320319
-passin "pass:password" \
321320
-in agent9-csr.pem \
322321
-startdate 161021000001Z \
@@ -330,7 +329,7 @@ ec-csr.pem: ec-key.pem
330329

331330
ec-cert.pem: ec-csr.pem ec-key.pem
332331
openssl x509 -req \
333-
-days 9999 \
332+
-days 99999 \
334333
-in ec-csr.pem \
335334
-signkey ec-key.pem \
336335
-out ec-cert.pem
@@ -363,13 +362,13 @@ rsa_private_4096.pem:
363362
openssl genrsa -out rsa_private_4096.pem 4096
364363

365364
rsa_public_1024.pem: rsa_private_1024.pem
366-
openssl rsa -in rsa_private_1024.pem -out rsa_public_1024.pem
365+
openssl rsa -in rsa_private_1024.pem -pubout -out rsa_public_1024.pem
367366

368367
rsa_public_2048.pem: rsa_private_2048.pem
369-
openssl rsa -in rsa_private_2048.pem -out rsa_public_2048.pem
368+
openssl rsa -in rsa_private_2048.pem -pubout -out rsa_public_2048.pem
370369

371370
rsa_public_4096.pem: rsa_private_4096.pem
372-
openssl rsa -in rsa_private_4096.pem -out rsa_public_4096.pem
371+
openssl rsa -in rsa_private_4096.pem -pubout -out rsa_public_4096.pem
373372

374373
clean:
375374
rm -f *.pem *.srl ca2-database.txt ca2-serial fake-startcom-root-serial

‎test/fixtures/keys/agent1-cert.pem

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIC1jCCAj+gAwIBAgIJAJqEq8+4pyrAMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
2+
MIIC2DCCAkGgAwIBAgIJAPrVDMagf1FsMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
33
BAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCU0YxDzANBgNVBAoMBkpveWVu
44
dDEQMA4GA1UECwwHTm9kZS5qczEMMAoGA1UEAwwDY2ExMSAwHgYJKoZIhvcNAQkB
5-
FhFyeUB0aW55Y2xvdWRzLm9yZzAeFw0xNTA0MTgxMzI5MDhaFw00MjA5MDIxMzI5
6-
MDhaMH0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTELMAkGA1UEBxMCU0YxDzAN
7-
BgNVBAoTBkpveWVudDEQMA4GA1UECxMHTm9kZS5qczEPMA0GA1UEAxMGYWdlbnQx
8-
MSAwHgYJKoZIhvcNAQkBFhFyeUB0aW55Y2xvdWRzLm9yZzCBnzANBgkqhkiG9w0B
9-
AQEFAAOBjQAwgYkCgYEAuOs3hW8rF+7xx5iB9wjmIgd+HTqRFUeKxG+mWV35Hl6A
10-
3uzYGXwWznqsOomr4a/UkZrxbPGp5Awqa9g72NF97g3Sysq2DW4a3ycXWAeYYcHS
11-
lRxqJGXTjx+vG/0nDCXLBhoDKO00zEccdjGS8xEjjieQQr+KeASmIm0kQmuN5YcC
12-
AwEAAaNhMF8wXQYIKwYBBQUHAQEEUTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2Nz
13-
cC5ub2RlanMub3JnLzAoBggrBgEFBQcwAoYcaHR0cDovL2NhLm5vZGVqcy5vcmcv
14-
Y2EuY2VydDANBgkqhkiG9w0BAQsFAAOBgQA45MmH28Gns+1yu9w9MR/oR8hKDMnG
15-
E4yDZ+9SofWdqRsGe5MNeMbp9c+FxIxODcNmdhV5Ao6+ZCRX4N9GjLqUL1jQoFAs
16-
pT/U80ZU+4bz2EwGMBQt7CJZb/u+j8/vXheyGFZkCWEQj6AgZQFTniRRQJLwbiy5
17-
uDktGqnhvamyrg==
5+
FhFyeUB0aW55Y2xvdWRzLm9yZzAgFw0xODA4MDgwMTE2NTVaGA8yMjkyMDUyMjAx
6+
MTY1NVowfTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEP
7+
MA0GA1UECgwGSm95ZW50MRAwDgYDVQQLDAdOb2RlLmpzMQ8wDQYDVQQDDAZhZ2Vu
8+
dDExIDAeBgkqhkiG9w0BCQEWEXJ5QHRpbnljbG91ZHMub3JnMIGfMA0GCSqGSIb3
9+
DQEBAQUAA4GNADCBiQKBgQDnXT3od/PORzybLaYoAhqwa87601hrKbOrcJH9XGVX
10+
TqFoSqkVZCbFFHDDlambsucH0jejao7cKFm7UKyMhlOxSYaynD2o28nS1ZBRwybV
11+
zOGsIhF2sPc3TY6+P2EQWhe1F9tZsUcoOSXihwx78V0HLVde3UoXmtDVwD8ASlRu
12+
vQIDAQABo2EwXzBdBggrBgEFBQcBAQRRME8wIwYIKwYBBQUHMAGGF2h0dHA6Ly9v
13+
Y3NwLm5vZGVqcy5vcmcvMCgGCCsGAQUFBzAChhxodHRwOi8vY2Eubm9kZWpzLm9y
14+
Zy9jYS5jZXJ0MA0GCSqGSIb3DQEBBQUAA4GBAIi44Hk6phewUYEEmSSuuS4pViPZ
15+
Eu/uCDtDAdn/Qz/q2lFHRsaia9ov7xfncYpgV7/vq5MAHigas4ZGUoutwCzwnaAI
16+
l9wxkLG3G8wPN3x4wDGoLxpqaH5nqJIo6iWady9WM9PDaVHn+6ibrP9p55T65o+O
17+
BaF2ovk9NzkxpMPM
1818
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)
Please sign in to comment.