summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-06-19 19:50:02 +0200
committerMichael Stahl <michael.stahl@allotropia.de>2021-03-29 16:46:59 +0200
commited3eddce65aa42b0c203aeb3631cdd8daef9f8c4 (patch)
tree8541a958e3af419ff49bf453cd4a66bd4d70fdc3
parent160312879f39d53f0231a46aa22e0b6bf7540fcb (diff)
Also fix the generated test certs + generator script to avoid expired
certs for a while (.db files generated with Firefox 57.0). Reviewed-on: https://gerrit.libreoffice.org/56123 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 71198fe7d9539859883b6226738fbea52a08a5c4) Change-Id: I30e1b13454cc45ead7605d076e8e24984ae186c1
-rwxr-xr-xxmlsecurity/qa/create-certs/create-certs.sh6
-rw-r--r--xmlsecurity/qa/unit/signing/data/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--xmlsecurity/qa/unit/signing/data/key3.dbbin16384 -> 16384 bytes
3 files changed, 3 insertions, 3 deletions
diff --git a/xmlsecurity/qa/create-certs/create-certs.sh b/xmlsecurity/qa/create-certs/create-certs.sh
index 30ae73df7463..93511dc2e371 100755
--- a/xmlsecurity/qa/create-certs/create-certs.sh
+++ b/xmlsecurity/qa/create-certs/create-certs.sh
@@ -60,7 +60,7 @@ chmod 400 private/ca.key.pem
cd "$root/ca"
openssl req -config openssl.cnf \
-key private/ca.key.pem \
- -new -x509 -days 7300 -sha256 -extensions v3_ca \
+ -new -x509 -days 36500 -sha256 -extensions v3_ca \
-out certs/ca.cert.pem \
-passin env:SSLPASS \
-subj '/C=UK/ST=England/O=Xmlsecurity Test/CN=Xmlsecurity Test Root CA'
@@ -102,7 +102,7 @@ openssl req -config intermediate/openssl.cnf -new -sha256 \
# The certificate itself.
openssl ca -batch -config openssl.cnf -extensions v3_intermediate_ca \
- -days 3650 -notext -md sha256 \
+ -days 36500 -notext -md sha256 \
-in intermediate/csr/intermediate.csr.pem \
-passin env:SSLPASS \
-out intermediate/certs/intermediate.cert.pem
@@ -137,7 +137,7 @@ do
cd "$root/ca"
# usr_cert: the cert will be used for signing.
openssl ca -batch -config intermediate/openssl.cnf \
- -extensions usr_cert -days 375 -notext -md sha256 \
+ -extensions usr_cert -days 36500 -notext -md sha256 \
-in intermediate/csr/example-xmlsecurity-${i}.csr.pem \
-passin env:SSLPASS \
-out intermediate/certs/example-xmlsecurity-${i}.cert.pem
diff --git a/xmlsecurity/qa/unit/signing/data/cert8.db b/xmlsecurity/qa/unit/signing/data/cert8.db
index 07afe1566989..95e58ffe5b92 100644
--- a/xmlsecurity/qa/unit/signing/data/cert8.db
+++ b/xmlsecurity/qa/unit/signing/data/cert8.db
Binary files differ
diff --git a/xmlsecurity/qa/unit/signing/data/key3.db b/xmlsecurity/qa/unit/signing/data/key3.db
index fac36c06870a..f449e60a667f 100644
--- a/xmlsecurity/qa/unit/signing/data/key3.db
+++ b/xmlsecurity/qa/unit/signing/data/key3.db
Binary files differ