diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-10-14 13:44:14 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-10-18 18:14:36 +0200 |
| commit | 7b4b03b9cf21ecd11bc82da5f29c4ff91ad242c9 (patch) | |
| tree | a4f54652fbea2c6a3e7fa4b3cc39f641bb3b7e10 /test | |
| parent | 33f3c2abd1cfebaa6e6957a2c189b2e345068788 (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 907784ccce7bd8b5121888cff7f5723a55d35358)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123643
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'test')
| -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 |
4 files changed, 5 insertions, 0 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}) + |