dev/null |binary test/signing-keys/cert9.db |binary test/signing-keys/key4.db |binary test/signing-keys/pkcs11.txt | 5 +++++ unotest/source/cpp/macros_test.cxx | 7 ++++--- 5 files changed, 9 insertions(+), 3 deletions(-)
New commits: commit 8e728fcdd11aec4b7fc73301888ee56bb3f5a1a7 Author: Michael Stahl <[email protected]> AuthorDate: Thu Oct 14 13:44:14 2021 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Oct 23 20:35:47 2021 +0200 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 <[email protected]> (cherry picked from commit d09cbdc12ef5af6d98f62c06056f36306c247cfe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123644 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/test/signing-keys/cert8.db b/test/signing-keys/cert9.db similarity index 50% rename from test/signing-keys/cert8.db rename to test/signing-keys/cert9.db index 95e58ffe5b92..c4064e419f42 100644 Binary files a/test/signing-keys/cert8.db and b/test/signing-keys/cert9.db differ diff --git a/test/signing-keys/key3.db b/test/signing-keys/key3.db deleted file mode 100644 index f449e60a667f..000000000000 Binary files a/test/signing-keys/key3.db and /dev/null differ diff --git a/test/signing-keys/key4.db b/test/signing-keys/key4.db new file mode 100644 index 000000000000..34a7fa28aa32 Binary files /dev/null and b/test/signing-keys/key4.db differ 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");
