diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-19 19:50:02 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-20 09:20:34 +0200 |
| commit | 71198fe7d9539859883b6226738fbea52a08a5c4 (patch) | |
| tree | 8a256dec60c5a641b81a104de5dac89be3bcb611 /xmlsecurity | |
| parent | 231035fe394138a924ef78780a02393bb122b14a (diff) | |
xmlsec: update to 1.2.26
Allows dropping the xmlsec1-ecdsa-assert.patch.1 backport.
Also fix the generated test certs + generator script to avoid expired
certs for a while (.db files generated with Firefox 57.0).
Change-Id: I8cba9a01633a3952c845e15e23b18d44544cdb59
Reviewed-on: https://gerrit.libreoffice.org/56123
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'xmlsecurity')
| -rwxr-xr-x | xmlsecurity/qa/create-certs/create-certs.sh | 6 | ||||
| -rw-r--r-- | xmlsecurity/qa/unit/signing/data/cert8.db | bin | 65536 -> 65536 bytes | |||
| -rw-r--r-- | xmlsecurity/qa/unit/signing/data/key3.db | bin | 16384 -> 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 0307d03b6ee2..4a0298047c01 100755 --- a/xmlsecurity/qa/create-certs/create-certs.sh +++ b/xmlsecurity/qa/create-certs/create-certs.sh @@ -65,7 +65,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 ${algo} Test/CN=Xmlsecurity ${algo} Test Root CA" @@ -107,7 +107,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 @@ -147,7 +147,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 Binary files differindex 07afe1566989..95e58ffe5b92 100644 --- a/xmlsecurity/qa/unit/signing/data/cert8.db +++ b/xmlsecurity/qa/unit/signing/data/cert8.db diff --git a/xmlsecurity/qa/unit/signing/data/key3.db b/xmlsecurity/qa/unit/signing/data/key3.db Binary files differindex fac36c06870a..f449e60a667f 100644 --- a/xmlsecurity/qa/unit/signing/data/key3.db +++ b/xmlsecurity/qa/unit/signing/data/key3.db |