[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - xmlsecurity/qa

[Miklos Vajna (via logerrit)]

 xmlsecurity/qa/create-certs/create-certs.sh |    6 +++---
 xmlsecurity/qa/unit/signing/data/cert8.db   |binary
 xmlsecurity/qa/unit/signing/data/key3.db    |binary
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 13370a49001b05bbc6e4128d17226ffd3eda4629
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Tue Jun 19 19:50:02 2018 +0200
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Mon Mar 29 13:06:29 2021 +0200

    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 at collabora.co.uk>
    (cherry picked from commit 71198fe7d9539859883b6226738fbea52a08a5c4)
    
    Change-Id: I30e1b13454cc45ead7605d076e8e24984ae186c1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113181
    Tested-by: Michael Stahl <michael.stahl at allotropia.de>
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

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
Binary files a/xmlsecurity/qa/unit/signing/data/cert8.db and b/xmlsecurity/qa/unit/signing/data/cert8.db differ
diff --git a/xmlsecurity/qa/unit/signing/data/key3.db b/xmlsecurity/qa/unit/signing/data/key3.db
index fac36c06870a..f449e60a667f 100644
Binary files a/xmlsecurity/qa/unit/signing/data/key3.db and b/xmlsecurity/qa/unit/signing/data/key3.db differ