diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2021-10-14 13:44:14 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2021-10-24 21:25:37 +0200 |
commit | 08b1d125254313917aeed38317bf422c2c958b66 (patch) | |
tree | 9110f7323d0dafbaf757d94a06ef9080e35c4d3f | |
parent | 18230ceac8ca09e8a6599eed6b040bf0c96ff705 (diff) |
test: upgrade test NSS database from dbm: to sql:
Fedora nss-3.69.0-1.fc34.x86_64 and Debian libnss3:amd64 2:3.70-1 no
longer support the old BerekelyDB databases, so convert them to the new
SQLite format for the benefit of --with-system-nss builds.
This worked to do the upgrade:
> certutil -N -d sql:test/new --empty-password
> LD_LIBRARY_PATH=instdir/program workdir/UnpackedTarball/nss/dist/out/bin/certutil --merge -d sql:test/new --source-dir dbm:test/signing-keys
Builds would fail running tests added in commit
40d70d427edddb589eda64fafc2e56536953d274
signing.cxx:551:Assertion
Test name: testODFX509CertificateChain::TestBody
equality assertion failed
- Expected: 0
- Actual : 1
Change-Id: I00aa20703e117ebf583c3331b84e966c2cfc78cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123586
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit d09cbdc12ef5af6d98f62c06056f36306c247cfe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123644
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | test/signing-keys/cert9.db (renamed from test/signing-keys/cert8.db) | bin | 65536 -> 53248 bytes | |||
-rw-r--r-- | test/signing-keys/key3.db | bin | 16384 -> 0 bytes | |||
-rw-r--r-- | test/signing-keys/key4.db | bin | 0 -> 49152 bytes | |||
-rw-r--r-- | test/signing-keys/pkcs11.txt | 5 | ||||
-rw-r--r-- | unotest/source/cpp/macros_test.cxx | 7 |
5 files changed, 9 insertions, 3 deletions
diff --git a/test/signing-keys/cert8.db b/test/signing-keys/cert9.db Binary files differindex 95e58ffe5b92..c4064e419f42 100644 --- a/test/signing-keys/cert8.db +++ b/test/signing-keys/cert9.db diff --git a/test/signing-keys/key3.db b/test/signing-keys/key3.db Binary files differdeleted file mode 100644 index f449e60a667f..000000000000 --- a/test/signing-keys/key3.db +++ /dev/null diff --git a/test/signing-keys/key4.db b/test/signing-keys/key4.db Binary files differnew file mode 100644 index 000000000000..34a7fa28aa32 --- /dev/null +++ b/test/signing-keys/key4.db diff --git a/test/signing-keys/pkcs11.txt b/test/signing-keys/pkcs11.txt new file mode 100644 index 000000000000..22c8f8519efd --- /dev/null +++ b/test/signing-keys/pkcs11.txt @@ -0,0 +1,5 @@ +library= +name=NSS Internal PKCS #11 Module +parameters=configdir='sql:test/new' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' +NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30}) + diff --git a/unotest/source/cpp/macros_test.cxx b/unotest/source/cpp/macros_test.cxx index 0acf9db7edf5..af6ac567edf3 100644 --- a/unotest/source/cpp/macros_test.cxx +++ b/unotest/source/cpp/macros_test.cxx @@ -90,9 +90,10 @@ void MacrosTest::setUpNssGpg(const test::Directories& rDirectories, const OUStri OUString aSourceDir = rDirectories.getURLFromSrc("/test/signing-keys/"); OUString aTargetDir = rDirectories.getURLFromWorkdir("CppunitTest/" + rTestName + ".test.user"); - // Set up cert8.db in workdir/CppunitTest/ - osl::File::copy(aSourceDir + "cert8.db", aTargetDir + "/cert8.db"); - osl::File::copy(aSourceDir + "key3.db", aTargetDir + "/key3.db"); + // Set up NSS database in workdir/CppunitTest/ + osl::File::copy(aSourceDir + "cert9.db", aTargetDir + "/cert9.db"); + osl::File::copy(aSourceDir + "key4.db", aTargetDir + "/key4.db"); + osl::File::copy(aSourceDir + "pkcs11.txt", aTargetDir + "/pkcs11.txt"); // Make gpg use our own defined setup & keys osl::File::copy(aSourceDir + "pubring.gpg", aTargetDir + "/pubring.gpg"); |