summaryrefslogtreecommitdiff
path: root/test/aux-fixed
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2018-11-27 23:06:16 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2018-11-27 23:23:33 +0000
commita7a1ad1447470b5bcc415d2fbdd368d585204516 (patch)
treecd9ca353871478a112d8a054ffd217fe3440374a /test/aux-fixed
parent5a2a0989efb831472f8edf5c4991953e6140c3ad (diff)
Testsuite: regenerate CA trees with 2048-bit keys
This is to support RHEL 8.0 where OpenSSL dislikes 1024
Diffstat (limited to 'test/aux-fixed')
-rwxr-xr-xtest/aux-fixed/exim-ca/README.regenerate1
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/CA.pem27
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem29
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/CA.pem27
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.key42
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.p12bin2941 -> 4301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.pem27
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.key42
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.p12bin2319 -> 3423 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.pem29
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/ca.conf12
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.Signerbin234 -> 364 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem13
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem29
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.emptybin244 -> 374 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem14
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.v2bin293 -> 422 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt6
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/key3.dbbin24576 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/noise.file188
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key46
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.respbin950 -> 1340 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.respbin962 -> 1352 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.respbin414 -> 543 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key46
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key46
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.respbin950 -> 1340 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.respbin962 -> 1352 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.respbin414 -> 543 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key46
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem93
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem66
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key46
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.respbin950 -> 1340 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.respbin962 -> 1352 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.respbin414 -> 543 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12bin3165 -> 4525 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem37
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key16
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12bin2730 -> 3386 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem27
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key10
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem91
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem64
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key46
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12bin3117 -> 4485 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem35
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/CA.pem27
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem29
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/CA.pem27
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.key42
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.p12bin2941 -> 4301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.pem27
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.key42
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.p12bin2319 -> 3423 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.pem29
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/ca.conf10
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.Signerbin234 -> 364 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem13
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.emptybin244 -> 374 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem14
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2bin293 -> 422 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt6
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/key3.dbbin24576 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/noise.file190
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key46
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.respbin950 -> 1340 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.respbin962 -> 1352 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.respbin414 -> 543 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key46
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key46
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.respbin950 -> 1340 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.respbin962 -> 1352 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.respbin414 -> 543 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key46
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem93
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem66
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key46
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.respbin950 -> 1340 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.respbin962 -> 1352 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.respbin414 -> 543 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12bin3165 -> 4533 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem37
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem91
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem64
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key46
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12bin3117 -> 4485 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem35
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.org/BLANK/CA.pem27
-rw-r--r--test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem29
-rw-r--r--test/aux-fixed/exim-ca/example.org/BLANK/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/BLANK/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/BLANK/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/CA.pem27
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/OCSP.key42
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/OCSP.p12bin2941 -> 4301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/OCSP.pem27
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.key42
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.p12bin2319 -> 3423 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.pem29
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/ca.conf16
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.Signerbin234 -> 364 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.Signer.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.Signer.pem13
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.emptybin244 -> 374 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem14
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.v2bin293 -> 422 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt6
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/key3.dbbin24576 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/noise.file188
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key46
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.respbin950 -> 1340 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.respbin962 -> 1352 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.respbin414 -> 543 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key46
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key46
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.respbin950 -> 1340 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.respbin962 -> 1352 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.respbin414 -> 543 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem63
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key46
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12bin3087 -> 4455 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem93
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem66
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key46
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.respbin927 -> 1317 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.respbin950 -> 1340 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.respbin939 -> 1329 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.respbin962 -> 1352 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.respbin391 -> 520 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.respbin414 -> 543 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12bin3165 -> 4533 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem37
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem56
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem91
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem64
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key46
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.respbin928 -> 1318 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.respbin940 -> 1330 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.respbin392 -> 521 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12bin3117 -> 4485 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem35
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key38
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem22
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem20
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/BLANK/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/BLANK/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/BLANK/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem22
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key14
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12bin2546 -> 2546 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem18
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem20
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf20
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/noise.file190
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem42
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert8.dbbin65536 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem68
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key3.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/secmod.dbbin16384 -> 0 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem50
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key16
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.respbin940 -> 942 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12bin2818 -> 2818 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem26
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key10
-rwxr-xr-xtest/aux-fixed/exim-ca/genall4
465 files changed, 4109 insertions, 2902 deletions
diff --git a/test/aux-fixed/exim-ca/README.regenerate b/test/aux-fixed/exim-ca/README.regenerate
index aba0a8f08..69046773b 100755
--- a/test/aux-fixed/exim-ca/README.regenerate
+++ b/test/aux-fixed/exim-ca/README.regenerate
@@ -1,3 +1,4 @@
WARNING for Exim Testsuite:
If you change these certificates you will also need to update the TLSA records in dnszone-src/db.test.ex
+and dnszones-src/db.example.com
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
index ecd523b31..4bcdc4411 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
@@ -1,13 +1,18 @@
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
index 25bd38a5f..b05c00a39 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
deleted file mode 100644
index 7685bc776..000000000
--- a/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/key3.db b/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
deleted file mode 100644
index e25620d62..000000000
--- a/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/secmod.db b/test/aux-fixed/exim-ca/example.com/BLANK/secmod.db
deleted file mode 100644
index b709dd8a5..000000000
--- a/test/aux-fixed/exim-ca/example.com/BLANK/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/CA.pem b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
index ecd523b31..4bcdc4411 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
@@ -1,13 +1,18 @@
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
index b039e2ae8..907c70aff 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
@@ -1,20 +1,32 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: E2 FA 33 F3 03 63 BA D3 6A 68 73 26 A7 0F 5A 17 58 37 00 95
+ localKeyID: 09 0B BA 2D BD 4C 9B 96 8E E2 10 9A D0 D5 02 3E 1D 9C 37 61
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAK8Sadt5dFFR8Ad5
-McPMCQbqKFV8DQP0QfnMq5IWxZMSGpcbi3RJLe24R+ZZ39tAkGsKNzPT7YgvQIne
-Xa9Cb2t9UucJqu4GXA+3ahOd+pDrnbtJb1f7AI4+KNDAik4sHgxe7yQphugck1bY
-9Rvxk0yGVytfTuNKzjkK1qV2N7bDAgMBAAECgYAqCPJIw5slkVZf/P3xZJKASgWg
-LNZVLjcPGtDRFU2f99dRk8gChjWUX8xHpymkE5b5VG0XsRlVuv60e6Mj2wA0OamS
-Q2rILLIEqL3R0rBhyvcSq8fvjtTFrO10Yl/GL9xm4z7daaqraBuYDlzhSCbc+y5h
-BZwrEzWNvR8sDZzuUQJBANakmIJOj2QmCVxvoXINrxHRrMeAdGucVqCprHNe6+Ny
-3HhSY/L+4uIy49uZyuJc5n2QIE/n0SK6epWhj2Dp7zMCQQDQzfN4vhAtUMX5lain
-+QLSgK4wi8f2saQcDPgqpOl12JsghpDHx3XBfYb6Dh4+K6JumVcmc98fc9ZcuVur
-Q1oxAkA/qYYKcB6bh6STJBDwcRqR4Gysp27gU/hloq2hcm/ogDLgBR/b/LlyecGX
-aqAAT6mVaGANEya2dDTTmJ2cEwZ9AkEAk1oTzIyMS/5ph8V2nPtcY4MN6hJqzgv0
-nRsF8sooOtLePmjYOTPoROC55TMbYpJWcahi2S8CMWcEyrDAIS9JsQJAa721f6yV
-ddxPZ33OxHN2egqb0VZ0pwBQWfgoX5jK8fkpof/LclZnXau4x9G+5N8Q80ea0JAJ
-grA/N012n/qfIQ==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0nIMLp5VJDUf3
+OgseYbk1BEvTzLzQR87+8UTgDThnkwSOhIwg3THdQSk10l9gqBrCWXVLJHtcTBsv
+4giVe7UgMxJMBTN41wV6Djb4cWVcIVDSSoahr0aVhWvKMOdBI3Gk8nDzoQHD/+n0
+scvMoipb4tuJFaknfNdv4uG6C4+aAxBoLXTbt6kGCR1ezrV9uA8VFcRnG5xVJBqD
+0vBCmw5inC8vMlzm+A6G/hqTMWUFJcE/EPgruNG/mbzDrUxN9sJLktGbsDtMrvAu
+8LU83NKeo/Camh6sI/Hk17xrJnHrmwn+bfReZvBqDR3SUf6I4IeZslwyEpkFY5J1
+r3QQe7K9AgMBAAECggEAObJmCqsWfafIfaoFM0d0qwMcViTpjH/kGH1qy0ht5GiK
+5Bxjx3viGhRe3dq+rVoGcl+xoLee0PVfGgTTSS2jxw2Jos9migvmq/8ugF95Sd06
+vHMiXzRnEAz3SjglKCHyhAcPHkUpEzwFuS2zNUP41DG8gCZzSzIOgKeyBIT88u3O
+RWIe6OBa/wdYukzyPGpwbTm5mb9wUcDhkjPzK5ZzLrMlu1+o5h5QgU/H1SsM8BH4
+Xx6222SuXhKHzqUjHtJbYBAoXsaYYZ6LvfcE8Iu/RUwUEOANvhqLiXdyI6L3kGms
+jyRHiYV3dAQ9CyXE2li7Jxzh5Sq3T9Be5tiEIjg94QKBgQDX4Q7swLhCPwszT/8J
+TTS4qcuLFpouOrnzqYaGvkQCkUyJfxeQHZt00QyoyO/m5G/p3VFHqY7xt7S5zIxD
+Or226F+1J1e9vSGEIHQa4TY+i6i1mRyczPIL9MbfBjScAaFbSakULjGBSZpFLp8p
+uJ9fwsk5whkjqx/E3KojZAsqWwKBgQDWLYJ0A+uxISev7nXqGBkkPZSuRFzqz8MI
+AEihFeEWg9tIYkUz0frLmr7CPKwXxJNOBska6ba3mMIEaxXctp3GMqMDnukt7lrh
+Y0O7n27SeMXmn2wcphA6NhHlktvJWfdfKrtnNaAlWdMwGYojKt3+qIrrb7jwYbQF
+RJuIfxgyxwKBgQC36FQFn1yZmwmYqiKzsuEiHAx5rkSk84SsrpQbQAXCRjP0wp+5
+N2/TAbCOLbgqdBtfGRsAONO82mqNClPHhkhOhQHb2utlibT+0YL3zzqd5+5O3mRA
+tFvTkbDGGIxDBySGF2eB+KRV5vUU0NXo/g5PzyoMGW2/NC45UF9lDPpyFwKBgBJd
+zLYOMAP8h966YDo23tEQxtM64YzxTBQ/kfreWXMI06EdbDnJY+xZ1MnrUganwMoM
+Iuq/5/9OhjTCyhknP9hjNz90PSLHMdvqG0DXpzU9Ths8yJScWP/k6xv4wAhAQspS
+a8ep/ZW2YjnZttLVNjxET8Voyz8x4bIh9AR8gaK5AoGAQM78ICTF1lRP0Ah/jG6c
+Uq4M6V3jf9XauuKeJXFgQt63jLWvZlN+VsGcbDiLQ4yz+FnzqfKQ6Snw7gnVDK1e
+hUeYpON/6CTfz7bXlvGhqGfcR3oi0m+GYbBz0qwIAIoJ5GgBCYlx9Xdus/EyVTi6
+eOP+T4tyVF6xSMrBEdw0zqA=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
index 53e5ea346..e1bd3c153 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
index e6f959fdf..cc150ff49 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDEjCCAfqgAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDFaFw0zODAxMDExMjM0MDFaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t
-MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAK8Sadt5dFFR8Ad5McPMCQbqKFV8DQP0QfnMq5IWxZMSGpcb
-i3RJLe24R+ZZ39tAkGsKNzPT7YgvQIneXa9Cb2t9UucJqu4GXA+3ahOd+pDrnbtJ
-b1f7AI4+KNDAik4sHgxe7yQphugck1bY9Rvxk0yGVytfTuNKzjkK1qV2N7bDAgMB
-AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQAMPEaTi7g8PZuliLt1ODdQmheZSoIzY6YVXCVZvJUQ
-3ibb8ANAkrXX343bN5VTtuXNa5K629/Dr2jjZiBOlUDyXxI8Gz7sZpShX1WheQsD
-mfRmCkeZo5iYYwUXNYAmSkymi8IP0n8qFakvhBUxpaAEYRJwZUZx1mtRkt4KzPXi
-9w==
+MDExMjM5NDJaFw0zODAxMDExMjM5NDJaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t
+MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC0nIMLp5VJDUf3OgseYbk1BEvTzLzQR87+8UTgDThn
+kwSOhIwg3THdQSk10l9gqBrCWXVLJHtcTBsv4giVe7UgMxJMBTN41wV6Djb4cWVc
+IVDSSoahr0aVhWvKMOdBI3Gk8nDzoQHD/+n0scvMoipb4tuJFaknfNdv4uG6C4+a
+AxBoLXTbt6kGCR1ezrV9uA8VFcRnG5xVJBqD0vBCmw5inC8vMlzm+A6G/hqTMWUF
+JcE/EPgruNG/mbzDrUxN9sJLktGbsDtMrvAu8LU83NKeo/Camh6sI/Hk17xrJnHr
+mwn+bfReZvBqDR3SUf6I4IeZslwyEpkFY5J1r3QQe7K9AgMBAAGjKjAoMA4GA1Ud
+DwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsF
+AAOCAQEAp0aou8td2RIK8QWBXCFvKT5ygfieI8eIhxNPOK9imXl2g0r3sex+C7+C
+diQJDLpPXiq/5leIhSOYnZWB1RvOeUA3/LkgXPoMxC4pUaPW7NellErsyRhaYV69
+HU8GLwDwoGDEpe+zaaeAGo+0whAC8RsFrFt+0eiWRXNZ4yVPioEQKgMaf2i0iTKj
+E9xxaX9SkcKJqbkme1JYuMXk7W+SQhau1jlt4tzMPIQwanOkDabHKZnLeGqPCjZ5
+nGunctzpTz40dGeyce3oldhvsGN1U3njJGa1Op7psE9jyUudSLpjwj/ODHF1iu2J
+zu5NJRrFisf2SVRuoqMRsAdDlVpyOA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.key b/test/aux-fixed/exim-ca/example.com/CA/Signer.key
index d7a3326a3..24f2fb932 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.key
@@ -1,20 +1,32 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: A1 F3 F4 37 A3 B9 CB 70 4F 22 65 FF 3B D0 08 66 E5 CB 25 2C
+ localKeyID: 07 B7 38 F3 C4 3C 32 C2 2B 5E 4E 96 D3 88 97 FD 7A 36 21 B1
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALFHTtwaKeCfLlDf
-/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIflTY0VBym8/Iu/ExE476g
-RmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtEYKvUPIyWaAvqBbwY1QOy
-HNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAECgYAJlnB+mUoLUR1kiyWNqncHrKge
-SEgu/pJfdMoRB9/0uLRR+jqb0ZJN7jqKDCjTuT/7TlECZH9WPwhaKbmxpOY8LwWc
-BK3p6xnjuvgw4DvDUN8U4wQe6bNRcuHaz+X29AeXMjESn5rVhlRtirbFFXUlT6fE
-EouTtGGkjmb2CMPvgQJBAOAV+rOGyuJey8RxHmjQAomwDznw/2PbTZVySTxKLSi9
-5V5xYXGpEKsAfzskNizu9NlccsoIrG8qGtk3h02PLaECQQDKhsP3TnD8YEgTSqkD
-J1yErHOnoN4JYxLUGH/vW/G2fd8NEgY08Qc3mxeUgPr31tkxXeywH3EninZEfEnY
-3xCnAkBqKB9vQxEEMpJnyor0bm51WfGsqk3iuXbEsLKfHCjOnz91AVN/a+9Yg1DC
-7MG5ga5+9nvu2DMQKqszcknn5UdhAkAF+5UuaRLNYcq/RyVXAoKpKK8B9K6aeGLG
-ATNGTuEFExLTwASO68/axKodqPHBAIfJ/YxQZ51gHacAvusvjOdhAkAyGZAo9RxY
-PxM0xAmKKIcXbhNol6AqgpvmNV6HV+JXqJzuIiyzlbPFgfd+JQe6OrxYgfVvmiKv
-wFSymVKzv1Vs
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDUBcwir+Go3sYN
+uf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYGouIlEOivWbzfXGBn+MqBaVGX
+N9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLNjeUk/jexvJdEEBndCQwtJ5Ft
+11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDwmu6Kctz8tMZlHgJtGRpi35nG
+JcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ4h/XzDCpk4iaBLC/UzT/rE+g
+Q6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLufT3Mbvtm5ANjFDV8I0vuYiA4
+bRPYPmX/AgMBAAECggEAUMaEpxJq3nNA8SnTg7erxRf0R+VaCgduxEE2rsiRe8QZ
+AENwne4yJoUXsxdmDqgZlN8Uu4fFXthJBVt5t5Z1EPnvFcOKRkFcvoW8cuKbOfvV
+4t4lNzf4zGcqzZUsksJOvteDgvpXcTyJ41cOc0kEyu01i42w28O52yQK6c5bP0P6
+lBp3dqnngHvLmLDTW/iW3tsQW8C5U4zdYmvcISeFDizvqEX87K+8Gr0yRA7FYWZ8
+2GSDwyUxQoHh2wDe3e3SiceqRAZlsGryGz6Gy+dPc7L3UDxGFPBOTna9bUaH6bDo
+gRpXFK0uIm5AXLRRcDptR0z9ZdJVZNqvyFIONZ1DgQKBgQDuxBU0rTBMNzcpYiCG
+tkSweQYFu4PTaEo6ebUrVOphxzNrXGR8TdqDlnus/IHaqd4mUhO20GbJAIV5cyGY
+R0GUXJA2hxhPc7eEfgnP/sYhq5/lrxsJRKvwXLWlS/C4oSY/DCxfS3RynWEbh1vK
+TU9UVw7LhvOhgetBbxuVNmfEJwKBgQDjU41Euw/fTSo6kkCo/TsmfzoJF3JyU4Ri
+LUHwroIgXd7JhJz61heT+6W2/YbVb8BPndGjxnikA/ZR8H21WefPFjl1wKF+Cxak
+2LmlYdJZZt+ypm9tV344Eg9QKWRnW7yY96ZsrXrWCsT+pAMNSliVw/rd1IsCMuHI
+htv3yVa+aQKBgEtsCT7Qjnck4fnik1+6Z8xPDoX1C9lWEkyScZY0hq1IXYfGcb+K
+YEI84OhuAx7tlc0JFE0lW7KWxZLtuWj+6UpSSwPOfPFsHkZuAe+ADVpJeoL1Y1b0
+KFQPFRoX+Px5ezljQQkBLtGdwTUO9wHalfqQXY4RHRihj4zl6hKiUvj1AoGAESuA
+Yg6W9lDHvcDKLXli/FdjtMgWltgECb5NWrZzkapFZ4cirDd7dGvvalDf3EMijWDo
+MqyM9CZwdmPpusbdoWCWWnSAPhrsTOspqnom/yWsA7xacjHHkMica3uU39Gn/w3F
+fjPkMUKC+pC8wkY5RqaUzih9j170esbk2mRUrvECgYALHelGwtZ1ZvyMUrz8YrIi
++4TUCFliHJTY4RuDvdffuUzzCv8VyNZBX9OXqa6up2rM3uexa2zMm9FsbK4AulSV
+mQZCSgC2Xe4qvZuMkSwRmrLdncg275SyJ0qwaLbh+wWLJSgFvXAavfrTW3TXCApr
+JY0PeptsNBe83qir5JWk2Q==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
index 0cd6aaf32..19833e51f 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
index 25bd38a5f..b05c00a39 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/ca.conf b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
index eecd87c27..f2f3dc5c5 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
@@ -1,18 +1,18 @@
; Config::Simple 4.59
-; Thu Nov 1 12:34:01 2012
+; Thu Nov 1 12:39:33 2012
[CA]
-bits=1024
subject=clica CA
name=Certificate Authority rsa
+bits=2048
org=example.com
[CLICA]
-sighash=SHA256
-ocsp_signer=OCSP Signer rsa
crl_url=http://crl.example.com/latest.crl
-level=1
-ocsp_url=http://oscp.example.com/
signer=Signing Cert rsa
+ocsp_signer=OCSP Signer rsa
+sighash=SHA256
+ocsp_url=http://oscp.example.com/
+level=1
diff --git a/test/aux-fixed/exim-ca/example.com/CA/cert8.db b/test/aux-fixed/exim-ca/example.com/CA/cert8.db
deleted file mode 100644
index b9b624243..000000000
--- a/test/aux-fixed/exim-ca/example.com/CA/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer
index 7c9b5da32..6df5b85b8 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt
index 8f00adf1e..ab7d7b073 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt
@@ -1 +1 @@
-update=20171217205108Z
+update=20181127215819Z
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem
index fb00dc38d..45f0b174c 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem
@@ -1,7 +1,10 @@
-----BEGIN X509 CRL-----
-MIHnMFICAQEwDQYJKoZIhvcNAQELBQAwLTEUMBIGA1UEChMLZXhhbXBsZS5jb20x
-FTATBgNVBAMTDGNsaWNhIENBIHJzYRgPMjAxNzEyMTcyMDUxMDhaMA0GCSqGSIb3
-DQEBCwUAA4GBAKTxaFNLywmLS8lwq8Zovv02EVqND7cRXlJByZJhxutszkDchMq5
-oEFPbxW8+Fc3tZqTMMLq2Fu5tViVzL0ziVVNs2l98wG3ws0PAXeiFYPJ0FgBYdam
-OEkTkAs8SwjUYq7YOVK2pzFK2NJ2f0uld1LfwMmLiYXBiRnIbiUW1fx+
+MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUuY29t
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTgxMTI3MjE1ODE5WjANBgkqhkiG
+9w0BAQsFAAOCAQEAK1oXdm1jYcygKcMU617940ScEHk/MefQs7CBcuoVa052Alcg
+Fn3mTzwm6pE/j1rHOskBJ/5Vi5YCNg9u7Eme3E8NYtD43mLFeQko5Re2J4oshqo6
+HMVRhWppXXnf31ayZOTzQYx/cZNWwDkXsUyX1R3SYOi+zsTuC+PcKPDx25g/akG0
++14+6/WfXtj3828Ih0SBLjiSvCenstTW2SfLInTZliZCwAYvfg390XfJloNgvHT6
+46jr8KZtmgw342s6+iMx+B6FORlzuEzJCGt3O+fBtLiMDw7nhrNS/t5EiIrih0ky
+QWEvF7oZn7hYfgG+NmNiCQzvi1Ll4bB1RIJaoA==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem
index 20ba802ee..68c7a5c0f 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem
@@ -1,16 +1,21 @@
-----BEGIN X509 CRL-----
-MIHnMFICAQEwDQYJKoZIhvcNAQELBQAwLTEUMBIGA1UEChMLZXhhbXBsZS5jb20x
-FTATBgNVBAMTDGNsaWNhIENBIHJzYRgPMjAxNzEyMTcyMDUxMDhaMA0GCSqGSIb3
-DQEBCwUAA4GBAKTxaFNLywmLS8lwq8Zovv02EVqND7cRXlJByZJhxutszkDchMq5
-oEFPbxW8+Fc3tZqTMMLq2Fu5tViVzL0ziVVNs2l98wG3ws0PAXeiFYPJ0FgBYdam
-OEkTkAs8SwjUYq7YOVK2pzFK2NJ2f0uld1LfwMmLiYXBiRnIbiUW1fx+
+MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUuY29t
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTgxMTI3MjE1ODE5WjANBgkqhkiG
+9w0BAQsFAAOCAQEAK1oXdm1jYcygKcMU617940ScEHk/MefQs7CBcuoVa052Alcg
+Fn3mTzwm6pE/j1rHOskBJ/5Vi5YCNg9u7Eme3E8NYtD43mLFeQko5Re2J4oshqo6
+HMVRhWppXXnf31ayZOTzQYx/cZNWwDkXsUyX1R3SYOi+zsTuC+PcKPDx25g/akG0
++14+6/WfXtj3828Ih0SBLjiSvCenstTW2SfLInTZliZCwAYvfg390XfJloNgvHT6
+46jr8KZtmgw342s6+iMx+B6FORlzuEzJCGt3O+fBtLiMDw7nhrNS/t5EiIrih0ky
+QWEvF7oZn7hYfgG+NmNiCQzvi1Ll4bB1RIJaoA==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
-MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
-bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTcyMDUx
-MDhaMC0wFAIBZhgPMjAxNzEyMTcyMDUxMDhaMBUCAgDKGA8yMDE3MTIxNzIwNTEw
-OFowDQYJKoZIhvcNAQELBQADgYEAn5ZwGpzxpslUm/7LRkIlajXyzGp+8iTsovc6
-6ibiOtZo0q1gp8AooZDv5lrZkWDVzYOs+eozzI0sOROxpQ4SE81dEwwBy9DlTvQu
-MA7DFDQWYPr3BoK4VRIJwjrHBY8UClt8DwY7O2NwtDHakslLFgq0dFZHKcW9c34T
-3qkrgBk=
+MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
+bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxODExMjcyMTU4
+MTlaMC0wFAIBZhgPMjAxODExMjcyMTU4MTlaMBUCAgDKGA8yMDE4MTEyNzIxNTgx
+OVowDQYJKoZIhvcNAQELBQADggEBAI9CHrhtdgLf6nx74935GhYVqJNGaEV3WeB4
+9PtBGrIKSM09GDp70tTOnhVjeYS3ZqYzO6mBfvop4OqfaBZhtlr1bXljH3/lcsG+
+EaYVz6aXKYq6aDTC8SJBlInAw/0H88iv4qUfyzEh07ExvXfG2ai7nhj0zul4lKmO
+Qf9BstZw8E6ul5UiGOT6MDbE4nLkZcti5d/RU6gy+BI0pnhnJ77ClYkSuGIypXQN
+PaqsuX2IXkdSnVKOUhNfk8qxDl14h+l33rbjuunY7PXF+xMwRz2Lv55h5cbZAKdi
+K35gQrr6vF4dxesWMcyOpmQXvJK+myum1NgqO7baRBeR23yr3b8=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty b/test/aux-fixed/exim-ca/example.com/CA/crl.empty
index 84b568977..bdadfda7a 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
index dc66bdfc9..ebd4a952d 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171217205106Z
+update=20181127215817Z
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
index 0c442e975..e40964b35 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
@@ -1,8 +1,10 @@
-----BEGIN X509 CRL-----
-MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20x
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE3MjA1MTA2
-WjANBgkqhkiG9w0BAQsFAAOBgQAOfOXd2OgzRF9Ftj0Nuh19RRunj9P1InuaLynR
-l6DhlXHRwUD6/YkBGvMgJp27UT/1d67yyGBD4kpEJcgGMeJ6Yq7O7gA+V0tdQcnY
-3rblV3hkzsEkzemfMdF8FnZLZuCyJHxSh7kbmR9dqYHDLF/tiNWt3awTMtXB54fT
-PW09hw==
+MIIBcjBcAgEBMA0GCSqGSIb3DQEBCwUAMDcxFDASBgNVBAoTC2V4YW1wbGUuY29t
+MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDE4MTEyNzIxNTgx
+N1owDQYJKoZIhvcNAQELBQADggEBACl2t544o+zEeRdORRiobbl64ZqQKYSq6Q9o
+nqIqs/xT0MmljhUot2wEHQcAR9v1LFDkoFFGuQGINxvRvQTPPvLi1SRqHF/yVgJ5
+zROZR6N2kI6q8HgKQ/+tvJv14M6G10aqBksb3A7KhhlUXGFVSsd2pQl9FRHWVv1r
+r5h7ZZu0gmfPW1SJBFYuEk4vnhZiHlrGxg/dyS1jzYy/YvTGXCdMwQy1APR7guvf
+LlEdt7GVn/pZOytf8j/+OmtRlkR3k5K3IBXWpFehGH073hXFAJWW6juqDBfJ0Rwh
+QPqGP67GSL3S1+aA4msLZ0uVAOzFUdyw3X9haGVXhX9UNA6o2Wg=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2 b/test/aux-fixed/exim-ca/example.com/CA/crl.v2
index 21ee927d0..6f7decb7f 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
index 7c2dcd446..e47bb50eb 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20171217205108Z
-addcert 102 20171217205108Z
-addcert 202 20171217205108Z
+update=20181127215819Z
+addcert 102 20181127215819Z
+addcert 202 20181127215819Z
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
index 2b2f1f434..c774dd7d5 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
@@ -1,9 +1,11 @@
-----BEGIN X509 CRL-----
-MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
-bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTcyMDUx
-MDhaMC0wFAIBZhgPMjAxNzEyMTcyMDUxMDhaMBUCAgDKGA8yMDE3MTIxNzIwNTEw
-OFowDQYJKoZIhvcNAQELBQADgYEAn5ZwGpzxpslUm/7LRkIlajXyzGp+8iTsovc6
-6ibiOtZo0q1gp8AooZDv5lrZkWDVzYOs+eozzI0sOROxpQ4SE81dEwwBy9DlTvQu
-MA7DFDQWYPr3BoK4VRIJwjrHBY8UClt8DwY7O2NwtDHakslLFgq0dFZHKcW9c34T
-3qkrgBk=
+MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
+bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxODExMjcyMTU4
+MTlaMC0wFAIBZhgPMjAxODExMjcyMTU4MTlaMBUCAgDKGA8yMDE4MTEyNzIxNTgx
+OVowDQYJKoZIhvcNAQELBQADggEBAI9CHrhtdgLf6nx74935GhYVqJNGaEV3WeB4
+9PtBGrIKSM09GDp70tTOnhVjeYS3ZqYzO6mBfvop4OqfaBZhtlr1bXljH3/lcsG+
+EaYVz6aXKYq6aDTC8SJBlInAw/0H88iv4qUfyzEh07ExvXfG2ai7nhj0zul4lKmO
+Qf9BstZw8E6ul5UiGOT6MDbE4nLkZcti5d/RU6gy+BI0pnhnJ77ClYkSuGIypXQN
+PaqsuX2IXkdSnVKOUhNfk8qxDl14h+l33rbjuunY7PXF+xMwRz2Lv55h5cbZAKdi
+K35gQrr6vF4dxesWMcyOpmQXvJK+myum1NgqO7baRBeR23yr3b8=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/key3.db b/test/aux-fixed/exim-ca/example.com/CA/key3.db
deleted file mode 100644
index 1be48c144..000000000
--- a/test/aux-fixed/exim-ca/example.com/CA/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/noise.file b/test/aux-fixed/exim-ca/example.com/CA/noise.file
index 210d9f839..a5c8243cf 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.com/CA/noise.file
@@ -4,8 +4,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 3164.675
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -17,8 +17,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -31,8 +31,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 3247.036
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -44,8 +44,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -58,8 +58,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 3201.327
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -71,8 +71,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -85,8 +85,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 3216.241
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -98,8 +98,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -112,8 +112,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 3153.150
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -125,8 +125,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -139,8 +139,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 3215.404
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -152,8 +152,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -166,8 +166,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 3107.617
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -179,8 +179,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -193,8 +193,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 3152.578
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -206,8 +206,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -215,79 +215,82 @@ address sizes : 39 bits physical, 48 bits virtual
power management:
CPU0 CPU1 CPU2 CPU3 CPU4 CPU5 CPU6 CPU7
- 0: 75 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
- 1: 69775 6441 4183 4351 8821 6710 4808 2655 IR-IO-APIC 1-edge i8042
- 8: 1 0 0 0 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 116958 16080 12437 10549 27759 16386 11560 7036 IR-IO-APIC 9-fasteoi acpi
- 12: 5146732 362636 240016 241533 534196 383274 265445 167959 IR-IO-APIC 12-edge i8042
- 16: 3 0 0 0 0 0 0 0 IR-IO-APIC 16-fasteoi i801_smbus
+ 0: 23 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
+ 1: 0 0 0 0 0 20896 0 0 IR-IO-APIC 1-edge i8042
+ 8: 0 0 0 0 0 0 1 0 IR-IO-APIC 8-edge rtc0
+ 9: 0 17259 0 0 0 0 0 0 IR-IO-APIC 9-fasteoi acpi
+ 12: 0 0 0 0 975537 0 0 0 IR-IO-APIC 12-edge i8042
+ 16: 0 0 0 0 0 1 0 0 IR-IO-APIC 16-fasteoi i801_smbus
120: 0 0 0 0 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 0 0 0 0 DMAR-MSI 1-edge dmar1
- 122: 40662 2645 2048 8326186 3083 2651 2210 2042 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 123: 50 3 7 1 9 3 5 0 IR-PCI-MSI 327680-edge xhci_hcd
- 124: 269 24 28 20 104 171 22 48 IR-PCI-MSI 2097152-edge rtsx_pci
- 125: 38 0 0 0 0 10 0 4 IR-PCI-MSI 360448-edge mei_me
- 126: 2 0 3 0 1 2 24 0 IR-PCI-MSI 1048576-edge
- 127: 2247 56 54 23 3782852 37 26 18 IR-PCI-MSI 32768-edge i915
- 128: 77 0 0 0 2 32 8 1 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- 129: 18 2 0 4 8 0 4 24684 IR-PCI-MSI 1572864-edge iwlwifi
- 130: 658 1 0 0 0 8 5 13518769 IR-PCI-MSI 520192-edge enp0s31f6
- NMI: 607 2649 2621 2523 2484 2424 2424 2470 Non-maskable interrupts
- LOC: 29014738 29910147 29754034 28953856 29024391 28521696 28469173 28816545 Local timer interrupts
+ 122: 0 0 30204 286555 0 0 0 0 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 123: 0 0 0 54 0 0 0 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 124: 0 0 0 0 0 0 0 459 IR-PCI-MSI 2097152-edge rtsx_pci
+ 125: 0 168 0 0 0 0 0 60676 IR-PCI-MSI 520192-edge enp0s31f6
+ 126: 0 0 3771 0 0 0 457557 0 IR-PCI-MSI 32768-edge i915
+ 127: 0 0 0 18 0 0 0 0 IR-PCI-MSI 1048576-edge nvkm
+ 128: 0 0 0 0 52 0 0 0 IR-PCI-MSI 360448-edge mei_me
+ 129: 0 0 0 0 0 0 45 0 IR-PCI-MSI 1572864-edge iwlwifi
+ 130: 0 0 0 0 0 0 0 636 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ NMI: 16 14 15 17 17 14 15 14 Non-maskable interrupts
+ LOC: 912103 935689 937695 989339 1036579 900977 963828 944405 Local timer interrupts
SPU: 0 0 0 0 0 0 0 0 Spurious interrupts
- PMI: 607 2649 2621 2523 2484 2424 2424 2470 Performance monitoring interrupts
- IWI: 6 4 3 2 10 4 3 1 IRQ work interrupts
- RTR: 18 0 0 0 0 0 0 0 APIC ICR read retries
- RES: 7885792 3950261 2715262 2193529 2474046 1957554 1665440 1988038 Rescheduling interrupts
- CAL: 987291 866818 901402 885321 915800 938469 935939 966681 Function call interrupts
- TLB: 231525 195523 218511 215448 205511 204323 194087 201607 TLB shootdowns
- TRM: 1627962 1627962 1627962 1627962 1627962 1627962 1627962 1627962 Thermal event interrupts
+ PMI: 16 14 15 17 17 14 15 14 Performance monitoring interrupts
+ IWI: 0 0 0 0 3 0 1 0 IRQ work interrupts
+ RTR: 4 0 0 0 0 0 0 0 APIC ICR read retries
+ RES: 243892 93357 40221 24354 17705 13147 11663 11184 Rescheduling interrupts
+ CAL: 33867 31854 33696 32831 33585 33534 32145 32434 Function call interrupts
+ TLB: 16415 15608 17440 17663 21127 17152 16593 16540 TLB shootdowns
+ TRM: 0 0 0 0 0 0 0 0 Thermal event interrupts
THR: 0 0 0 0 0 0 0 0 Threshold APIC interrupts
DFR: 0 0 0 0 0 0 0 0 Deferred Error APIC interrupts
MCE: 0 0 0 0 0 0 0 0 Machine check exceptions
- MCP: 202 200 200 200 200 200 200 200 Machine check polls
+ MCP: 29 30 30 30 30 30 30 30 Machine check polls
HYP: 0 0 0 0 0 0 0 0 Hypervisor callback interrupts
+ HRE: 0 0 0 0 0 0 0 0 Hyper-V reenlightenment interrupts
+ HVS: 0 0 0 0 0 0 0 0 Hyper-V stimer0 interrupts
ERR: 0
MIS: 0
PIN: 0 0 0 0 0 0 0 0 Posted-interrupt notification event
NPI: 0 0 0 0 0 0 0 0 Nested posted-interrupt event
PIW: 0 0 0 0 0 0 0 0 Posted-interrupt wakeup event
-MemTotal: 16293504 kB
-MemFree: 934072 kB
-MemAvailable: 13703496 kB
-Buffers: 452228 kB
-Cached: 12441380 kB
-SwapCached: 101680 kB
-Active: 2599800 kB
-Inactive: 12195432 kB
-Active(anon): 1356304 kB
-Inactive(anon): 588448 kB
-Active(file): 1243496 kB
-Inactive(file): 11606984 kB
-Unevictable: 64 kB
-Mlocked: 64 kB
+MemTotal: 16284452 kB
+MemFree: 10017268 kB
+MemAvailable: 13198904 kB
+Buffers: 264676 kB
+Cached: 3332548 kB
+SwapCached: 0 kB
+Active: 3262260 kB
+Inactive: 2461476 kB
+Active(anon): 2128188 kB
+Inactive(anon): 249756 kB
+Active(file): 1134072 kB
+Inactive(file): 2211720 kB
+Unevictable: 80 kB
+Mlocked: 80 kB
SwapTotal: 8212476 kB
-SwapFree: 7376112 kB
-Dirty: 11044 kB
+SwapFree: 8212476 kB
+Dirty: 836 kB
Writeback: 0 kB
-AnonPages: 1871520 kB
-Mapped: 416280 kB
-Shmem: 289864 kB
-Slab: 351256 kB
-SReclaimable: 257264 kB
-SUnreclaim: 93992 kB
-KernelStack: 12832 kB
-PageTables: 58172 kB
+AnonPages: 2126728 kB
+Mapped: 482028 kB
+Shmem: 251440 kB
+Slab: 324616 kB
+SReclaimable: 173204 kB
+SUnreclaim: 151412 kB
+KernelStack: 10096 kB
+PageTables: 39776 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 16359228 kB
-Committed_AS: 7879332 kB
+CommitLimit: 16354700 kB
+Committed_AS: 6618696 kB
VmallocTotal: 34359738367 kB
VmallocUsed: 0 kB
VmallocChunk: 0 kB
+Percpu: 4256 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 0 kB
+AnonHugePages: 806912 kB
ShmemHugePages: 0 kB
ShmemPmdMapped: 0 kB
CmaTotal: 0 kB
@@ -297,14 +300,15 @@ HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 523752 kB
-DirectMap2M: 16115712 kB
-DirectMap1G: 1048576 kB
+Hugetlb: 0 kB
+DirectMap4k: 282088 kB
+DirectMap2M: 7968768 kB
+DirectMap1G: 9437184 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
-enp0s31f6: 9760816648 13664538 0 0 0 0 0 8965 118421394195 83833297 0 0 0 0 0 0
-wlp3s0: 3643580 7768 0 0 0 0 0 0 4732829 8244 0 0 0 0 0 0
- lo: 9996035 41708 0 0 0 0 0 0 9996035 41708 0 0 0 0 0 0
+ vnet0: 1155867 4102 0 0 0 0 0 0 960100 10308 0 0 0 0 0 0
+wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+virbr0: 1098439 4102 0 0 0 0 0 0 735824 6022 0 0 0 0 0 0
+ lo: 7424702 45950 0 0 0 0 0 0 7424702 45950 0 0 0 0 0 0
virbr0-nic: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- tun0: 20139456 21861 0 0 0 0 0 0 3370846 19686 0 0 0 0 0 0
-virbr0: 47538577 146404 0 0 0 0 0 0 164360816 210422 0 0 0 0 0 0
+enp0s31f6: 39251323 34779 0 0 0 0 0 0 5044761 25668 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example.com/CA/secmod.db b/test/aux-fixed/exim-ca/example.com/CA/secmod.db
deleted file mode 100644
index f8cc0e78b..000000000
--- a/test/aux-fixed/exim-ca/example.com/CA/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
index c6accd35b..e9e7eaac6 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
deleted file mode 100644
index 0cc8c2ec7..000000000
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
index 569d91be7..092306e61 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 11 3A B7 95 2B 9C 29 53 DE A2 85 E3 4D 03 0B 39 AA 06 23 73
+ localKeyID: BF 95 EA EA F3 AE 8F 76 AA D2 83 FC D8 6E 7B F9 FD 43 40 32
subject=/CN=expired1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVGSR3x/dy3K1D
-9ksiSdVXCeWMLkH3MbKzc6vGq7/kKoNNh85Zu9EnftbwY0jyBUSnhyi8sq6VTT3b
-NK4aLcTCvinzlEIaM5HFD/h/dsLBTPuwVo9FhsJtgGwI0c0ZktyNOQl9SsHqOkWz
-AJiFqzo+3As4Q3xWwWpdhtXTaOPAkwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
-A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AELflNznRRAJHrDXTjLsHl7IC0N5eS3j4/cckAA0hsvQfuwoQu15A6301WyfS8vQ
-JBg/rHzX4ZkSVovQ0ximDRgPsZ0Ytj7zz4kfLnVOEHzVDv0boH4UNYMOWziTJFex
-Zl1VQzLlik1oyO/qfo7EysB12RZlm7mshkD/XV0zwkO1
+MDExMjM5NTdaFw0xMjEyMDExMjM5NTdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz4oXX+vU
+z0sSPxY+Bi71XGyaJSgkgAvXkyFGxXRMCPX9zpTtaXhtCbp87UQXu5ieshq6vG47
+1rTYSrJqSK1GCeDtpJX9K3yiBS+fvganEX9U744+V5PopV15gLjGW7v5tZQjV40M
+73ZBmyCO6vHNoS5ikFo6FceFSaFXIKvjMsgtamqHcj5aQaDkouejsEMhL6v8VcbS
+MO1XsafHblcgVK6Ju3DdX8ExexJe1IFn8iu7fi8ZDFzcYh+fYAJraHE2Pi4MM8Ci
+uebVtHXRLr1HV4tR7Lbeto4b85cZ2VqjUtg4UUb6f4x3iKIE0udS4Z4j/m4sULsB
+fz0v1BHFWIlu7QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4
+cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQA/beB81LUEur6i
+vL9i8IILNs2WXuHUgU29kViIIAtt3+G5z7a9S/0YBrIk9vWCZgiTT9Vy/UIhfiY0
+gdHTX8kb5E9moWvCBxyJW8hXKpU+oGk/WzZqsKF3+5tEwcN2goCjxlAZkfLS1nv9
+iYZ+AqK7qsdAIOHSNA2rDG/RxrTkFZ4O+ofje/epjy941fURCetIdsjK0EG4Q8iB
+Efi/M7n8xkmfU03m+FSfTh80uqB8J0JBB/yVbYedpQYeJNJUUNwWkXISzkg0uZUX
+0i22/znBqa0Ah6B1G7PKlruc+0DzjWBfaxRKxuBVn8Gco6na7ai4e93/VCIc/7as
+5BQ0wtL0
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
index fd67faff1..8a0c2d4ca 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 11 3A B7 95 2B 9C 29 53 DE A2 85 E3 4D 03 0B 39 AA 06 23 73
+ localKeyID: BF 95 EA EA F3 AE 8F 76 AA D2 83 FC D8 6E 7B F9 FD 43 40 32
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIgkIbOgBN9YECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLGsir1I4gLUBIICgCrulaO7xBkc
-GYBbg1ga7mNDUyadIvk4590APLip3on48zzw0NMFSEFMcmxmbFAffjqPlit2jqfy
-3bYxP1qWAUCn8lizPSsvl0ZUaetD/RezM1JV0a5W/JDxdX3DgDOcnFRXZdyzCz/W
-vx8G69btfgMr/xTkBEpcYK0x2YTBGrRGqW8YqgjP5wcS3gJrAZgnYLFdXmNDp4Wc
-QcysKmtCTrlG9awBaTlf5CyF1wwHWpKmS2rGuBMLY1zr7N0+EICKlfLJ612ON2Iv
-2IkpiwEpYtR2mo6lW6ULjBc5Ah1CwxkqFyIGk/zxJnYGGoVgYobNK0Hl9yTNSjSU
-TXG3zMOoaHr6+W6rK1xAXlArkP0GAW2Jfc/6SQMiNuqxczSrgeDC05mp9uH4p7ly
-lKPSWJupzMi7PUF3dmYyR1578uEykbRpOOSH1tL/KUduGlesqJi3XzGH1M6Ajhwk
-xXfxiO8zEsCbtlSkAiiiXEFx8pzPz7eUhG9PGLt+/HN/DeM9bEIFQgvuWwq0Qa3u
-aS9gfj65C2wxUVqycq+6LG+8lSeoFjmKlQNNK/o2f56skfo1JpFR7Zy50C4oLV14
-8TbfofPUQnDVuqnuEP3LMIGNDlf3W8aip6CiCd1C3c7AgO/rbhF323ZjpbpxmrSW
-uQZAIu/avmVdtKUi+k7twb6jaecbVW3KUg9LnwAFHBzwRhy239FxUIZ3z7+9IOoe
-gZXF1OnaQo9U9lRmFPmkjGCIv5RkgGZ7G4+Ing0m2hDbaFa45RJn1+x51msB1V8y
-TwErRlYvWpFW2HI3SoEqr8axD4AWWCGHl7o9j8DV1AsV7L1B9DSPLdVfUH2vPafD
-k9MfD+MTcEs=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI3BRcdwf9iWsCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCzNOzasgHX4BIIEyFKL7OakBUwg
+iWWmb/kNNnb2tbZHmrWYbbKA+TIl3nopjmZFP1SGW4MuYvLRoNSWb5lggBEs+m3h
+FTdIHDsH8uvh0LpqTEjdj0b4AcqPO9CuRrU5mRkWkvxDTRNslSJm6YaLyFuyzFMu
+CNi3RTv2dLy5MHDi/poNT96a1At1kRIlCjGu9gL2425PWso6M4tScxkWT97AwRYv
++OuPljA+kuLi7O6HKUTHe/DwrZZIC/lL30nXP1D2lRxyJeYyM6jyViZqDZQ34ZJb
+fNohOK0cqZXObuww2dwl3R9z9zubBcFTvXbh0SsC3xy/4TQHlv1VXTWmsr7wOvk7
+C7C0uMys/tuPS+qpmFvr1HoWTJRd+RLY8C9Nr2z/UMJaIvgaQmIla0o0g1lXhWqb
+ffmxpuNF1suLuWNTs4BDbWIJgPWhJd65CT1luoD5LnZAphngoZGK9JSG2Ww0UOSO
+tjLVODCIwppTYybmRZk249u8ExCGuLrHLwNpjeITj1nlq0SKKS6S9diEUGhGvgAG
+Gbam0FlWE3qMs5reqzA8hJYjV959jMp3KB8aAOvnr7412Pg4itoL6UrTSD5QIwEA
+YXM9MrqfH4FkMu5Qsnkxhypbbf0W4obUbcT9fheoNQKcrRML99hPcLsen8Xzc1ir
+19UIVU+WaiavZCZP6o8GrQ8rSfuo79/TLL/YJn+JK8ToCVNRDmGFpz8z6eW6KJiG
+xwz72qOKvUe7OXTwYjz5tos7SCsqAlpgPbXQkjcEGJ8zDbKH03J43VFoxcf3Ktyi
+uvCHUoZ6w2cPSuEngfBJs+JKnOvxof8ezdd0+ilmTOG5dgtbkY4UHzC7o3xwOwRn
+tefuFqWlzxnoT8SuRz9oudS3dYo+B0SgfVSX6A2rgudSM1dYA61z8LsbfYjhrRPu
+l8/CF94/n/juLxyXmzwADywqpCCof52Pi9P8v84ypvGKC0NsMmZ7fVNHIKQEh7+V
+Ow36KfdMQPoRiSljQ2z45qfBTyuR2i2hzZ25sZ/C2rgz67oSvTC+OdrAHZLMj43Y
+XRjJWnoIVQrkwUULIc7qa2KhdSmgnqvA0hnZwiVsNVqbSjSoaqmnU+K9HpWDgVJ8
+nri+uesYVfg+AJhgArvevXNB5DJtPSFzcbqSUaIABdYNwEv+CkTdZyqWzaOHwmIT
++yW+VMYnYMuUex1rN3DY6aDEqRtXbZaam7gDbwzAgxt8sWmSc7rFNrXBbS8nbz9z
+Im7mKNCSWh7qshZJwgSbTG5LRqJSJx7LKbuS69KTVHFU0j3uiY9hzaGIfmCP+5zc
+Yu/5WhNPToCLAWu+KWxkVPE4f78BmytnKDma5d2ZWvrGoiImN+e5B++zWfchxic9
+AcA+qskQIMTrnvuRMAWRhkbcyi0oyy0EdR7dwtAmLAKfjPFILhx9XI2UrAb9Wdla
+SmbM3eD6FSMSzXuu7BH7XZt2psMe946n2U7S3ZlhMp+os18fyedeVXJ/m75oR/b+
+Q1ZCHT+GxXzqmaKw7qh7PMFM81ThQPeqS94iJFCxiCNCv6f4Bp5in/oRAG6LTfdO
+TqT07U3Hh1QA3ej1Sdp4Otv67H2GELOtiocH7Bf51tC5LDOqWVea0wvTrjech1Ku
+hAZuBJxCfikelMqmcLco9Q==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
index 58215459e..89d8fe30f 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
index 1753432dc..defc20b78 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
index cc85143a1..8a24ce409 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
index 8eb6640f3..b89b74489 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
index 24552969a..8fb952cc7 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
index 47b413510..094516657 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
index 4a0093761..a4bb39384 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
index 81a380556..58ed9a7c2 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
index 461bd62d5..e27e96100 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
index 084867c14..f1f6223a0 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
index 9e3d49c35..8b6972b22 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
index 94c607094..f9cbb5ade 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 11 3A B7 95 2B 9C 29 53 DE A2 85 E3 4D 03 0B 39 AA 06 23 73
+ localKeyID: BF 95 EA EA F3 AE 8F 76 AA D2 83 FC D8 6E 7B F9 FD 43 40 32
subject=/CN=expired1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVGSR3x/dy3K1D
-9ksiSdVXCeWMLkH3MbKzc6vGq7/kKoNNh85Zu9EnftbwY0jyBUSnhyi8sq6VTT3b
-NK4aLcTCvinzlEIaM5HFD/h/dsLBTPuwVo9FhsJtgGwI0c0ZktyNOQl9SsHqOkWz
-AJiFqzo+3As4Q3xWwWpdhtXTaOPAkwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
-A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AELflNznRRAJHrDXTjLsHl7IC0N5eS3j4/cckAA0hsvQfuwoQu15A6301WyfS8vQ
-JBg/rHzX4ZkSVovQ0ximDRgPsZ0Ytj7zz4kfLnVOEHzVDv0boH4UNYMOWziTJFex
-Zl1VQzLlik1oyO/qfo7EysB12RZlm7mshkD/XV0zwkO1
+MDExMjM5NTdaFw0xMjEyMDExMjM5NTdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz4oXX+vU
+z0sSPxY+Bi71XGyaJSgkgAvXkyFGxXRMCPX9zpTtaXhtCbp87UQXu5ieshq6vG47
+1rTYSrJqSK1GCeDtpJX9K3yiBS+fvganEX9U744+V5PopV15gLjGW7v5tZQjV40M
+73ZBmyCO6vHNoS5ikFo6FceFSaFXIKvjMsgtamqHcj5aQaDkouejsEMhL6v8VcbS
+MO1XsafHblcgVK6Ju3DdX8ExexJe1IFn8iu7fi8ZDFzcYh+fYAJraHE2Pi4MM8Ci
+uebVtHXRLr1HV4tR7Lbeto4b85cZ2VqjUtg4UUb6f4x3iKIE0udS4Z4j/m4sULsB
+fz0v1BHFWIlu7QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4
+cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQA/beB81LUEur6i
+vL9i8IILNs2WXuHUgU29kViIIAtt3+G5z7a9S/0YBrIk9vWCZgiTT9Vy/UIhfiY0
+gdHTX8kb5E9moWvCBxyJW8hXKpU+oGk/WzZqsKF3+5tEwcN2goCjxlAZkfLS1nv9
+iYZ+AqK7qsdAIOHSNA2rDG/RxrTkFZ4O+ofje/epjy941fURCetIdsjK0EG4Q8iB
+Efi/M7n8xkmfU03m+FSfTh80uqB8J0JBB/yVbYedpQYeJNJUUNwWkXISzkg0uZUX
+0i22/znBqa0Ah6B1G7PKlruc+0DzjWBfaxRKxuBVn8Gco6na7ai4e93/VCIc/7as
+5BQ0wtL0
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
index 7d6c85dd3..2b3aef98b 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+MIIEowIBAAKCAQEAz4oXX+vUz0sSPxY+Bi71XGyaJSgkgAvXkyFGxXRMCPX9zpTt
+aXhtCbp87UQXu5ieshq6vG471rTYSrJqSK1GCeDtpJX9K3yiBS+fvganEX9U744+
+V5PopV15gLjGW7v5tZQjV40M73ZBmyCO6vHNoS5ikFo6FceFSaFXIKvjMsgtamqH
+cj5aQaDkouejsEMhL6v8VcbSMO1XsafHblcgVK6Ju3DdX8ExexJe1IFn8iu7fi8Z
+DFzcYh+fYAJraHE2Pi4MM8CiuebVtHXRLr1HV4tR7Lbeto4b85cZ2VqjUtg4UUb6
+f4x3iKIE0udS4Z4j/m4sULsBfz0v1BHFWIlu7QIDAQABAoIBABawlT+ia+DB51vI
+Vb2dUqvpH60iR2NMaCQoxjD+NvXf1wDH3XDjfqBKqC/UevfChs8YBwRk1NvzZ5Y7
+DU2my/p2geS1lTk05g3FGCTRW2CZWDLcjUpL3Gp/3rHJAb6zvWgxqu9+d0SS3DdW
+hul+yClwBcycYK9S4eqb3gevYyaA86dYSuVW8GOK2/IhEjoDgxiRYja9Earf958B
+OYtyLNO0RkGZ7mywuvO41OcfupzwQwJzQaYI3BrZALFJJtKw67yykkxhjSDOy2bX
+oYD/LxUrCGQNMeMtBYBrJ3BnGshkfgLkZwl28Olw6KqVnmPCe5r+S+jy+8RddLrw
+iFbzAYECgYEA8lrzCfAM+kRzBA1NxbM+3iNowmlGAJNYsz1Pms8tdWf3j2vTb7KT
+sdrkot2Pq+KTrHCMvruZW+bj9YD9woYRqhNc8FS0eDb7tybGK5Q9il5hlZcBOCXK
+fnOuDlla9cKdLj4FYvGoZtrFwJbwyvejdrx7FApdd772Wo5n283JkKECgYEA2zlX
+5aL/itjMSIVqQ1li1VIPdl+TtH+LnvQCsLl4MNeYW/akd1Y+MmYODklQNk1yHb+O
+aY+8dU7/FUx2YcnoaTOzz6B0jHfYWqCV8fhe75bL2uFar6nHINMZrXDUgqupLZyx
+GwHC92eoq3A5hi96JUp05xEh860CutF/onWV3s0CgYEApaMBTj5xMC7OCOvqxn7O
+LdY3h/+ZJ1WNHtt9Z4nHQOGwsaX5GPMMvFalQqZ4xfoSAZ3eo5DlrIjuLeFeDa/B
+rOKU93B881hoyvFGKYykTshYm3tcCvrRHYGEaSwq3aKH+I3M8qXE+Z713r2Kjr2X
+S9Rfrf+zh97M0nFXjENmSmECgYAh3lkbDDSosdfVuG7zWsLvLA9hfWCneTEL7Kzh
+urW77gMG6jL8kOFpDeVMBb2TtiFUQTzySBeYlAzKsJZ1gykZ37f+8s4uyXEuhzLD
+QFkCcOyrszc8fmFaS+LirdTXH0gy2Mtv3bTOXkBrxBnPBlS7oCYxcK8rI2aRkD5E
+zh/KXQKBgHE6MZAV+18DeDN+qZKvso/035qAfrsIAR7Re98KQzafsy8RL54AKkOp
+8BtZ6NbrtVOG4L32eRW4FuYiSbBueenSQnH2lUIt2Htt7qDHVog5+kpDRaLFRCtY
+oRuxwkXuf/VGHR8HtDk9Oc8tYm717yc3aroy88etXkTRS0KDAtpN
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
deleted file mode 100644
index 5726b1a39..000000000
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.db
deleted file mode 100644
index 5ab9cbddd..000000000
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
index c6accd35b..e9e7eaac6 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
deleted file mode 100644
index d9c92b857..000000000
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
index 6d0c80150..f451fa86a 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 2E CF 5F 43 53 BA 8C E9 2F 62 95 52 FD E6 1B A1 1F CB B7 DA
+ localKeyID: E9 B1 CB 42 2B 3A A9 C8 05 16 4E 06 AE 40 E0 F9 7C C3 D3 06
subject=/CN=expired2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA2WhcNMTIxMjAxMTIzNDA2WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyUlBWmdTM96y
-ac0i8r1M520NAWSe7mqaefQ8ikDjcL8OOLFBm6WWZ2Twux5/OnIybzTJ2WKm58fa
-TOlEiw5GsnhnjMTi9zHhEUdJn2/Gz/0oaGfkXu1QsHIP0SjfEGUy1lvg/EhXnPz4
-XGixIZyhQLqOiOrx2BhFqGVZ9FYzO4UCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
-BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQBNavRiDJHQwrHch2BJLP7BCtAPshqO9aJNicnXVDE5f7MKc6wjcjgoMNn25Y8w
-WlT+3LGZuvT9QUfC3XSUzafiYDzaI+KxBMQWlztTyoxV0Ug2tVoN65WgiIKgAIwC
-LjP5yVh9q3dsoEpBQ0OGpw7t5Jd4z5isDVdAxQ7LIPpu2w==
+MTAxMTI0MDE1WhcNMTIxMjAxMTI0MDE1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALv14myw
+eRdB1Dmm20HFfqBHjUS5e1xZtoYduT2Uk1vRAvm84LPwmabiIKZN1MbYnmvRh78P
+hpV+OeCU4bPF/r//c2ZD9/scOHKIk4Q08Hjo+JWEj5dwx3ekCt1PtzSQ8SOPqDUe
+QfQEKyNlcIJ3M1+iZLvCcEeRkYMrpel8ZJICPtcqbXbRIK564+8KDHT4pA6ycR1W
+a2p8a0alGRryjTiFesxC9yF7t6ZWhts6a47HgAYvhHLevqL+Z9KnGIV30GGiGA/J
+duRlA4YeGNYuNQujGfMJ4ilrGsxK/0c4KRiJ4tgX84/VK4yfJDLOoRizy47g3EHA
+IhrlR75uaxFSIm0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRl
+eHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAETLDvgZU2NtO
+V4eGjZ/PuFZ/nj+ic3vxf/5uKbPaAbB5mQknFKSebzkDSeBvBcD0qSyiPnaqgG1D
+HpVGU851LprcDKhfm/pfL6CwCkHh5X29nIxwFgP8hre47pn2hlMsQIW1VBq9Slb1
+qvFhdwZSEEZXX2AuGKjoeutGM4Tb/TddHw2vUAVAdGG8PsS13u7bTQclfYeyQpY3
+hbXQ0ybWUuSwWTu21Gyohjrg2XeeO9cqX9cx+ql96R/asecs8Q8BqgMzvH4nJLaq
+hse4w6EPwg4M5ChlriAjSJ8aSazyJZk2JS9/Xb6+ToA7XFHegkBSFXNJ65+ulWbO
+xmABBb/xyA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
index a8942ef1c..27ca5e94c 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 2E CF 5F 43 53 BA 8C E9 2F 62 95 52 FD E6 1B A1 1F CB B7 DA
+ localKeyID: E9 B1 CB 42 2B 3A A9 C8 05 16 4E 06 AE 40 E0 F9 7C C3 D3 06
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQILtiYmswfV5wCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJCv2ZpdgYbsBIICgJRWLJSp/sRa
-X5GinSqjXfa4IBVtGXeYBuisP1XtWBb0/dP2L0bxgg5TTpxfPTXJPY2VeBDLyh7a
-xTz5i8v0TnGVy7fJeDjwhfJw3fQy/s/XAFhNeu4zSwtzvU+FGcHgXdywvS+Riq4F
-jKgoNnv86wWN/gbSYi3Dx7wapHSNIjwUqaKPbp6DQbr60V/QLU1gYYK7L/7xb4T4
-PvPc11SytPHGi6AVQJQC7Vc6l317sVHwYA7r0ES7x0v5EPBDsgw6pfZvg9Dufn7q
-sylw9qZ/FOwP8wPMmPOMe2QTTOXMmcZsshB4yCRnPubFT6LlARnjGPmPH+NNOtYY
-ywARDO3ZjYFmCvM3zyCHfrCbV9rR6wQIGfAmVrLiNbVv/FWdJGIZ/cbDgAuvoTUE
-j5qRdb7O6hhXRQjmHpiIK07tE/V4MdcAwlizfxSMsdrBVh5K1LTd6ZAUaLzDyXHs
-UdFSVhdYOAHryEzNtVGAMbJf0zT8CxYxQboCOCffoVvI7Fb4sK6syDtXAZZFJKdR
-1GJULr2IGxdppS5BXHZ9egezRpKombVECkctEnjgKGQmiK20Zs7wHUcnh9S97C3l
-oF9UXieisHTDY7SegBu8ufU55vCi8TSD5AtMMkyGCPU68YDEPcvD6YKeJQ3R1opO
-5n7z9c+QWT61L8pIjBADxSxV9VP023q0fc4HODLWBjpxDgw1lvkAaoxQFTNFu8nx
-AIX+MN+9jrHS+2ZJrfcHJRug8A7SCrc7/is8H3RlenvXiseJIUXaFec0Y4ug5ZTi
-1DTdhC7U9DmHFOsvgxEyDgxFpPV5/2CHLQyNREiTqs2jg2a8sTxF3J8p2FVKbD/6
-G/1U0JXS5H4=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyjVXLE4d3gsCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGuLo+ZPK3+SBIIEyK2SW2qwEKwk
+r7tDMizqZkk7NlyUph3nEfyPKpWNp/R2YABGVq+Ib4dDTObmDyKl3W0uM1j1NHkp
+3xSwMK7z6cd6W/hH5twhhOfm6RGuSN0laqNRydLNo3s3eLZJHhgtHKpmpYX+NSah
+TrVQLaivKxDQHWBNfZSxDKwnuW+oqYOPbIbTjceaUF9viRkjVAKWsRE3/1GAqKrG
+tI70IvL8rHgeoxz+Crr/EUTyW42QYMGkCmhsSocs6uJZRoOelhXX5Xu77bbFFP2v
+Dat/ogn+qjlzbpzeKNYTPVX3/YRfm6B+eFL0PLRRwaPS2pvHEjf8PCzrOrdKuAAD
+q7BLtTi6HlOlLQf69ylrLSOx5UzU5wSqz5eYadZSNPYe/0xgq60IAf7qzLCfT2Oz
+qZvvqGWKBx+DIkc5qnwag6xvLovyvJ4vPVCAtClB/gw10dne52T/UEiGme+ymMK7
+ZuCelGiD/snR0ztB1LCkg2C5OGumuKDcqB4Vvnfqng+N647X4nXCzSuZUvOXAlBy
+rdSpRd0wplIHFQ2dGZ7uy1V+6/nZLSrpq2KvnUxMhP1SYdDnKVB+VEkSkxZcX1RN
+x9W0C6nErDvJ+U2DVnLffJjS/w0sCQsVY6idRLGsGZaTJZhjkWXcsuGutKcyacGv
+A5Gp+TsJOYXe+4vD3XS+IEv2FmBL7Z488t3DsxKEV/n863D56Ja6/rzB9ELPpwox
+i9o4Zv0+SMb3/rz4e8kdq6Cxtras/0DRG26sXLRO0/XRW7+8q2T+y4R0zFI+iUL8
+eWfwzqNggUUCKTUpZ9EXWXNEDcrE229JlvBv73jUuqaF1RyPwIgNE1orL8mxYm6Y
+nMe5MpMteKrNX8oo6YRUs8UyFrVH64utTxosrqTaLcHrVTssXlDDm6NISlz0pPB9
+ncaEhPg0X01xqSADHzXV96I6FpIoroXM6ugx5mdCEptJ6AvhDS6G3mjFGL47uSGV
+uQf6hEmXLhwCAVVPf42GATWDC+/6HLuL20rrOQaG3D0jdlht45f1SHlwzGxTMgqP
+qH6dz0chQ9Pgw3PHdJ0ajSU5pa4qx2YZh9A5ywz490mIXbZBdQYZxxDjOyti8mvn
+8vbuHfsGyzTJ6fLWAEoumXil0sBvG4vF6V2eHeIyIgD2u7ohWPq+hnigafSoHJyR
+qcpCVYmu7yxWjPRclDEUoNJhBsNu1dpEbKQe1AyQn9jDVVkS+oe42c0lnh/rbu+o
+Dq5bXmbXFwja8IKBbigcsIYYAg6UK1CVM83AE6KU55Vx8bDKqSIA5J0lXemOtX8j
+j7xcyG83mN4URXCOqPjD5JhMnggJ4JuyBSA6w6+BPv8mynyPfWjXKuQKdRIdkAfC
+H+sU9igx4DfFOgaSdtW1eMnd2++3CChggGAzgfptL4C2MMIlvJaKEjBEoK/T26fb
+uDxdZfps9rGU9zp4vNmVhzTpbqcm7F8knWUmBIl3p5Vw105aW2+9GNXkODLIUZ2X
+u4kerPDal6OLW9fzNN4tnJxl5WVw/MaN2kPBwoj7SPD6PNtCDyROZJ8XmGmzmFxa
+GPNXGnqdnqSpGMXV+/rpNisw8uTT7FHbIjINw3JV62CV7ZTa9Pp+d0fQRWLThMlf
+1RYoy2UDY8sTh5xZlTpjwg==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
index 608b267ec..81fb0a46a 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
index 02615500f..39a847706 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
index 4529ac728..546281fff 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
index 02615500f..39a847706 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
index 2de3cf922..840a75279 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
index 3c5017150..824234072 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
index 3c5017150..824234072 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
index 7c1bd8c3c..07780be1e 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
index ee478a865..9a95ac59c 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
index ee478a865..9a95ac59c 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
index 816258f90..663a89a50 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
index 19910a050..c05c66b7e 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 2E CF 5F 43 53 BA 8C E9 2F 62 95 52 FD E6 1B A1 1F CB B7 DA
+ localKeyID: E9 B1 CB 42 2B 3A A9 C8 05 16 4E 06 AE 40 E0 F9 7C C3 D3 06
subject=/CN=expired2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA2WhcNMTIxMjAxMTIzNDA2WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyUlBWmdTM96y
-ac0i8r1M520NAWSe7mqaefQ8ikDjcL8OOLFBm6WWZ2Twux5/OnIybzTJ2WKm58fa
-TOlEiw5GsnhnjMTi9zHhEUdJn2/Gz/0oaGfkXu1QsHIP0SjfEGUy1lvg/EhXnPz4
-XGixIZyhQLqOiOrx2BhFqGVZ9FYzO4UCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
-BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQBNavRiDJHQwrHch2BJLP7BCtAPshqO9aJNicnXVDE5f7MKc6wjcjgoMNn25Y8w
-WlT+3LGZuvT9QUfC3XSUzafiYDzaI+KxBMQWlztTyoxV0Ug2tVoN65WgiIKgAIwC
-LjP5yVh9q3dsoEpBQ0OGpw7t5Jd4z5isDVdAxQ7LIPpu2w==
+MTAxMTI0MDE1WhcNMTIxMjAxMTI0MDE1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALv14myw
+eRdB1Dmm20HFfqBHjUS5e1xZtoYduT2Uk1vRAvm84LPwmabiIKZN1MbYnmvRh78P
+hpV+OeCU4bPF/r//c2ZD9/scOHKIk4Q08Hjo+JWEj5dwx3ekCt1PtzSQ8SOPqDUe
+QfQEKyNlcIJ3M1+iZLvCcEeRkYMrpel8ZJICPtcqbXbRIK564+8KDHT4pA6ycR1W
+a2p8a0alGRryjTiFesxC9yF7t6ZWhts6a47HgAYvhHLevqL+Z9KnGIV30GGiGA/J
+duRlA4YeGNYuNQujGfMJ4ilrGsxK/0c4KRiJ4tgX84/VK4yfJDLOoRizy47g3EHA
+IhrlR75uaxFSIm0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRl
+eHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAETLDvgZU2NtO
+V4eGjZ/PuFZ/nj+ic3vxf/5uKbPaAbB5mQknFKSebzkDSeBvBcD0qSyiPnaqgG1D
+HpVGU851LprcDKhfm/pfL6CwCkHh5X29nIxwFgP8hre47pn2hlMsQIW1VBq9Slb1
+qvFhdwZSEEZXX2AuGKjoeutGM4Tb/TddHw2vUAVAdGG8PsS13u7bTQclfYeyQpY3
+hbXQ0ybWUuSwWTu21Gyohjrg2XeeO9cqX9cx+ql96R/asecs8Q8BqgMzvH4nJLaq
+hse4w6EPwg4M5ChlriAjSJ8aSazyJZk2JS9/Xb6+ToA7XFHegkBSFXNJ65+ulWbO
+xmABBb/xyA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
index 7d72da0b5..fa920e65e 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
deleted file mode 100644
index b92d5066e..000000000
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/secmod.db
deleted file mode 100644
index 2461ab320..000000000
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
index c6accd35b..e9e7eaac6 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
deleted file mode 100644
index b76538765..000000000
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
deleted file mode 100644
index e2cf707b4..000000000
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
index af15d75e9..93eb9be5d 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 98 A6 67 6B 44 FD 94 63 18 18 7F 6A 7A D2 3D DF 66 C0 6E 88
+ localKeyID: 73 E7 B0 12 1E 6A 40 57 BE 62 22 93 08 FB 10 76 2C F8 31 93
subject=/CN=revoked1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDsdwu9PSYjL1f
-WC5eLgCXa0bq1Jc50NieHN5ydpxB3Zys2ti34lNqQEqFmkWwTy6CfMUUvqncqvhC
-FPdOHAvRkKrDteXpYRU40YgZy8Tf+/x27CvGpZ2Wohruvwrts5F1ChqDi6hObl9S
-p0kerRHLoe98CDqLW+CxmvmchNgCfwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
-A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AJMKgKfXkftMHP9bwQ5WWJGcNbmkpYP9PnsJGn0M/3G6SVcY9GxQyKSDw4GmoVaR
-Kr+JEZFL+UNwbVobW10/29rvXn8nBlPowFW7YS/XxdM0WMA6w+ZMoekeU+7DpBAq
-SArj3U1kCBnK1jb71O7Aj1cVQXT9UMxRx+SMWC0zLFC8
+MDExMjM5NTFaFw0zNzEyMDExMjM5NTFaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo+KD6Ydn
+cYyU3feyDDMajOtu89d4Xix2z2OcgWVM6alC8mC7rQn23jeHgQWOIGw2nscZBTRJ
+y9sliv+MKUnNLoOYYmXObuJyTP/cYPAMDFkrVYQpOF0oGNLC1kvzs2Myfuc74+s/
+oGjW0u6aFFdbtBYqRuAzjggtvVuAmKO0iNPSqRoAKnU3VGI+nGVOdJGeo5OTmxoe
+xJOe6A2Z/wGMJKBlAdyVBsqVF1aXtyexsiid+byjKcFkbf+g/F5Qm5vj0NURYCq0
+awGhglWEBSZP0+6GHC0PNxoLEFecYtb7e5E51cqnJTMj+acG8XZAZyeV8eVeW9iB
+bwhkjruH+MDqDwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFHJl
+dm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBRh7Fln25unfd5
+7J+79mYhwo1Tx+i1mWgJcARWE9xvDZKE2u9RmzmBjGI4gr5YOUKmpOSk1jNzzYae
+Vsn+wxdvjuULF/OV53+7iOaynJRqGjpM+S57Uv7rp8saqJhHFqUoz4Sk3uNXXngW
+PZa66qKO+xiYOXTSdcO7DnjZUntVB2X8BB7I9otmFYSVoUT4GQfpJRa+f9/S8+ix
+793LmT0bEOAtKPgsed5+7jJlUTQoMemYzBAJMWcZvrS0dEl8lnO1HEYBBAQSMxY6
+WJ5SnUE3cesI8QjbI+/qPyFl9UAAOm57wgWRfYAVOz4RLVH7z8J6EjuLg0CJgnwq
+/E7AcSzb
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
index 6f00126a2..2ca905aa1 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 98 A6 67 6B 44 FD 94 63 18 18 7F 6A 7A D2 3D DF 66 C0 6E 88
+ localKeyID: 73 E7 B0 12 1E 6A 40 57 BE 62 22 93 08 FB 10 76 2C F8 31 93
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIraAmh5Hz5MgCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLd0uIVgUYBaBIICgKC+Bq3xDcih
-xIw795zCFmwYE96dbTkfFa+I/6O74TdzoVzl+udw56MLnLVeen+KHTxJsA2Eiv2J
-Uil02vnLbB/VeXDGPSvPwu7CxWc5GdXmrkXS6gttNmAhuqcy0cOmH1Gx/e4qk7Nr
-WFgAANNj07FBmmEvcDQz0YtEYf/t4tioZo7xoO+tg9cMgRufrp04f1p6MlV1FOjB
-ZLCEPHetvBM2s2LL7F1X5cve7pWvFprOAoz3aaLvpwYdNy4Wk8/xSf9cl2VDomSs
-I2csRRT2JFcRlGQaSbhrtecDlNTEfXfClhwIMuwbfXsRcb7aRxKkdkSa1GDbMkDn
-IJah0z/3G+zBuCVNH9geB7ybxCrcdLRgScLse6be3BA59LUl3bhP0YvLj3cYc8dY
-HlRWJxyStMwz4+bg4xa7c1KsSt9utd/Fbzz8C/c9tyZDWNzeXoZgneb0Jmemk4o8
-+L+dXqujWKHJqsI3pSl5Amv/QjHFjh6bg/j8VgDe8qxhkx7TR1/VxfCj4NAp6IgI
-m8onSmPqwahEzLW6DoLvqCbmpBKbXsZTcBRE5ZbE/bZd32K9o2dbYMvB6SiXU39D
-R79marfIwIhma8qYmmhTLXoAhuK9s2ZouvSfSAdS0Jy80I9HATKtz7/gvZlg8aA8
-lAVC5MnMgBciRBDAWgco7uHIWL69L/O6J+NmkFA1Ql2N95nOFJaAQC92G6pVsPCJ
-FICkRQrBCSnkcEjwX/BhHdP5CkGUZLs83brJOQzYNI6EFsBnl+xK4BwO/y5mezlI
-K6BXqoJZ2xJ3R8wBzKi8hPBYk66aKew8vDmWQq3AU+Skla/8yavQQfP+H1uhuSri
-323Zh+Oa3S8=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIBvO1WOkKKvcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFeGCUO9R0xXBIIEyJgWYmvjwhwE
+XxAZZ/O4T1hU8FzwCOvgmqSkNs7GnT2Q/NSQhUsvUxA8/nyU7wW1Vx62mjJXdJBs
+VdseKBsDLr7xn1hQrGwfQB+39uBUMyJ+b7NZZT/zbBjIXck2++iAAf9uB6/OjhQY
++BAanYgaizQJyanbEzK+xc3dn6ihayKtTYCpzpFW/kLentOL2gib/3U5N9Jd1ND2
+BP+D/POLpfeD2LfLXZLB0lCvXx5UpNOja5V58wHHWsvtm+CaVs/cnaXDhTbzGtNq
+EKIyTxkHbpO/k8kwfN+pcN3CUUUNy+9wIv6LhNujeEYehosJjSbRoOjsFiByAaX7
+Q5nF8sM+mZJDVcRQPkBVJSFPLo4o4bnMcAVF1hXZgxNAgPElhe84YGv0NpVxBGcQ
+6aS1BG6i/OMeSC9osPc16tP5IiiMAaHf3xQawlR4RdHcxczcfc03DE5BzM2XcIVS
+3t1l9aOjQItdr6pYtIClKDTrHm9aHPb639EpShCsoV1bEdSS2QhDbtAyLLAQczh5
+Vj4a6jlkMzITZHdMdpcHtPvoXAJumBj8cSqK7DVUYl1fu+28fDfaOnVPLVFkhlLi
+Tk5AOgP0Bi+VrgB8dXD/0mqYEnJ+YLVEBMBMjzc0DX0+Sqv8j9IGjxKNMl2ynGex
+pIZuwddNLOZOAlaYNBFtgwpOnc2ca/zdtETkwAs5jXlBnV4ICGkm7JxhfOmKvMy5
+eOT6fqVOHORO9JFSNivueIv7wQMMRcb7RcAKbECt0NDHtGdSw79jLh/pp7cy0S8X
+8gofDtUIK8BkjFSutG/2S8Qv5FUhsiQLFgJO2+4Nyt4XiRVbxb6tlM+tFzqcVY+U
+boWnk+AV0WiQRxRgpVnJ2gMsQEh+cAkecoARyeB7L6s06LrPca2DLY0PeM38jSEU
+YIBjES9/TYu5uCYL9skCf7U6n37UlLHmK2YXwrY5RKG6y28yizWI0Fw8Dw7MrCSH
+UZmGELhgMRLMbp+59x2QOvWWAe8rcdpN0BcqAWZ8MgGxX1Uyh3wV93U6Oo3Uyzg8
+IoMJUlnq6A2VJZ2gGHhWtIfO3FEQUKZBbcrNZnCMYc+72PxlHuC6hsUD6U+DE8ex
+T5rjbgwB9bfQfKxuUamLY/I76+C1Q8RRuq3HdVpmvs7Lfr0ItIaTpFpkCrSuXoUQ
+PN+Wmi+2xwNGGE1TwL3aLmOTIstfL02IizHOlM7ih2JH/YhZKcc4jNP10k2s9WTs
+HWbGT05IdroCdj7ysVJx8gbEJSN+5AO+E0wqTssS+KUi2MYTADzCZcJ9Y1AAT0oz
+gPSV3YVrudS+1lgsS6Y9PqtM0dggHtBYfgWnp5hXlUB+oO1DNwmBLtp+lCRdYK8J
+5G8OoBLKY5TlsbpTyzIOFlrWe+HVDgDTdycu9AO8dK9RaUOCU94mExyhwO+rJA8F
+XsQw7nBuR4oYDdxONxeqcNcaYTKfC/ew3WIvEGMdqW70jDuhNLuIKGgvQvGyQGnj
+VE0HFPyyqjrqvqVUnq0+ieIYosAqRQ5CPrgOqz+7Q5tCPBqavSSPycPZ0ZIK5PGr
+YjZDj/SNvm3kLmETJfzz0wYmrGQleRjUuz0oFUNy09hydjQ4ODS4I84hX1wi4XSd
+Gy0S58Dur+BRsgTjbhUszw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
index 534b77a3a..40fee1a49 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
index 0d755f471..9597bcb66 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
index 71e01eb2e..da3808857 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
index 780041741..56f31287e 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
index 18204f14e..78cced8b3 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
index 8c42fc2a6..d6721505e 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
index 856afb1fd..cc6d38c50 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
index 63b5b00fe..0147f59eb 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
index 26803cf28..917e81729 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
index 9606ef38a..32be35b50 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
index bb0372652..e5587cbb5 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
index df215d277..620ee9053 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 98 A6 67 6B 44 FD 94 63 18 18 7F 6A 7A D2 3D DF 66 C0 6E 88
+ localKeyID: 73 E7 B0 12 1E 6A 40 57 BE 62 22 93 08 FB 10 76 2C F8 31 93
subject=/CN=revoked1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDsdwu9PSYjL1f
-WC5eLgCXa0bq1Jc50NieHN5ydpxB3Zys2ti34lNqQEqFmkWwTy6CfMUUvqncqvhC
-FPdOHAvRkKrDteXpYRU40YgZy8Tf+/x27CvGpZ2Wohruvwrts5F1ChqDi6hObl9S
-p0kerRHLoe98CDqLW+CxmvmchNgCfwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
-A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AJMKgKfXkftMHP9bwQ5WWJGcNbmkpYP9PnsJGn0M/3G6SVcY9GxQyKSDw4GmoVaR
-Kr+JEZFL+UNwbVobW10/29rvXn8nBlPowFW7YS/XxdM0WMA6w+ZMoekeU+7DpBAq
-SArj3U1kCBnK1jb71O7Aj1cVQXT9UMxRx+SMWC0zLFC8
+MDExMjM5NTFaFw0zNzEyMDExMjM5NTFaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo+KD6Ydn
+cYyU3feyDDMajOtu89d4Xix2z2OcgWVM6alC8mC7rQn23jeHgQWOIGw2nscZBTRJ
+y9sliv+MKUnNLoOYYmXObuJyTP/cYPAMDFkrVYQpOF0oGNLC1kvzs2Myfuc74+s/
+oGjW0u6aFFdbtBYqRuAzjggtvVuAmKO0iNPSqRoAKnU3VGI+nGVOdJGeo5OTmxoe
+xJOe6A2Z/wGMJKBlAdyVBsqVF1aXtyexsiid+byjKcFkbf+g/F5Qm5vj0NURYCq0
+awGhglWEBSZP0+6GHC0PNxoLEFecYtb7e5E51cqnJTMj+acG8XZAZyeV8eVeW9iB
+bwhkjruH+MDqDwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFHJl
+dm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBRh7Fln25unfd5
+7J+79mYhwo1Tx+i1mWgJcARWE9xvDZKE2u9RmzmBjGI4gr5YOUKmpOSk1jNzzYae
+Vsn+wxdvjuULF/OV53+7iOaynJRqGjpM+S57Uv7rp8saqJhHFqUoz4Sk3uNXXngW
+PZa66qKO+xiYOXTSdcO7DnjZUntVB2X8BB7I9otmFYSVoUT4GQfpJRa+f9/S8+ix
+793LmT0bEOAtKPgsed5+7jJlUTQoMemYzBAJMWcZvrS0dEl8lnO1HEYBBAQSMxY6
+WJ5SnUE3cesI8QjbI+/qPyFl9UAAOm57wgWRfYAVOz4RLVH7z8J6EjuLg0CJgnwq
+/E7AcSzb
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
index 80aba4907..61dfea521 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/secmod.db
deleted file mode 100644
index 783e9a8f8..000000000
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
index c6accd35b..e9e7eaac6 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
deleted file mode 100644
index b17492281..000000000
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
deleted file mode 100644
index 81156c7b4..000000000
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
index 4e1f49364..477d71b5f 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 74 A8 5D 76 70 26 D5 BF 09 D2 76 28 56 4A 09 63 C1 3E 74 38
+ localKeyID: 17 70 E9 C3 AD B1 45 7E 44 8C 33 32 BA 18 40 C2 98 CD 86 18
subject=/CN=revoked2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA1WhcNMzcxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWnQq5CGPVEE
-nyli+ZdX0j40iMHy1f74fR3hvZS2mzoVPfJK5/QGK6yQ653Oaos1Vxtm8m/RbIQh
-GN+ozzFTbFvVrFjGzDFrwq8DJiPDYeq2IobRJJ5yn7Uux6v6A0mBpqfrVVYjQlPH
-GBD5TPCN0mNkfI1NZlm3mWVoy2lxU7UCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
-BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQCqNJnznvo85tNaulsd7UtAriF/WafbhQp0i41bnD4gMxQ6mHHVgEmeIDqY3jjg
-B7GG3O7sqp7JeQa+yRrD4OxEVIxBQLFIsfwwxxaklGom9wh6MjHzgyW3K7EAYi/V
-CSgzHvGoQ2g+VmeyXdFLmriszi5M0fMizgbeA96h2KoJlg==
+MTAxMTI0MDA5WhcNMzcxMjAxMTI0MDA5WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANpsJV/G
+TKhcrSF1c3SIuSEFBsLM8Yr6RP+Ezrxafhfg3qm/DdVGwNbhoBjF+qobE28bYH5s
+hMSNGNWbbGCgzSLPXRNsAFbBkShPDr2IV+5q/9R9v6R3ejSoLEJtr0NLqGY+gDmJ
+lCGK0jRZmfUGBLjcMj1ZFCtSI4DCglgyTuGR73Ccd4Rf8dPqVYVZYcVnsKDgwlaD
+bglxa7Gz1n8rad8v4ZW5lnTi6iTm8uyRao+JgChxDdEHhv/4oiE/iYdTWOLnZ+L2
+W1cFaJ41fL6ayAinAcbADpI8TAsNGGeSqPhNCe3Ym3KtwfoXFqeVYZltlEvPuJVO
+N0y/oP0UrUclZe8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRy
+ZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAKOYKTZN1lODE
+EnV7hacCK6RxFBwWXAot3lFesZ9afi8CdgIQe6nBjEFnjrzx7/sY43XiR7N27SZj
+4DXp+La2ZWluePljcsm0ybGBHfFNEKBwIRS0Xfjfp+OKxNsiRwmeYZzEoKqVLREh
+e+FaHFUKaoK/XR7RLeorra+ygodWNrcgaRSIaHDfY/VeHeejCnAnvBH7rf0Z3SNy
+Fx1KbQd+byXsaiTN8rHxag36PN4SKuhgeAkZ0fJrzLt70VNfcqvoFbZO4yyq9X62
+otq8k5MVgtLaFTOuQfI3NDdkudOfTvyfkR9tHQLwNxIlMZ42ikGn0hqJkVw0m5NK
+TPC7zpPj7A==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
index 327c4a312..d7ce09eb5 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 74 A8 5D 76 70 26 D5 BF 09 D2 76 28 56 4A 09 63 C1 3E 74 38
+ localKeyID: 17 70 E9 C3 AD B1 45 7E 44 8C 33 32 BA 18 40 C2 98 CD 86 18
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI1zwihuvGBhsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECK1nd9++uvUtBIICgBlpfub4yRmW
-udFwK3GM6yk42ovS/NcBCzZGk/Gwv3z/dgzCwhsBhQ7AByHxi0u2XhCJMdWGS48f
-wwlmAWjpy2okDR92QDALMoUj6ud1HvZiqlDXdx61hbWaCiICw3QlzTo/A0d6hRMR
-BPxJ1P8Ky4Pb+GCoQRI1RzAP93AK2bkT9m8PLUxKnQpUdnP8o5ni5cO5l2t+FYsv
-7+cRn1PKGq08F3oO1bcrPf9Mm/6V+Tyl6vaIB36NlqZBq+zG05tRWFIl4KZl5vcj
-z2X0GUIiql6ZWL+2Q/qzsYxQLkIwD8w/hX2hhKteP/hlcSsGXL+utw0WR2OFFHOg
-RdFeiPTEaaCTsLURV2UOfBaHEkns60fxs7wgqbfPDB4CGTyeb/ZV8C3L4f98Disb
-vs9cH/cPTsj71RU2TOZEtGPjWyjnwv1fxkCDRmaNATioxrkbx9LZRvNXosOdwCvy
-WUU6sWzfYYWP+YYaLDwbQH8sPph2/3gsIBziCR1BognOuBr7RQsrNtMXcCaRNiYG
-HJAampXZh+DePYa5k8RZeCE6nCbQQXK9CkJgqCPxqcuATiPT2wmq+feOikizTEwr
-lD8aGz2AwWYZChK/fdIfhGRY8a/Bnwyff5thox0lpXTuVIdIGFl8Gf47NpvbQbY3
-mINJgCczw8IWf29ZtRGpBg78BM0SAIG7yluRm1HJBSzD02WE/fisp1DcvAj9Ywxp
-EDYH6DAJt3vnum96BDY1szk3DPd86EiWDkeOsoK0+bLaBKdFoqbYe98rWK+4s0xV
-3o8r+SfD/4zv/08OifNk57KPkBS3VTvqcwjNY68b413TLJoS9CeRNTMJdf2g6rYe
-WvNaQf3EW/w=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIAFdTJ8R3MIwCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPMj42ItFVHDBIIEyDzVt+Z9YJFT
+j9/EgqK97zAD2KTdOE32KcV7G0DIqWQ5EVG4r4P/ovTW+SZa1Hjx/vC8JGDOqZvI
+InNHMQvxoBGXYx76wMB+qE0/tVXOCUZ1+0ahJ2cKPrImMV/GxeTJpZ9BQum6FeLT
+yEek1emVy5MNQbpmQ2leGgfzVBVo8lMj3bE8EJJculAK15NBJ78pLubj5lWIlH46
+8k6amNbe7YPxQ3WFlkqxpa212pIPFURzOymdoFkrLCaRaZF8/cXE0iC5jLZbmt1v
+NjjKKcLUQGn8V5219C6GIc460o2c90xtLbszsTn7nQrr3mB+1tmdE8hafrvIvVWr
+ZWwh81zdbOdemsOC+bEcVBpALzYXGAQ61lZzqwA/JHWq5TL3EXvRu4K5rDukDmZc
+uSSfDJKsA8b7QDqlACj7YoEErPjHk3eW0qqiJ9KyCTBPmuqbVXeEz4w7iXWXLR2o
+StrAvZz2DzeX83acBKQ/LPpRhjcSytKklUfrmegA+c6efDArGCbxulIBL8WmKOY6
+xqPxMxHQgsWgDBg5u+tTWnSpd6AvW6MInDcBty/nVQ+Cx3kv2fdBoM6pbokfxZYe
+scaLdioMUYOyrsG+LDlPgfkqMNqchve3o1J8nLXR0h4/nehxyEiUZBrUhzQ8NZhS
+xpaEq3Xf4bWp1RIs1c8VClNEK9AKqemAojD94wNf47hURZ6/QEXUeoaCCgYm09KO
+rwYgvMzXrbU5I2d9+OjLqOjJBX3gQgfYdCRtpeEhm9a3KvGmSxD0+NxousRFMePp
+C4QQhJvKJjfVoBwqMDIBuIw66FH+X50wTPqXaYlym4LxdhXvFpEKZ+9DINtFGP3E
+wHHsSLmS/1i5ga79WGXogvoDBtjxVKLCCdEj18BTjErVWH/lOV1PXesVGZjDpHPc
+PzYQvq5lY9bnlfLFtpq/ZwvGFtixig/JcQLqDcjmmBo4xDbWIgYIhltHG+joIav1
+MYKq+GItHAj9tWpGMVSRqEtrQPe2THDlqxBzGvzNu7UeS2Mn+Kd/+ynhhddOyC/n
+iyGvjGZnbwC44sgx+K53RQlJLfrmwf6EBlb0vvQBsbCpAEyCuxNWY+5DqGnKJxis
+XULa0TgrK7ASwrTvjScRdjjwEWr9JfZIKUed0Uz03hNm8CHPLeaXkTQitl2/UJby
+3ndz5rXA+WSJNF6beqNIlH+Q2S0Cm2X9yvW0/fR33MBaK+/IMyvOi3SXXH3g5MH4
+3tA8Ct+yTzrsD3HhTRky8X1EjWxSnsixCxAjbZ2c0F0PyKrQmLX2nxoliN4aPxAg
+aQTSSJbVqUfpnmhjgHos5XZuph4uOqqrHGZaqq7uAwpLmwRMq0Bt91DIebFWV/x2
+h31qbp206zyz7D3wE1aA8oEHoNFiG2YINtPIgYZ0JXUVVY8L+UyulY00M+awOT4y
+X+sM0amQyy3ZJJJbKepDu/WbAHxTlDYpb8lqGH2/0kHfDuVF6rgDoqPt6cEZHeR0
+jlazD8bNsFsEC9qFFxZ4i3zrYYmT3bJBVzoH3eEK24IF8MVBFaRvlQLCjTbBmHwa
+cqElfTe9Il/4Gn8TeEnSHhMYYpmygaZzWp3+slBss4ajAAnvocq/X/yzwzHwrWkz
+TuOLrfjmbk5Oa/hIeiU3Tw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
index c97771ac9..c36ab1223 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
index 8fdbb9c89..89f08308b 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
index 56dcf0dba..89176e5b1 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
index 8fdbb9c89..89f08308b 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
index 11049662b..66863a501 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
index 294e1f759..195d3fd84 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
index 294e1f759..195d3fd84 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
index 7f08f2c52..7e7e7f392 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
index 07c290099..be3ae8879 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
index 07c290099..be3ae8879 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
index 702852cd1..27d21ecae 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
index 8bcc0dbf0..ac858ed0e 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 74 A8 5D 76 70 26 D5 BF 09 D2 76 28 56 4A 09 63 C1 3E 74 38
+ localKeyID: 17 70 E9 C3 AD B1 45 7E 44 8C 33 32 BA 18 40 C2 98 CD 86 18
subject=/CN=revoked2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA1WhcNMzcxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWnQq5CGPVEE
-nyli+ZdX0j40iMHy1f74fR3hvZS2mzoVPfJK5/QGK6yQ653Oaos1Vxtm8m/RbIQh
-GN+ozzFTbFvVrFjGzDFrwq8DJiPDYeq2IobRJJ5yn7Uux6v6A0mBpqfrVVYjQlPH
-GBD5TPCN0mNkfI1NZlm3mWVoy2lxU7UCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
-BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQCqNJnznvo85tNaulsd7UtAriF/WafbhQp0i41bnD4gMxQ6mHHVgEmeIDqY3jjg
-B7GG3O7sqp7JeQa+yRrD4OxEVIxBQLFIsfwwxxaklGom9wh6MjHzgyW3K7EAYi/V
-CSgzHvGoQ2g+VmeyXdFLmriszi5M0fMizgbeA96h2KoJlg==
+MTAxMTI0MDA5WhcNMzcxMjAxMTI0MDA5WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANpsJV/G
+TKhcrSF1c3SIuSEFBsLM8Yr6RP+Ezrxafhfg3qm/DdVGwNbhoBjF+qobE28bYH5s
+hMSNGNWbbGCgzSLPXRNsAFbBkShPDr2IV+5q/9R9v6R3ejSoLEJtr0NLqGY+gDmJ
+lCGK0jRZmfUGBLjcMj1ZFCtSI4DCglgyTuGR73Ccd4Rf8dPqVYVZYcVnsKDgwlaD
+bglxa7Gz1n8rad8v4ZW5lnTi6iTm8uyRao+JgChxDdEHhv/4oiE/iYdTWOLnZ+L2
+W1cFaJ41fL6ayAinAcbADpI8TAsNGGeSqPhNCe3Ym3KtwfoXFqeVYZltlEvPuJVO
+N0y/oP0UrUclZe8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRy
+ZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAKOYKTZN1lODE
+EnV7hacCK6RxFBwWXAot3lFesZ9afi8CdgIQe6nBjEFnjrzx7/sY43XiR7N27SZj
+4DXp+La2ZWluePljcsm0ybGBHfFNEKBwIRS0Xfjfp+OKxNsiRwmeYZzEoKqVLREh
+e+FaHFUKaoK/XR7RLeorra+ygodWNrcgaRSIaHDfY/VeHeejCnAnvBH7rf0Z3SNy
+Fx1KbQd+byXsaiTN8rHxag36PN4SKuhgeAkZ0fJrzLt70VNfcqvoFbZO4yyq9X62
+otq8k5MVgtLaFTOuQfI3NDdkudOfTvyfkR9tHQLwNxIlMZ42ikGn0hqJkVw0m5NK
+TPC7zpPj7A==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
index 6890906de..983e3dd45 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDBadCrkIY9UQSfKWL5l1fSPjSIwfLV/vh9HeG9lLabOhU98krn
-9AYrrJDrnc5qizVXG2byb9FshCEY36jPMVNsW9WsWMbMMWvCrwMmI8Nh6rYihtEk
-nnKftS7Hq/oDSYGmp+tVViNCU8cYEPlM8I3SY2R8jU1mWbeZZWjLaXFTtQIDAQAB
-AoGALffQOHZo8TnIN2vGsjteDAHsynQOGv42YMYxWLV3kP0E/2wOkYJV1Rt2dglT
-fc8IJmPE2+nnhDsDAr5liJjYkoY1peWF3tliD9sj9NhwBGJLk09m2LTR2mH0MgbI
-fElXOQl4AwaDM5S0/s3hNb0SsH+C3Vr02Chd7UKnhixI1CECQQDyrCvWiZd7bXXr
-4dwrAXkK8An5mWua8GkR7LxkNhDAPqWPx7HiTo7oLm+PIlsJjjToV8hgTb5s+rGA
-DU5B1vpnAkEAzAkW3+ztuL1Tg495GjS/ayXbGXnbiKkDsNMBgGTVcrhhdgB1U2Ik
-wuR3jDoGT4WBkd9kqd9kH+qzjjxx6nqngwJAEPdkoT1BcAm5IuLJp+AUfGVH7UGC
-unRwhCZPDZqSFT7MCH9nunDPoQAOIK3AO6zLmir5AXKuC6SDYHaNsCC9pQJADiZf
-OL5UqigvH4OWsXORBtxEOpsR14NpJx0rEH1ttBwHXkif2l2HESEJDWeEwoUOvFAS
-yhkc932uYCHfAJTrAwJBAMAjR1npUbf2REnClP6VYJ6qhtfw2xgPdWiQfvVtyt+J
-r8tjpScHlghDvLFKzCFov4+QZGIaZGX0dR087hWhqAI=
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/secmod.db
deleted file mode 100644
index 3413d5695..000000000
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
index c6accd35b..e9e7eaac6 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
deleted file mode 100644
index 9e9795309..000000000
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
index 29d231359..7b18f41a6 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
@@ -1,58 +1,73 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 1A 46 FC DC B1 BE 7D 7F DA EA 76 75 69 D2 3A 50 3E 58 94 0F
+ localKeyID: 96 02 3B 95 F1 C2 AD 4B 75 AC 42 71 F3 78 57 B0 C8 87 09 06
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8u6xFkINzVzn/a
-tZNmSSSPeC3DbFmcPKYy62lqRQf0rDP/SbiNe4yYmoHynTguN5+/A3pie0+bdwVS
-8NyTH4cUCO/8RBIMfIaI+xusFXPtTrTNf8OtravljL7rF0kUbG4vLTARgpSxtpnR
-fLX51qVWRF7sR7NsNmp13z511UgRAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBnggkqLnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVy
-bmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2Vy
-dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQBKp0xZ4RomCgCdCDhw
-Inmj1+koPd+rLefivbNk9xuGV9huAV9+m8ovNNlAYqy204rTXa6Lhusdb0v4WWOp
-UToJMT8jGNhJReP/z6w3r6EFID0MlQoDNaMN36WioGrk4/FBMtJ81rd+kvxh98Lw
-ttQaEZsB3WehiI2pRFSRscQP1A==
+MDExMjM5NDVaFw0zNzEyMDExMjM5NDVaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWyGbgjJa
+2oOoufxk4SOCu9CIRT6tVZF30x6QkZu9D9q6qvTwDBxMBzFJ2GuEzjIpich6oxMP
+VV692sY/UUEHQVcePA6MA1olx3INNFKOJrYJ3ZplnPgjAQiZF+JjQ6PJpiLSUrf4
+WLLTk8V5FZRB9r8LLmIEgsEznATf1SAwBLwilVm0JjJtgYTmH4F1CLMxRt0t5NaM
+PMs/jksKp7C0I9AkqyboE4ilXBBfeA4Awp0g3/fP0o34N9wncfXuWbzBXU6Jumgq
+AyPdhZHwW8yjsRD4DW6D19fNxoDKZcnmDzciHYROfoc5eXWTqrW9NOqcg8ZvzxxD
+vqQ8rbvK6OXVAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CImFsdGVybmF0ZW5hbWUy
+LnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAr+/hCRxMXYOY0Xa1aY1Szf9NsqqQ7bXh
+SYYtXkT+yq4M0NTzmmSWy7/F7OzahIWkULrkqmv7xC8LTeG58wYyGCk+6Lv/uKoe
+ocldM+dI1CConMs6IiTOuX9EjGGxHVdN7W1wKUt2ofMFbH608rlEN/g340ddPlKa
+4IpX18/ISWVwa0qLgtzQQpMAhIwHVSAszB0RaYyhOPi2gIaWpp+OjIM31rGTDRRM
+m8Huv4hAyx1+K1yqcF2X5rwYNaCuuITur5Xy4tH0dbzQsM2q4UiQBKNTuyNZkmbr
+98uHnwjZ3CK1Sh/b3lXAt0jIsao+SF+o/Z89vom5O2k1HCtjAkZdSg==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
deleted file mode 100644
index a61212af7..000000000
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/secmod.db
deleted file mode 100644
index f037d5104..000000000
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
index ceea00514..8b51a3466 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
@@ -1,37 +1,47 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 1A 46 FC DC B1 BE 7D 7F DA EA 76 75 69 D2 3A 50 3E 58 94 0F
+ localKeyID: 96 02 3B 95 F1 C2 AD 4B 75 AC 42 71 F3 78 57 B0 C8 87 09 06
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8u6xFkINzVzn/a
-tZNmSSSPeC3DbFmcPKYy62lqRQf0rDP/SbiNe4yYmoHynTguN5+/A3pie0+bdwVS
-8NyTH4cUCO/8RBIMfIaI+xusFXPtTrTNf8OtravljL7rF0kUbG4vLTARgpSxtpnR
-fLX51qVWRF7sR7NsNmp13z511UgRAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBnggkqLnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVy
-bmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2Vy
-dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQBKp0xZ4RomCgCdCDhw
-Inmj1+koPd+rLefivbNk9xuGV9huAV9+m8ovNNlAYqy204rTXa6Lhusdb0v4WWOp
-UToJMT8jGNhJReP/z6w3r6EFID0MlQoDNaMN36WioGrk4/FBMtJ81rd+kvxh98Lw
-ttQaEZsB3WehiI2pRFSRscQP1A==
+MDExMjM5NDVaFw0zNzEyMDExMjM5NDVaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWyGbgjJa
+2oOoufxk4SOCu9CIRT6tVZF30x6QkZu9D9q6qvTwDBxMBzFJ2GuEzjIpich6oxMP
+VV692sY/UUEHQVcePA6MA1olx3INNFKOJrYJ3ZplnPgjAQiZF+JjQ6PJpiLSUrf4
+WLLTk8V5FZRB9r8LLmIEgsEznATf1SAwBLwilVm0JjJtgYTmH4F1CLMxRt0t5NaM
+PMs/jksKp7C0I9AkqyboE4ilXBBfeA4Awp0g3/fP0o34N9wncfXuWbzBXU6Jumgq
+AyPdhZHwW8yjsRD4DW6D19fNxoDKZcnmDzciHYROfoc5eXWTqrW9NOqcg8ZvzxxD
+vqQ8rbvK6OXVAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CImFsdGVybmF0ZW5hbWUy
+LnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAr+/hCRxMXYOY0Xa1aY1Szf9NsqqQ7bXh
+SYYtXkT+yq4M0NTzmmSWy7/F7OzahIWkULrkqmv7xC8LTeG58wYyGCk+6Lv/uKoe
+ocldM+dI1CConMs6IiTOuX9EjGGxHVdN7W1wKUt2ofMFbH608rlEN/g340ddPlKa
+4IpX18/ISWVwa0qLgtzQQpMAhIwHVSAszB0RaYyhOPi2gIaWpp+OjIM31rGTDRRM
+m8Huv4hAyx1+K1yqcF2X5rwYNaCuuITur5Xy4tH0dbzQsM2q4UiQBKNTuyNZkmbr
+98uHnwjZ3CK1Sh/b3lXAt0jIsao+SF+o/Z89vom5O2k1HCtjAkZdSg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
index 4b892580b..8558180d8 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 1A 46 FC DC B1 BE 7D 7F DA EA 76 75 69 D2 3A 50 3E 58 94 0F
+ localKeyID: 96 02 3B 95 F1 C2 AD 4B 75 AC 42 71 F3 78 57 B0 C8 87 09 06
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIHovK/g+qWjMCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECP4xkWIBKyMBBIICgFMvujBX4+EH
-jtl12JEPSL3dUJk9mAhjmpQLW8Sgzvft288oUFUtcTS0C8dcYCT6OQlksB2bmi1d
-7W60zIwIR/sLC+C44CQU7jeRoPhRowMSt+jaqjzvbkdAPfS2zjCHpFov7vrmv76b
-IbufOVoS0d1Th9IDJBUyQEISbzA+hlF8otlnOHuvOr/X8SLlEOPukE06sC2ur7EN
-Y/zTAfRzYgPkesVctseUrYHTHeZJodR4HkVZKUsE0o63rtlpgUwb5Hhmu1Q6junc
-jhzliKIbKx5lUhdGfrkl340TE+fSMURpVSCEdoLSEJ3a51E58dUAtYUJ2W2R1e23
-s5p1F5PIW0ew51Ro5Cp7FC0h5BSr6wWNaFdNgoLntyqGPgGwjy+hgznfMnrtkqg3
-bHRjSHSHfLmUdQxNTu8+2ZJfUnoA2kQ/076Wp6hk5U9isYhdt5H2C+Wm4vNW7YjL
-N3L+qHzY+8j/MnFcqFHqDHbukcAsoJNuCVnTrQq8T11NbnZWyxH5Mf1GX3M/bPWq
-ocB8LLyHqNfvVLzxs8lBIL/E6A3Vi+sjVznqpb0dZK90aJpPODJ7G/Yi03u/JJea
-kTtqSsbgaBnU3OMlN85L8T5HX63oEzKyco3MtwwsblxOpC5+472nKHhszITpN2Tb
-PwukhYl8z2qkMqnWV8XDYvV3ZCLR0SCpsOkEQfBGZ/s1Qyd1bg1t13U942w0CGqw
-hK4tX30V/8V3AOWPe6tiXezm31uVDR7qSwnAS1rT66EJVrw5ebiAWhShw2Caj1EN
-ItUGRr0uAIsuQWXd98OlkfzLthnkHXahOCp+y/47cpM/tTkfcisJzZAf5z1FYhEv
-NK5HIqffIQE=
+MIIFFDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIr4ul6lREJhkCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBDC9ZRlNIyqBIIEwMi4zvB674a8
+o1uOYlT3gWq2mfAdxjNKe1ul2DdObkEDbdH9LoSJGrdjymuLxltSwdi7j2YDlLTV
+iwerzyYy9ADerbVXY/FXx80WAihQVN6sPfOmS88zLJG7xRwNj/bfG9VGB5tgtd6H
+CrKBGYIxJ+uPogfEtQWUfHvEGB5qPv8jYsUTkNxtGjph/N/4yE6ar7LWv5yil0e0
+iLfyhwXRgBBiqywawFiy2D7BVJIFpaUmWeRKU+6KeRtjFxp2713EdrQIYVmJVK8V
+mHZFpMyBbcfizi4QqgEpjR7wHPCY3yd1WULMQ2KDsUAIJyzcrNz2iwUfl5vof4z5
+T9Eh9NTkCcaaBc89XEpWr8PHxF7tdDA8S/R7TgfG/DvWr/cssVlpvypkHZJLMKSi
+usneSVK3H+rjLzqIsVrSMV97YPzpj/Jfu8TSJAhO8OSLkeKHgt9+YH7YI36EVECX
+Frb1GUMsAK9lQeHEmFiWfM+2wsH5W5REkLHYvxYK+Vhm6iMoyStJwLXHPZ+sLjJW
+DQf+ygG74ZGM2rMR+zuXZXBAW1m6vWKXiy3WXMEgZQDLi0uPkJS1L6lkygyNciZF
+FvTDMbppDXMD8NDkUctztFjZn+y8AYY1pG0nEsUZCGtOrKMqI5hUIQXaagWtOIEP
+4WgYzDhxcjQVHlg0pdo6BbYk1O7qFlmiWWykIWCMig1dsxI9npm5NSKtKjW+USoE
+0ubZDwRe+xeAT0TtkLJ96x52LsQetZhnHBl5Lyj5/TAmeThfTda6CX7PFFDhWlV9
+n/eAc5QXU5fkW+K3iHKrqRHXz3yP+89nEwiZ2Co8gAVUIWuFVxpZHZ6GZ/Nade0J
+FlRoeIO4/1naY+YYLvzRdz+Rp58Yjmzy3jpdmnp3OoHxxRUBBitMpyWWENY2HOeW
+OF/RLdFRqOFLO6u3Io7/SzsajCmg8wxX0lTKNfBIMK4CtdtT+g0hQcJmxxyi3Rr5
+ueEtkTaTlMKsYLLExAB9T854+ZU53veLJZ8aC26cccjfh9W9Q9WCC512jpZbtI6D
+gxfrYqBTMA2LtvokzlmuP7/kIvT6XdWubkPTzWSZE5ATDrL/QFMK8ZwfLqjYg6nY
+YvBtVAFwJMjuEn4/V6Pj+ZzztNaNAEyWDwqJ3phjQlapNDX982ywEBITyOj3bBC6
+dQEbEAD6cyq4Bye6Nf7g/Ro2Nd4g1kvnvpehWJpO0ib+mUq0qc6CMI1kxFe8y07I
+jp5M0yknD8k7F1Qxv73neR9QEVFngM/17pHHJvxaH+/f/rwGsLTTIFwPLzC8Kpuy
+vMw+NaMo0lHN1C3mUPkQmYot4hcoiTc5PF7Y+LwVf7eW77fpfmGJsWPyxcht01nd
+nr0O/XDpcW6l+Esd3E8f7HlPNF5vtyWUi82+hMg8f8nKdKp0Spl/J5Jc6L/I3u3O
+woKAOWsN7tBZzXNK5sxZ7Rwu7u9yC+sQsKnP5W/T1E0oloXgxIWCHlyHX6fCmBom
+ECneWWaYc/sMgA637l5ABWsUBdJnlhWpf34qKJUyqNnmFY5J3ZXxHSAfQDXPb3MM
+6fWQnSy2UREZkbptZcZIbC710WziNCDs2fkdLtuAEf8KpwHod5OXmXn1ajikW4Nt
+No9rlGf+Qyk=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
index 2a5c85ee8..ae8413cff 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
index cd4558291..9d6ca3706 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
index c5e8cd643..7ae023e0c 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
index de0e711b3..9fc9aef44 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
index 1c103e71a..f782d58db 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
index 2952c69b2..b8a33f912 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
index 030f38245..6770e841b 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
index 52435cc4f..9c5f958d4 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
index 11b3d44ad..1338bb966 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
index 5d3f0f97b..d2dc8faa2 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
index d54e84908..cb8460238 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
index 36f82a125..c4fd61323 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
@@ -1,23 +1,28 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 1A 46 FC DC B1 BE 7D 7F DA EA 76 75 69 D2 3A 50 3E 58 94 0F
+ localKeyID: 96 02 3B 95 F1 C2 AD 4B 75 AC 42 71 F3 78 57 B0 C8 87 09 06
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8u6xFkINzVzn/a
-tZNmSSSPeC3DbFmcPKYy62lqRQf0rDP/SbiNe4yYmoHynTguN5+/A3pie0+bdwVS
-8NyTH4cUCO/8RBIMfIaI+xusFXPtTrTNf8OtravljL7rF0kUbG4vLTARgpSxtpnR
-fLX51qVWRF7sR7NsNmp13z511UgRAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBnggkqLnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVy
-bmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2Vy
-dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQBKp0xZ4RomCgCdCDhw
-Inmj1+koPd+rLefivbNk9xuGV9huAV9+m8ovNNlAYqy204rTXa6Lhusdb0v4WWOp
-UToJMT8jGNhJReP/z6w3r6EFID0MlQoDNaMN36WioGrk4/FBMtJ81rd+kvxh98Lw
-ttQaEZsB3WehiI2pRFSRscQP1A==
+MDExMjM5NDVaFw0zNzEyMDExMjM5NDVaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWyGbgjJa
+2oOoufxk4SOCu9CIRT6tVZF30x6QkZu9D9q6qvTwDBxMBzFJ2GuEzjIpich6oxMP
+VV692sY/UUEHQVcePA6MA1olx3INNFKOJrYJ3ZplnPgjAQiZF+JjQ6PJpiLSUrf4
+WLLTk8V5FZRB9r8LLmIEgsEznATf1SAwBLwilVm0JjJtgYTmH4F1CLMxRt0t5NaM
+PMs/jksKp7C0I9AkqyboE4ilXBBfeA4Awp0g3/fP0o34N9wncfXuWbzBXU6Jumgq
+AyPdhZHwW8yjsRD4DW6D19fNxoDKZcnmDzciHYROfoc5eXWTqrW9NOqcg8ZvzxxD
+vqQ8rbvK6OXVAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CImFsdGVybmF0ZW5hbWUy
+LnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAr+/hCRxMXYOY0Xa1aY1Szf9NsqqQ7bXh
+SYYtXkT+yq4M0NTzmmSWy7/F7OzahIWkULrkqmv7xC8LTeG58wYyGCk+6Lv/uKoe
+ocldM+dI1CConMs6IiTOuX9EjGGxHVdN7W1wKUt2ofMFbH608rlEN/g340ddPlKa
+4IpX18/ISWVwa0qLgtzQQpMAhIwHVSAszB0RaYyhOPi2gIaWpp+OjIM31rGTDRRM
+m8Huv4hAyx1+K1yqcF2X5rwYNaCuuITur5Xy4tH0dbzQsM2q4UiQBKNTuyNZkmbr
+98uHnwjZ3CK1Sh/b3lXAt0jIsao+SF+o/Z89vom5O2k1HCtjAkZdSg==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
index b21104ead..5a8185ab1 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
index c6accd35b..e9e7eaac6 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
deleted file mode 100644
index 29b64a508..000000000
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
deleted file mode 100644
index a9ea832c1..000000000
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/secmod.db
deleted file mode 100644
index bd782e8a1..000000000
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
index eed87f9d2..06f2c14a0 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
@@ -1,36 +1,44 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: E0 17 8A CF 74 D6 61 D1 12 31 3B F5 E9 F0 FE 3A C9 78 81 A0
+ localKeyID: 21 98 F7 5F 05 37 D9 9D F9 1E CE 3F 4E B5 F5 54 D8 EA 40 33
subject=/CN=server1_ec.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICrjCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDLzCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE5WhcNMzcxMjAxMTIzNDE5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQB1ubm7y2hpf8A
-PpGOAfdu4qNIXh8QpXT3wrmwg+LssCjXKvCNZtlA9bluYGSkVK8o7QXLIKxrWb4x
-eKRW0w1Bhm8BnKtC2znA3Rw7TRErRF7MelYgI1BTqeIZIzewdokg8iHVpP2h0XL+
-Verdwojs1jNNvyGz9Bqt3+J7hddg3rYOsGejgeIwgd8wDgYDVR0PAQH/BAQDAgTw
+MTAxMTI0MTM5WhcNMzcxMjAxMTI0MTM5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
+LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAKq2F5c91EGNJ
+FjZUvOuymJPkyWGijmOAsiuidgqe0NFK4I9IguYJt6kGUYWgBfXZSgynuxupSsq7
+0UPmn7HZK2sA8UE0mS7ZOTB9kvUwAm/vlORcUf1ZgxZMR2PYj31y+fX7/WcR2wUV
+qociI+J6CP81IQfFWj+UjnJPfwtY3qwHvmKjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
-VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYIJKi50ZXN0LmV4ghNzZXJ2
-ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBAAHH8k1i49be/X2e66xq
-wk69K2dtWEliPC56lIAPQqev2P9MD1ZyuuL3l4A90qGooZcqf7cSUw2ie8Uh1HrX
-d4WcfkrUXBNAfgN0HGnkJU214JewxRFD58k+qntSshR9x6GePi6Zva2QkyB9YpjF
-suLsTzCsqaDZmTWgMbgLPlOY
+VR0RBDowOIITc2VydmVyMS5leGFtcGxlLmNvbYIWc2VydmVyMV9lYy5leGFtcGxl
+LmNvbYIJKi50ZXN0LmV4MA0GCSqGSIb3DQEBCwUAA4IBAQBaDGZd2+pIuZ+ZgEif
+ANNPihHmfwSoNSHlddVk97hAXvsYexhG/Guyyv4zBQ7Q9SmQ46T/StHwrbslG27u
+ceJCWETm4/GKcwxcODDZWTsl5mE1XudE0mRPTJVfntF2d1lb2Hi9N5+qYcwq3v0u
+hH0eqxihPfHhJr/hUDcA3ULOYqhK6ECj+QYSix9oko4hocs/bEhCpkA59xWtW0f5
+5n//9dEWlT6cNmY2pOxXHYDihZSHuCOe5PTM336K+e/Pgei0jBbmy/42wRmOYle5
+hGDmrKes7NeM+D66UgT8DG7O1DmFF1HyoFKyqKp7hkygjf7Z8XbYb1B+7CledfeP
+HtR5
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
index 459491706..f8702cac4 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
@@ -1,13 +1,13 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: E0 17 8A CF 74 D6 61 D1 12 31 3B F5 E9 F0 FE 3A C9 78 81 A0
+ localKeyID: 21 98 F7 5F 05 37 D9 9D F9 1E CE 3F 4E B5 F5 54 D8 EA 40 33
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIh79X+VfzLosCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECH5VbzTpNflHBIH4t6hSXTWYY3sB
-D+Sp/1NdSB+3zrb+G8iXzt5H8a5dEiUwjaXSS8l1+Xw7SpppLLuqrv1v73Fwsi6z
-EDS0M0bMJz/wPq/xM8LkT2ohOS4p+bsy90/46SiSXSSrXKnGkEe9sDzaoLcE+//J
-7xIpOnLFPtqsJ39+aIdjeiqbGYHcSMi0AYpycB+6KHZipPOanvdxhkb/lSQNXCYD
-T24PW8WDctE8iuVCMTrJomX5FLXiCH/W9m6citmprvDo1eewdQFHeAQ6ZwYTAz2Y
-Rj0lqOg6LlbGLnVFl4E3jHvO3gBpSBqbWbWg6c59QPHDNQ9NiqHQwDHjmT1R1dw=
+MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIHgLwt5itRPcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBmpIMX84oyhBIH41rR0+rt1gLaH
+/eJcH1f5sjyeuRmgeIW5dc4MZm9dvKNfCqEoJSI7Lbhx5Q3C+eOGb1EBcgPb5RB4
+JPYzuJ/X62Ycx9AJE3F0hS/6qguX9PYcJgEUGvCs36oDU1EJ8+CvFCx2WM6DN5UN
+oWQ+guQ7vPqCUeJe84QWJqK1i6Dce+UyhgL7aTj7GUyYnssbApbkYV88W62Huwbc
+Tfca7ZatpkfcuWsdedYBT3w8T/FV34BB6lyqAhm5cwH+GJrgJe4krpmy8VWk6ZcV
+qM+JLwmS1aL0ZYSryEZt5YtgC+hmZQ6fwnkvkgPxd4yazIJRQGKJrPSGiD+QzEg=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
index 21dccc088..2e3bde6bb 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
index 2c518e681..941ba3245 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
@@ -1,22 +1,25 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: E0 17 8A CF 74 D6 61 D1 12 31 3B F5 E9 F0 FE 3A C9 78 81 A0
+ localKeyID: 21 98 F7 5F 05 37 D9 9D F9 1E CE 3F 4E B5 F5 54 D8 EA 40 33
subject=/CN=server1_ec.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICrjCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDLzCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE5WhcNMzcxMjAxMTIzNDE5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQB1ubm7y2hpf8A
-PpGOAfdu4qNIXh8QpXT3wrmwg+LssCjXKvCNZtlA9bluYGSkVK8o7QXLIKxrWb4x
-eKRW0w1Bhm8BnKtC2znA3Rw7TRErRF7MelYgI1BTqeIZIzewdokg8iHVpP2h0XL+
-Verdwojs1jNNvyGz9Bqt3+J7hddg3rYOsGejgeIwgd8wDgYDVR0PAQH/BAQDAgTw
+MTAxMTI0MTM5WhcNMzcxMjAxMTI0MTM5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
+LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAKq2F5c91EGNJ
+FjZUvOuymJPkyWGijmOAsiuidgqe0NFK4I9IguYJt6kGUYWgBfXZSgynuxupSsq7
+0UPmn7HZK2sA8UE0mS7ZOTB9kvUwAm/vlORcUf1ZgxZMR2PYj31y+fX7/WcR2wUV
+qociI+J6CP81IQfFWj+UjnJPfwtY3qwHvmKjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
-VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYIJKi50ZXN0LmV4ghNzZXJ2
-ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBAAHH8k1i49be/X2e66xq
-wk69K2dtWEliPC56lIAPQqev2P9MD1ZyuuL3l4A90qGooZcqf7cSUw2ie8Uh1HrX
-d4WcfkrUXBNAfgN0HGnkJU214JewxRFD58k+qntSshR9x6GePi6Zva2QkyB9YpjF
-suLsTzCsqaDZmTWgMbgLPlOY
+VR0RBDowOIITc2VydmVyMS5leGFtcGxlLmNvbYIWc2VydmVyMV9lYy5leGFtcGxl
+LmNvbYIJKi50ZXN0LmV4MA0GCSqGSIb3DQEBCwUAA4IBAQBaDGZd2+pIuZ+ZgEif
+ANNPihHmfwSoNSHlddVk97hAXvsYexhG/Guyyv4zBQ7Q9SmQ46T/StHwrbslG27u
+ceJCWETm4/GKcwxcODDZWTsl5mE1XudE0mRPTJVfntF2d1lb2Hi9N5+qYcwq3v0u
+hH0eqxihPfHhJr/hUDcA3ULOYqhK6ECj+QYSix9oko4hocs/bEhCpkA59xWtW0f5
+5n//9dEWlT6cNmY2pOxXHYDihZSHuCOe5PTM336K+e/Pgei0jBbmy/42wRmOYle5
+hGDmrKes7NeM+D66UgT8DG7O1DmFF1HyoFKyqKp7hkygjf7Z8XbYb1B+7CledfeP
+HtR5
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
index a400a3713..023332019 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
@@ -1,7 +1,7 @@
-----BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIBHFhFJ4s3N0FlAYZzwzUyOmLWKvRy93rhN41JhR/fpgAY4pZW+JPd
-SfQJbQBbc3yXHfuGp8vJrrK7qj9Bc/yd+UqgBwYFK4EEACOhgYkDgYYABAHW5ubv
-LaGl/wA+kY4B927io0heHxCldPfCubCD4uywKNcq8I1m2UD1uW5gZKRUryjtBcsg
-rGtZvjF4pFbTDUGGbwGcq0LbOcDdHDtNEStEXsx6ViAjUFOp4hkjN7B2iSDyIdWk
-/aHRcv5V6t3CiOzWM02/IbP0Gq3f4nuF12Detg6wZw==
+MIHcAgEBBEIAXgREqrH/QSRC3hg0WBm5uicFgfLOV2J5OrPxubzy5npUqu5EnNV/
+jt8iMnFhX8RpBrawhVx0JBWYJm10jqjo3lKgBwYFK4EEACOhgYkDgYYABAAqrYXl
+z3UQY0kWNlS867KYk+TJYaKOY4CyK6J2Cp7Q0Urgj0iC5gm3qQZRhaAF9dlKDKe7
+G6lKyrvRQ+afsdkrawDxQTSZLtk5MH2S9TACb++U5FxR/VmDFkxHY9iPfXL59fv9
+ZxHbBRWqhyIj4noI/zUhB8VaP5SOck9/C1jerAe+Yg==
-----END EC PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
index c6accd35b..e9e7eaac6 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
deleted file mode 100644
index 7e56c3d67..000000000
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
index 907769db0..bc98021b5 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
@@ -1,57 +1,72 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 77 8B 89 22 47 D2 AB D3 65 BA 15 30 A5 01 41 AF 05 2E 27 1E
+ localKeyID: E7 5D 53 7E 47 87 58 01 05 05 D4 F3 39 B0 0D FD 73 72 80 88
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCf6MdoozlJCZPw
-dIHXdFHddXJfZ5xn2e6XoMmSjqOrOJYIIFKdgtlrMhtTVU1VLlK6V7H8142r78YQ
-4RKcj9QhTuQJxrrVtVuRt38Zy4RW0/+ujMcXoV8nV7Yt1c1z/tIJ4afSapAnAAm5
-wVdIbUhUeM/K5Wozm1gV5OCtNZPa4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
-QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
-BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
-YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAgAA5TLssFua+
-7lS39p+J/nFieS+QV5UHVGcv6RKWQRvFm93eaC3l16c1x+qx2ZUSQEkMBz0MdN9X
-0bYEX4NcFf6af7c1fez4t02sduqMRIqG4EI4eP9oigmDRBBntP2kXKTqkUHnjqd5
-N/bi+N6dD5aFGCIsXAavAYWUYsFpjS4=
+MTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2I
+gy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSod
+F3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xw
+PCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYG
+OhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNS
+gCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59Ytxx
+JC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
+LmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkq
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6
+/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPD
+hmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJ
+hJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6
+XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovd
+VVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
-Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
-gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
-2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
-EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
-rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
-xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzM1oX
+DTM4MDEwMTEyMzkzM1owLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhy
+ViriJP99AW0R2BQWE2OUn/6PKdIsoDwnn/E3xiA7fYy/2zb+d/oCqWQFFRGtxWDi
+YIfJjm2/6Oh1fH0g3Ji47zH8REixQBJ/mxCD/0btIgz2tye3q53jnVGVhgP3Yal5
+/XOR3cec8IYvTVD72VktKyhQHBJcDqP1CfaQGTcK1AkoJ1DEQf7B8ASMO3vt3dDd
+ST0W/aYzxcMClL2g6qVK0XnkbORBeRNeJa0Hmn76iiHyzLTy+AbhpbX5t/6MwZhg
+Vm64Lv7D0gQGJvUkbLuSnJ9eFFKTVN24DA4D6sJTDrDoifPWuzHt/T9iq+5VMYel
+OdNadR8ZfAT6uIngn1kCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAA6IY/JMqR5qW+weMR2Qad4I
+sZ7KNpCUhJNhgXUgBwJrZsiuDVSxCs2VvQuD/8dLLK/1at9Y1GFQLmzsfDmwbYHz
+NYfurfGQjpT9nMJfVykO0luQAvX+35K9WPJYVAiwJji4wLcvt5fPnqyis5jYVJA6
+Bw0krK2tZVxgMJJ2SxjuroRqa4GGwBZQaZFCbIWr7WBwiXLQTZUceqgDbmGDv2c8
+PnTXJMct17yzG8xPTe6Y4Om5YX5BrD8ZN7MFE3gwtLi4ayqVN6aYY0V0GwpiYPjM
+BP5p5nYWnAqj5fJkeoIApG7RiHwe+2+7r3qGdNLK98VkQrW4qNS4SwOfRdP02yg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
deleted file mode 100644
index cadb6eff9..000000000
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/secmod.db
deleted file mode 100644
index 39f84807f..000000000
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
index dc9a7593c..3e0cec0c8 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
@@ -1,36 +1,46 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 77 8B 89 22 47 D2 AB D3 65 BA 15 30 A5 01 41 AF 05 2E 27 1E
+ localKeyID: E7 5D 53 7E 47 87 58 01 05 05 D4 F3 39 B0 0D FD 73 72 80 88
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCf6MdoozlJCZPw
-dIHXdFHddXJfZ5xn2e6XoMmSjqOrOJYIIFKdgtlrMhtTVU1VLlK6V7H8142r78YQ
-4RKcj9QhTuQJxrrVtVuRt38Zy4RW0/+ujMcXoV8nV7Yt1c1z/tIJ4afSapAnAAm5
-wVdIbUhUeM/K5Wozm1gV5OCtNZPa4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
-QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
-BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
-YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAgAA5TLssFua+
-7lS39p+J/nFieS+QV5UHVGcv6RKWQRvFm93eaC3l16c1x+qx2ZUSQEkMBz0MdN9X
-0bYEX4NcFf6af7c1fez4t02sduqMRIqG4EI4eP9oigmDRBBntP2kXKTqkUHnjqd5
-N/bi+N6dD5aFGCIsXAavAYWUYsFpjS4=
+MTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2I
+gy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSod
+F3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xw
+PCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYG
+OhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNS
+gCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59Ytxx
+JC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
+LmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkq
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6
+/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPD
+hmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJ
+hJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6
+XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovd
+VVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzkzNFoX
+DTM4MDEwMTEyMzkzNFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDUBcwir+Go3sYNuf+ljyDb3XtIMuAV/28ZgnMpvjf8SLkX1TEloyYG
+ouIlEOivWbzfXGBn+MqBaVGXN9l6yw9ANx8VmXgaXggJilMZAggA5IUx/ps/DGLN
+jeUk/jexvJdEEBndCQwtJ5Ft11V+eiLRrSjbNDaPwTn65JVtbzIXyVMJVP9ImmDw
+mu6Kctz8tMZlHgJtGRpi35nGJcRMTKoRPdJWmvzJWxeYn62l4w2cPhA28YlCEZaZ
+4h/XzDCpk4iaBLC/UzT/rE+gQ6862D+ijyDwRtuDYGjkR+kdHTyy6HGrGf8QWwLu
+fT3Mbvtm5ANjFDV8I0vuYiA4bRPYPmX/AgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQACqVKZJ2GUba+p37hxuwlXJlvHi0m8i8Fhwq6B14g9
+It/ZZhx7GbDCKgYw9G6x6zgt33GjHKzDsfsetjnZcx2UZ/YsKFiFi6MmXDAeaBHB
+HAXKNaiJdgSu+erSsuDGdyINKkAu0I0GaBfvxPKxNrsji2Au+3EYIryOzZ7jfNuO
+a9H2Hg8ohYVff1KTqaEUrZfJw6whQMJQPNECUQuMhjHrB8EQrNbjZXrqRE+zFkas
+k8HmRo0qa+MyZu/40ErA81KEM15FIr90qFUZWkTAdUAkl0/y42mwTQi0urKel2hn
+ZN83xs/ZTUoex2IlhW3ElLFkohy0IRxSF0qGwmPZIsgQ
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
index d58ef339b..e7abe7a6d 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 77 8B 89 22 47 D2 AB D3 65 BA 15 30 A5 01 41 AF 05 2E 27 1E
+ localKeyID: E7 5D 53 7E 47 87 58 01 05 05 D4 F3 39 B0 0D FD 73 72 80 88
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI1vLqrptV+aUCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJxH1i8CWr89BIICgD5oxp9UMxgO
-FsJc3rds07IfU7tPIpm4sIpDbp9kyr/hpnYj4BtXt9wuQ+fxDJ1rPnUldj9wsCcF
-Zuxcy2cWiKR2gKPMWHWIu2cTLdbBekMOl3FwFMio/KECI8uo5YFSM7falvW40nkC
-iieGVsa+w2NTBWsAPHL+82DydqIYl0xDa0H7In3LTHU4Hw3M0ndL7HNJzKnQ8Dqg
-tCCK/bqZT1TaNLXCHDm4qSXLVxntlcrZJ4yYovG92l7oMOzSwu5Ctm7CHO4WRD9+
-dWPToCqZ4BM4+DkxVTCZns6ux1eOyhUMJp1vxieK2NRrDvlyqoNDTl+p+cbwPnWp
-wzYsnrZP5BlwqOYGtU34+/LDcU10OYnL9wfj+F2RBKcC10HcdfWv4uC6hjdUamL8
-OhrLjusyoz+XlUZK4DnelRrzVBRSJphghmXDXQ3qi8PP4wNwphLJzBU5lfEqiSL1
-nW7zadhrDY+9AX3deR+k17MzWEz9nTYul0UN/CZtD6RXsixA3IdAlCo0lKneV2EJ
-44lopW4LkyWurh81fH7whANq3WA8pr28NT872CyVXIXOOYAYTez1WsSiPVpMpuKQ
-6kSV+FryNaRshAa29KS74wr6XHnC5BmNwQbdxXD1hyFpQujiRzw9EucFU317Hu+A
-DicwhimMyG4TiLI3fyGyHw2jGHPIavQXjQUG3XgyXrQNCOJoL8EoX6CVuFw5dwnG
-8UYPcBPFfEHU/GoCroBysosSDJjf4O4XsGR98tiL2lUQlYlT1BrfQwguC0Z7FqI/
-7HdBwn0iwnGOQFrbRXIUYhQqnmmUSCPaysAD6K2cSBViJZsfeY+fOU4j85CylUgs
-9/P/d9N76g4=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIViD8TCcfKtwCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECD2BIv3q2AntBIIEyPXAhb7sVFtw
+6FSNVDiAly+eqpCjgibtAw5zYfRo+GAFkC6WL6k6oCwQdFjffvccrZ357rCNVe0I
+J7aA28/+P6zD6QV4tmcj94ZMgssCdra4ydgIxKw/sgWcCAnRWmejRYYwpnJt1utt
+sPnjMQjbbhmCKiTE0A9k1Xse403ANWxMPhqLyFxqIoulS3BcGRu7rPiNqnIgs4uU
+oU4OziZs63Gr50S5zMIYm9IZoK98XkQQDB4wIhLfmRuNVxJU64zcNIw3/cK8tzmT
+e5tQxtWAsVp1+aLfmAeDSDjZxnhK1zQfTVdz0Ab/5xWvCL6M4r+wo7B9ClWQYuMk
+VTGuMWlLZXM/ni3bwjp3+1NlNaeIYSG3tgkqd1ZPvsCjqP4y/a4xsdPmhot6Wjnu
+RAMd7GryO9UN/j/g/eg2FQXqWfcRB3X2FJo3HLgR85Fml5LTGqS2C05uftc5i/GG
+ZKxoQH5MQFgjsYyVTKWQxw4oLtiTpf8xm5Gu9yYRhl+LwpdFMteELr3TbeoASuCq
+mgjNxn4I7wi+8M+IF7Dlqsp3LdvINzEfCgbwF4a/tjGX/Bh86oJww7ixia0zTw7H
+JNfZhp0fxdFCUEXS9IbnbGPurgbh8pRxocemObTaSKt1HJXspIH5hmwajwXRm/O1
+kTq0IkYPsEG46APAfOk4komydnuRYUmZbZopwwenHI+O15GfF7SIDDQ2cYG7RivY
+ueV5NIlV3jdscZAYJx71Jl+sp/kjYcEiFliDoEoShGZh4/RZhkUc9un73iISbs15
+0a0bJ7+LvDuDhIFiZpKdY3MzIUmJgl6XNwMumo8MSI39+jzeYQ6HHLNc4BVkiTn8
+j+ErL9F9YZ9fIlMRzWkNvbnxSfaEMVhrYo25AJjhOekVftqRWI32HMGpv/ltQ71h
+08FGr7v7E3sUQXeAI96wApDYMwVb8g9z/O2Ias4npxOmzTHvNXcfhZFoS/v5RsxB
+i4w8VrWTBLG8meg3Jar7SvTBq0Bw+zPHSDKJ7C4jZIgn9e2p8HoynSXqDO6vGEgq
+51qBNqUjHaU6VsKD6RaEb84D+WnFNWH9ulhpMkptURD0M2vuY7vtzS9QHUmGX66H
+vhmxAB3AM4YA2ZEPfeLE1wkN5OiDpfmXHQzti9Ucnc3fhuHs3ooQ7YMgPzKMMsa/
+OY/SvJRwo6ErNkOctuZGCs0AWqoANBDXZikD6vWpOZy6euMwT4X6RlaxIuoJOKzs
+JsyiZjM6h0ilh/IYB5/+oiJQLB6bxfUGgFawsX9RacFRxvdHuijt1Wni5VWMCNsr
+UVnaf9AA1c3B8cITGG2G6w0BXcTDSacZgEb0GI73pRMvCTUEJ0s9Vnc9Y4Lr5Edd
+rC/NYupYlGcxA5ATqiapR5rEiCqjHT95HelJhVPyrqWHhT6qsIMPo/DYcVuH9w6N
+LohyXPMn0QJnq1bBYmETjnep6eHtFeE8dFtXXcKMBrI/uM1dqv6OUV7k3ZiSDYOg
+17TcczOle5r4g/GhqL3cPcOC6tAkVCSg5KY6PJkS3f60RvJCPR126U6sf2AHPOm0
+juuKFc+fU3cTddfeBBWwRgeLcRXvoMpnidfVwS7WuH9scqvvkWh7111LUZUmQVUw
+6n2lsTnPTJlTTOcEjWs9Rg==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
index df711b4ca..7c98897c7 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
index 455d073eb..5fd4d8fdd 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
index ebd9c2fc7..ca5343313 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
index 455d073eb..5fd4d8fdd 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
index 61e13218e..8f71d1e03 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
index 7a0789ef0..88b851c21 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
index 7a0789ef0..88b851c21 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
index 7b818f7c7..7da7b0606 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
index 60feb64ea..f2187d10e 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
index 60feb64ea..f2187d10e 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
index 03273d4e5..8d04b5171 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
index 825b4c4d4..a77755b39 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
@@ -1,22 +1,27 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 77 8B 89 22 47 D2 AB D3 65 BA 15 30 A5 01 41 AF 05 2E 27 1E
+ localKeyID: E7 5D 53 7E 47 87 58 01 05 05 D4 F3 39 B0 0D FD 73 72 80 88
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCf6MdoozlJCZPw
-dIHXdFHddXJfZ5xn2e6XoMmSjqOrOJYIIFKdgtlrMhtTVU1VLlK6V7H8142r78YQ
-4RKcj9QhTuQJxrrVtVuRt38Zy4RW0/+ujMcXoV8nV7Yt1c1z/tIJ4afSapAnAAm5
-wVdIbUhUeM/K5Wozm1gV5OCtNZPa4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
-QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
-BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
-YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAgAA5TLssFua+
-7lS39p+J/nFieS+QV5UHVGcv6RKWQRvFm93eaC3l16c1x+qx2ZUSQEkMBz0MdN9X
-0bYEX4NcFf6af7c1fez4t02sduqMRIqG4EI4eP9oigmDRBBntP2kXKTqkUHnjqd5
-N/bi+N6dD5aFGCIsXAavAYWUYsFpjS4=
+MTAxMTI0MDA0WhcNMzcxMjAxMTI0MDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA52Rfiv2I
+gy0NiaKN5gc0VPLbEoHngkdJWv3wEORp+iFl6skQRbsCylT8djJ2pvHstFpnzSod
+F3Wwjj2/EDuj3iKBzN9HeXJOvJz8j9Si1xkgCxJeUjPGgYcvKdxybaZAOpi9l3xw
+PCCEXN4JBq/WaQQ9+eP1PczeMNfvFtXma+VcHXG743ttPOv7eSMr0JxQl3zjQvYG
+OhFP/KAw6jh/N6YPqii9kV0cC/ubeVzpqJ5/+hndx5YrmAu39N5qzwWujhDPkFNS
+gCJUhfkEiMaQiPxFxDTbUzWnQ5jpAQ5El4WJVkGWkqxose1bOjSSNzFPJt59Ytxx
+JC3IWN3UtGODTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
+LmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkq
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALHOkZkvHLpNm0QSof09vmmdNFE6
+/+0TCIoPExeqqSOsy4NsF+Ha46WttjJRSVtbhRxF8jxEU7btPiFgQUaOcJZTwQPD
+hmQSOPNO8GS46oJ57aQ7U7O+X3M1sVS5Pa2IzE6vrJSh349/CNbTA8WPQdWLlxVJ
+hJXAcZNtaEu6lCsZuDSMTpAsW5I4+snyrm3yvP5t0eD28K5LgCKePX962drkAOP6
+XGQ51VnbMQ7b1TSdQedtYKIpR3VKUvG5Ky/+0c+Rmwfi2aQ8oXXwekzJyS5jvovd
+VVsdhO68It+Rz/zursN5Pn+Gj1YuQNUs2nDrGHN+VIIFpgWUjLZO4bcJctY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
index 8ca80238b..762edf6e7 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
index 8b2c0a5da..103f85dbd 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
@@ -1,13 +1,18 @@
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
-ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
-RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
-et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
-ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
-BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
-nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS7
+IuEH6cCgw+wmNZq7FY1PCuCLtRYzQTKg/q83JdIBKN4DcrfnQ9VzIGIK6zYq9845
+ks//RXv8EjQyXVhw2yNOqDiVgqzKu8MTtwQC13GIxUsuDf/epDFhDssh9yeC9u+k
+DrvoCgoRIODqlJyM2/UL4qBF2TcpoLF6JmGuoFlR2Lmy6ClnCCG+I1+BB9bBTb1l
+6W3npIrOtqe599VZlI+Uiih1thA6BcMuIO9Yrqn9yLj0nz6Yt/aBGXFc6pin1TM3
+TvkUIainW0ZQFKShxz1ZeLjp5/ZReVoBS65jWvqMJwEE0hEfFMKwmi6HO9Gc5wYu
+rVFIhvNZCYrP4nr0On8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAwIqtvjNK00tI4/OOv8T/+v
+f/s7ZFHW8cT/1WD2sg21fh5r1sA82EqPIbQ7IZlub6FwtsC1MX/MjcAwttCIzKJR
+xB5BHvoEC/taYsEuWR0W1xb/DE4uDAX6X5dk5ckE1lUBqs9LNbR8Q4UDMGMdyyfz
+ElT8scQ9QTGtil4mTI44JPjJvhqV2w5Dd4aOP7W4j6T0apKYC+fj1HYEvwVaPBPo
+txQ+IGfxcLvnYoKe8wDhlY0cnk3orsxG+umx2CESMz5OLg3Qm4WG7U6+tpi0jkOA
+FFYyxoxIW3dMOb/p/mMyr6Z4gNNqQG1F91DhWnEWHzTd98Sm9zEbeZGdkqN7ZyY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
index 6513c9044..7054c3540 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
deleted file mode 100644
index d93fbfc5a..000000000
--- a/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/key3.db b/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
deleted file mode 100644
index 78fa4ffbf..000000000
--- a/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/secmod.db b/test/aux-fixed/exim-ca/example.net/BLANK/secmod.db
deleted file mode 100644
index b709dd8a5..000000000
--- a/test/aux-fixed/exim-ca/example.net/BLANK/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.pem b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
index 8b2c0a5da..103f85dbd 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
@@ -1,13 +1,18 @@
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
-ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
-RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
-et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
-ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
-BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
-nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS7
+IuEH6cCgw+wmNZq7FY1PCuCLtRYzQTKg/q83JdIBKN4DcrfnQ9VzIGIK6zYq9845
+ks//RXv8EjQyXVhw2yNOqDiVgqzKu8MTtwQC13GIxUsuDf/epDFhDssh9yeC9u+k
+DrvoCgoRIODqlJyM2/UL4qBF2TcpoLF6JmGuoFlR2Lmy6ClnCCG+I1+BB9bBTb1l
+6W3npIrOtqe599VZlI+Uiih1thA6BcMuIO9Yrqn9yLj0nz6Yt/aBGXFc6pin1TM3
+TvkUIainW0ZQFKShxz1ZeLjp5/ZReVoBS65jWvqMJwEE0hEfFMKwmi6HO9Gc5wYu
+rVFIhvNZCYrP4nr0On8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAwIqtvjNK00tI4/OOv8T/+v
+f/s7ZFHW8cT/1WD2sg21fh5r1sA82EqPIbQ7IZlub6FwtsC1MX/MjcAwttCIzKJR
+xB5BHvoEC/taYsEuWR0W1xb/DE4uDAX6X5dk5ckE1lUBqs9LNbR8Q4UDMGMdyyfz
+ElT8scQ9QTGtil4mTI44JPjJvhqV2w5Dd4aOP7W4j6T0apKYC+fj1HYEvwVaPBPo
+txQ+IGfxcLvnYoKe8wDhlY0cnk3orsxG+umx2CESMz5OLg3Qm4WG7U6+tpi0jkOA
+FFYyxoxIW3dMOb/p/mMyr6Z4gNNqQG1F91DhWnEWHzTd98Sm9zEbeZGdkqN7ZyY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
index 2d9720449..a9879cc32 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
@@ -1,20 +1,32 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: 62 C4 3D B8 CA D1 AA 6D 04 AB 53 AC 8C A3 27 B1 3F D5 40 55
+ localKeyID: 94 03 30 D7 FF B8 C4 4D 73 3E 6C AF 47 CC D3 DD DB 03 45 0B
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALftYoVnXB0Ntc8L
-+QFPfvndGjDy2YDm/5px+S+3149TTdDiQubE4sxJTcL8IXmU5SgA3/A4yL+poebM
-dRGVap4eMSCOdpAEURRAidhkYQrr2iiPpgU5WG30Q4Ae+14ZB/Dp9jXy/Rrjv6HJ
-aPUaYTy7iTRo6hxvXxdm1lpvHCz7AgMBAAECgYAGmeLO/HOtU0Pdg+lEQ8ZAGF6Z
-t82RfnHLIgRE75sxRuTkaDUiQZoNUHkVqaVXsoTlnsNOUtYShLBi9oJ3VPrw41RF
-x/sbwtAl8O55Ps4mHOS87ERsVwJBIL4luBXe6nuUJN3tA6UUo1y6t1AxVdcKQXuw
-WO0JnB33oNTDuo7UgQJBAOmVxKpFQeGeM0F1bu5jap2UrzMSrK78OwLmif+vHRlv
-sYFSfUXaEnw7RSrgtBNWb7tUw5i6RusrbRLpLVHOjzsCQQDJk7puqL26RasNYIf9
-bWyaV2qF0u0R6HoQH1IaBYJAOie68B1cvkpM1fhQYlT0Fm+iEM755xJaMy9mD0ph
-jn1BAkA+wvARtAQso/4vo2cIBIxcBNxCQ81EQx9z+w+vNJUEBZ/TGJ/ySdLXsHE4
-QSIBZCMnWXIosjxl6cgn4aE8rtyLAkAq5EVCMKOWVCauhQDKuxLl0H35FcWeDuKS
-Nafpo4xwkC9OBrOovVDgApOAvzumaHO+f2cbI8Dy8ns+czh3g7NBAkEAltBUuf9J
-M8pYnjy9NJL0zbJA2RrrWmMxcTOuYnAHlOzjKYqSjdigU9dAZB4HzNJMlML28tFs
-WZhVV9Y4ZxUvuQ==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC4piSKzExQJCgv
+hBKPPyaexasBPB6Vc1SFSSIGvvvH3dsuZ9tIl4tZOmkseut5T+gta6rEefE7F5JV
+LHWkx5G0dWuX/vn3Vbm3ghg+9MdTNDDp6WZHFjiVgOTs8zSo6lEUTCtWK95qd3vH
+9BcrETpDOSicYN9Rekzkx9SyWgWlgO7KZ2yxb5ciWpulAIBR9xyM2UNq237iaTzu
+b/a/7M8Z+k6pIS7KOQT9dvRgcC54yuWHWCU2H1VFea66rUDqJtj/J9l+9pDa+YFH
+DUUU0Cpk1sI4/DOmC+UzLINWShxGUYX+oZZK81l64X+pXZCn0Ur5Kcn0/jsg+qP4
+GoSf3pO5AgMBAAECggEADHqdAFzhgO6KoTh0rSXsUSFkhtU2b2z/jrD0Od69IyMv
+IY4fC6NDRYTdMAaAJL8V3sD2pefkWdUkXHmAW2Ip6pdfbcKrh8/NOPXTt+iA0pKV
+xi8yDHaX3SG8hveCTPKmB2BE8wJMuicIUGmCidR0mq+xmwzwdsAUU4deTG3pUQed
+w14MCpZBZpewXWdLvbjP/vD+SCcLERXqxNcN5b8mHaRBqyy9T9DFcYwgc/zqEmPW
+c02YtDXfS7voj/PSsBMZr+TCTcISTiongdy8qcKrkVLf3u4zDd62xMMZBHYtG9/m
+IiF8BejElXTkAS/eUPGRY6RACJxGxHEMFtYOKItesQKBgQDwJU5ZzXu+QSuXOUhQ
+dSZO9nE/lgGXk5agQEDdBaqxtuxZsO0iqakaf5t9lWxkDgJxdnTrXr4mTgEXM9Vo
+FTcoHyjBeVMybzLTyOs5nqyNAmC5LbQRSS7zTmajxelZrbqpc78MiTOCttesRuLe
+/6X4TfvtMc4GH7ro3CkdsFuFCQKBgQDE1uN0sYUeeLEiDU9CMOzD654Q5mzPLS86
+sEoX7PW/j97pfj65/6BSvjZwo1QvmyFMzg/Pdz2bkLbCb630xOjEzxB8up1gL0bu
+dUSzf5lTW82VKvsH7D1/apuInbYPfN3s2O+bNgvYZmtoUlMSig4ojpqUbXRCHNoA
+okgdnmV1MQKBgQCZO5TFJKLjAX6pHfoQrM/m7sXQhw05BQnF83nwDl+eylQB3y1R
+QuUObYJwHdpt9aqFb8qnLWsz0e5MOdzgbzkkts0wtxPpSJ8sGDZQK/l6eJvzTUBr
+D0GQKuS/d9ewS3SiD6NGgn2F2NnBqfG1zXa//DLWZUNLERAY6fKqaQ/c0QKBgDc6
+Y89WD5ehHXIEcfyMZaIC9fKf9F+cueepluBnp/v7jfvNZCQjyQPuQrAP44sH56v5
+FQ6M0khXri+XziMjLHwr7OBSK93U5f36ATCr2IU++Mulp5Ftg0PA0arfNTnbOxk9
+NN1DqMcq1XALySsmeRqACHckzr3OAoyy+7DzxFvBAoGADD8y+xZP5vxqY2tr5Vj2
+h8LTgpV1IbuD5SSOkY+XD0y/JsYbp2WDifRfYqXktL6AIr/i02ub4LKbTFTqYoL7
+dUjKr7APT9DrPqKZ1IBr+8Q3NWyz2eseanuVyV94ly7qF4Bh6UfiscaPlSK9XtWx
+p/Ua6aIvKcDRWWOd3njEiak=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
index 7b1763930..4c26942be 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
index bb5fd8608..33b40f274 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDEjCCAfqgAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTRaFw0zODAxMDExMjM0MTRaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
-MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBALftYoVnXB0Ntc8L+QFPfvndGjDy2YDm/5px+S+3149TTdDi
-QubE4sxJTcL8IXmU5SgA3/A4yL+poebMdRGVap4eMSCOdpAEURRAidhkYQrr2iiP
-pgU5WG30Q4Ae+14ZB/Dp9jXy/Rrjv6HJaPUaYTy7iTRo6hxvXxdm1lpvHCz7AgMB
-AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQBe5cUVti0qB57EzmjbPpAlNQfO0mTNBauVY9LPBWIJ
-LItwQ0IZ4FtI+RqHdfmdREpl9Lac+qJ9xfOu/jnpGxMXiCrJ3LhR6M0chRvp0QgP
-0Hrsi1fhwLOaPLPo4uZHsIAiWMyGGJBD6k3g+pNfPp59z/PavNPH6m9ksqEPdzPw
-AQ==
+MDExMjQxMDZaFw0zODAxMDExMjQxMDZaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
+MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQC4piSKzExQJCgvhBKPPyaexasBPB6Vc1SFSSIGvvvH
+3dsuZ9tIl4tZOmkseut5T+gta6rEefE7F5JVLHWkx5G0dWuX/vn3Vbm3ghg+9MdT
+NDDp6WZHFjiVgOTs8zSo6lEUTCtWK95qd3vH9BcrETpDOSicYN9Rekzkx9SyWgWl
+gO7KZ2yxb5ciWpulAIBR9xyM2UNq237iaTzub/a/7M8Z+k6pIS7KOQT9dvRgcC54
+yuWHWCU2H1VFea66rUDqJtj/J9l+9pDa+YFHDUUU0Cpk1sI4/DOmC+UzLINWShxG
+UYX+oZZK81l64X+pXZCn0Ur5Kcn0/jsg+qP4GoSf3pO5AgMBAAGjKjAoMA4GA1Ud
+DwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsF
+AAOCAQEAXmrD8/s49rInxdaW+Hw7ShvrMqbJ4YYbTGbReMYn/vA6bKr/dFk+MMRW
+EClz6+sCrZ8L7QWv3HEd9j/C43JDPIWjJ3fKBCY2VI+gWTKeeJLWOIE2rP50/09D
+witc7z/EAKzbrb22I42FPt7CFW0BENfLfh9YiuTWkIaGKDjd2QvtuaOXRCIXJLhq
+EaUG+rQVVyj7U2M6Yva8q4ur8j+xV64DHobFupyWk0NmNy4ESFDFwHdtRRrv8T/z
+HxsT1cLHCzfMy8IpjuOLQRneO3TDaPdk8PcbIWXwRvrWoGfiDoYTAFTY/CBjpwUS
+uH6K6/R0j2E2FWlBeWoCv+RIWj5+vw==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.key b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
index 62d9269ee..94fb861ed 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
@@ -1,20 +1,32 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: 5A 0C 9A 97 E5 60 5D 52 7C D5 94 4C EF 06 96 C2 76 76 98 57
+ localKeyID: D8 7B F7 64 E4 37 67 20 4A BA 13 3D 49 BB 50 40 A6 0A E7 E5
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKFOi+80c9pb3Uid
-QJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToyPruZ9yLq26a7c6sLYqEv
-pHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8PhzYl4p3M23rQzNSXcHC
-xcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAECgYA36Evq3+CplX5oLQyWlTFrPKfF
-GX00SvEy66r3J2QvPCQDtNalOiftPK07+O8yQWZdJU51BvJLnboVCLi3HC7N3QOK
-aDAXgBGzIGG3DzccIybOc4pur52PkuCmVSM0Qq3tSx6sxPmEWacBgWaiFGGu15AM
-o/OhlI+mfP1RK4jIYwJBANXq4uNiGIACfHOUpQxcD8yQL16E92/CJqE4LyMemG7U
-eHzfYdLDlhlOPlZTgcf8NycnzYkiruXLYzmewtBvyisCQQDBCiEoQWviGwTNhSvV
-aZlLmbo6uzDweKyq7RyBHB7RacOwHQ9/ZigMiHtSQKxXZBhNOnXM2EyOfKDMsttm
-RCCzAkAhV64rsPOOqFSLk2Sya3sO8H5hpioHImTxBhfayn8J71YkaJEPz+qKYTa4
-L+XvrPFPyhVwRZarPKtnpMZKxNHnAkEAmnQVZZU60bXWmO6FzQLqAeBlblqaZL3Z
-QgXn+bHbQqlCRuZpoQDG6IhHS9+tRVs0So6M9LLYRmWXb1FoVKIMGwJALCHxYw/a
-EUsckc2aw+mI3nVKr2hkJRRbn2px0uWSzXY6i76EMw/X58SKsTQDGxX6oZFRQGW0
-TITUGwqrFxFV0A==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD7f9mHP5wzfhDH
+hjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/Gn4c8lnbq+QpiLSVuXgE0+K3
+Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQhdd0cDsxGBzpolD48DwXkrBN0
+wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61fstY/RTZU6CDi2uqYLGsWWVU
+SuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKrffdU6ey8U7W7ksb6Ky6Plz0D
+07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1spYsi2fUg8yd1NfVyVpF9ye63
+etyldj+bAgMBAAECggEAdx7SKFY/pMAEMIzoC2g1s2ZTPjzWGVC0zs0fZw3B9zQO
+0iC/he7u8HEa5JkBaKOc2PNQHU6QgzDcxEpHGX3ZRN+VADftcWJui4o8ndKrXvqE
+uVMPsInnrGWICd8Ub+LCjoAQjh/LecjrGjWbjz31wOX7N8/jFg2+3hgNG/h4mNtq
+KVDhlcX3ORkKxeJCAsjxbikeKPr5L1FcBP7dYI4hdKNY7dmOM1keitYjhcHLkCEp
+vhtnyKeFba2cqFsCqE5Q2OqtM69gds+izLlBBNAAzNQZYK672SgxxuIy8ro27dbi
+B1G+Jc33yr6eKJzY5MLOgVaEQUaQRuF7tASCqWcAqQKBgQD/wTa4idPV9r7MjHtR
+eS8jQiw09eCur3wdu/kFe4JE5IAdps2EblZrJKM3QC9vGqkOjf7/fWpV8EObn9L9
+8lMgfehglP5YTP4gvE7Y/oOi3k7mMd5jwQ4b/U9E/osIeQi6is88ZWcAPE0U4pMN
+pwp+S/cV5QWzEPheNNjNLB8mtwKBgQD7vZdgCoL0y5STOTqZbh8xXTnvE+TQuAus
+5nAUVFZtpAlafehQGpJI/02PipvtcH+EGIm6eeF8jQTQno2G2xUVijx0xnhniELQ
+v7qp+8Z9+mk/QKsCmfa1t0XC6gaPnyKYEdyUHOj8AXUDrf9BySqejdggEjygMlTt
+u2V+99AqPQKBgQCOTIKVypoCwncGeGNkwXhotbjC/ss0Zo84PA4h7sZcboaZ+OUA
+eiO7GXd2lk/OEZdeccMfhDhV+IilXheXE+0MdwGEO2II303GCQAV3AaB6A8eJUEH
+X7Lp/9bLHJVe8XjZ0cHcaM8WYnbA2A/Z2McN3lZr6DFzoE2QnPbDsXjjoQKBgGDE
+eDPK1pwSxYHyNbxUwFjRZTupggNZO+OykNK/uJlcvNu0GmDwVdsJiF7tARM8c0fr
+xsWPpEWkT32B9RUpkek9wg+BWzcxAb4MdUxyI9K5N0vBJ/tQA63GTWKnYu5CVaHu
++8NTeZulU72eXMiE84UPMUzitbs+nbbkmhc8WyBhAoGAFhx0yPYUjT8fKB1Zq4Fn
+xeBILVSBsTn9pUkPzFS5G1BIyGdF7YBRRC7DMTDPxQMXF6rJ2+ACzJJzXpqsoxYI
+bYdhwGK4afTGtqnpoivcJDsf6nBiFIEMd5V+t09Rg/b3YwgMRZ8ucIBILIYsor+i
+LI7Go+X00RTw4LJ8zccRh+E=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
index 02367d9eb..fd5c08d4c 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
index 6513c9044..7054c3540 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/ca.conf b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
index 09e83063d..230f9ab78 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
@@ -1,18 +1,18 @@
; Config::Simple 4.59
-; Thu Nov 1 12:34:14 2012
+; Thu Nov 1 12:41:03 2012
[CA]
+bits=2048
org=example.net
name=Certificate Authority rsa
-bits=1024
subject=clica CA
[CLICA]
+ocsp_url=http://oscp.example.net/
signer=Signing Cert rsa
+level=1
+ocsp_signer=OCSP Signer rsa
crl_url=http://crl.example.net/latest.crl
-ocsp_url=http://oscp.example.net/
sighash=SHA256
-ocsp_signer=OCSP Signer rsa
-level=1
diff --git a/test/aux-fixed/exim-ca/example.net/CA/cert8.db b/test/aux-fixed/exim-ca/example.net/CA/cert8.db
deleted file mode 100644
index 5aa6b374c..000000000
--- a/test/aux-fixed/exim-ca/example.net/CA/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer
index 5fdfdb5e7..fbf12fc1d 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt
index 8f00adf1e..ab7d7b073 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt
@@ -1 +1 @@
-update=20171217205108Z
+update=20181127215819Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem
index 6f4ab63ab..70e2b5d5a 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem
@@ -1,7 +1,10 @@
-----BEGIN X509 CRL-----
-MIHnMFICAQEwDQYJKoZIhvcNAQELBQAwLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQx
-FTATBgNVBAMTDGNsaWNhIENBIHJzYRgPMjAxNzEyMTcyMDUxMDhaMA0GCSqGSIb3
-DQEBCwUAA4GBAGWZ1eVxdihOylK+Mts4bHZn1mIy4brvfqJk9kwwblJ0tJj0u7PD
-32XxwBxOgDOW9KCYC+xL2ObsUe8aRax8c8bpLzLrDm1DOMNqL7WULOeoid4UWLZf
-Qd+NclW3/1aa9oUa2RJJ45rIfTDRB7c3wr+0YkD7cX9oMtJ3IgGctR7s
+MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUubmV0
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTgxMTI3MjE1ODE5WjANBgkqhkiG
+9w0BAQsFAAOCAQEAmoHDEj+wCPagwutH/O2ntIDfdMsnZ6GonnLxF1AywzjPhzne
+e6Q2FAGs3jeRVJc97UM4r6C71WCbcGZASL5QacZ9wKlvfSHt0r7eFpJQ4PdLt0el
+mpBAH1OI/6w35sraXh7ZZQYquXfoskoIWo21Hz6PYOUbb7eW+ldewBdyk0h5noMJ
+0ZWZ0r//+7p2TF3sTL2YQUOXWhQJ06QKa/fDGB9IaMFhya827l6ycbUiHPPra0W3
+HHa9A1P8B4lcrUxqAl57H/eIhRNAzVwohakBa/yEc6p0mzgK7tKL0oAvCKm2Voj2
+0fHrlxV43dLYavq9AITjQ3fyf/aF4RKQ542/Wg==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
index 565cd2016..d4a07fbbf 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
index dc66bdfc9..ebd4a952d 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171217205106Z
+update=20181127215817Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
index a1ec2e518..c2edcf46b 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
@@ -1,8 +1,10 @@
-----BEGIN X509 CRL-----
-MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQx
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE3MjA1MTA2
-WjANBgkqhkiG9w0BAQsFAAOBgQAFrYL7zpUpEIizo66Gus5y9BeRPUeHFOc5YVL1
-sii6FqIrDtBJZjUvf+11ED5sdVrJN2T3rxbDPpm6NyBHjW7Tz69Tx1FjyMpRhkTC
-XKMCZIjysxYiteO7dcHgpJ4jHxO6UHd61CCOQKbX79oRF4Sfa2ABAxcWBsO0Ce/C
-/bUP1Q==
+MIIBcjBcAgEBMA0GCSqGSIb3DQEBCwUAMDcxFDASBgNVBAoTC2V4YW1wbGUubmV0
+MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDE4MTEyNzIxNTgx
+N1owDQYJKoZIhvcNAQELBQADggEBANGAO0waSVFGj9/q0XOcjqk+0b7bp8Qdlc7O
+EZYhe0myDz7+mPBTW9N7595XWprSKy/4H6l5wczDXHM8zSWmSuvaBlQXeYK63N3V
++kaT4zl7crLnEsxjtED+Rt8jujEHPbUl3OmQkVRei5Hic1Aju8mF0CvvIPIXZqCW
+ZUyKg5oN4R+MRrnKD0dc8Bd41nA0MHeQGmMzv5xVVd+09a+FwJC5mTgFAI+QNNs6
+bm2HWOWsDPaShXgaSIf7dz6T0l3p25OsYMiQ6tZvs6VtupRy3LaOML9wYw/tzPSH
+w+LoigSP7MWJr0rHZ6ex2HzKBMr4Fi2fwUULZ93YsSsZkGYyQeY=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2 b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
index 24335b8cc..9d722435b 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
index 7c2dcd446..e47bb50eb 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20171217205108Z
-addcert 102 20171217205108Z
-addcert 202 20171217205108Z
+update=20181127215819Z
+addcert 102 20181127215819Z
+addcert 202 20181127215819Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
index 4c30664c5..4f3e84d4a 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
@@ -1,9 +1,11 @@
-----BEGIN X509 CRL-----
-MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
-dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTcyMDUx
-MDhaMC0wFAIBZhgPMjAxNzEyMTcyMDUxMDhaMBUCAgDKGA8yMDE3MTIxNzIwNTEw
-OFowDQYJKoZIhvcNAQELBQADgYEAaKKqlVNZJTNZ2EjUoAB3C8SO2sXomGeNrJZl
-xvm/9QkGbxDOcjjpWEBJ8ffcg97m/sT9WY9dseofUN1sAzm2xoNB+VJkLFBbhJH0
-rqJZLCTUh9LG0c7IY3/Rrb/AEUVl/5+XvDdtc+QJo8ywY+oVB7ccW1iEvjtzfg1G
-n25kDno=
+MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxODExMjcyMTU4
+MTlaMC0wFAIBZhgPMjAxODExMjcyMTU4MTlaMBUCAgDKGA8yMDE4MTEyNzIxNTgx
+OVowDQYJKoZIhvcNAQELBQADggEBAKv022Dqq1GH3B6AbE9mDaxe/J6WBydq0r5l
+r759+v3X8+EZx164k787Of00Zm0IY44++OPZug+TkzQ8Za37R1+UpWBICpwrRBj9
+8Ltpz9QbwzNcioo/8vxqiEvKhJB1w7USqJ0TA0ZeeAo/dARMOeHoHkbJY5PrJgRY
+ftArrNg8kqaJbknxnGrBX7AkxIJzv1wb4aQQTIbuiDO6CYQyOJivwynLcSw10NLT
+seUlXoO6eh5g+FF6SLvsaiHQhvzlhKT2D2yxes3mosgTA7yVl/Q7lFius1i0jDxq
+rNPUYGT6YvT92Oz5hWTvvhJ1yLtub+OnJZwA9ulG0aZyjC3wJo4=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/key3.db b/test/aux-fixed/exim-ca/example.net/CA/key3.db
deleted file mode 100644
index 9ac925099..000000000
--- a/test/aux-fixed/exim-ca/example.net/CA/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/noise.file b/test/aux-fixed/exim-ca/example.net/CA/noise.file
index 8cd258c7b..a3fd77068 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.net/CA/noise.file
@@ -4,8 +4,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.567
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -17,8 +17,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -31,8 +31,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.304
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -44,8 +44,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -58,8 +58,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.904
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -71,8 +71,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -85,8 +85,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.140
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -98,8 +98,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -112,8 +112,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.316
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -125,8 +125,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -139,8 +139,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.052
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -152,8 +152,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -166,8 +166,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.211
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -179,8 +179,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -193,8 +193,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.089
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -206,8 +206,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -215,79 +215,82 @@ address sizes : 39 bits physical, 48 bits virtual
power management:
CPU0 CPU1 CPU2 CPU3 CPU4 CPU5 CPU6 CPU7
- 0: 75 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
- 1: 69775 6441 4183 4351 8821 6710 4808 2655 IR-IO-APIC 1-edge i8042
- 8: 1 0 0 0 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 116958 16080 12437 10549 27759 16386 11560 7036 IR-IO-APIC 9-fasteoi acpi
- 12: 5146732 362636 240016 241533 534196 383274 265445 167959 IR-IO-APIC 12-edge i8042
- 16: 3 0 0 0 0 0 0 0 IR-IO-APIC 16-fasteoi i801_smbus
+ 0: 23 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
+ 1: 0 0 0 0 0 20892 0 0 IR-IO-APIC 1-edge i8042
+ 8: 0 0 0 0 0 0 1 0 IR-IO-APIC 8-edge rtc0
+ 9: 0 17253 0 0 0 0 0 0 IR-IO-APIC 9-fasteoi acpi
+ 12: 0 0 0 0 975537 0 0 0 IR-IO-APIC 12-edge i8042
+ 16: 0 0 0 0 0 1 0 0 IR-IO-APIC 16-fasteoi i801_smbus
120: 0 0 0 0 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 0 0 0 0 DMAR-MSI 1-edge dmar1
- 122: 40662 2645 2048 8326184 3083 2651 2210 2042 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 123: 50 3 7 1 9 3 5 0 IR-PCI-MSI 327680-edge xhci_hcd
- 124: 269 24 28 20 104 171 22 48 IR-PCI-MSI 2097152-edge rtsx_pci
- 125: 38 0 0 0 0 10 0 4 IR-PCI-MSI 360448-edge mei_me
- 126: 2 0 3 0 1 2 24 0 IR-PCI-MSI 1048576-edge
- 127: 2247 56 54 23 3782468 37 26 18 IR-PCI-MSI 32768-edge i915
- 128: 77 0 0 0 2 32 8 1 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- 129: 18 2 0 4 8 0 4 24684 IR-PCI-MSI 1572864-edge iwlwifi
- 130: 658 1 0 0 0 8 5 13518768 IR-PCI-MSI 520192-edge enp0s31f6
- NMI: 607 2649 2621 2522 2484 2424 2424 2470 Non-maskable interrupts
- LOC: 29013600 29908567 29752721 28952298 29023548 28520116 28468408 28815966 Local timer interrupts
+ 122: 0 0 30204 286226 0 0 0 0 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 123: 0 0 0 54 0 0 0 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 124: 0 0 0 0 0 0 0 459 IR-PCI-MSI 2097152-edge rtsx_pci
+ 125: 0 168 0 0 0 0 0 60672 IR-PCI-MSI 520192-edge enp0s31f6
+ 126: 0 0 3771 0 0 0 457003 0 IR-PCI-MSI 32768-edge i915
+ 127: 0 0 0 18 0 0 0 0 IR-PCI-MSI 1048576-edge nvkm
+ 128: 0 0 0 0 52 0 0 0 IR-PCI-MSI 360448-edge mei_me
+ 129: 0 0 0 0 0 0 45 0 IR-PCI-MSI 1572864-edge iwlwifi
+ 130: 0 0 0 0 0 0 0 636 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ NMI: 16 14 15 17 17 14 15 14 Non-maskable interrupts
+ LOC: 911203 934148 935935 986987 1035225 900206 962225 942413 Local timer interrupts
SPU: 0 0 0 0 0 0 0 0 Spurious interrupts
- PMI: 607 2649 2621 2522 2484 2424 2424 2470 Performance monitoring interrupts
- IWI: 6 4 3 2 10 4 3 1 IRQ work interrupts
- RTR: 18 0 0 0 0 0 0 0 APIC ICR read retries
- RES: 7885527 3950261 2715187 2193513 2473698 1957554 1665356 1987982 Rescheduling interrupts
- CAL: 987291 866818 901402 885321 915798 938469 935939 966681 Function call interrupts
- TLB: 231525 195523 218511 215448 205509 204323 194087 201607 TLB shootdowns
- TRM: 1627777 1627777 1627777 1627777 1627777 1627777 1627777 1627777 Thermal event interrupts
+ PMI: 16 14 15 17 17 14 15 14 Performance monitoring interrupts
+ IWI: 0 0 0 0 3 0 1 0 IRQ work interrupts
+ RTR: 4 0 0 0 0 0 0 0 APIC ICR read retries
+ RES: 243281 93274 40196 24339 17700 13145 11662 11183 Rescheduling interrupts
+ CAL: 33860 31849 33687 32823 33578 33525 32134 32426 Function call interrupts
+ TLB: 16415 15608 17440 17663 21127 17152 16593 16540 TLB shootdowns
+ TRM: 0 0 0 0 0 0 0 0 Thermal event interrupts
THR: 0 0 0 0 0 0 0 0 Threshold APIC interrupts
DFR: 0 0 0 0 0 0 0 0 Deferred Error APIC interrupts
MCE: 0 0 0 0 0 0 0 0 Machine check exceptions
- MCP: 202 200 200 200 200 200 200 200 Machine check polls
+ MCP: 29 30 30 30 30 30 30 30 Machine check polls
HYP: 0 0 0 0 0 0 0 0 Hypervisor callback interrupts
+ HRE: 0 0 0 0 0 0 0 0 Hyper-V reenlightenment interrupts
+ HVS: 0 0 0 0 0 0 0 0 Hyper-V stimer0 interrupts
ERR: 0
MIS: 0
PIN: 0 0 0 0 0 0 0 0 Posted-interrupt notification event
NPI: 0 0 0 0 0 0 0 0 Nested posted-interrupt event
PIW: 0 0 0 0 0 0 0 0 Posted-interrupt wakeup event
-MemTotal: 16293504 kB
-MemFree: 934856 kB
-MemAvailable: 13704060 kB
-Buffers: 452228 kB
-Cached: 12441152 kB
-SwapCached: 101680 kB
-Active: 2599816 kB
-Inactive: 12195548 kB
-Active(anon): 1356404 kB
-Inactive(anon): 588700 kB
-Active(file): 1243412 kB
-Inactive(file): 11606848 kB
-Unevictable: 64 kB
-Mlocked: 64 kB
+MemTotal: 16284452 kB
+MemFree: 10021040 kB
+MemAvailable: 13201980 kB
+Buffers: 264456 kB
+Cached: 3327020 kB
+SwapCached: 0 kB
+Active: 3261616 kB
+Inactive: 2456108 kB
+Active(anon): 2127964 kB
+Inactive(anon): 244648 kB
+Active(file): 1133652 kB
+Inactive(file): 2211460 kB
+Unevictable: 80 kB
+Mlocked: 80 kB
SwapTotal: 8212476 kB
-SwapFree: 7376112 kB
-Dirty: 10832 kB
-Writeback: 4 kB
-AnonPages: 1871576 kB
-Mapped: 415968 kB
-Shmem: 290116 kB
-Slab: 351256 kB
-SReclaimable: 257264 kB
-SUnreclaim: 93992 kB
-KernelStack: 12848 kB
-PageTables: 58588 kB
+SwapFree: 8212476 kB
+Dirty: 692 kB
+Writeback: 0 kB
+AnonPages: 2126256 kB
+Mapped: 481400 kB
+Shmem: 246332 kB
+Slab: 324580 kB
+SReclaimable: 173192 kB
+SUnreclaim: 151388 kB
+KernelStack: 10096 kB
+PageTables: 39944 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 16359228 kB
-Committed_AS: 7868784 kB
+CommitLimit: 16354700 kB
+Committed_AS: 6637056 kB
VmallocTotal: 34359738367 kB
VmallocUsed: 0 kB
VmallocChunk: 0 kB
+Percpu: 4256 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 0 kB
+AnonHugePages: 806912 kB
ShmemHugePages: 0 kB
ShmemPmdMapped: 0 kB
CmaTotal: 0 kB
@@ -297,14 +300,15 @@ HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 523752 kB
-DirectMap2M: 16115712 kB
-DirectMap1G: 1048576 kB
+Hugetlb: 0 kB
+DirectMap4k: 282088 kB
+DirectMap2M: 7968768 kB
+DirectMap1G: 9437184 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
-enp0s31f6: 9760816648 13664538 0 0 0 0 0 8965 118421394195 83833297 0 0 0 0 0 0
-wlp3s0: 3643580 7768 0 0 0 0 0 0 4732829 8244 0 0 0 0 0 0
- lo: 9996035 41708 0 0 0 0 0 0 9996035 41708 0 0 0 0 0 0
+ vnet0: 1155867 4102 0 0 0 0 0 0 959892 10304 0 0 0 0 0 0
+wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+virbr0: 1098439 4102 0 0 0 0 0 0 735824 6022 0 0 0 0 0 0
+ lo: 7424702 45950 0 0 0 0 0 0 7424702 45950 0 0 0 0 0 0
virbr0-nic: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- tun0: 20139456 21861 0 0 0 0 0 0 3370846 19686 0 0 0 0 0 0
-virbr0: 47538577 146404 0 0 0 0 0 0 164360816 210422 0 0 0 0 0 0
+enp0s31f6: 39251323 34779 0 0 0 0 0 0 5044761 25668 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example.net/CA/secmod.db b/test/aux-fixed/exim-ca/example.net/CA/secmod.db
deleted file mode 100644
index f8cc0e78b..000000000
--- a/test/aux-fixed/exim-ca/example.net/CA/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
index 3beef64e5..c5b00da24 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
-ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
-RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
-et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
-ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
-BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
-nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS7
+IuEH6cCgw+wmNZq7FY1PCuCLtRYzQTKg/q83JdIBKN4DcrfnQ9VzIGIK6zYq9845
+ks//RXv8EjQyXVhw2yNOqDiVgqzKu8MTtwQC13GIxUsuDf/epDFhDssh9yeC9u+k
+DrvoCgoRIODqlJyM2/UL4qBF2TcpoLF6JmGuoFlR2Lmy6ClnCCG+I1+BB9bBTb1l
+6W3npIrOtqe599VZlI+Uiih1thA6BcMuIO9Yrqn9yLj0nz6Yt/aBGXFc6pin1TM3
+TvkUIainW0ZQFKShxz1ZeLjp5/ZReVoBS65jWvqMJwEE0hEfFMKwmi6HO9Gc5wYu
+rVFIhvNZCYrP4nr0On8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAwIqtvjNK00tI4/OOv8T/+v
+f/s7ZFHW8cT/1WD2sg21fh5r1sA82EqPIbQ7IZlub6FwtsC1MX/MjcAwttCIzKJR
+xB5BHvoEC/taYsEuWR0W1xb/DE4uDAX6X5dk5ckE1lUBqs9LNbR8Q4UDMGMdyyfz
+ElT8scQ9QTGtil4mTI44JPjJvhqV2w5Dd4aOP7W4j6T0apKYC+fj1HYEvwVaPBPo
+txQ+IGfxcLvnYoKe8wDhlY0cnk3orsxG+umx2CESMz5OLg3Qm4WG7U6+tpi0jkOA
+FFYyxoxIW3dMOb/p/mMyr6Z4gNNqQG1F91DhWnEWHzTd98Sm9zEbeZGdkqN7ZyY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
deleted file mode 100644
index bee4de063..000000000
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
index 74e2dc7b9..60fecaa4b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 01 11 9A C0 58 86 76 AD 43 C8 AD 6E B7 D8 88 6A 00 8D 27 AB
+ localKeyID: 8A 4F 4E D3 55 83 6F 81 A0 9B 27 0A AE 6A 70 F0 5F E6 7F 54
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTVaFw0xMjEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwzxfp2vYw5w96
-4Eq57WBMZdmZZ4B27eqMV2gGS7fINlWoUqR6JsClfrBJ5A60LjsvPF2ccr9uyG6r
-mLlarc0kXBREXRpZdmcxX04MS7lu/1TnGem170ZzldtTXV/Z7UHukvDID+tYV2X2
-aTQblO2JbE1+9F2tXILc9TSX9fbBNQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
-A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-ABHsEhKoJeK909uBPQLCZVVVGiHybCGkoXbf3iLR8lQsEHrHi1B2Jh4b8UbHH/Co
-PmDmpRpbpQOjawMDQIRZxr5NJlBFSDHC9XN1LfIarevXrqmHz4YnuelWxR3dZ+mx
-joeBCLnshd8U80WmsVesPlNWnG8XCRdZ0QylvBpd1Ufp
+MDExMjQxMTdaFw0xMjEyMDExMjQxMTdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoPjPeMGY
+s/5oiazaIe1/UtAeJVPKJXL71t+5CK5FjN1umswps6lxmEaNV99cKTxvLvcmbibn
+iD+DS01LsM7VEv0WLOMKNs42a6IS21ux7JklBVlYTr7oNi6k/gnOLQRkhkhii9MS
++fVipfa0hLbXbV9HchqufjN6yCMyX8xwBMb01024TcHV/ibJJAXoT0qCzp+1MCWY
+uCZfgLVchb4y4tp3vLWu17nbwSMQ/55V+V2itlWqvR9bsgMj6zoS+wK4GnxZ7pMr
+oqQmVW3TmMNDFjbjPdkXhKxbUGETb/Xu256XLR9a4cm8JN7Yqmm8mn+WLUjjh8J1
+56fdsWwN6YqW2wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4
+cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQDs0tvqjmxMihXU
+4Kf86vo1mXpR+tlk2lMUcnE0OwxA0kVoVVZPruO1Y29TFfIl2uxncaY2XgR2Q9BH
+LGMeSsQdIMgLBA0AVJQ4MzNgdwPqLLbnNVCXG6lrFTWLuS6j0Zu4uX9V9TDb4FnW
+IDgbHCtDMGX3t47DoXV8YsPfw6aTOncjoVYVeE2NVvLAvaLqwpiuYkymWO2hwX0M
+UY+Anfn3WSDO6+NMHLnPLU41T8S06Nu/PjH13JOErEhd/rWfcd5xikLcgNN3yZs6
+IG391dQz0zTmoG5HfdvzobGc58HAx+YZ3jNyTZ0hsHxJyvTHOD3oa34KDRcMbuU2
+9NoOjUvc
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
index bda96e53c..d77c234ba 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 01 11 9A C0 58 86 76 AD 43 C8 AD 6E B7 D8 88 6A 00 8D 27 AB
+ localKeyID: 8A 4F 4E D3 55 83 6F 81 A0 9B 27 0A AE 6A 70 F0 5F E6 7F 54
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsdmFOA4pkusCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOwDCiGC5J1ZBIICgNkR92fHe4t/
-TnXkRaqoFcs/AOgsCc4NN9jqpuhcFU6vbzT0vR32//DNgTXdwDYFQJ8/Ff/ST96v
-o+/MqVNsaUXEd9cowKSRKLDaBI8HlfSFToQnBoCLNAzSDo4FD7iOKke7jUe3Aqfv
-cydn4xxdEQxlKC1UzTjsl9MgNdV3P61kGVDaFYcXGWsDJGoLsLbOZIurlL3In8hU
-68vsznk55hXioTocYJWHadhcgJULYd2inJx0yS7+S+aGzGzhSxf8Yen861zutNlw
-Hl61CJs+fzyxBXpZHb+JfEh2vIlCU+HFhdTCCaNU3lP7w8WacYWvM995jW1KsdAz
-RsJvFFLa9UTnhAou1FRiHuHD/XObF9sOUsvoqUuGjtbQG27FPPLAVG+H2Fc/fr+g
-7qLNMvpcnZaOipTF67iPdFUDuJy8wpnBMlvXkMKiWqhMG2Tv5fBhFR2ozoYasFah
-aSDhchL2Wpc+uwxA8sz+EsNnmkFDyc8LFLikPRUS3jn9PPDio1PLqlXBbSHlx3xh
-4ci75ho0gEqpmE8nfoNtzMh+QZadpg63iOn1Rcw2YqGnDRaJQyGqEJucUY15KtTz
-+WOzVw55joukpgdiOuEL3dsR0mYJsDkq5oAD+FxNK9KzYXeNDKoCVNxc9HgXFRDX
-eQLQVZeBzorHnrwB0rBWc0CoSFq1ENwa+9Ij0Emd41Eeo/8nxEisW0nt+ezjEUdK
-ZwcFbdzUdLh6mU5y4acNDTNZ+oiEZ66lXK3sVGkcoleyhj7Y4J40ys3X7LfqWkq1
-BLoOQ7rt1NwWjLneSoUS9PzH1FoM5VAP3zkbZMywXsj6rpj2TMV5xIk3Ke+pLLtd
-gQMv6zy52N0=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI165RINayKDkCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCpmNR68bPwZBIIEyBpQcXmzJL3Y
+H0y7gb3eEX7jmptKkZHJ3f7IUTlstt1UNzwNGkQRKp5K7PcRiTL3cu7ayLNyZaF5
+m3q6ULCQ9QHbNW7Uz3HJo2XzSNi25ev6x8s9ee9P43y6nxGjcSY4wlfcMB0pNc0b
+mckeURDBden16RpA1eb2gYSh9NKXI1SdkbICVnLsWzdpoRYfRWDW1ptAnXBt5CVO
+nil+HfV69gbNjxiuxQiHak3jRpekpWGY7V0KwHnx3lXzTlLbEJrr0m4pawXx1kVh
+DWP5Fd5bLNVkRH2lie+1XmuKEM5BFV8kQ0W7bJL16TzWB6BB/O1YN+ThMc/tgaLA
+T2Y7gDkBwQ8IRp01g5Y2jFzfBpwEBVO+SmvLCMlP0mHpMCnRuY4SyS4u1nQmRukX
+NU3dxRqyiXgmSsTtgh/E1O22Rq9tUVTCIdi7agbPiutpnU5USdkh3PxXpiBZJOL5
+9QXkaxaQ74tWbpfYXmDXlxiRSTvs5p6UCBrM3MxkwPe1QsWbGoddW4Es9z6aYjH2
+3mTh1YBcek6Rchxx7SZX4s2zB2bSwai7KO0hounEi2LXgzVxsZQPjkQddgBhCXrz
++PxT9u25TkN9s45P5sH1x/2AWavTw3ztT/Xng6zLbXqWeacxiOTLSUEuwb7oUwSr
+xOV2PmxNPZMAspb1J0j7hHLv3uKr/opUBt973FkzLCED+4fPweP5MU8HcHcfeDJ+
+d51nJ2BJT3WYpjpjTX1SHA40MOHtf7X541oRU2okpZmCdzQvW3Y/YazUcjCVTI+A
+MIQsBXl42bq94TUBbHemZAlIYHRlWqFD42oEoiIWypch89qy0GwvFWYJDH26khzi
+LjC8zmYTugmsFSuP45FFFhj0JHeCqOrm6Mvg52pj3TKGiL+ROvCPO90+Wb1j9Afu
+/UVGv7v6Orjdt7KosxCHssiF7xJRBtbagyjqMb3oPOJWWtgx7NBCt0KTN+iPl1oh
+Vpr6ivToOEBymmE+3eXmmgrcGCr7L91saJ4cfujE1IaptbrF5QUAngTLFt0ZgxV2
+YNytpeSU3g6aeXMyfvr4a/fikjgHY+Nfm6yLIrq2IvjVnINHVojM+Z1vq4o/LTB3
+8oyWuv7c7F5ivaY3S+SSp/hncbcZ76MtSAUpHe5EJ+iKBW9b9yirU1Wn73q4yMsw
+ZwNX+vAM0z/xhQOwXcvgNXiW01+b+bSDmSOczMkbK72jfJN6TVinZKcpJyBp9Lnk
+otdx6Ly8DhwiHrBI8R/0+mL0m3vyaopYJayLR+jXg5d89Mus0yOUNrnLgJGVrhn7
+8V2HD3QdnCWYO+nsXgj6+toPBf3IKw4/0AI7u90cLEGuNomnQcKpzqkpmYZdqZQ2
+WolTnvbJumTwVw1Yjb6akI/M/qYgAaAw+RtFqrecp/hncumY1Ri92A9DzWh9vrT0
+CUinco7MUsFFj0XkJwqP91RL643dw0FXuOGt+ftCL4+COZuE+xAqOR8M7O5OoVXU
+yRDSyU56higgEwuVnEXW5bmM/Li9/UVEWGF6eyUGTmec7ZrtgqHauNk9mw71G0c+
+W1CfOXSVTsJAb9QzCllAiuoqHaDKnp4WmOLJxPZYIqKa8PaIrJZBAkYf1Wd/633k
+MOiq/uPUS2zQQPTrz6cHnA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
index 3b3a2a794..16b9cd1f6 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
index a8b4ff4d9..bc375428c 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
index 63ca00468..f1055519b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
index d7592fc07..e3e5c2229 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
index 170190efa..090a4dfa3 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
index 51ba5582f..3fb9262bf 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
index 95ce1a7ff..c75929e2d 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
index 523c369db..f7ba29276 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
index 8fa0c98ca..3407ec72d 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
index 8fb99762a..90ae93303 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
index 66ef77e21..a7b63caf4 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
index d07da34e5..43393714c 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 01 11 9A C0 58 86 76 AD 43 C8 AD 6E B7 D8 88 6A 00 8D 27 AB
+ localKeyID: 8A 4F 4E D3 55 83 6F 81 A0 9B 27 0A AE 6A 70 F0 5F E6 7F 54
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTVaFw0xMjEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwzxfp2vYw5w96
-4Eq57WBMZdmZZ4B27eqMV2gGS7fINlWoUqR6JsClfrBJ5A60LjsvPF2ccr9uyG6r
-mLlarc0kXBREXRpZdmcxX04MS7lu/1TnGem170ZzldtTXV/Z7UHukvDID+tYV2X2
-aTQblO2JbE1+9F2tXILc9TSX9fbBNQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
-A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-ABHsEhKoJeK909uBPQLCZVVVGiHybCGkoXbf3iLR8lQsEHrHi1B2Jh4b8UbHH/Co
-PmDmpRpbpQOjawMDQIRZxr5NJlBFSDHC9XN1LfIarevXrqmHz4YnuelWxR3dZ+mx
-joeBCLnshd8U80WmsVesPlNWnG8XCRdZ0QylvBpd1Ufp
+MDExMjQxMTdaFw0xMjEyMDExMjQxMTdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoPjPeMGY
+s/5oiazaIe1/UtAeJVPKJXL71t+5CK5FjN1umswps6lxmEaNV99cKTxvLvcmbibn
+iD+DS01LsM7VEv0WLOMKNs42a6IS21ux7JklBVlYTr7oNi6k/gnOLQRkhkhii9MS
++fVipfa0hLbXbV9HchqufjN6yCMyX8xwBMb01024TcHV/ibJJAXoT0qCzp+1MCWY
+uCZfgLVchb4y4tp3vLWu17nbwSMQ/55V+V2itlWqvR9bsgMj6zoS+wK4GnxZ7pMr
+oqQmVW3TmMNDFjbjPdkXhKxbUGETb/Xu256XLR9a4cm8JN7Yqmm8mn+WLUjjh8J1
+56fdsWwN6YqW2wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4
+cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQDs0tvqjmxMihXU
+4Kf86vo1mXpR+tlk2lMUcnE0OwxA0kVoVVZPruO1Y29TFfIl2uxncaY2XgR2Q9BH
+LGMeSsQdIMgLBA0AVJQ4MzNgdwPqLLbnNVCXG6lrFTWLuS6j0Zu4uX9V9TDb4FnW
+IDgbHCtDMGX3t47DoXV8YsPfw6aTOncjoVYVeE2NVvLAvaLqwpiuYkymWO2hwX0M
+UY+Anfn3WSDO6+NMHLnPLU41T8S06Nu/PjH13JOErEhd/rWfcd5xikLcgNN3yZs6
+IG391dQz0zTmoG5HfdvzobGc58HAx+YZ3jNyTZ0hsHxJyvTHOD3oa34KDRcMbuU2
+9NoOjUvc
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
index 7f468ecfa..f23894674 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
deleted file mode 100644
index af75b1c8d..000000000
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/secmod.db
deleted file mode 100644
index a9f8a4539..000000000
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
index 3beef64e5..c5b00da24 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
-ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
-RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
-et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
-ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
-BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
-nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS7
+IuEH6cCgw+wmNZq7FY1PCuCLtRYzQTKg/q83JdIBKN4DcrfnQ9VzIGIK6zYq9845
+ks//RXv8EjQyXVhw2yNOqDiVgqzKu8MTtwQC13GIxUsuDf/epDFhDssh9yeC9u+k
+DrvoCgoRIODqlJyM2/UL4qBF2TcpoLF6JmGuoFlR2Lmy6ClnCCG+I1+BB9bBTb1l
+6W3npIrOtqe599VZlI+Uiih1thA6BcMuIO9Yrqn9yLj0nz6Yt/aBGXFc6pin1TM3
+TvkUIainW0ZQFKShxz1ZeLjp5/ZReVoBS65jWvqMJwEE0hEfFMKwmi6HO9Gc5wYu
+rVFIhvNZCYrP4nr0On8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAwIqtvjNK00tI4/OOv8T/+v
+f/s7ZFHW8cT/1WD2sg21fh5r1sA82EqPIbQ7IZlub6FwtsC1MX/MjcAwttCIzKJR
+xB5BHvoEC/taYsEuWR0W1xb/DE4uDAX6X5dk5ckE1lUBqs9LNbR8Q4UDMGMdyyfz
+ElT8scQ9QTGtil4mTI44JPjJvhqV2w5Dd4aOP7W4j6T0apKYC+fj1HYEvwVaPBPo
+txQ+IGfxcLvnYoKe8wDhlY0cnk3orsxG+umx2CESMz5OLg3Qm4WG7U6+tpi0jkOA
+FFYyxoxIW3dMOb/p/mMyr6Z4gNNqQG1F91DhWnEWHzTd98Sm9zEbeZGdkqN7ZyY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
deleted file mode 100644
index fe554f736..000000000
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
index 0232c2a20..77819b6dd 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 1F D1 DE 25 84 FE BC C7 63 D6 EB 9E 69 1A 15 06 C8 4E 6E 41
+ localKeyID: 42 D3 9F 5F FD D6 1A 5E 45 FF 77 93 1D 17 6B C6 A7 49 57 9D
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE3WhcNMTIxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA78bAlofh/mTJ
-krU0npKSLZvgKcA0f55xIT9h1NEkf399IT0PoFAYGBjar7PraKot4mMvw8E4gcer
-yx1F+SCFu7l7me1ErpmqsEMcD4fKwvzm2Uc98I0XGOIFgq0BP2fIH6cNrdESEE9v
-4E1otkCn+/g/kxiqYw3DH0LeZizyiacCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
-BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQBhduzCnRpc61IE5jaIAsC0xYS35fjk+g+Ef6kgcRNUKnSIwJhlzbP9PSRmB1bm
-MJMO9Stbm8Bh+AU9YoZX9tUCqr4Vlj3LLKVbz3l4EP1In2wAhqUavY+owo0XW7P2
-7Xa+CZyFHuuftiaeSDzI57Up/Ue1p8AB9wbSlqaxGVhuGQ==
+MTAxMTI0MTMxWhcNMTIxMjAxMTI0MTMxWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/e+I+f
+FtycWiSx1SgvyUlqtLk8hyw28Lf7VOcEz31PSVM/VMe8kcODn9EdmO5W5g5n9Cuh
+A1uPbtPdRnwkZ2XqPyJvXhUu5bfYYMF/H+Ui64hvDZ2fWR5Sx35q1FH5amUfzQkx
+9QUPPgU5yNLSpabxFuelJpL6zq8zMYm5ywXZ0gXk88B9ZpHCZJi1oMax5j8t9qOj
+bz9+HUSEd1mYgS+hEVSCFuMk/d1sadAlxdSXaWvGYltas2jGsyxMSasIerwIJkIM
+ySpDRCBOrJvJ6QsvwpXNS3KPt07Ly8MwrBSaxYii/NVPZBUdWMgmmxt3bSSbWf4i
+JGpGaqNE755YEj0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRl
+eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAlHp99YUJwSN3
+TuRa/qcZjKtmDvbbt1uBKS2zUVup23d9efzNtBX4JuKid6iVJSpQCzIAK4pgfmaG
+P0tWmw/nx4hy/KyMZCCKcRDvkWWVUENtcra2jSRXFTfpsSJQM1HiH0JibS4Nydre
+7NwIwEVN89lWqGASFlmc8LTmm400oRqHTJEn4Q835exqkj9rzoMfh5uqgf/Uo12r
+Rk2fwG6d1S7Y+cVczPGXcSXwfUoC5oABnfV04uvDJCp2QZrnD5na4/6Py0ASj/HO
+yGTRYLv5Gr1sdYTzSMvay9/l/fwdvxAmdcZzwsmORdkJ7Zfoqeeg79HeNuWIxrZR
+bFClzZrCXg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
index 2ae8e3a2c..cda33505a 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 1F D1 DE 25 84 FE BC C7 63 D6 EB 9E 69 1A 15 06 C8 4E 6E 41
+ localKeyID: 42 D3 9F 5F FD D6 1A 5E 45 FF 77 93 1D 17 6B C6 A7 49 57 9D
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIQcqIYMGCluoCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFYA3JEf+IWpBIICgEwno96LeVBk
-C7Bf33v0eoWENsPV6Yqbon9fAivIC68RcKSmzB379CWsu0VTPLBGlHRylqhVceEc
-P/PKybLQ34NqPtHmQnmTolz7dSy8IKPmVp6XgiPpE4xHV2lggebxG3vwa5l6zZwu
-KOhX4UPZcYNfXZUAGWbDKH8Pauc6o1H3XIFVly2BkBpEq/G+wo0UIhh2xnZB+9nY
-yFLKbwd0y5+2ty/mjGPanrvIUTKLoGHFDHYTNDKjHuwqVbY4s2Jpf+cwniozRIL4
-BLK5SL0lz8dA8RMb5RjJBN1KFR35TIqtRsyT05AzeWAQRgqDK9p9KnZfaubj90Ao
-Eq/MygUzRcIiS5ppHf3MX+mgljynFP2wOUt05/oaHfzJ1PC2fs7q/G7K0VJ/dRkT
-qWZpJ4yqJKeW0O6R9+5AeytsKphMbasXobzk7yTVjk9IK2c96cNQxNhE9IsXKWc3
-x7/Y1wLPtO8kjuBy6VfrgTerT2+Haht33UBjEyHS/zvVZwigdRBXOfcwyFRLh7iH
-6WKSDGu63z0QVnk38hZcV7dyvfdYenD6lVvTZltPDGIy2Jxj7kLJnJMsjq9N6oJc
-ZZOEtYvgE2nEaWVnpLjG1k+jkGtFRqwW7U1RRJ/VPKeHrQoPNDkR3DBcnclPqC0A
-72bXtbrwuNHz5d0mLnaP1ucvgqWrQaoLYV/2rSZWo0JWOX0zBYFhgJATY1PrpQfX
-HFEElSpgvAwWUjDFS27Xo6+/TNvAlyMcIj1X2Oc1WwyOrtfzVl9iL+3f5wjV3yrt
-4R3eHibmNkSnMwSe/Sq67YBVCXkSoKcXoGRTstKdkfYO8Hx7h3YLIyq4gLJQQom8
-C6jFeuOWcGc=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIjLg5MpcU6qoCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAZYAXEHM2l+BIIEyHn+wubn8m13
+LVsuTTJWIErS8fD8wBruKo+rvR5+X5u+slODcNBdKuwWOvEPSyUCpfMcsQ1lqyOv
+hbBUXnp5yl/Ft3YUOrv2gxyQPILZrNotAgrViG6+uqVxsbTJhZAKLUrkr6C3ex8V
+km0jT8WY31itR5dGfeqGZUf8EAtvbVxXbEk/8dB7lF1iYN8LuY6W/VsNce0HyYbm
+ckVCECas79B+hpa0lRWRUpWjdsDrQHx/9+GIrC8niThxf0u8GV+tYhL7BPUDx1KN
+Eht/Mp4yR1TyRnDI/V3B0tJCNv4NkoPVc7u1R5m45OHxvzKYYwnG6DgwDAamwPUW
+c7Skn9ryEpitIsUt8C4or0b1YhacE0fvUjqmv3vQtgGnro4qh9jiqR0jK+faPkvj
+Beg9n0mGgi/AkepQn5HcrAyamrppB4JYYBq9cgoT8MDeAky9AF7eZXLS7ICMurNm
+AenfSVnauZKb6pfy+JT8KOqCojmj00VCXz4ggh0/CDnh/NalOhvdfEF4bfDCqrgd
+eQNyMxvB0Ze1JFrI4/fkggSsA/f7PCTQ+syaaezxvqsD0OGXeXMBttOYTT9y+yp9
+cGXM3Szi1uRmu6A7slOxVijnhp1cle1pf40xys3OYuMTpmAVDqNnIaBCTZ/sSLPL
+FnNOhb71J/q1XduuOp/FNHBmjmEYS8MEsOPK+7YSVlrMlqV6PNa/PCab14ZeVFsi
+TGQIzQGaF7IASompty74E17Sq233zSXR6zm6Yk4Cs6XA5NiI1Bvij9KRwkR0W9S4
+AasZHS963KKmFYNrugzrc3TrEfH0CDVCn4GBv9vL2bQC0t34C1hr8OSro3s+OLkm
+d3Lr8TNbPrI03xvnuUKJU3c3mtlv7X1xTM/mseJU54ZTOW81ccxPgQpdxrLaH+8o
+VaTZnX2PST++ui99qEh0xjcYWALiq44dCon/D9POuc9UzAgHPYtMFT30MmbHQoec
+7PPojl0ixRL8Zxyakj1HQYuqv7G5ZShHlpypaqeUjpsOYVnFyGDvzv5EVPosLOBG
+IeDd2O11JnKmEBO83mCiFmPtSKhg3yMo4BrFsfBA6e6y6+vJtskogI/N/1s/Ex9f
+JGVYL3qvnHaDcABQrV/bmXpx5BDUjV2Pm4vVA53dt4J6dz0EN92XFUzfw7MbKL8X
+dy0hXpGRHu7p6sBvmXw2im/jqJenr7mGY3W0HAAIWtDDCDRUhj+wjRibaUBbnT3g
+7Jm5HMY6jHZ0vKvyMgaeczdmzjm0JPTHQH4tYa1v912qrPoc9WzH3zmOBywC/j+D
+zlqea5s5n5BYYWgq/w8TBEqsdKZVRMP5hQXYkA06RbMhsCcvbCS8xRu2e2196ejq
+wDwaoGtis5+7faISj1EOeNozGkPSNnaUVl/j0630D07NimcHmAR5eP4J2Z7zcy0B
+VlBQJs8kD7FqO5+yyx2+6o5KcX7Mp0CNuO7KN+iXsUM7qUeeuVNEEuEjmdqb/iLO
+tpwkXjP+HluiOZAcsGJLUaKJ7zvEFnJPI7H12VVrv2dZLtCknI2jfHfNtdxfB7h5
+htiZtyYeMW1u3R6F9fygIurs2vmXnJCdJ12o9anCZQJFg2tKby0dqYVvA9wufd4T
+qDy8ppnMt0X0w5JrakMwFA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
index 896a20bc4..3e9937056 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
index f4c8b4ddf..447adcd96 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
index a8739820e..5973b1e19 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
index f4c8b4ddf..447adcd96 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
index 01ce2baa8..8112a7771 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
index a16d36ab8..d47f73e08 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
index a16d36ab8..d47f73e08 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
index bd6a2cb58..c23489521 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
index bf54667ae..b54e09081 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
index bf54667ae..b54e09081 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
index 18ccf5c0a..b09b06fad 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
index 5e8873497..1c9560df9 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 1F D1 DE 25 84 FE BC C7 63 D6 EB 9E 69 1A 15 06 C8 4E 6E 41
+ localKeyID: 42 D3 9F 5F FD D6 1A 5E 45 FF 77 93 1D 17 6B C6 A7 49 57 9D
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE3WhcNMTIxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA78bAlofh/mTJ
-krU0npKSLZvgKcA0f55xIT9h1NEkf399IT0PoFAYGBjar7PraKot4mMvw8E4gcer
-yx1F+SCFu7l7me1ErpmqsEMcD4fKwvzm2Uc98I0XGOIFgq0BP2fIH6cNrdESEE9v
-4E1otkCn+/g/kxiqYw3DH0LeZizyiacCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
-BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQBhduzCnRpc61IE5jaIAsC0xYS35fjk+g+Ef6kgcRNUKnSIwJhlzbP9PSRmB1bm
-MJMO9Stbm8Bh+AU9YoZX9tUCqr4Vlj3LLKVbz3l4EP1In2wAhqUavY+owo0XW7P2
-7Xa+CZyFHuuftiaeSDzI57Up/Ue1p8AB9wbSlqaxGVhuGQ==
+MTAxMTI0MTMxWhcNMTIxMjAxMTI0MTMxWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/e+I+f
+FtycWiSx1SgvyUlqtLk8hyw28Lf7VOcEz31PSVM/VMe8kcODn9EdmO5W5g5n9Cuh
+A1uPbtPdRnwkZ2XqPyJvXhUu5bfYYMF/H+Ui64hvDZ2fWR5Sx35q1FH5amUfzQkx
+9QUPPgU5yNLSpabxFuelJpL6zq8zMYm5ywXZ0gXk88B9ZpHCZJi1oMax5j8t9qOj
+bz9+HUSEd1mYgS+hEVSCFuMk/d1sadAlxdSXaWvGYltas2jGsyxMSasIerwIJkIM
+ySpDRCBOrJvJ6QsvwpXNS3KPt07Ly8MwrBSaxYii/NVPZBUdWMgmmxt3bSSbWf4i
+JGpGaqNE755YEj0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRl
+eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAlHp99YUJwSN3
+TuRa/qcZjKtmDvbbt1uBKS2zUVup23d9efzNtBX4JuKid6iVJSpQCzIAK4pgfmaG
+P0tWmw/nx4hy/KyMZCCKcRDvkWWVUENtcra2jSRXFTfpsSJQM1HiH0JibS4Nydre
+7NwIwEVN89lWqGASFlmc8LTmm400oRqHTJEn4Q835exqkj9rzoMfh5uqgf/Uo12r
+Rk2fwG6d1S7Y+cVczPGXcSXwfUoC5oABnfV04uvDJCp2QZrnD5na4/6Py0ASj/HO
+yGTRYLv5Gr1sdYTzSMvay9/l/fwdvxAmdcZzwsmORdkJ7Zfoqeeg79HeNuWIxrZR
+bFClzZrCXg==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
index 1615e324e..57247084f 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
deleted file mode 100644
index e9abaca46..000000000
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.db
deleted file mode 100644
index 1cfbdb2d0..000000000
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
index 3beef64e5..c5b00da24 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
-ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
-RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
-et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
-ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
-BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
-nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS7
+IuEH6cCgw+wmNZq7FY1PCuCLtRYzQTKg/q83JdIBKN4DcrfnQ9VzIGIK6zYq9845
+ks//RXv8EjQyXVhw2yNOqDiVgqzKu8MTtwQC13GIxUsuDf/epDFhDssh9yeC9u+k
+DrvoCgoRIODqlJyM2/UL4qBF2TcpoLF6JmGuoFlR2Lmy6ClnCCG+I1+BB9bBTb1l
+6W3npIrOtqe599VZlI+Uiih1thA6BcMuIO9Yrqn9yLj0nz6Yt/aBGXFc6pin1TM3
+TvkUIainW0ZQFKShxz1ZeLjp5/ZReVoBS65jWvqMJwEE0hEfFMKwmi6HO9Gc5wYu
+rVFIhvNZCYrP4nr0On8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAwIqtvjNK00tI4/OOv8T/+v
+f/s7ZFHW8cT/1WD2sg21fh5r1sA82EqPIbQ7IZlub6FwtsC1MX/MjcAwttCIzKJR
+xB5BHvoEC/taYsEuWR0W1xb/DE4uDAX6X5dk5ckE1lUBqs9LNbR8Q4UDMGMdyyfz
+ElT8scQ9QTGtil4mTI44JPjJvhqV2w5Dd4aOP7W4j6T0apKYC+fj1HYEvwVaPBPo
+txQ+IGfxcLvnYoKe8wDhlY0cnk3orsxG+umx2CESMz5OLg3Qm4WG7U6+tpi0jkOA
+FFYyxoxIW3dMOb/p/mMyr6Z4gNNqQG1F91DhWnEWHzTd98Sm9zEbeZGdkqN7ZyY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
deleted file mode 100644
index 032179c75..000000000
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
deleted file mode 100644
index b9ef70b86..000000000
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
index b3220e2aa..f0d5f02f2 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 39 28 04 F7 9B 40 F5 6F 6D F7 72 3D 22 52 17 63 86 D7 09 5B
+ localKeyID: 0E E7 EE 1E 59 29 64 97 EC E6 FC D4 5B 23 7A 8F C5 CA 4A 63
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTVaFw0zNzEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDC/MjDGXrdS86L
-zBBqkdktHEvcc8c62zjdFIbpr45sltqx3o2GstMnTHCkRs48qBj+V1/vYXYoDT2T
-qJhFDbIR0AoHcin1BTqGl62xrKN/31C8K7e0EnbGZytVvguhLBhv7Pymvn9YKUaC
-zo5yoWj+jxr6PjP5mh1pTWZMulUm/QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
-A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-ADFL2kIImEaICoOAOxTsP/pQViyEDQNomaGnfRtqM9QREFIqzjIr15H+ZC6e0MQx
-blu6sp/IdDvbNBLpLzAdLuaukVwvR16uYw3Tb/5C5UbjGv4rTgEQghcoDRQxL6Yy
-ze9qOw8hT28ENT7OzHGXoR5LFdpIelZyrHIZxf7e3Ir1
+MDExMjQxMTJaFw0zNzEyMDExMjQxMTJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtPqSirLu
+tXEB9YO/EZsDQvDqeAVQhfQH4Ky9bWGOlndu0fEO5Omg/YIuWzBnD8/i5TiYw6wx
+S5k9xbRx4adP5Q1FH9xkOlLf+HZ116mcXsrUBtQYMDwp5wgr6emnXCU/f4mwua0T
+NhdaZsKXhQ0bIdQ9uOMAzhK5nq+FMmrfsDjuujJfuAJ9MgUnIErVETtKRDhstcs3
+hiUyQv4RXI2uXngc3SiaP16EjVDlEuklP7guCY3rZnEfC+aeiYcnKhUAOFI4LjGq
+TpyHB0LIKNk1dfjgvL9ur69JAr4NZJtOAoPrsPgzHdquFhLDscyKX4RH8QRf9rBR
+XZLcBPTVrJRYHwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJl
+dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQB3pqryqTXKjjjN
++/DHZXcfWRkNU1PbM710I8SJUzAhe7p2GKERwBLzc2No6OeSo0a6gz6rYEkhBvov
+4sWv6N1luJMCKweSQG1VD3kjK10l+j7uroUt469h1lT4Mvjb7mCbI9ebpQOOYJVx
+Qsw6YM1H3GZmsEb/HEqZwt7WBmcW+jiomiJsUSXngKe+dcXbd0IjBxw79JU/shRa
+O1edLG8AhvqNKvhvgSjANMw1uYK4aaVIu9+e7VV+/J+sZqeF5Xqre4Kk/uz2rqzl
+djgDQD3ik4alDZ1aKXXfvbjSY0KL96gtpDmygjO0AeC9nvl9vcrFnz2rIMrIzFtr
+qxJsx4KO
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
index a0ac068bf..91d72e98b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 39 28 04 F7 9B 40 F5 6F 6D F7 72 3D 22 52 17 63 86 D7 09 5B
+ localKeyID: 0E E7 EE 1E 59 29 64 97 EC E6 FC D4 5B 23 7A 8F C5 CA 4A 63
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhx9aJ+TiNIQCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPE14MZqoXYGBIICgKA1y27TAjxn
-OoKp8K2NHxEeHNjJR7q7L9PshVgBVI0puDA9n8893xsQ/ESTRarEoAlWjhucQ8+x
-fpAXiWh1AxDEYVlW2q0IKxXbe0u241i7QyCDBvYQuLJBTWv7OLsR7JqlzLwanvpC
-YKlNjMg+0IAglwyNeanAC3GyHbR01P6GK6bXKchDgsm2O5iTxEFYTZrXY2SYXXJ0
-FA/5hAh9BraeDPFslwdb8vjGjtBnKTHknXb0RFw6uHoc18++iplqqKN71NIGoTVA
-/1IuaZLB8mEYYdJMUpYGFYDxi0kHT9o4kYJQWJs+pjnOIuorf/XTT5l9InrGTBjS
-atIZAAhX6BG7xPijUpfxhu2Xjsfl28hssU7nE+50DaEkrUy5O/3VyiwlZvjqQ4Y7
-e+xIFTUoGJw9Noyl8fVaJFwXXGXhJ84/qAA8gKsekerVsVf5jpzN12G+Db0cH+L8
-NBS5SLioWLNyQslYc+DDB6k4G3u0XVOT0iLX8rLsKljqkpNaq/0dn/H7PYLcqt5X
-qAgGvblE5RqDpMtMN1o8G8CS9r2HIXGMfuD2NcbfuFpRlM6QygSVIH7OBMelHAhV
-Cvl5NXrRU+8pPqek1gqiAjpoRdGXgav7hLYe018jUdNpr0vJKM0jBXqQ8MERV701
-avOLD7qTuy8mrsIDcBdJE9Mtl7ZaquDlLNFAeFF9VIhmYz/afN5iKvxDAiRm6DFL
-Z1hGYUqLOhU8wxiHsGK3rp9f34Xz1S1Jb8vss2r31z/inIX1OUvzJGpFJc5hUU7k
-xFjI+4Z+jUkalpSBmzQ6EY5HR2dkEwP0Sicbnmnd2Pex8wVL/D83D/FlZ5OMYRu4
-O9HWMXlkYXk=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIYGVWLt/VpXYCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECImfVSLhCy3OBIIEyOuFKsz9blsW
+rVfm3j5ejkgGx9ehzZyNGRAW2O+9H/+oqnleJ0+4CWFf6pEzb8/18BGLWQR5xzOb
+QeYIyWqNVXWrDV+LTUw89HxMRpNmO8sLln73le1HGFzp2KJwAAJ48gf4G0YhcMJE
+61rRrmMvBsHNdUFERyUbdXTDV/Ak6C8KDTYLFWJ3emzfof3ZyqtJKxNO+hV7i9wS
+NtMIFu0+UQ+vM73Wjxzbcl0eQpEv1nvr/a0DCBJxIUs2HiWOIujGPEkg+RaZBBwH
+4J1kde6Q8jTxvXfYnQvG9KA6IweL494KXmNqWKuAr8g2VLGE+mO5TyJ5CjuoPLxJ
+NbpJbnaOm3hDdycrPDR3UlUePYFn/8klE5s5R5zuks7M9ZB/zEJ4EtjTxbCd1cGB
+aVIK4pvo/mG/H615KVveqGwdqOgF8ZaC/wh6+ywr6dpYJ4kNuqqhiMlMRS2qz4U0
+lsBBEiXGEcn1MHCSOIgS+XFNtxvCrjztoQb/IppFyEE5ij9OW+qXJLKXAqFa+zsp
+UzEH1L0G4Kn0qNCBc6PJVsVivkH4m3Qi/wDJ6adeffWcOXO51pjW77iPbaNWRD5x
+M1tlpg8rmzeDZBW2wE1tjoFsWd5wP0pivnl8FV56mXajJ0oP66H7yEqr2cN3MtQo
+VbUYQL+coSsWTkvTsLt7IYcbkghqpQb9WQ5baFywjEAKpuQ4ZbpA1UHpeX6kWqWM
+Ta0V5Xr4fcarfKYJwNNrXoKKHnos/xd9u6/qpjnyGd0hyfgt8hbSmwRFBrI0gWiM
+mVOjsLEDwY4GvZfCO5BEXo676Lx+DLXJ7Fw6+RGEMmtsIlTRV2pbAR2abztUZotR
++citzi80JOYgSOPB3pt9P2ShdN3uSlIPIcZMvCryeIQ/ToFqSLZbnEd+pAoXN42+
+u5TmS3csvhuVD9okNumw6FJyTeWvRNe3m3Gb0y+xI9x8ZFykTB28AJIBFuF08OJb
+c3IByMvFmiCwrRuH7q22oyGjx5h7SpDOFeu8QwJqnPRFJdssanF2OwWHE6sC76fo
+uaQKibDyBsEIqo0HwlhQN6MbeuGr6tQL9dTc3EVbmviHYfk7HNZYp7ZG1EFDDxtk
+KYA56ypGmeHnW3+DbwFJ5R/5LveXQyVWP7A6+r6/+l0DLDEYROlqmPO2b8A5dSSt
+ko7hNuv1DdMKwOMPGZBMY7NGXb8T2AoVW3wPskIBK0OuRxBZenR45JPE8/+Vu/RM
+jVh/AtaesDsYjfBN060WrigHHXQjkGMmg5IcF+9ljTRrE+8MNEt+0K+psaPuNzrh
+2TP6k/LXmLlgocY40HCYIyaB75/OeQYSEGLeniBjcKTgEUVoO2nGxZRFkqh9vS5N
+RHmhxE2UK8OVfOpVGDWrb+yFsjkBtdxFq2Y7H7QpFwlYWCXgC3ZC/LoUocJZfEdE
++5wrJRvhLjii9H8vfhW+TGWlKpflC9t01Sf2uz7M9/rCRsWo5fcKqe0HCKNXmJrz
+nAR+7Foviw+35B9iNSbjyAKMiP3nYSQViy4WtHozamGLK6xNo8u2urcnmPvdfM0u
+MpeB9vONOjrURYSli6m+ezyGYxWqYl+NUvq+H3z7ceVVfJg/pOkigLuK9qBNmqCz
+aJTlEJPYzKnN4YEggP9/2w==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
index 5803ebbab..c196ed156 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
index 15e26b294..7565c86e4 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
index 6bbb37f4c..18723af5d 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
index c0b8ec694..fa6b5bbe9 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
index 8f375b104..fb31e2550 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
index dd70b243c..62bf9ecca 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
index 4d7c6e9ff..c1d78dae0 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
index 0d134545a..65a082ef8 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
index c4f3d01d2..21abb184a 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
index aa98b18ba..158ef1b10 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
index 094e804f0..672dc8004 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
index e2c0eb4a2..d6ac436cb 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 39 28 04 F7 9B 40 F5 6F 6D F7 72 3D 22 52 17 63 86 D7 09 5B
+ localKeyID: 0E E7 EE 1E 59 29 64 97 EC E6 FC D4 5B 23 7A 8F C5 CA 4A 63
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTVaFw0zNzEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDC/MjDGXrdS86L
-zBBqkdktHEvcc8c62zjdFIbpr45sltqx3o2GstMnTHCkRs48qBj+V1/vYXYoDT2T
-qJhFDbIR0AoHcin1BTqGl62xrKN/31C8K7e0EnbGZytVvguhLBhv7Pymvn9YKUaC
-zo5yoWj+jxr6PjP5mh1pTWZMulUm/QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
-A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-ADFL2kIImEaICoOAOxTsP/pQViyEDQNomaGnfRtqM9QREFIqzjIr15H+ZC6e0MQx
-blu6sp/IdDvbNBLpLzAdLuaukVwvR16uYw3Tb/5C5UbjGv4rTgEQghcoDRQxL6Yy
-ze9qOw8hT28ENT7OzHGXoR5LFdpIelZyrHIZxf7e3Ir1
+MDExMjQxMTJaFw0zNzEyMDExMjQxMTJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtPqSirLu
+tXEB9YO/EZsDQvDqeAVQhfQH4Ky9bWGOlndu0fEO5Omg/YIuWzBnD8/i5TiYw6wx
+S5k9xbRx4adP5Q1FH9xkOlLf+HZ116mcXsrUBtQYMDwp5wgr6emnXCU/f4mwua0T
+NhdaZsKXhQ0bIdQ9uOMAzhK5nq+FMmrfsDjuujJfuAJ9MgUnIErVETtKRDhstcs3
+hiUyQv4RXI2uXngc3SiaP16EjVDlEuklP7guCY3rZnEfC+aeiYcnKhUAOFI4LjGq
+TpyHB0LIKNk1dfjgvL9ur69JAr4NZJtOAoPrsPgzHdquFhLDscyKX4RH8QRf9rBR
+XZLcBPTVrJRYHwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJl
+dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQB3pqryqTXKjjjN
++/DHZXcfWRkNU1PbM710I8SJUzAhe7p2GKERwBLzc2No6OeSo0a6gz6rYEkhBvov
+4sWv6N1luJMCKweSQG1VD3kjK10l+j7uroUt469h1lT4Mvjb7mCbI9ebpQOOYJVx
+Qsw6YM1H3GZmsEb/HEqZwt7WBmcW+jiomiJsUSXngKe+dcXbd0IjBxw79JU/shRa
+O1edLG8AhvqNKvhvgSjANMw1uYK4aaVIu9+e7VV+/J+sZqeF5Xqre4Kk/uz2rqzl
+djgDQD3ik4alDZ1aKXXfvbjSY0KL96gtpDmygjO0AeC9nvl9vcrFnz2rIMrIzFtr
+qxJsx4KO
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
index 3ea7070ff..069e5c7dc 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/secmod.db
deleted file mode 100644
index 2b46ffb24..000000000
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
index 3beef64e5..c5b00da24 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
-ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
-RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
-et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
-ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
-BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
-nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS7
+IuEH6cCgw+wmNZq7FY1PCuCLtRYzQTKg/q83JdIBKN4DcrfnQ9VzIGIK6zYq9845
+ks//RXv8EjQyXVhw2yNOqDiVgqzKu8MTtwQC13GIxUsuDf/epDFhDssh9yeC9u+k
+DrvoCgoRIODqlJyM2/UL4qBF2TcpoLF6JmGuoFlR2Lmy6ClnCCG+I1+BB9bBTb1l
+6W3npIrOtqe599VZlI+Uiih1thA6BcMuIO9Yrqn9yLj0nz6Yt/aBGXFc6pin1TM3
+TvkUIainW0ZQFKShxz1ZeLjp5/ZReVoBS65jWvqMJwEE0hEfFMKwmi6HO9Gc5wYu
+rVFIhvNZCYrP4nr0On8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAwIqtvjNK00tI4/OOv8T/+v
+f/s7ZFHW8cT/1WD2sg21fh5r1sA82EqPIbQ7IZlub6FwtsC1MX/MjcAwttCIzKJR
+xB5BHvoEC/taYsEuWR0W1xb/DE4uDAX6X5dk5ckE1lUBqs9LNbR8Q4UDMGMdyyfz
+ElT8scQ9QTGtil4mTI44JPjJvhqV2w5Dd4aOP7W4j6T0apKYC+fj1HYEvwVaPBPo
+txQ+IGfxcLvnYoKe8wDhlY0cnk3orsxG+umx2CESMz5OLg3Qm4WG7U6+tpi0jkOA
+FFYyxoxIW3dMOb/p/mMyr6Z4gNNqQG1F91DhWnEWHzTd98Sm9zEbeZGdkqN7ZyY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
deleted file mode 100644
index 62d64bb63..000000000
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
deleted file mode 100644
index 69d7c9c82..000000000
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
index 9e20dd40d..f2ea6de3f 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 83 13 41 37 13 F9 8B 48 BF 7A 19 2E AF 2C C3 CE 41 AE BF 29
+ localKeyID: 5F 66 9A F5 43 76 CF C5 A4 1B F6 48 F5 A2 02 DA D1 F2 1A 43
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE3WhcNMzcxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv+zvAcvxTw7G
-L/0U4pF2Q9ozF+fT4icIhPfn4nJ26TpNNEPzGaZcBHE1uoYF26eRBKkPuI9jZLKK
-aI4r/stZJHLdPRcar6jo9UOWfkh8cFkL+sZIoDu9B70arwjbYFQ+SpL/MDXGCP7/
-QMU+UM07wiNhYwpI5wk7FGxSWBIiACUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
-BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQCA1RX+/cyPFYaT5X8jBtWpkdUMpJUiZFVWr7RW5iAJm6F6SwHPIA9vkVtaOZfA
-TM89+p8SiAR7cKAdC6NGd6yer5HT/15r4YZY8t9cEB1JmXvmOtof+qjBGTmm9pJJ
-eT1LNAS1PPiBYPh5U+JEC1rgB2TR8GkZ064pnWAtyKCJWw==
+MTAxMTI0MTI2WhcNMzcxMjAxMTI0MTI2WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4IKw9j
+fdtnAMpvGSQ1kir80uY8zhAbf9581GSNBlsQkZRUcQDUkLcDuNnKRXnd/Vzk9fzR
+60VRTCT0RAdZJdPAbgUniQxzuu2j930Cd1tqyRFmu6EyZHlS55+l4SZyODSsrf8i
+tVsI3BQXoQw9e9fOzcXgJEu5TfweBKmKi+v5GrGA0KZ9ktXk7PBQUieK1nNzBwKU
+uNT4DtgRLy4Thbgq6MqsjfmjtAL9Lubbz5kWDzR1jfm8muBkrB88pEa1XK3a5TE3
+uQ0JlNW8PVAvmA7GLOP1FeJ9d5nIDiFJwAI7NPMcxXraC5ZlXXcucYqah+Q4O1Rb
+6whxVy/KfVSc1QsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRy
+ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAPAvtLB/KBjSx
+Oo7wkcSOt2CWolSBOU8HasaM122q+q0d8xgT7rCzSXCRWlcnpuL2d10P2GGWgquw
+B7Ma4i13MOrdcElpwIz6Zsm14CymhCRf9E1IFxZg0bYSGswQPc/tFfKwf5TIM3Dz
+4u+9vKCD+r562A9AUw7JOTxcR6vcAWtIL+BDGaeZE9Gh5l9DwZ5glM7FUNAXAVt+
+2pitjRsCfv2emKCW5wEfSLB6gEZbrw1es5CoXj+oQn6AOmfoHgQMRZmootqRqy1i
+574dNw6v/8F5s6LNhms5jt78JYzugvAqR0jxjH/3ibGXXSq4Wx3N2gEmrjCVc09A
+O/hty7z31A==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
index 961ac327b..2de47e562 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 83 13 41 37 13 F9 8B 48 BF 7A 19 2E AF 2C C3 CE 41 AE BF 29
+ localKeyID: 5F 66 9A F5 43 76 CF C5 A4 1B F6 48 F5 A2 02 DA D1 F2 1A 43
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhxAelQVibiQCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECN5FtKyn7wy2BIICgBPO92WTZxGt
-qAKlvORgY01WBoGNYwx5Ug/7uBwbzgHILdEGz3ZYfVffFmk+zZKlvDn2iKLtMCpb
-CE24ir9hKr+2EtXw1HDG0Zg5Ucb5xAZNMKBGh0oV8ay/g48gDTgFaSVsi40FxrlT
-S1Hzgj/ERDClFIzdMofUpkTveOzdJrp5zGHrHjBgPyF4dD+HAfvei3SODw6n0wiE
-QtCiMTofoc6M1HZEkgbUuK5iqKAYcYP9BiST1F5y5Hxae554jXOdZVrn2MyLvhvW
-h6eXYPBHbJY7SLlm8g68A6dr7Esau4lX6Ui5IVqC0RSdLnlHFT8wcaNOohvqOi5C
-1uS0UjEVujKvJDQ7i6OcU4mEL83PEMaEpgu+SprwpZpl3lXOM5RVf2MN6UQZ6iOU
-2VM0FYfrxNE+W7DVJrIJ2m4r7Ai7bSch+yjEbL1dGHcsO5npU+T8skUoyVnXZPNb
-2mq50Pg2L5bEWMQGOHmsaAwdl79mgpsqIIbG6zjUmAT71kl+TIETyacwil2du/Ur
-fcsvwryNxFOj/ERnaTDS2KyZLf+P8yvmRTVZbklp1Gjr6S518Pz/ipL+NLQyWrNz
-rmk215lccXau46f+5NTumEYSDk1FxbpmZm7wekkf7fh/waJGIwnx/feBz84V+vEt
-Rd63dzRWwpqV57n3hcb7SMO2Z4PnPTjfZwXGe1QZK77LrJzL45yS449l8koRBkoO
-ZsKAFa2I3P93UlXHb9e/287WFJodtMCBcRsYtu+Nr6tuesmCTnZoKI1x4Rl1MZOF
-nwSQZosOZIHbAGIvfz3NUGTp8YDb6/Tqp/XUhNNxiSZgsXIA6Ff8CujVbycesppu
-yyg3Ayoqpko=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIjtaZItJ3IUYCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDfRZdY9WSvIBIIEyGlGGfYWSEeN
+tWPTJwylMfJbb7zPaN6zAWAsza0plVEVqGaBY9tzGoM3dxjlNspX14pX5APUJggr
+lbXYelt4ZuJ4OH6HOfVNGz/gLxV0ldqub2B7B3LoReZAuL+G0TZTqjQl0bLkpCA2
+2s0Z1+jNsbV0uQ+J6B311HgIc4wiXFrFE6cIKYa6ZLBK/Y58BdwLh65V1UJOHtn/
+R1ZI7oEnPaBY0d6upiNDWzSo3x9LEHEt2linZ0zmgDjfNJtGnl/nM06+t+HXujCb
+PoHvvNLvk8SaqH5jcVcxNuSJleAvRcZ37b+m4OOU9Se6zO5NMAKnSJ+9veGVchTJ
+4PrsMS4JIIbRzVngBkIsukoDwzCt7yNapAFg3JZm4c8kA7cyP6DzXutLfa5mDE2T
+qRQaSKCUxUBhftlvblpLHPjMeYqNUsdwBthqtnDMqdjoqtel4YKgEWvEQdA1kRR0
+2AEqzQ5rBpRS9zGw7EEfzUuhd2CbcfnXOdV+/3xWoR3o4Fs6UWqGHJDI/op2RZ4o
+BpmhYZukXbcNDNTyfDb3L8qmEHndtOM037l9dXBzn1Sbu+qraYG5oyoeChdzFfKj
+6KKJdxgMkjViTD9r3CHeClQNbB90RwleEUktxq7v3l/82ZtuZlOmUgx03OmI7uZV
+Ne52CALyRq5lAtugfSGwb175uE8TGbyawjAd6yls/TwzWjBPGH2XcJvFAgSdAFYR
+YfcrXUWFZCDs6ewoiVfBBBbaxvGCEtZMdkH7vSgvEuMsFurnO+Uvoekt0EhWiTi5
+L4LOd8rVbHgTz5TSrhSUFwaP3L4hsYAzezrC+y7N7LEU4MJ9dDAuB66ekXugo+EA
+hy2EYfOMDkyYklcwIaEOdtlpvDzdK2m9BrbmHa8Jyt/I/n8mjuKyo1q9B2fliFmi
+pAvxriiN0N1728VE3/zapD6kzPF1Nh/X85hB+5aDykEfFIWOZwj6zswPbJJxV1h3
+6zMiA8YAH2DzE1jKFraDjbtjfo93xfXpcV6rLdOwDy4Tv1F8AmKFkd3pcP/BCxM3
+o/wWJUCzMDWbLEmRXg7FXHiRqWlRvn0Xohw92uuu2WZO9aDI5dJhu56ZG4YDdjvN
+EoWeAnHTeXeOhojSNbsIlDNc04z68qHKDfhKyMEGQHTADKRzsIWdOZ5+uhZdkF01
+hQBxVNWPJ2m24C8zFS0UqUBCcW/yPZDGfwGG31nQDPK04+6l9ATPbmAL//vjDgVT
+TQHqnoa0ttrh0HzWSHuR6TqabjROxi6pI+f/e4t854GNLCfZx8KAY+Lq7tGX3kDV
+Is9Lt+s1qcKX57IOZsz6/3hhgp6iphb/GcTpqMo0aHq00LGWNf2YqKXI4JlIjSdt
+zjnYV+ygpD3BcJVD5wrCyJkCTK3RhqTIUhWFB7xm3yj0SiVqnjiTg2e6ZOSl4fUy
+hpTLhSxC4kT+0jFdBavO1K1FpleSXkEY+hMELJmk4ebRSqngXHhbC+x6ch4IP2rN
+sCGgoxEOMXQUNxgILzxMPJl6pW3li8NC0c+rerMUgjvrmY9a8CPpdZepgucfji7f
+VZoM1QT3LM8ndmJzOTAkqrXEXKyljzpOct6J1t+BzbuZpYs/tsD1RYggnkZXcNwj
+kRTvsZ1yZd7XTsj172UfxA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
index 96436ec30..44a041eb6 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
index 12cde5746..9ce30ce51 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
index 23c7dde58..2211191ef 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
index 12cde5746..9ce30ce51 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
index 1710c9bb8..043a85ae4 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
index 925cc25da..87ef09202 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
index 925cc25da..87ef09202 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
index 92114ae78..7e90b5988 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
index a93d470b9..4119bb8b5 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
index a93d470b9..4119bb8b5 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
index cc133b88c..6dfc95609 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
index ebf8460cf..69fe4d288 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 83 13 41 37 13 F9 8B 48 BF 7A 19 2E AF 2C C3 CE 41 AE BF 29
+ localKeyID: 5F 66 9A F5 43 76 CF C5 A4 1B F6 48 F5 A2 02 DA D1 F2 1A 43
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE3WhcNMzcxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv+zvAcvxTw7G
-L/0U4pF2Q9ozF+fT4icIhPfn4nJ26TpNNEPzGaZcBHE1uoYF26eRBKkPuI9jZLKK
-aI4r/stZJHLdPRcar6jo9UOWfkh8cFkL+sZIoDu9B70arwjbYFQ+SpL/MDXGCP7/
-QMU+UM07wiNhYwpI5wk7FGxSWBIiACUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
-BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQCA1RX+/cyPFYaT5X8jBtWpkdUMpJUiZFVWr7RW5iAJm6F6SwHPIA9vkVtaOZfA
-TM89+p8SiAR7cKAdC6NGd6yer5HT/15r4YZY8t9cEB1JmXvmOtof+qjBGTmm9pJJ
-eT1LNAS1PPiBYPh5U+JEC1rgB2TR8GkZ064pnWAtyKCJWw==
+MTAxMTI0MTI2WhcNMzcxMjAxMTI0MTI2WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4IKw9j
+fdtnAMpvGSQ1kir80uY8zhAbf9581GSNBlsQkZRUcQDUkLcDuNnKRXnd/Vzk9fzR
+60VRTCT0RAdZJdPAbgUniQxzuu2j930Cd1tqyRFmu6EyZHlS55+l4SZyODSsrf8i
+tVsI3BQXoQw9e9fOzcXgJEu5TfweBKmKi+v5GrGA0KZ9ktXk7PBQUieK1nNzBwKU
+uNT4DtgRLy4Thbgq6MqsjfmjtAL9Lubbz5kWDzR1jfm8muBkrB88pEa1XK3a5TE3
+uQ0JlNW8PVAvmA7GLOP1FeJ9d5nIDiFJwAI7NPMcxXraC5ZlXXcucYqah+Q4O1Rb
+6whxVy/KfVSc1QsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRy
+ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAPAvtLB/KBjSx
+Oo7wkcSOt2CWolSBOU8HasaM122q+q0d8xgT7rCzSXCRWlcnpuL2d10P2GGWgquw
+B7Ma4i13MOrdcElpwIz6Zsm14CymhCRf9E1IFxZg0bYSGswQPc/tFfKwf5TIM3Dz
+4u+9vKCD+r562A9AUw7JOTxcR6vcAWtIL+BDGaeZE9Gh5l9DwZ5glM7FUNAXAVt+
+2pitjRsCfv2emKCW5wEfSLB6gEZbrw1es5CoXj+oQn6AOmfoHgQMRZmootqRqy1i
+574dNw6v/8F5s6LNhms5jt78JYzugvAqR0jxjH/3ibGXXSq4Wx3N2gEmrjCVc09A
+O/hty7z31A==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
index 4dfba30d9..00108db30 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/secmod.db
deleted file mode 100644
index 294739ed6..000000000
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
index 3beef64e5..c5b00da24 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
-ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
-RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
-et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
-ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
-BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
-nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS7
+IuEH6cCgw+wmNZq7FY1PCuCLtRYzQTKg/q83JdIBKN4DcrfnQ9VzIGIK6zYq9845
+ks//RXv8EjQyXVhw2yNOqDiVgqzKu8MTtwQC13GIxUsuDf/epDFhDssh9yeC9u+k
+DrvoCgoRIODqlJyM2/UL4qBF2TcpoLF6JmGuoFlR2Lmy6ClnCCG+I1+BB9bBTb1l
+6W3npIrOtqe599VZlI+Uiih1thA6BcMuIO9Yrqn9yLj0nz6Yt/aBGXFc6pin1TM3
+TvkUIainW0ZQFKShxz1ZeLjp5/ZReVoBS65jWvqMJwEE0hEfFMKwmi6HO9Gc5wYu
+rVFIhvNZCYrP4nr0On8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAwIqtvjNK00tI4/OOv8T/+v
+f/s7ZFHW8cT/1WD2sg21fh5r1sA82EqPIbQ7IZlub6FwtsC1MX/MjcAwttCIzKJR
+xB5BHvoEC/taYsEuWR0W1xb/DE4uDAX6X5dk5ckE1lUBqs9LNbR8Q4UDMGMdyyfz
+ElT8scQ9QTGtil4mTI44JPjJvhqV2w5Dd4aOP7W4j6T0apKYC+fj1HYEvwVaPBPo
+txQ+IGfxcLvnYoKe8wDhlY0cnk3orsxG+umx2CESMz5OLg3Qm4WG7U6+tpi0jkOA
+FFYyxoxIW3dMOb/p/mMyr6Z4gNNqQG1F91DhWnEWHzTd98Sm9zEbeZGdkqN7ZyY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
deleted file mode 100644
index 7c9062aa3..000000000
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
index c041cb9a7..835403766 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
@@ -1,58 +1,73 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 69 72 E2 63 A7 B5 AC 27 40 75 52 26 F2 25 F0 8C F1 5C 91 38
+ localKeyID: CB A7 97 AF B7 78 B7 64 2E 05 39 4B 77 D2 DF 37 41 05 7D C9
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTRaFw0zNzEyMDExMjM0MTRaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANVH7zIGC44d585t
-XcyXnYDjwyhLki3hraCHa6IFcyuuysiUrGISJGwl0/49+msC/9KIvCWg8kjE/oWz
-C/ex/aCAi2YwLZGuT4xszWhTIz5weYmi5oVloyITl9GeNPXoylLPmnhHW7JfmbH6
-OvNcL+y211KO1yCVKxwe3vUzahfbAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
-bXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2Vy
-dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQA1xBe2Q+dkcSIc36qk
-lx23XeGIpH+9XfwuRcwyHniQJwl0JBLGwRjPUgk9n5I7xleNjGEujxVNMKDJtZ9F
-4sQ+CebdmzAxKKHU3vW+x9cIPctk64fqoMt5t0SD0+d1Zw8NmdEyneHTAcvSysXn
-SHwjpa/Qpi2r3xxNrtu+9BN6UQ==
+MDExMjQxMDdaFw0zNzEyMDExMjQxMDdaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkRgF4m4N9
+6E9nSGO7/OcOzyULoG/muKxJmc2CRHXLXlD0wMO5pvj8iPAS1NbRHFGQcHIFDDUJ
+o7xq+2iT8ulOWxsJZR7p+pEUsuz5giTN75gYdPS2hNIwSP7YZAZEdzcjKETSl7rp
+gFX5lM5uCTszbQqNR/LMM6/AYq0Xm+byS+LbBYElV7zwCRuPzu/Eo/yGf1YaL+Ju
+eV8z7MMptIhEPfDPIA3u+xwiixWkGrQrOPLCuMeweo5AcNoKR/RmFMic+8rbcCq1
+5irPBOGu5CarqRDLHTth19o5ahRcDtS/rDcsUqkNpGTszGY7S7XkAXTo18AY3JkD
+dJ+1shxK7dzZAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBnggkq
+LnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5uZXSCIWFs
+dGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAdUuyNLI1p4WN4d/Dt/5Uuhs6V805Gouu
+jUklir5h51ZpK0cIuuLhai/jswGWN+GmM0ie+NEqj2EoxLfqYEuRm/0QdrlWYpLT
+WpIYfY9djM5fOgWyAaF+/8d7MUNLKjbz8MGTQzysBdhNSNEWRRi4ZXzxHt/VW3qz
+1U9pR1p0qsACYdTsbmOJw8CiExE04eEsz/0F4R8Grn8WYAuY1Yi7maXdByzXNTmZ
+WzIekkZw2eRIgvHpHG4yL7jyYyqCQg3+loGMzo4njY2WBv5VMqf58GW4ZZCNNwl8
+LpqswRJ3QzqMYv0OahEimggNi4d7OpYBnC1RBsJo4/7EGfg6EUdKtQ==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
-ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
-RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
-et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
-ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
-BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
-nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS7
+IuEH6cCgw+wmNZq7FY1PCuCLtRYzQTKg/q83JdIBKN4DcrfnQ9VzIGIK6zYq9845
+ks//RXv8EjQyXVhw2yNOqDiVgqzKu8MTtwQC13GIxUsuDf/epDFhDssh9yeC9u+k
+DrvoCgoRIODqlJyM2/UL4qBF2TcpoLF6JmGuoFlR2Lmy6ClnCCG+I1+BB9bBTb1l
+6W3npIrOtqe599VZlI+Uiih1thA6BcMuIO9Yrqn9yLj0nz6Yt/aBGXFc6pin1TM3
+TvkUIainW0ZQFKShxz1ZeLjp5/ZReVoBS65jWvqMJwEE0hEfFMKwmi6HO9Gc5wYu
+rVFIhvNZCYrP4nr0On8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAwIqtvjNK00tI4/OOv8T/+v
+f/s7ZFHW8cT/1WD2sg21fh5r1sA82EqPIbQ7IZlub6FwtsC1MX/MjcAwttCIzKJR
+xB5BHvoEC/taYsEuWR0W1xb/DE4uDAX6X5dk5ckE1lUBqs9LNbR8Q4UDMGMdyyfz
+ElT8scQ9QTGtil4mTI44JPjJvhqV2w5Dd4aOP7W4j6T0apKYC+fj1HYEvwVaPBPo
+txQ+IGfxcLvnYoKe8wDhlY0cnk3orsxG+umx2CESMz5OLg3Qm4WG7U6+tpi0jkOA
+FFYyxoxIW3dMOb/p/mMyr6Z4gNNqQG1F91DhWnEWHzTd98Sm9zEbeZGdkqN7ZyY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
deleted file mode 100644
index 7386326f8..000000000
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/secmod.db
deleted file mode 100644
index 31dd52e12..000000000
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
index 153ae400d..afcc2f247 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
@@ -1,37 +1,47 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 69 72 E2 63 A7 B5 AC 27 40 75 52 26 F2 25 F0 8C F1 5C 91 38
+ localKeyID: CB A7 97 AF B7 78 B7 64 2E 05 39 4B 77 D2 DF 37 41 05 7D C9
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTRaFw0zNzEyMDExMjM0MTRaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANVH7zIGC44d585t
-XcyXnYDjwyhLki3hraCHa6IFcyuuysiUrGISJGwl0/49+msC/9KIvCWg8kjE/oWz
-C/ex/aCAi2YwLZGuT4xszWhTIz5weYmi5oVloyITl9GeNPXoylLPmnhHW7JfmbH6
-OvNcL+y211KO1yCVKxwe3vUzahfbAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
-bXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2Vy
-dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQA1xBe2Q+dkcSIc36qk
-lx23XeGIpH+9XfwuRcwyHniQJwl0JBLGwRjPUgk9n5I7xleNjGEujxVNMKDJtZ9F
-4sQ+CebdmzAxKKHU3vW+x9cIPctk64fqoMt5t0SD0+d1Zw8NmdEyneHTAcvSysXn
-SHwjpa/Qpi2r3xxNrtu+9BN6UQ==
+MDExMjQxMDdaFw0zNzEyMDExMjQxMDdaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkRgF4m4N9
+6E9nSGO7/OcOzyULoG/muKxJmc2CRHXLXlD0wMO5pvj8iPAS1NbRHFGQcHIFDDUJ
+o7xq+2iT8ulOWxsJZR7p+pEUsuz5giTN75gYdPS2hNIwSP7YZAZEdzcjKETSl7rp
+gFX5lM5uCTszbQqNR/LMM6/AYq0Xm+byS+LbBYElV7zwCRuPzu/Eo/yGf1YaL+Ju
+eV8z7MMptIhEPfDPIA3u+xwiixWkGrQrOPLCuMeweo5AcNoKR/RmFMic+8rbcCq1
+5irPBOGu5CarqRDLHTth19o5ahRcDtS/rDcsUqkNpGTszGY7S7XkAXTo18AY3JkD
+dJ+1shxK7dzZAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBnggkq
+LnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5uZXSCIWFs
+dGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAdUuyNLI1p4WN4d/Dt/5Uuhs6V805Gouu
+jUklir5h51ZpK0cIuuLhai/jswGWN+GmM0ie+NEqj2EoxLfqYEuRm/0QdrlWYpLT
+WpIYfY9djM5fOgWyAaF+/8d7MUNLKjbz8MGTQzysBdhNSNEWRRi4ZXzxHt/VW3qz
+1U9pR1p0qsACYdTsbmOJw8CiExE04eEsz/0F4R8Grn8WYAuY1Yi7maXdByzXNTmZ
+WzIekkZw2eRIgvHpHG4yL7jyYyqCQg3+loGMzo4njY2WBv5VMqf58GW4ZZCNNwl8
+LpqswRJ3QzqMYv0OahEimggNi4d7OpYBnC1RBsJo4/7EGfg6EUdKtQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
index b61bd5f75..ed9cdee1e 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 69 72 E2 63 A7 B5 AC 27 40 75 52 26 F2 25 F0 8C F1 5C 91 38
+ localKeyID: CB A7 97 AF B7 78 B7 64 2E 05 39 4B 77 D2 DF 37 41 05 7D C9
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIAbzDXwulWlMCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECN2IMycEH5NFBIICgEUhEFp2nkX8
-1GbVBN3BR1N0DVolwJ7Ae8bjDAHiTfhd33DEwBELm16Hg2fNWkx6aJBREs9mY6qP
-xWoscuDGyBDV9G/yfN8Ekv/JgIyUSmlaE8MOFJmYSJOtcb1gRZkFvj2R8JGqY3EB
-9LOp54k7jtt6gpE92sfUp2iGLTHL4gD+Zmrj0mMZJDKThmrABMj+VDl/0P6rW/mE
-KIZdPP6awKLrR+Rv2mOqcArqbgOj4SInPy6oW5eFMp3V25BeWulrVBZqXs9RuGwx
-1fo6qb5SC/zkjrbGQ6exRzq7JY5Cl377hC6ubtQpLqzXpNPi92HaYYhvpsEWreZP
-frviHIaK8FJ4JSsiCruBOPPWzKyzn5Z+NT3aZGjmtV6Nfey12tNqiLfdptrQm9pH
-W88sRmOxMgnaTYCOcYldM67Lkx5Jopa4poYTh5wvyWrQ4hBvQ2JdT6uwE9Uzkd+W
-0zBfxauoULiuoyQXMeHUZ75E8OG0k0rUOi/gscec7q8VavX8NwNlFVpCytskUfUM
-ajBJ7SdZ+iO040wbVWU6q+d0X0zRgoKDlNcSCPL05wsYUWXthqBl828wCM70V6II
-tF2ghNInveu6vYSuv9+LSvyo/mlACXllScGEo8LYP8fiNrCJVrZ+i3GYKSeYypDZ
-PihMmSIjBaeSKcTgrK93NneV8M1q4pDITJ/IoZz3aeYhwfR87CAfprGakb9uOzLP
-3Rl2qXIvKMG5XyQmeu2rq7EUGzTUbdAG1ABPrgGw1L7rkGWS6Db1L2pMdQrb9YlE
-I2tPgfgKl2ilAGpiWs0DddflJTXJ9tKeqoVPl6NXRt4Eau9cSowA1wR6k/5lb2Xv
-cDLQUQdx8Dk=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIGUwYfag5H2ICAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHe7a7MvZfyxBIIEyJXMM87lm5z9
+GA/4DFdexz0+vOmd148ntjk6Vx/vAHlpRJtBd4dphhOl4FBH6oxdM0O1/RRIHNbP
+almzg73uyUGOiG6GgFFiWeId/tNSHT4DqbTIqFG40X9Zzklx1FwX2MRYvILVO99r
+KnrKLChVNhx3OCjvKvbB886znuNyXQX8LkE966MJGrV+NJ63mSuk83W45u8tjNaP
+BjhNg82IbqcKYorMcSCpH3G/U0rEEZTRq9ECxxMWQP0ou4iyfzwZfF5Or8fL3gIV
+N3G7hfnIxsdLCDNZ0j8dHBQiCUHCRwAMVK3geau3UOaax7LFYIcNjYRvkkR7nLXD
+omFqzspXzkg3k0YTOOots25qGjtiWIKD9UZMdVjdK7Bm3T+JAzLQyfMZCn4uv6YZ
+TnWkuHhR2e05EEafaULvsDRRK9JVn/GZbW4gTT9xVuEnmnuqmq+9wpuObH7ZTfeS
+tLm3EQDQSA97qCJ13ZXqovXnR4/+e86DmEJuY5IkzuajEqiLUV7Kv1BtemeIk5+P
+4R7nNT12HlEvq4qAGGku4huqf8AHlhvlo4KFzJpUMZCqpVwbud0bOQZFFiyJ2S/T
+w9hOs68Wyj8FAiXlREJlCzlFu5sU1IW9V2vXB1f1ERVrNUX+ALFtawL56yqZwSYB
+gQRlV+ywIp9L3pfTk+ndOa6jDTyS9ZLsJTfKfMn/SZC7QnO5eaMUAzkQ2Pmt+Sr1
+L1QY3Tw1Sy/WX+Si+YfSS74SSpf0cZgpWwN4Lxz77Rsg+6qUMpb8m5j6hM4njR8Z
+mxniCAI6iLT8S/VyB2wMMxaA4K3v/hjHfaZtfudEw9w8zMhIPb61u1Z9hx/1Uj4Q
+CRtIQJEcW5OkLMko/J4XZmh/l2z9QaqWMLsBnVGF+NYAreLWgEFxcR7GzJw1Rr2W
+mLs+MbhFQuQ/ef5mjXPOS5wRwzwAVjq+CTAAe8QWy4JVXlF0WnyJHnReM7N3yNmm
+ILpTD5aSglybQUTuWtHYv1rBEYCm0pjAQ6wXBD9IrE82vlPBeBsr67uNkTdlRDyn
+Oxey71mGbWxuQy/xO8yElAN/p4Rz6yrFB5km3IQEiQXGf/mbvv6Ce4LL9mokEtv9
+uLeVOw+reHwrokGEN+pydQUENvL7FAAGoy62PiqLt6DWj28Hd5Cs/H6mB/2UpeWP
+YyInqEuQXjGPJlYQq5ZdU4bGthVDwUWRLay+8i5OkqRv2C5H5U0vGWejPuXW9fa5
+Ryyt1i3O7JpXWDEphQHf07jH2vq6DH8fCo2rvUKKHUXJeVCY76/tXITeSuYi5ABb
+jqjZCEfZ2fahkHuN2EKiKUtFObcAZ6eMCOMVyMxiJbDktMRGdF2GaTkfEaGW1p1a
+F7NYo3HYmz/aiWOP+dfCRI7MvE4M7NeJhhnSPCk559KRDMmLsQAjHFFloEtu6itM
+O2MxrTCidAfjElai9bhYsLkyqh9vjggy1sNT73mmdVr/lWnNZZ2/CktWqtz+wDDR
+13Jgt8r51bz9EXih12aNzg3L5izk5OjEeDH9RlDr1PVjJYO8ziRaSBnmuT443Og5
+HsnnVhhWWocu9t8XPU1CBJjUT/j2/KK2eGYdbU/tQRV4a3bTd53JOMLncOOowHaG
+I5aWJwj7QPCJ/4RZfDCTgQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
index 9a6190ec2..d65a1f160 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
index 3631938fc..bd8176cd4 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
index 0da0bcfa5..0c9360f3d 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
index 6c9b48f38..3fb5a3bcd 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
index c7330841b..35a0a8fd3 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
index 71832d971..dc4d872ff 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
index b9dcb6ea7..0426d38da 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
index 1c6dca31d..59e526b73 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
index 878cd6770..77aa76df2 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
index da33f385e..a52a550ab 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
index 80b0e100e..b71a6983b 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
index 48d293188..b8e41d55f 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
@@ -1,23 +1,28 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 69 72 E2 63 A7 B5 AC 27 40 75 52 26 F2 25 F0 8C F1 5C 91 38
+ localKeyID: CB A7 97 AF B7 78 B7 64 2E 05 39 4B 77 D2 DF 37 41 05 7D C9
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTRaFw0zNzEyMDExMjM0MTRaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANVH7zIGC44d585t
-XcyXnYDjwyhLki3hraCHa6IFcyuuysiUrGISJGwl0/49+msC/9KIvCWg8kjE/oWz
-C/ex/aCAi2YwLZGuT4xszWhTIz5weYmi5oVloyITl9GeNPXoylLPmnhHW7JfmbH6
-OvNcL+y211KO1yCVKxwe3vUzahfbAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
-bXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2Vy
-dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQA1xBe2Q+dkcSIc36qk
-lx23XeGIpH+9XfwuRcwyHniQJwl0JBLGwRjPUgk9n5I7xleNjGEujxVNMKDJtZ9F
-4sQ+CebdmzAxKKHU3vW+x9cIPctk64fqoMt5t0SD0+d1Zw8NmdEyneHTAcvSysXn
-SHwjpa/Qpi2r3xxNrtu+9BN6UQ==
+MDExMjQxMDdaFw0zNzEyMDExMjQxMDdaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkRgF4m4N9
+6E9nSGO7/OcOzyULoG/muKxJmc2CRHXLXlD0wMO5pvj8iPAS1NbRHFGQcHIFDDUJ
+o7xq+2iT8ulOWxsJZR7p+pEUsuz5giTN75gYdPS2hNIwSP7YZAZEdzcjKETSl7rp
+gFX5lM5uCTszbQqNR/LMM6/AYq0Xm+byS+LbBYElV7zwCRuPzu/Eo/yGf1YaL+Ju
+eV8z7MMptIhEPfDPIA3u+xwiixWkGrQrOPLCuMeweo5AcNoKR/RmFMic+8rbcCq1
+5irPBOGu5CarqRDLHTth19o5ahRcDtS/rDcsUqkNpGTszGY7S7XkAXTo18AY3JkD
+dJ+1shxK7dzZAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBnggkq
+LnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5uZXSCIWFs
+dGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAdUuyNLI1p4WN4d/Dt/5Uuhs6V805Gouu
+jUklir5h51ZpK0cIuuLhai/jswGWN+GmM0ie+NEqj2EoxLfqYEuRm/0QdrlWYpLT
+WpIYfY9djM5fOgWyAaF+/8d7MUNLKjbz8MGTQzysBdhNSNEWRRi4ZXzxHt/VW3qz
+1U9pR1p0qsACYdTsbmOJw8CiExE04eEsz/0F4R8Grn8WYAuY1Yi7maXdByzXNTmZ
+WzIekkZw2eRIgvHpHG4yL7jyYyqCQg3+loGMzo4njY2WBv5VMqf58GW4ZZCNNwl8
+LpqswRJ3QzqMYv0OahEimggNi4d7OpYBnC1RBsJo4/7EGfg6EUdKtQ==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
index e6eaf2ec5..63cd135dc 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
index 3beef64e5..c5b00da24 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
-ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
-RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
-et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
-ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
-BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
-nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS7
+IuEH6cCgw+wmNZq7FY1PCuCLtRYzQTKg/q83JdIBKN4DcrfnQ9VzIGIK6zYq9845
+ks//RXv8EjQyXVhw2yNOqDiVgqzKu8MTtwQC13GIxUsuDf/epDFhDssh9yeC9u+k
+DrvoCgoRIODqlJyM2/UL4qBF2TcpoLF6JmGuoFlR2Lmy6ClnCCG+I1+BB9bBTb1l
+6W3npIrOtqe599VZlI+Uiih1thA6BcMuIO9Yrqn9yLj0nz6Yt/aBGXFc6pin1TM3
+TvkUIainW0ZQFKShxz1ZeLjp5/ZReVoBS65jWvqMJwEE0hEfFMKwmi6HO9Gc5wYu
+rVFIhvNZCYrP4nr0On8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAwIqtvjNK00tI4/OOv8T/+v
+f/s7ZFHW8cT/1WD2sg21fh5r1sA82EqPIbQ7IZlub6FwtsC1MX/MjcAwttCIzKJR
+xB5BHvoEC/taYsEuWR0W1xb/DE4uDAX6X5dk5ckE1lUBqs9LNbR8Q4UDMGMdyyfz
+ElT8scQ9QTGtil4mTI44JPjJvhqV2w5Dd4aOP7W4j6T0apKYC+fj1HYEvwVaPBPo
+txQ+IGfxcLvnYoKe8wDhlY0cnk3orsxG+umx2CESMz5OLg3Qm4WG7U6+tpi0jkOA
+FFYyxoxIW3dMOb/p/mMyr6Z4gNNqQG1F91DhWnEWHzTd98Sm9zEbeZGdkqN7ZyY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
deleted file mode 100644
index b9471a4bc..000000000
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
index 9d67ce107..f5c17e91c 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
@@ -1,57 +1,72 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: 54 FB 5C D7 4D A7 32 31 72 D2 2B 6B A2 EB 32 81 4E 5A 1B F3
+ localKeyID: 1A 2B 68 1A C9 98 AE 99 75 2F E5 B7 D2 6F 17 12 A4 14 57 F1
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZlzAAFO0CinxW
-9W0WATpMYpFYgiqZd2z2+nucbslOuJDsLHqKn5sJSL1pXnZP50CIXKuYfLK0GS+i
-7UqXdalTbZ/Y4CH5kLDSfrKJLqkgB+gbTHIsEhwGC+5Z2M7NXlk6rzxQavQ3Dp+h
-yuyfDc/C5V+asL9+S9Q+aKnwBltgJQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
-QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
-BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEACduCkaIWVVeW
-mI9SWw1iMf3gIxMSx/hK/CFcthAfGwcq7Klpe3k0iDHqTAzJrgIOoiBRo/bKn2s/
-Ta3ykS24YF7SdkFWPE22XZiQ1qoSH5ShVg1M6+jo31Cbtl1bO4sPiNcxzlgFDvmt
-RD7zGZ+em4e8hzZhB4Np8dOec6H9bz8=
+MTAxMTI0MTIxWhcNMzcxMjAxMTI0MTIxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Ar3krE2
+ZS3e6fLaPkrl+zl3bHpQQ6qlK1emHoIKKm8ELuoqwQMXC5QA8Q/7jO3bhbYVBLyU
+ssSRS0PvjVaTPj52NEap4HmVPNzIMFV+hZbcOEiRoXCZAxLExWiip0HcYDLjUdia
+4dmumyqB45HFoZBaLTA+wFIzCH4gKBJfxyC0tw2bR2pSmKsQBUTzl4r+JIRGqvu+
+jdFFHdvVhTy0uXwlywIxbGab2XuzFw6PU16AqsFK3fUzAbQM9jJ7bPlTUNavNFdS
+XYG0jq9/YA0mqJO6sILFVApHqVL15JzD5WBFtOOHlCLjvD6EM1XYYtK8QJGCVBRG
+hBcUyICpGGlikwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
+LmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
+bXBsZS5uZXQwDQYJKoZIhvcNAQELBQADggEBAHYgFC1Bo0I2sYZuOmIVt06ItcTc
+aQJFmqfa9HGvgsFEMDbzrTsIV30GopsCWC3g8C9dUs4bnoZKKC41mE2PECbed40E
+NTIwH91ZSspkm1A7sWJJqDQ6Doc74zIjwJ0luu4mdCPxb2EnpuWqyesR7z2cBzqQ
+pHilvVfIp0egGqw7/a2r/b9aDu+YECSUrPdivNa9GxPLXEFkLIOiEM8BExTVL8pG
+En3eLYNBIiUjfiR/JeESnPMuaJVYUA3yD9WfqpoE7ml/2UkT+ZbJTsWU459KeCtl
+nvLYbf54OSB3dczsoltY6QBffpyVwd2b9PmMdVRZ2BiKGNK0PB6o6Ycih+o=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
-ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
-RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
-et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
-ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
-BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
-nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANS7
+IuEH6cCgw+wmNZq7FY1PCuCLtRYzQTKg/q83JdIBKN4DcrfnQ9VzIGIK6zYq9845
+ks//RXv8EjQyXVhw2yNOqDiVgqzKu8MTtwQC13GIxUsuDf/epDFhDssh9yeC9u+k
+DrvoCgoRIODqlJyM2/UL4qBF2TcpoLF6JmGuoFlR2Lmy6ClnCCG+I1+BB9bBTb1l
+6W3npIrOtqe599VZlI+Uiih1thA6BcMuIO9Yrqn9yLj0nz6Yt/aBGXFc6pin1TM3
+TvkUIainW0ZQFKShxz1ZeLjp5/ZReVoBS65jWvqMJwEE0hEfFMKwmi6HO9Gc5wYu
+rVFIhvNZCYrP4nr0On8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAAwIqtvjNK00tI4/OOv8T/+v
+f/s7ZFHW8cT/1WD2sg21fh5r1sA82EqPIbQ7IZlub6FwtsC1MX/MjcAwttCIzKJR
+xB5BHvoEC/taYsEuWR0W1xb/DE4uDAX6X5dk5ckE1lUBqs9LNbR8Q4UDMGMdyyfz
+ElT8scQ9QTGtil4mTI44JPjJvhqV2w5Dd4aOP7W4j6T0apKYC+fj1HYEvwVaPBPo
+txQ+IGfxcLvnYoKe8wDhlY0cnk3orsxG+umx2CESMz5OLg3Qm4WG7U6+tpi0jkOA
+FFYyxoxIW3dMOb/p/mMyr6Z4gNNqQG1F91DhWnEWHzTd98Sm9zEbeZGdkqN7ZyY=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
deleted file mode 100644
index 4762cb2cf..000000000
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/secmod.db
deleted file mode 100644
index 410a6d0fa..000000000
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
index 470ac8c5e..55a0403e9 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
@@ -1,36 +1,46 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: 54 FB 5C D7 4D A7 32 31 72 D2 2B 6B A2 EB 32 81 4E 5A 1B F3
+ localKeyID: 1A 2B 68 1A C9 98 AE 99 75 2F E5 B7 D2 6F 17 12 A4 14 57 F1
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZlzAAFO0CinxW
-9W0WATpMYpFYgiqZd2z2+nucbslOuJDsLHqKn5sJSL1pXnZP50CIXKuYfLK0GS+i
-7UqXdalTbZ/Y4CH5kLDSfrKJLqkgB+gbTHIsEhwGC+5Z2M7NXlk6rzxQavQ3Dp+h
-yuyfDc/C5V+asL9+S9Q+aKnwBltgJQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
-QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
-BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEACduCkaIWVVeW
-mI9SWw1iMf3gIxMSx/hK/CFcthAfGwcq7Klpe3k0iDHqTAzJrgIOoiBRo/bKn2s/
-Ta3ykS24YF7SdkFWPE22XZiQ1qoSH5ShVg1M6+jo31Cbtl1bO4sPiNcxzlgFDvmt
-RD7zGZ+em4e8hzZhB4Np8dOec6H9bz8=
+MTAxMTI0MTIxWhcNMzcxMjAxMTI0MTIxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Ar3krE2
+ZS3e6fLaPkrl+zl3bHpQQ6qlK1emHoIKKm8ELuoqwQMXC5QA8Q/7jO3bhbYVBLyU
+ssSRS0PvjVaTPj52NEap4HmVPNzIMFV+hZbcOEiRoXCZAxLExWiip0HcYDLjUdia
+4dmumyqB45HFoZBaLTA+wFIzCH4gKBJfxyC0tw2bR2pSmKsQBUTzl4r+JIRGqvu+
+jdFFHdvVhTy0uXwlywIxbGab2XuzFw6PU16AqsFK3fUzAbQM9jJ7bPlTUNavNFdS
+XYG0jq9/YA0mqJO6sILFVApHqVL15JzD5WBFtOOHlCLjvD6EM1XYYtK8QJGCVBRG
+hBcUyICpGGlikwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
+LmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
+bXBsZS5uZXQwDQYJKoZIhvcNAQELBQADggEBAHYgFC1Bo0I2sYZuOmIVt06ItcTc
+aQJFmqfa9HGvgsFEMDbzrTsIV30GopsCWC3g8C9dUs4bnoZKKC41mE2PECbed40E
+NTIwH91ZSspkm1A7sWJJqDQ6Doc74zIjwJ0luu4mdCPxb2EnpuWqyesR7z2cBzqQ
+pHilvVfIp0egGqw7/a2r/b9aDu+YECSUrPdivNa9GxPLXEFkLIOiEM8BExTVL8pG
+En3eLYNBIiUjfiR/JeESnPMuaJVYUA3yD9WfqpoE7ml/2UkT+ZbJTsWU459KeCtl
+nvLYbf54OSB3dczsoltY6QBffpyVwd2b9PmMdVRZ2BiKGNK0PB6o6Ycih+o=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
-DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
-PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
-PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
-Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
-JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
-C53ODVdhE6yCQs1m
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDEwNFoX
+DTM4MDEwMTEyNDEwNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQD7f9mHP5wzfhDHhjX9DLOWPRmpWyRhJEOGDpUo11uxCrrQ7g8/Edy/
+Gn4c8lnbq+QpiLSVuXgE0+K3Mch2NMFNhaTmd1mdvgnld5OqdGCSQRFPOonW9XQh
+dd0cDsxGBzpolD48DwXkrBN0wseJ6cpVpxz0PYw1nQZ0yY3PXw2cTLn+gzxaTu61
+fstY/RTZU6CDi2uqYLGsWWVUSuLlxYf1qWgv0KAqIIccTRCvkrkAeNdkjtyFpyKr
+ffdU6ey8U7W7ksb6Ky6Plz0D07i3esIzZ3uHiO8iPMzhpxUgyF5wYRfT8zBxyT1s
+pYsi2fUg8yd1NfVyVpF9ye63etyldj+bAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQCWgEpj0C+ATEwh9xfOY/ONxZU6IORCev7/DKD6ugMl
+3XYa+OLRCNJKyAM01cHZbhhoGT2eB9JSfXRsWKqhoxTH3ao+SdBtEwVo2BWEIJq2
+AMVEzjzCF719xQI13HicgTvKH5w+W9GBKcFtH0gSsGx1HwkjBGSd22Rm+X/KlyEa
+CaFt/9JbjpU78YGU5GEFUFF1M748ghEa6xFknZxwMWEqvtIDlOTkzV6VyzycPHK5
+dUvTFoxa6OBIwbOJsSRJu2mx482TBAuSIji9EbccB1GRw5k5bXNgvUj+/GOneRYg
+RfnbPMZEu4N+lOc4+K8UyrQGHdz3W8E0t28EfuCPKve4
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
index 14752e7bd..0a37970e6 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: 54 FB 5C D7 4D A7 32 31 72 D2 2B 6B A2 EB 32 81 4E 5A 1B F3
+ localKeyID: 1A 2B 68 1A C9 98 AE 99 75 2F E5 B7 D2 6F 17 12 A4 14 57 F1
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQICL4dpOTDtE8CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLs4fMvRcBTgBIICgFL8H95N3zcg
-mRjJ7gKfh9LXdVjROyvnjlEHR2ZwYWjPcet2DS0uLY9OWNZSEl12moXFTzYrqx9v
-uoaCfYhkRZlfzrfIar6v1qsyptJPLRsKY6/FrI8/7OBpXkyQZfPTa0y4lkJpurjE
-PfX3ZVxHDJqG4Kv0+PaBpMa0qOgcMqlFtRDC53jFDSsPw4lmqwTN0T8Upc3Fc4qj
-qOCT7ctjioQEM1ih7r5eRLqP7fzLujHto6INf8cgCAMT8mCyoAS4YBbMKIxAyf6F
-yKoAyr4Ka0/I7xGfkok2IIYvxbUtsaDxrd3OV+bPJ5jzCmVZq6l8Z5KaZGHfsma2
-hd6WKgZnYilXB4Ym1bZIWyETZSZ+BlSFR95ynu8os221rXJkDSa+d5d/1ewrwGXX
-c9l7xzYj1UoML0ClAxY1vr/bHGppBU/7WXgSgAHeLyp3dW5ciBrpzVJYfG+9NUt9
-t6s35dJOI1MhL2QgEH4h6c074xcARIYIa+s1CQVSYCjN2juzf6F80PfSpIwjJo96
-2wNnIn3C9sPJRoE0eVUwmhjSRp07ipv5pLiHGwPiVuaRJwx1zZRwS26bDccSAmuW
-Q/7NANZCE0j99GouR+mW71obFl3uQx8+Uforv0P32oJtLxIzCOCYQpltbTDJvSC6
-1St8ehS6+ynHI4EXM4+LjpS4WqXAd/ASpLSj63KyFBAKQsuoTJ6IlVv4Xlihzyfo
-8t55mfbYOoJyl9R0NFj4QM8dGGqOzOBCOGxLaYS8Qgt1QyLoJ2sc24fuyAajnSeV
-RuY6JNAHINrwkJcI6Yn5E+YWXhSx57/WzSQbK+C5nRl0FG2Y90u3xnTQYZPbLu3G
-Dg+Aqo+a0sc=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInvLX9INO9+ACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECCFsY1y7YDtcBIIEyE3AvEfWukhe
+QSV3lJtV1wXYicAu2rByMfGlNtUYQ3Yof1b66kRaNUL8LnfIUvdbP2umMS7z5pcX
+L8X85/p5VWbrY0jeLwJv6HjMSpb1tnQ609NNrt2WrKX/2bmAUMa74/Eq6vs3Oh/k
+xH5BpWVvbCIBDtzHuTjgx/vN9K6lZpSFuHLXcj3cqAqjmg66rrTdk7XPeuxAmul0
+6kSqObO6Ac5r5ZEq5XlXvR9BK7lkawaSrkfNY0e0ngM/TdVDbdOaqBpoMqjGpat+
+ZucRAQqLefuFWRqn0efxDqiBjK6fXvpJlB8ndV9PGxu0iRpINmMvTGUv1EdUHzKT
+q/XNegPazcE/dJDmDYNgW+g+yqjPGB7unUFNTfOna//Lk19RA2Kqq7DRkHmU7R27
+PUYU6vb5V9fWdPn1RkcBbijlTfMPHIIPxEYKztUxgyPlMzYwxW+fx3EQNF1Sgv73
+ovoabdD8AGQB5U0GKx2MxBrZJmFZ43/RMbSCp4ljMR3vZK+3TGdhJtD+mlVDZ0KX
+COj8GN3bd3Yq75f8sgSVymSAz8PXT/mDw3rNSCl1Go3Blsq2J59P6MvZGtUOiI7o
+LFdL873ZyZs4qey4hOjD9CTA7KKWpIzLtiNgzAI5Dn8ai6JQ2GKwUGFK57pa6wTT
+dzSa0lWIGNyM2TCRMHW1xZ8TWODplEeBYtGcq396Qjpbc0aUe/eMpgSziaN/CEnY
+WqJrqCTQcLE7E+kr+Ff/M1MvBH4NCQpm18RgZj8DoXNjhLPAYh8UwN/yNpPU52fN
+j0cjl+5ik1sNbCQ3P+5922JeGDTuNvtC4Bs/6pSrcmmigc59O5DkwhG34KCNb3OT
+V0PbYv5Is8C3LzXA+SKjfxGZjZmHiWz9mwWhjpN9fOZ25t1VTRkoSkpJOrGIiVJ7
+nu72DpGqMChra1BaEKy8P/oRxPtaNrp8HnQg1jMseZO9v+8aTqzljydUCGW0+SM+
+/Hb8hxfvrasW4ImxeCg00nTteAkhW+0EjqBQ92zY2Cs8F/EBE5hResPI/5vBUmKH
+m/cRHE4VvYKnXL1YfTmpSVhgLmHzWMvC7c8yg8RPDE68UpQYhBa00mD1IPy4eI2R
+Z7YLYaYfNrRd/eExLmj2dTkYxXinBAyot8uBHkqh06p0YgHj1pV/nirbQwNtqWMt
+wi2QBVK7ZuBA62OedZgjGz3fXkIobUdbRlYT3SoEpG8UiySPjLvj6XaVCXsS0g6J
+A6biSYeI/ZqxIveQ7F2Y0eAaJG6kCT9l7So7AXoUW8NESucCRO7ZaH4xX4sq+bVf
+o6HK6TtkFBvGbxLcxegodmrd9F3eWqR3gaGPt2vMMm5xO+tVylnbDlRPc31rO9MA
+S6hwfB7tRvqmtE8LCHhBxiACGTPjy9GUmYtWMfNbGG+/qp4Ive4j/72eH4HtD2T6
+llkSPkgPeWZHGc8h8BEO2w8aqfXIuHOJ5wByGSF0E1JEEP2ZP+6u0dH/ct9HA0qw
+wke8NiQRnyUha3XhLJ7c5nx8U5rR8ThlTK7NkS9VYOq+5S6Oo6/SzJrZzcFr4cnA
+83UTFcAKbWnmx96Ik6NRvi2KsAQ2ksDFQFZtCurr4GjLSIzVoWim2q0H4CWz5lO3
+OJZG7ePfDidxIcC0r/e5QQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
index 407b29489..96cf26887 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
index fd508a072..2e7c6b47d 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
index b2e215977..557ef39e5 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
index fd508a072..2e7c6b47d 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
index 21f83075a..b477ca695 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
index 56cc9fec0..d3fefae35 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
index 56cc9fec0..d3fefae35 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
index 089811ea5..0011b4648 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
index c0970a73f..2295e06c1 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
index c0970a73f..2295e06c1 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
index 8396e2e53..4469fae1d 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
index 6daba765c..56ed7bcf0 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
@@ -1,22 +1,27 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: 54 FB 5C D7 4D A7 32 31 72 D2 2B 6B A2 EB 32 81 4E 5A 1B F3
+ localKeyID: 1A 2B 68 1A C9 98 AE 99 75 2F E5 B7 D2 6F 17 12 A4 14 57 F1
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZlzAAFO0CinxW
-9W0WATpMYpFYgiqZd2z2+nucbslOuJDsLHqKn5sJSL1pXnZP50CIXKuYfLK0GS+i
-7UqXdalTbZ/Y4CH5kLDSfrKJLqkgB+gbTHIsEhwGC+5Z2M7NXlk6rzxQavQ3Dp+h
-yuyfDc/C5V+asL9+S9Q+aKnwBltgJQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
-QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
-BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEACduCkaIWVVeW
-mI9SWw1iMf3gIxMSx/hK/CFcthAfGwcq7Klpe3k0iDHqTAzJrgIOoiBRo/bKn2s/
-Ta3ykS24YF7SdkFWPE22XZiQ1qoSH5ShVg1M6+jo31Cbtl1bO4sPiNcxzlgFDvmt
-RD7zGZ+em4e8hzZhB4Np8dOec6H9bz8=
+MTAxMTI0MTIxWhcNMzcxMjAxMTI0MTIxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Ar3krE2
+ZS3e6fLaPkrl+zl3bHpQQ6qlK1emHoIKKm8ELuoqwQMXC5QA8Q/7jO3bhbYVBLyU
+ssSRS0PvjVaTPj52NEap4HmVPNzIMFV+hZbcOEiRoXCZAxLExWiip0HcYDLjUdia
+4dmumyqB45HFoZBaLTA+wFIzCH4gKBJfxyC0tw2bR2pSmKsQBUTzl4r+JIRGqvu+
+jdFFHdvVhTy0uXwlywIxbGab2XuzFw6PU16AqsFK3fUzAbQM9jJ7bPlTUNavNFdS
+XYG0jq9/YA0mqJO6sILFVApHqVL15JzD5WBFtOOHlCLjvD6EM1XYYtK8QJGCVBRG
+hBcUyICpGGlikwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
+LmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
+bXBsZS5uZXQwDQYJKoZIhvcNAQELBQADggEBAHYgFC1Bo0I2sYZuOmIVt06ItcTc
+aQJFmqfa9HGvgsFEMDbzrTsIV30GopsCWC3g8C9dUs4bnoZKKC41mE2PECbed40E
+NTIwH91ZSspkm1A7sWJJqDQ6Doc74zIjwJ0luu4mdCPxb2EnpuWqyesR7z2cBzqQ
+pHilvVfIp0egGqw7/a2r/b9aDu+YECSUrPdivNa9GxPLXEFkLIOiEM8BExTVL8pG
+En3eLYNBIiUjfiR/JeESnPMuaJVYUA3yD9WfqpoE7ml/2UkT+ZbJTsWU459KeCtl
+nvLYbf54OSB3dczsoltY6QBffpyVwd2b9PmMdVRZ2BiKGNK0PB6o6Ycih+o=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
index 28f85e154..5b973453b 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
index 499940547..fd4f76fb4 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
@@ -1,13 +1,18 @@
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
-oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
-bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
-sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
-Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
-n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
-Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+0
+/AXNFYu9r75ONuVA+DregT3n0YcxMQ8l+GYxgxrFkDXEl0cpmPd9G0FWOU4S/il1
+ou26A72Tk112tgy2az+353taOgRFNK69Lyo9brBYyAhGKmBJWyuwL5d3c1YY92gr
+2O2fzno7KP10byITammONZ+XHOHbKtFH6/s1Emn5B7YwkPuess92ddQAK/rWTPfG
+94h6DcCsoTViIgnOGiDSwAih2RR5+j0+4/BfpqHPZIKooslmHWj7pu9mR02bRbgA
+iXXGyaj89AfKObLHWuNC6mJb+sKsSoX+MOFCfLrIsLcxzTiZ6soB7tSiBS5EBaZ+
+w2/viGNLmDLWnd8bNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAJ+JNevMy3D+5qRSNiOu//jB
+6yuUGZJuOFA8R0A5fZpdsVwmzBDWSAjM5o4NiWBYuK47GqSz13gTbRc77X7K9Rb8
+rNoFxdxiB6XUtNoII5eMebgHOrO/eKTmn66x+yM6bD9ypR6Yz3uq2MC5yDLWT4uv
+axoL+W9E+VesTFBL9d8EezfKliHdL2Knj+NPYMQ25xRGltOZCOs/E0NIHzt4RV4z
+kHdctDkkZu5EdtsC/pZ7FQgvtDFod89uAYY3ZQ/fFaqw3XkRpkycQcYe0kSv0AZp
+padHI4kXxR4hE/tbBYipJFFoeeeXypZZ9V9V9Lps9IeJduadgXUPR07yA7XRLCA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
index 6f2d4d15c..ac19bee10 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db
deleted file mode 100644
index f0cf58987..000000000
--- a/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/key3.db b/test/aux-fixed/exim-ca/example.org/BLANK/key3.db
deleted file mode 100644
index a2503fc90..000000000
--- a/test/aux-fixed/exim-ca/example.org/BLANK/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/secmod.db b/test/aux-fixed/exim-ca/example.org/BLANK/secmod.db
deleted file mode 100644
index b709dd8a5..000000000
--- a/test/aux-fixed/exim-ca/example.org/BLANK/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/CA.pem b/test/aux-fixed/exim-ca/example.org/CA/CA.pem
index 499940547..fd4f76fb4 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/CA.pem
@@ -1,13 +1,18 @@
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
-oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
-bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
-sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
-Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
-n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
-Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+0
+/AXNFYu9r75ONuVA+DregT3n0YcxMQ8l+GYxgxrFkDXEl0cpmPd9G0FWOU4S/il1
+ou26A72Tk112tgy2az+353taOgRFNK69Lyo9brBYyAhGKmBJWyuwL5d3c1YY92gr
+2O2fzno7KP10byITammONZ+XHOHbKtFH6/s1Emn5B7YwkPuess92ddQAK/rWTPfG
+94h6DcCsoTViIgnOGiDSwAih2RR5+j0+4/BfpqHPZIKooslmHWj7pu9mR02bRbgA
+iXXGyaj89AfKObLHWuNC6mJb+sKsSoX+MOFCfLrIsLcxzTiZ6soB7tSiBS5EBaZ+
+w2/viGNLmDLWnd8bNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAJ+JNevMy3D+5qRSNiOu//jB
+6yuUGZJuOFA8R0A5fZpdsVwmzBDWSAjM5o4NiWBYuK47GqSz13gTbRc77X7K9Rb8
+rNoFxdxiB6XUtNoII5eMebgHOrO/eKTmn66x+yM6bD9ypR6Yz3uq2MC5yDLWT4uv
+axoL+W9E+VesTFBL9d8EezfKliHdL2Knj+NPYMQ25xRGltOZCOs/E0NIHzt4RV4z
+kHdctDkkZu5EdtsC/pZ7FQgvtDFod89uAYY3ZQ/fFaqw3XkRpkycQcYe0kSv0AZp
+padHI4kXxR4hE/tbBYipJFFoeeeXypZZ9V9V9Lps9IeJduadgXUPR07yA7XRLCA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.key b/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
index bd61342f5..4ec6ac3ed 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
@@ -1,20 +1,32 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: 8E A1 79 AD 6B 18 83 8F 55 9C 07 C1 3E 70 00 F9 52 F4 A4 AA
+ localKeyID: 81 86 48 8E EA D9 3B 75 FA AC 0D 2F 37 7E F8 81 C5 C8 9B A1
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANQh/oM4NmwlJyu0
-9bXHxnitR5k6t9WdVWYzTJ9bynjoqPWTfTH/mo7iznLUrOXNaGZ3OT6xHLiJGtp+
-2ePiD++DcGJgB4EnnNpiLL8EUPuD0X8iOI5x07UzQHP19krjsSwKqDWfdLMQTk+O
-RTcPW+/62nSMF55FSwooqkoIMwllAgMBAAECgYBe/34/+1t74MOC8j4bEwURo9/t
-gfszoYrOAukscGni7aZEm7E0Q9hOZsm3aQCoxO0c/gVXyu8mwNeSw74GLIWflzy5
-wSOAT8NzPZzyDWOkwAYdLF7dgwVaxATwWlNtAQs92DnV5SGFkKokArweGeyR9v9m
-NTVAk5G9+1akLJ9uXQJBAPZe0yIgh3HqUW7k67WXN/NvzFgvOW4WS7DLV5OxdAV5
-fJwuP59gE1YistL5DslMapKGH6B8Vr816tpux1hp8UcCQQDcbJa8V9Dit4Y1+xP7
-l9KxIKS3JJdeV8T2g7EcYGQk5QxXO8JIwzE4A5q8OJFYjjEf63myxBgpWYC118w9
-/mXzAkBVUPsee1NMMI+orl+tz8MRayrBcwEZTWFCxPf77ly2NJ7hWuavY07u6i8w
-/gyPywWw3f9/zO8hYiOFJw2jYXSrAkBAgXq/VYeowYKCS572cuDSuzXY7tlpX5Ah
-gDqVjlPgRDOPV8qslorR1KQ0zu0iGEKiD7xGp4JWn32+OY/o2IknAkEAnjIMK0CQ
-T2MkwIyUvSM7KYFFHlqj8CxNfX6+6yQqcBd+xV970BZs3Y9AkidgGBkotmSydnQe
-0NhRj4RzqjjETg==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD1LIM/wmGvsZ9q
+Du0YRsS10PCs+HkG3jdGmQcYZoMfx9qS7i+U35YGIaW4cw/W8YBEzDVdrt4DRfcC
+2YEAVBy3Azj8pBwle/dav2v6RsEEJNiM/hqvnAgGN2ZabDjUgTRqMu0qnDrR5MKV
+JFcAugmmscf/vzR66UfcvtY+RzR3mDbU0Wzhm4khCofzvBDqGve2CwvJtD4L+7S3
+Fk5nGK82p/a1qIxLq5kB8JBXosx73aTDcJjdfmn/Knh4/xsWhbcUQGbspXOLCN3j
+0sV2XSJ8AAfhfknTvpdcv64lrubTHgMxl4njrZpFqQnkkzjzz4sy/6RTswNdYCNT
+t6zVZtAfAgMBAAECggEAa35utT/GkL+yA1A0B9bPXGAVheETPz2iwqNJhxs7Fm4L
+mSwxVHaLUnjiLfLU2QrdkExwgXiwAoNkf61ZcAlw5ZTWIX7akFy/4NvYvczTx7tX
+7slibehdZExZ5f9ZE2Lq1j0p2urQp0JDRhy+wKTQonOEGs98dP9e8JwDVx7lFCGf
+CMK+3S74XDFTdFgsoWfzuA9tFusxDS0MZ4sn8mSgmGY5uXPgREXh9Q3MZZ6aLtoy
+VNmpKXf9n68BqCabpNTL3XZVyYq8p7XDZs2//IGM9s+ctNseSw1qam64BP7p88Xz
+xm75/53lkAW7AkHkQ9QxDcthja+4PR+/AxrwpX83YQKBgQD7UarlInDk5tsq91Na
+Z5nNLIgl+FfVhGA5gzLiAXAwLNn09tkWIqiWm3UM7zEqbXqoqS5lB2ZTMdo121Oz
+e8yeX0jgo8wIBEKsKO9DfK0LZTEfKr0DtkmuBMGVh9egb0LV9Kkil405TexVjpdx
+mgNTXPMdzzEE6ZyiIIP+2r+peQKBgQD5vYtHsIDaHkQbc7nL95XhEibs9cMLNdrL
+ZiQJyvzOG6/yGn2fiKAGYiMMfeN6V+cihyqA7WiMViMT/foO0bmkhvmrYk6zS7zG
+sEbAFrfvYtE60WCmsL94JLfjBU4m/M/drKpC438cHgkeiO/MybZdWCyj8ccqnfVT
+Bj72BA/4VwKBgQCDq6X9pq2/P7RULoBdPSo3dL1gJ1zdYR2JBFQEVPySQO1wimPy
+VPY+8fPBcxAvSmyZMQo9pELYE6Zf0SlpP9NUpldoWmjrSlAkIs44bXm8Hqg9zAZ7
+i2XO5m8GCMXQKHq73hM/LGexPkI0ESEHQ8m6Q1icpZDpIfwOdTqyq6j/AQKBgBPE
+F7j11EzvJk7R6vukvd0Rdbk9flFt0sJUdDe+NCIP+O39gMHWq2u16rY7ZHyzZlzK
+O+f2YlbxHlefu2He4YWPFUWmQzpXnTpQi1j6s1YkCRFRrweiZ5UXuuIh8lyNl9og
+p10h6laMXgZnqisYL/HVX7seELhjxh3rGaKZEbaDAoGBAKjSKSBAm9zHUlmM9MOG
+FXzEBE7SY/KQe9M0NCA7tbI6R6iXE/djXpxYFZo7LsuZqi7lsN1ktJemACkNmU1L
+4Qhd9G4n2mXv40cQiqFR2uQkcUYUYswbpd7V+twphjZpfOUiHtrBTl9F4ILpdAlJ
+peZJsAVnfvD7dxSidaFffyt4
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12
index 845f17631..d57440db5 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
index 961de931f..92212dd2a 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDEjCCAfqgAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDhaFw0zODAxMDExMjM0MDhaMDYxFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBANQh/oM4NmwlJyu09bXHxnitR5k6t9WdVWYzTJ9bynjoqPWT
-fTH/mo7iznLUrOXNaGZ3OT6xHLiJGtp+2ePiD++DcGJgB4EnnNpiLL8EUPuD0X8i
-OI5x07UzQHP19krjsSwKqDWfdLMQTk+ORTcPW+/62nSMF55FSwooqkoIMwllAgMB
-AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQBdQH1764yjd709o2r/hmxCyVshZRW83BtI20uys/e9
-eWbp3VSHWbPuuNkjMBIuYMXSSD9C+Psv+IQ8V0jYyWbhLC7+j02fFBsRXr5/BIKj
-L9PM/q3/FLm+dLrq00M/o0yg9jX+1ALU3NhNe7DUjO9ncFoUxkiKorf1XptZ81Ab
-+g==
+MDExMjQwMjlaFw0zODAxMDExMjQwMjlaMDYxFDASBgNVBAoTC2V4YW1wbGUub3Jn
+MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQD1LIM/wmGvsZ9qDu0YRsS10PCs+HkG3jdGmQcYZoMf
+x9qS7i+U35YGIaW4cw/W8YBEzDVdrt4DRfcC2YEAVBy3Azj8pBwle/dav2v6RsEE
+JNiM/hqvnAgGN2ZabDjUgTRqMu0qnDrR5MKVJFcAugmmscf/vzR66UfcvtY+RzR3
+mDbU0Wzhm4khCofzvBDqGve2CwvJtD4L+7S3Fk5nGK82p/a1qIxLq5kB8JBXosx7
+3aTDcJjdfmn/Knh4/xsWhbcUQGbspXOLCN3j0sV2XSJ8AAfhfknTvpdcv64lrubT
+HgMxl4njrZpFqQnkkzjzz4sy/6RTswNdYCNTt6zVZtAfAgMBAAGjKjAoMA4GA1Ud
+DwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsF
+AAOCAQEANTWgabAYWFA8MRKb8R6d4zI467T5jDjK2UlWtpzJQgNulyosZeDmjRSw
+orsBrOFN7jOpWNgnIL/joZm3xiKb4V14F2yRa0qvbP8rtOWHRb09x0P08Hw8/sh7
+5cDBwtZCgS6RmZouG74Qz3GAN3tV1Z5geezP+g+u3RN2jU9KV1/Cx/0IfUNzRYEp
+fE8klaatrUwxg5vBd/BmcZb8fF40Qn/yz0pNLPCvZfSh+UUcXiqmvKDZUI9DGXo1
+BgjOMWLYJRccfzZq97zISvdx2ic2qBvEkYJBCptKDwXMDvx2vGswLYgXIeBtWmig
+qmn2HNOF/KBa8T5KCg232FUiDAlYCA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.key b/test/aux-fixed/exim-ca/example.org/CA/Signer.key
index 51b15d3dc..f67c98107 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.key
@@ -1,20 +1,32 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: 83 92 A6 8E 10 1E B8 76 A6 DE E9 A7 BB EC 9C 44 19 0C 29 A3
+ localKeyID: F0 4C 5C CB 3E 27 5E E3 A3 16 3D E0 C4 61 81 BD 27 8E 00 0A
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKvNwx4xa7WCNqEV
-Zytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTjebOF+sPAK9x+o+sBYwUu2
-27LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQvmTv5J5W9WjF38aHEpFH
-JL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAECgYAyPvBkwTFuGVIe1GKjBeL4XjRI
-kgUhS0AQgt6P9egW5dsN8Tf8lCJVGVpynmKbpHDdE2fpA4Oqg4qsuSMR7xuZstHW
-AIWjF2feAe96xG78w5OkjzxJEcnfA+0FSJs5yF2QSt/nEaahAfhBhZZgo4kweKN5
-tDPofvHrUnB8vttIsQJBAOCFBo7P2rPCwDfBUo3z+9WntUKFVvAfU6J9PPONMNvs
-4ZGYjalXnZtgYBtvFn/ZNnhrgWn7ETJyQFijMB4tbuMCQQDD5ImQGbrfakrmegT+
-JQdyvtdpeeTaRr9rDfLxpovtgqW5ug6Nb8acQz+H5WJh14S/QcEY0p3a0k3+RpE3
-kWUpAkEAx1p2gzHd4AVJhXgbZD3CW2hJEqKwmg9GxJ1tFFhGjNBdTVjmV/ma0M6X
-J2TQ1n441l2mkELEd0VpCwsC+5idvwJASTUjY8L533ytuSxoqUHVYsCHaFexexFt
-f+iankyLhpuIq7worBrVspg/Kd5DwiT06zT7oPc1Hw3xL9HXe1jO4QJBAKTt0EOi
-dYyPR6vB+NxigHUzIXJfkibRMYOSzC9e8SkLCDif2uEA4+zeNWpcj7zTUYh3zdGr
-O34iyBA7P+OhnMA=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGwlUZM/hbcUJ8
+4Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49KAJiC4WRhX5+sbvjWK9XeDZEb
+VCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3oreVGBCxEgyJs/aTT7Jtlav3
+SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ8KFs1wtSoG8UZiiOhEvCVNph
+Ry0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6WUW2yFVes4WotOa9ZjO3GHWV8
+Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50nBL0OPz2cVn0BgBMLPMFZUJFz
++9ih/QlNAgMBAAECggEAKJwRk4/vBU3vkgCpJYYUCPDckTgag0q/uKI8S9ZC1Z7K
+KzQ9O7vkGrBi+NDQ9+U4BFz7GhVEQfWfKYiJuu5m2S6TxIbZGwSPzGvkxYiak+xY
+Im/V0S9cM6IrJLsRRACGT8dVkLUmpWXAiErXBe+YW8ckba3nCG5CqepvrkIa97Eh
+D+a6ubyDutCS2O7eB1ZNd68awG9hkTvuujNCINU/8juWt/5hlEJZlOHlTPSr6dGD
+yDfYRQq+MlJ7/6yrtFHNwhdv08rxxMU7uOEeBRvsM1cvXfWLdrhvYUWBohBpnR3V
+KVMncSxJ9+v7HNWrPQzgnY3pebSMeH70JBuvJlbNeQKBgQDqphYGu6RKqTkE/m78
+eHmDU0YBs7N82bNU+MhCbcs9MZNU5JVvpKfjLydX3CiKPkTZ020zef1muK3dCtEa
+GrfQBy9zUVODE5w3eMC3ivauUHjmvynr7j1R3hFVBm0X2Gq/dyXmREdl4fAcjumT
+htiFn0CblOKDh0CCeiW8b67TlQKBgQDY2DtTopqBVbqnDmKSX4obJ2ce1q783ftk
+gzCp6kXIEtPEOUbh8xonSpBIDhu44YKOoOzdFzRkqiKji0nQ2rshPIFQn35LXOgh
+5US/pHnAyO0qFqzve54X32J2z1cYG0xajep5TT4XQIgHl5ELcedB+H+xvhMeIsDa
+advvsrDw2QKBgEqHlldtIjHUrhe3+OiYG4Bq4sGHomr1etBydKkk1nkJVhKQyCY9
+1lWClKyDcRz3ykalsPm4tZP69L5QwTnZYqjgn2GxYyUvBV9ZK10g9llHlh80eMxH
+T5LBRiALensocj9+SLtq1IK30NxBSE9jdUJ74rmIAKpmO0c2JOZFUvJBAoGAVfvw
+EmrgvzZCTCndFlOCDOBj+IuCWcyf+aw3qLi3sO0eQanAnKnsDfZ4HcpSXc42Gd5f
+7g9cfComkBkUTRfeqgA2+sQzrSiK953U0/UhPjuuJ0lUi6XF+4tdnOT8kReKAEJT
+3oOtgkTZa8FDB3nEDJm/8LgBFqsLM9BUIMkHdokCgYEAgHreS54nY1owZTcnYD7H
+9elj9g4vJceMh/1GmJeegKwu9PWsgi480h+J3Fs0Ep5gEvk2zWl1ka9ehCRbgmdE
+Ao4782kjwFl0t7h9NDJQvohdTWiLKmgxmJQt7ip6TIE/DU3O6l83pgK4Ahxpije8
+LIBJKnxWfjeZrHLgwIZW3yU=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.org/CA/Signer.p12
index 924aa9a16..e6727370b 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.pem b/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
index 6f2d4d15c..ac19bee10 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/ca.conf b/test/aux-fixed/exim-ca/example.org/CA/ca.conf
index bdcb3250f..046f055d1 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.org/CA/ca.conf
@@ -1,18 +1,18 @@
; Config::Simple 4.59
-; Thu Nov 1 12:34:08 2012
+; Thu Nov 1 12:40:24 2012
[CA]
-org=example.org
-name=Certificate Authority rsa
subject=clica CA
-bits=1024
+name=Certificate Authority rsa
+org=example.org
+bits=2048
[CLICA]
-signer=Signing Cert rsa
-sighash=SHA256
-level=1
ocsp_url=http://oscp.example.org/
-ocsp_signer=OCSP Signer rsa
crl_url=http://crl.example.org/latest.crl
+ocsp_signer=OCSP Signer rsa
+sighash=SHA256
+level=1
+signer=Signing Cert rsa
diff --git a/test/aux-fixed/exim-ca/example.org/CA/cert8.db b/test/aux-fixed/exim-ca/example.org/CA/cert8.db
deleted file mode 100644
index 1a73502be..000000000
--- a/test/aux-fixed/exim-ca/example.org/CA/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer
index ea4346e9e..98861858b 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.in.txt b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.in.txt
index 8f00adf1e..ab7d7b073 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.in.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.in.txt
@@ -1 +1 @@
-update=20171217205108Z
+update=20181127215819Z
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.pem
index c26ea229a..4c268f5f9 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.Signer.pem
@@ -1,7 +1,10 @@
-----BEGIN X509 CRL-----
-MIHnMFICAQEwDQYJKoZIhvcNAQELBQAwLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcx
-FTATBgNVBAMTDGNsaWNhIENBIHJzYRgPMjAxNzEyMTcyMDUxMDhaMA0GCSqGSIb3
-DQEBCwUAA4GBAEYHLxfKEuWn1m3X8VPNpfg86Bu0MKqMHdSQzlOcUyxayMyrC2Iu
-0ZcpDQ4fg0HJ/R1qcf7BwEXRE5PHXIQp88DJHgzUOPwvkdqkTjBfn3bdFkqSbOS1
-g99dqNxeyLTehd4tmPVMY4t0GfQ4SEky54g+7p3K2bWvNEBRFWY+9vAy
+MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUub3Jn
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTgxMTI3MjE1ODE5WjANBgkqhkiG
+9w0BAQsFAAOCAQEAZNuqljjk01PdhqpTF/Y5ZOC6N9JHaqloDF7744k5uRC/9I1r
+gJHSQzVCwJMmS94Cbdyc157wDUOx1IqNm6EEH9xUH+ev93kjBqMa9o4NZbNyrJox
+OQ2voGK0bA0/KLux40k9zE31/B6q6njD07m909AOAxYoQ4U8jrf5M4MOfYfKcfFn
+4zyZhZG89QyeJXrrKKfhF1La4qfN2an92Qr6jGphjziodit1pKzxWr2oQCokk7WJ
+xj9+qPYm3I52X+863ORp8YqosFZ7lZ1AMT6z8oGlvjv2RS5ub6TyRJ6DjrrrQxnc
+WHkoJpn6506KRgU+HUuSP/fIq5CMqjv5BOHP7A==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty b/test/aux-fixed/exim-ca/example.org/CA/crl.empty
index 4e5ff44b6..13d174520 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
index dc66bdfc9..ebd4a952d 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171217205106Z
+update=20181127215817Z
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
index 1d75d92ab..66c46a7b5 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
@@ -1,8 +1,10 @@
-----BEGIN X509 CRL-----
-MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcx
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE3MjA1MTA2
-WjANBgkqhkiG9w0BAQsFAAOBgQAD6koYS1ciWJWf9E1VErTJg1UkjIQ0SUPOAp6o
-cPjbKVXIxgPLSXowf89FB5RCQcLJznLQV2bzDWOaBAx6TijEsE9NjA+DPF83byGr
-j6om22/395FQEP0WuoIw9O3Gn+SekE+7IBxtMExR/oiJygLy2qSxhgxiPm7HiANG
-4TNxgA==
+MIIBcjBcAgEBMA0GCSqGSIb3DQEBCwUAMDcxFDASBgNVBAoTC2V4YW1wbGUub3Jn
+MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDE4MTEyNzIxNTgx
+N1owDQYJKoZIhvcNAQELBQADggEBAMZoBv3Ok7lA2iRRDUvOYxZ+l9vWQ3qzVPaW
+MTXk/FLsZCMbUHRI0lowUraJO9i93si/KgdyuOTjdjktKf6tvp23u7F2fgFWTQ5q
+lxJRt5Hn0jDKWXB2pRbfY1H2TdC2vvLlyyLiVcBVrgrigqeP5hmLF4QqfD/G11Ea
+ob65NF+eeRCmT7KK/GQYl6ck5HkBjjDawGvRocd1Q4MV5MU6hq5yCOu4mPCkb4PO
+lMEutae0L4hHs9YXjcjX8evmMLBC+z0MjhhX8wlYOedmJDJ5WChjm8pQzLYaKcn4
+lRU4t3WlJx6+FabB6zL7sHn1jClfZM6MPVIk5ggBXBCvTln0G64=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2 b/test/aux-fixed/exim-ca/example.org/CA/crl.v2
index b17fe8ae0..90157a148 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
index 7c2dcd446..e47bb50eb 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20171217205108Z
-addcert 102 20171217205108Z
-addcert 202 20171217205108Z
+update=20181127215819Z
+addcert 102 20181127215819Z
+addcert 202 20181127215819Z
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
index 1d2e2f814..4747ec824 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
@@ -1,9 +1,11 @@
-----BEGIN X509 CRL-----
-MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm9y
-ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTcyMDUx
-MDhaMC0wFAIBZhgPMjAxNzEyMTcyMDUxMDhaMBUCAgDKGA8yMDE3MTIxNzIwNTEw
-OFowDQYJKoZIhvcNAQELBQADgYEALlKpDn1wXQ4xFhTT4REKpe2o0AsxJVZgu8ox
-Xlh/0BeFBOy63mGXofjMxROa5Omrwqz8x78IP4SBeyQlVjEsXSKxdyB960stfTfb
-Bd8KSzeWMxdYlbQUpstSKDXgOqfKB8HZPEAT3FqdbleBndFwrWW3ia8Z7POMt32z
-SX0Qo7o=
+MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm9y
+ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxODExMjcyMTU4
+MTlaMC0wFAIBZhgPMjAxODExMjcyMTU4MTlaMBUCAgDKGA8yMDE4MTEyNzIxNTgx
+OVowDQYJKoZIhvcNAQELBQADggEBAHKs7D3m2UlGFx/s9cqLmjz/yM7tABD9Tq94
+an1VWmAWWBvJYRlvuuP8BE8ujxO4LzKBfUzAEngYZsk89sqXjsNHW/bEp9ZSxsqo
++O5mUnvfu9QYdqvJoc1ju5eRiK5hpd7HFWtG3r47PVIzBVlOyNwrbbeOrVrDoXFt
+PvfRkj/bdiWGUDX9EbMxwKsZPYA080H+n+uW/Wg1Ml8UNZODRRSpeqHWbnMumzCj
+KUyW7X8s/k66HNdyYuXQY0cH1J1ke2x5HtmkIna/N2spLDJidfhd79PIzuP9nnSN
+lgEvq+qocq74D6UaKzDVb1c18Av9+NVNXahvaZh3ZzzxykqM7Co=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/key3.db b/test/aux-fixed/exim-ca/example.org/CA/key3.db
deleted file mode 100644
index ef6a2c4d1..000000000
--- a/test/aux-fixed/exim-ca/example.org/CA/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/noise.file b/test/aux-fixed/exim-ca/example.org/CA/noise.file
index 0f9a1627b..8ced64b39 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.org/CA/noise.file
@@ -4,8 +4,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.013
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -17,8 +17,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -31,8 +31,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.112
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -44,8 +44,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -58,8 +58,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.215
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -71,8 +71,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -85,8 +85,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.123
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -98,8 +98,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -112,8 +112,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.295
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -125,8 +125,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -139,8 +139,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.348
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -152,8 +152,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -166,8 +166,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1600.078
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -179,8 +179,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -193,8 +193,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1601.723
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -206,8 +206,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -215,79 +215,82 @@ address sizes : 39 bits physical, 48 bits virtual
power management:
CPU0 CPU1 CPU2 CPU3 CPU4 CPU5 CPU6 CPU7
- 0: 75 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
- 1: 69767 6441 4183 4351 8821 6710 4808 2655 IR-IO-APIC 1-edge i8042
- 8: 1 0 0 0 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 116952 16080 12437 10549 27759 16386 11560 7036 IR-IO-APIC 9-fasteoi acpi
- 12: 5146732 362636 240016 241533 534196 383274 265445 167959 IR-IO-APIC 12-edge i8042
- 16: 3 0 0 0 0 0 0 0 IR-IO-APIC 16-fasteoi i801_smbus
+ 0: 23 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
+ 1: 0 0 0 0 0 20849 0 0 IR-IO-APIC 1-edge i8042
+ 8: 0 0 0 0 0 0 1 0 IR-IO-APIC 8-edge rtc0
+ 9: 0 17211 0 0 0 0 0 0 IR-IO-APIC 9-fasteoi acpi
+ 12: 0 0 0 0 975537 0 0 0 IR-IO-APIC 12-edge i8042
+ 16: 0 0 0 0 0 1 0 0 IR-IO-APIC 16-fasteoi i801_smbus
120: 0 0 0 0 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 0 0 0 0 DMAR-MSI 1-edge dmar1
- 122: 40662 2645 2048 8326162 3083 2651 2210 2042 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 123: 50 3 7 1 9 3 5 0 IR-PCI-MSI 327680-edge xhci_hcd
- 124: 269 24 28 20 104 171 22 48 IR-PCI-MSI 2097152-edge rtsx_pci
- 125: 38 0 0 0 0 10 0 4 IR-PCI-MSI 360448-edge mei_me
- 126: 2 0 3 0 1 2 24 0 IR-PCI-MSI 1048576-edge
- 127: 2247 56 54 23 3781445 37 26 18 IR-PCI-MSI 32768-edge i915
- 128: 77 0 0 0 2 32 8 1 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- 129: 18 2 0 4 8 0 4 24684 IR-PCI-MSI 1572864-edge iwlwifi
- 130: 658 1 0 0 0 8 5 13518732 IR-PCI-MSI 520192-edge enp0s31f6
- NMI: 607 2648 2620 2522 2484 2423 2424 2470 Non-maskable interrupts
- LOC: 29009682 29903290 29748276 28947320 29021017 28514836 28466147 28814163 Local timer interrupts
+ 122: 0 0 30204 284174 0 0 0 0 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 123: 0 0 0 54 0 0 0 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 124: 0 0 0 0 0 0 0 459 IR-PCI-MSI 2097152-edge rtsx_pci
+ 125: 0 168 0 0 0 0 0 60654 IR-PCI-MSI 520192-edge enp0s31f6
+ 126: 0 0 3771 0 0 0 455167 0 IR-PCI-MSI 32768-edge i915
+ 127: 0 0 0 18 0 0 0 0 IR-PCI-MSI 1048576-edge nvkm
+ 128: 0 0 0 0 52 0 0 0 IR-PCI-MSI 360448-edge mei_me
+ 129: 0 0 0 0 0 0 45 0 IR-PCI-MSI 1572864-edge iwlwifi
+ 130: 0 0 0 0 0 0 0 636 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ NMI: 15 14 14 16 16 13 15 13 Non-maskable interrupts
+ LOC: 905212 930597 932722 977823 1028907 895142 955127 935727 Local timer interrupts
SPU: 0 0 0 0 0 0 0 0 Spurious interrupts
- PMI: 607 2648 2620 2522 2484 2423 2424 2470 Performance monitoring interrupts
- IWI: 6 4 3 2 10 4 3 1 IRQ work interrupts
- RTR: 18 0 0 0 0 0 0 0 APIC ICR read retries
- RES: 7884861 3950261 2714667 2193280 2472671 1957554 1665074 1987836 Rescheduling interrupts
- CAL: 987280 866818 901402 885321 915796 938469 935939 966658 Function call interrupts
- TLB: 231515 195523 218511 215448 205507 204323 194087 201584 TLB shootdowns
- TRM: 1627310 1627310 1627310 1627310 1627310 1627310 1627310 1627310 Thermal event interrupts
+ PMI: 15 14 14 16 16 13 15 13 Performance monitoring interrupts
+ IWI: 0 0 0 0 3 0 1 0 IRQ work interrupts
+ RTR: 4 0 0 0 0 0 0 0 APIC ICR read retries
+ RES: 241612 92765 40077 24283 17690 13138 11647 11179 Rescheduling interrupts
+ CAL: 33817 31808 33649 32783 33546 33493 32109 32390 Function call interrupts
+ TLB: 16415 15608 17436 17662 21126 17152 16593 16539 TLB shootdowns
+ TRM: 0 0 0 0 0 0 0 0 Thermal event interrupts
THR: 0 0 0 0 0 0 0 0 Threshold APIC interrupts
DFR: 0 0 0 0 0 0 0 0 Deferred Error APIC interrupts
MCE: 0 0 0 0 0 0 0 0 Machine check exceptions
- MCP: 202 200 200 200 200 200 200 200 Machine check polls
+ MCP: 29 30 30 30 30 30 30 30 Machine check polls
HYP: 0 0 0 0 0 0 0 0 Hypervisor callback interrupts
+ HRE: 0 0 0 0 0 0 0 0 Hyper-V reenlightenment interrupts
+ HVS: 0 0 0 0 0 0 0 0 Hyper-V stimer0 interrupts
ERR: 0
MIS: 0
PIN: 0 0 0 0 0 0 0 0 Posted-interrupt notification event
NPI: 0 0 0 0 0 0 0 0 Nested posted-interrupt event
PIW: 0 0 0 0 0 0 0 0 Posted-interrupt wakeup event
-MemTotal: 16293504 kB
-MemFree: 935960 kB
-MemAvailable: 13705244 kB
-Buffers: 452216 kB
-Cached: 12441244 kB
-SwapCached: 101680 kB
-Active: 2599204 kB
-Inactive: 12195644 kB
-Active(anon): 1355808 kB
-Inactive(anon): 588700 kB
-Active(file): 1243396 kB
-Inactive(file): 11606944 kB
-Unevictable: 64 kB
-Mlocked: 64 kB
+MemTotal: 16284452 kB
+MemFree: 10022420 kB
+MemAvailable: 13200564 kB
+Buffers: 262860 kB
+Cached: 3327644 kB
+SwapCached: 0 kB
+Active: 3258808 kB
+Inactive: 2457468 kB
+Active(anon): 2127484 kB
+Inactive(anon): 246404 kB
+Active(file): 1131324 kB
+Inactive(file): 2211064 kB
+Unevictable: 80 kB
+Mlocked: 80 kB
SwapTotal: 8212476 kB
-SwapFree: 7376112 kB
-Dirty: 9740 kB
+SwapFree: 8212476 kB
+Dirty: 596 kB
Writeback: 4 kB
-AnonPages: 1871100 kB
-Mapped: 415996 kB
-Shmem: 290116 kB
-Slab: 351256 kB
-SReclaimable: 257264 kB
-SUnreclaim: 93992 kB
-KernelStack: 12848 kB
-PageTables: 58476 kB
+AnonPages: 2126080 kB
+Mapped: 481728 kB
+Shmem: 248108 kB
+Slab: 324564 kB
+SReclaimable: 173120 kB
+SUnreclaim: 151444 kB
+KernelStack: 10064 kB
+PageTables: 39656 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 16359228 kB
-Committed_AS: 7879004 kB
+CommitLimit: 16354700 kB
+Committed_AS: 6641128 kB
VmallocTotal: 34359738367 kB
VmallocUsed: 0 kB
VmallocChunk: 0 kB
+Percpu: 4256 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 0 kB
+AnonHugePages: 806912 kB
ShmemHugePages: 0 kB
ShmemPmdMapped: 0 kB
CmaTotal: 0 kB
@@ -297,14 +300,15 @@ HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 523752 kB
-DirectMap2M: 16115712 kB
-DirectMap1G: 1048576 kB
+Hugetlb: 0 kB
+DirectMap4k: 282088 kB
+DirectMap2M: 7968768 kB
+DirectMap1G: 9437184 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
-enp0s31f6: 9760813034 13664519 0 0 0 0 0 8964 118421391088 83833279 0 0 0 0 0 0
-wlp3s0: 3643580 7768 0 0 0 0 0 0 4732829 8244 0 0 0 0 0 0
- lo: 9996035 41708 0 0 0 0 0 0 9996035 41708 0 0 0 0 0 0
+ vnet0: 1155867 4102 0 0 0 0 0 0 958956 10286 0 0 0 0 0 0
+wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+virbr0: 1098439 4102 0 0 0 0 0 0 735824 6022 0 0 0 0 0 0
+ lo: 7421470 45918 0 0 0 0 0 0 7421470 45918 0 0 0 0 0 0
virbr0-nic: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- tun0: 20139404 21860 0 0 0 0 0 0 3370846 19686 0 0 0 0 0 0
-virbr0: 47538577 146404 0 0 0 0 0 0 164360816 210422 0 0 0 0 0 0
+enp0s31f6: 39251323 34779 0 0 0 0 0 0 5044761 25668 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example.org/CA/secmod.db b/test/aux-fixed/exim-ca/example.org/CA/secmod.db
deleted file mode 100644
index f8cc0e78b..000000000
--- a/test/aux-fixed/exim-ca/example.org/CA/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem
index c9cf7dcd9..dd4b26270 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.org/CN=clica CA rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
-oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
-bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
-sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
-Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
-n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
-Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+0
+/AXNFYu9r75ONuVA+DregT3n0YcxMQ8l+GYxgxrFkDXEl0cpmPd9G0FWOU4S/il1
+ou26A72Tk112tgy2az+353taOgRFNK69Lyo9brBYyAhGKmBJWyuwL5d3c1YY92gr
+2O2fzno7KP10byITammONZ+XHOHbKtFH6/s1Emn5B7YwkPuess92ddQAK/rWTPfG
+94h6DcCsoTViIgnOGiDSwAih2RR5+j0+4/BfpqHPZIKooslmHWj7pu9mR02bRbgA
+iXXGyaj89AfKObLHWuNC6mJb+sKsSoX+MOFCfLrIsLcxzTiZ6soB7tSiBS5EBaZ+
+w2/viGNLmDLWnd8bNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAJ+JNevMy3D+5qRSNiOu//jB
+6yuUGZJuOFA8R0A5fZpdsVwmzBDWSAjM5o4NiWBYuK47GqSz13gTbRc77X7K9Rb8
+rNoFxdxiB6XUtNoII5eMebgHOrO/eKTmn66x+yM6bD9ypR6Yz3uq2MC5yDLWT4uv
+axoL+W9E+VesTFBL9d8EezfKliHdL2Knj+NPYMQ25xRGltOZCOs/E0NIHzt4RV4z
+kHdctDkkZu5EdtsC/pZ7FQgvtDFod89uAYY3ZQ/fFaqw3XkRpkycQcYe0kSv0AZp
+padHI4kXxR4hE/tbBYipJFFoeeeXypZZ9V9V9Lps9IeJduadgXUPR07yA7XRLCA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db
deleted file mode 100644
index 373627491..000000000
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem
index cc9c7a5f7..251777941 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: expired1.example.org
- localKeyID: 90 42 F6 BB C9 D1 AC 51 79 53 4E E0 F2 44 CD B0 FD 03 25 A6
+ localKeyID: 94 15 DB 8E 03 54 E1 54 D1 ED F2 D2 11 37 0C 18 DC 2E 3A 80
subject=/CN=expired1.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTBaFw0xMjEyMDExMjM0MTBaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDF9YzUTezJJ8uz
-6B6rG+H8o72xbwqFhLpEUUXjcHR5jvQu4U5ITpX5ojFg0PV7cH4kJtAfVrijcHwe
-XtxYNB4XgrV1/9ndFu0NHLgdsS+C1Tu3h2b4jdcjyN/DXfRd3tIZOcYxaOhHgAz8
-zpb/TClKxDmP5UDmNmeMS/IZXXOOBwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
-A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-ADiojtPPZXV9BMA0dh4i40Lws8MZpnm2to3OlTW4ekGhHB303SZtauGzHiP16kQd
-36f+5aVYB9c05lYznKiaCymdMUTzuvMBosUA9iYRs0yXJw6IeRpVOPks9FzEhDyv
-bXRF8cAqfrjWggfukQ7v22EiFDP42DEfeDKb+5Lal5UA
+MDExMjQwNDFaFw0xMjEyMDExMjQwNDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3V6fGZt
+Cte/MtenrBWVY0P7bvIHtQd1IdV5i4zMzQQRNvfxquyfPQ6j9eB7z8ZjIT59n5Kp
+Awcc5Japm4M7ug5qv2tjRTwLm+iCJkmjsw8LW7EtFV8EpG7qjpsJmieKjzEb2Ann
+o2cZ28h4XAc/8t6RURPw5vwfL+bEhLnvqIeow/e8jiI9jg4g2Yb8VYJmIQzGpW/5
+UbUl54ApjsAnSMK49Ie/TEOBNKLlODgb9mO/R5l5W6f7fH3Uf/zL5qZzjC8W19bZ
+trgcAE7+qnmHt/uaeLuxMlDHbRaiMwNvxshW6EzWk9qexA2FlMlHpgZZUn1rScws
+zZP1YTo4Lt9fVwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4
+cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQCfNdixAikrewya
+LgT7Yc3nsOvZ7QRQaI3e1IRvjDnGqNhMmKcEf+q6vqKBTfBnEScphkZuBX8rI1Fw
+/EpbtmsI74bZc+koYWx/JeHuD/yOW18LNu5KosLhUT/hVtGd10IrUF7Re2wgQ9K3
+xx4Vl98h/4DKZ7PqOtdoxoVI0W6xi8vX2F0oKOCHxMpT5MkeZjNIXESTFlHR1j5v
+N037HQ9s3sCSLzfGGIt3s2D6ZX0HInE1EivFr45Eh+X94epPfuU06ywe2ZGwgjhu
+qqbPHrxtAyfB8LxwKRFdB9nuleo7rMnO2M4ASPm/P8FDDkhCb1ELQ48cs6wjOfqr
+C1NJBtzb
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key
index 46678dc74..e0677f6c8 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: expired1.example.org
- localKeyID: 90 42 F6 BB C9 D1 AC 51 79 53 4E E0 F2 44 CD B0 FD 03 25 A6
+ localKeyID: 94 15 DB 8E 03 54 E1 54 D1 ED F2 D2 11 37 0C 18 DC 2E 3A 80
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIZQtWztc7lo0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFFLUbCqhj3eBIICgITbQ441dxkl
-xvMcRvv5T2DIQge76FnPKY+0bUYb7dsB1uZZQ3mKcD6GRiPFR4/x0F6KMzpMoL8Y
-225xxu3sdQwtjVivMVsPSuRHDJmqX0uUjv27oD1NOAfQOZiZlFu4x9h7odsA00ML
-1ryw5BUbvz4hfBsDRBTU2yzB/0fCm0qgMb5ak2aHqiR21Ad8ha14Y/1E0LXnGmbK
-b27eWqzuegRGSij5V4COhY17QB2nKhqmi1Y3uVC7KSuSBWNpz1fFpN+UpNZXJwAp
-iyWqHpl8rD/juJ3BKCzvhM1fOFkBkm8YWxb2KJMCILnRu9ucOy7ZpLeyBEn1Jua+
-Z47kGqoNauKLMMOZFBreRrudvH1yqtI1SxZJLftCMQ8yAH4eDxLrw7bxc4LJ14No
-0oZiW3SHcwNU03GZ3wQCg5SggKeRJOeymkMQsYqkdySyn1IV83051V/1oMMsWluf
-A1oxp8u2l5mvMFJ/B9CiIwTFOcUW6QvL9F+/bpKSUVbTqVhF5ndZLbZBDe7GMwZs
-cieGYGZiqzz5WxK5Im+BP1IChPAKvkr5Sd4UZv+vrY0IsLjX9BT9yGrRQPnVy73S
-NAym0O4y8snl2MUzTn6+XFvsW7xTh5CnmKKkDxsORdwb25Rw2wqN+94BubBH3IrV
-mjOlHCUeomx7VAouR6xiZmJi33gFHfTkvg5GpDhWNjMqMB7yNNWUfvNF4v4lEVI0
-J6dFwTlXJOOBV3teqBz2cz4h16Tdd5KZHV4WvZr5nanKO/QZCvmfzUdl/QpeLhsL
-ZPfY6xJTGhK/Hpg+8pbQgkbdxWHp3YgnJ4jwQy6wMX26Whwe7/xhdm8eQvmx1c0h
-XkNwMqOpjeg=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsGeNmikEOicCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDY2X1eV1aLyBIIEyE1GkyeULy/1
+/UiCnBhf9vYX1iOSFVkY2Y4PNXdEZ6wqWWYVCZRhLsHEF63uMmNdNk86ctyHx5O2
+KjJscjYVCcSYF7H9CSgJwp9siwUaMlUbTnTGs8F6PLTrXHShYinlrOrhT2+het67
+4lK1V+oUFXqgBLicTJRtOMnB+v8gZCLGs83sV6ol6neHf0KGmNx2KoLbxhElLCVT
+9EncRv9/3iunLY5e8sJ6TNVKx7mM38EVShbQ7LN7aaxeejSFCfX9SoExNnHdMECX
+EWLf/8Cbai/+wkFZU1XpBGV6o6Xk+6MXTGDL2OWkhwxNqVUFkyJvGuC+4Q0USTX9
+isT2qS3r7bpLsCixcqhx0yeHeALjzMyQ1vjmogTusRo5cV1yRZr59oNhWFjXJlxz
+Mk2MI3kEgWSVU6BaFwg/xuVJEBCfyqwiZJZhPJD9KsIy3kE7L2Lpojt0FO1g7cv1
+fUMm42bPIyTbeFVDD36c1wZVFc1oNMsL4zRCnZn2PAxeMOVqRZS2qCCybf/LjLk5
+j96EpIJboe5QiBOjbCh/3843dabFifUxd3zQBUtuNeWUo6vzh/1W+VWJT9YzAv3C
+UDrn4YAtAtjpT15wmLyk183bTphFunm0y0eKejn8rKdCXEix/Gv9VsxZoyTGo77V
+bOwITlo8LK4nAq+BY0C7c80NCb5+Oba3x48HvctT5dOkOVS2pNPIkv++zW0TvBzn
+dfFnPT4PVaSFZ7U1aCw+PbcpMf/w0nG3uPsr5pOCcaI3dfs33UvKo/bCQOY/h92U
+bdKn4uCMKnmSby6wB0Jwo3y3P6j+hsR7HPl9XZ3+4jZSM+/RE2Yq3oXrTo672Buf
+Si7neoFT9F8vy9Mj3EM9mHe/Fl896o+XZOWDFwdy74OBCBBYJlElDoPRlq8UarRq
+GZ6sJoREUiPGIpKVhppPPf/1r5d9277QL4ys8TAOiNuFtH2UYU8k5qj1kwGmsdd2
+Avy2t9QF27k4HJbhgbga8whetUm8v3m6/M9H7DnmIpLF9IlKZMlY4pj19Tq61ktv
+oI4MGlWL/PAYExGv8GMxHluPRIEvv0sm4CNB7jwyTtlzAxZORuM9XFEWz5ys0x/o
+sVfNHfUr+Lsj43tDqu6qzFuWOOy84mLuRWh7JT0y4xLjnAAOChyU9EYZO2pU/DnA
+3St0HArEC8QZBdLGVD4lcCSOkrINsSbCIwMq6UjqhnG4PQ2ex3xTmwHV/Rq/OCcb
+eShsU5GExZ7XawO8E1NtkTRC//qJNh+Oef/qm6oEikC3NF6TubN5NsRphrCpCcCS
+tWwjjOmdWrB4rnedrGS1kAVD4JqglBe15Jw8xdFcPwsvgLc9GWKREu0Pe1no8qUz
+2cHEC943K1ezYZQoOOfZlGHjPOPEs8JsRCeQhjRmKxRvd0nHvUJHxA9Oy7NpvjCm
+bBc17A/0U4kAE1lK2ow910yJHvuvuA/CLUx/eDNm848dpSxSbVbyoYcG7NcNQMrq
++BjOuqYiNP8t8F5ga/aRhRA5XAJZgL/y/Y7JUDA52y6vUKaEl4tmvHsmt4SeS0M0
+5IHP0BPQ3nX2RZbufskvSOVU+nHGwUwRB4feULhLzIaXnHkyLfohNx6L4KNdz50T
+EEaRJh2SXQ3Cc7clCyvDbQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp
index 810da1db3..5a219d38e 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp
index 522e30ff9..770517336 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req
index 394654548..f05610586 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp
index 05accc2de..28a4ce967 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp
index 94742bc15..2ca2f68f1 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp
index 6a886604e..33eb8f9ae 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp
index 3d046615b..0f33545de 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp
index 887a3787f..4efe89e8a 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp
index c3e16699d..ba0b2bf2c 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp
index cf05fae11..6c39e8606 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12 b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12
index 61da138b2..c01c5f62f 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem
index 8f782a59d..dd432c3f7 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: expired1.example.org
- localKeyID: 90 42 F6 BB C9 D1 AC 51 79 53 4E E0 F2 44 CD B0 FD 03 25 A6
+ localKeyID: 94 15 DB 8E 03 54 E1 54 D1 ED F2 D2 11 37 0C 18 DC 2E 3A 80
subject=/CN=expired1.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTBaFw0xMjEyMDExMjM0MTBaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDF9YzUTezJJ8uz
-6B6rG+H8o72xbwqFhLpEUUXjcHR5jvQu4U5ITpX5ojFg0PV7cH4kJtAfVrijcHwe
-XtxYNB4XgrV1/9ndFu0NHLgdsS+C1Tu3h2b4jdcjyN/DXfRd3tIZOcYxaOhHgAz8
-zpb/TClKxDmP5UDmNmeMS/IZXXOOBwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
-A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-ADiojtPPZXV9BMA0dh4i40Lws8MZpnm2to3OlTW4ekGhHB303SZtauGzHiP16kQd
-36f+5aVYB9c05lYznKiaCymdMUTzuvMBosUA9iYRs0yXJw6IeRpVOPks9FzEhDyv
-bXRF8cAqfrjWggfukQ7v22EiFDP42DEfeDKb+5Lal5UA
+MDExMjQwNDFaFw0xMjEyMDExMjQwNDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3V6fGZt
+Cte/MtenrBWVY0P7bvIHtQd1IdV5i4zMzQQRNvfxquyfPQ6j9eB7z8ZjIT59n5Kp
+Awcc5Japm4M7ug5qv2tjRTwLm+iCJkmjsw8LW7EtFV8EpG7qjpsJmieKjzEb2Ann
+o2cZ28h4XAc/8t6RURPw5vwfL+bEhLnvqIeow/e8jiI9jg4g2Yb8VYJmIQzGpW/5
+UbUl54ApjsAnSMK49Ie/TEOBNKLlODgb9mO/R5l5W6f7fH3Uf/zL5qZzjC8W19bZ
+trgcAE7+qnmHt/uaeLuxMlDHbRaiMwNvxshW6EzWk9qexA2FlMlHpgZZUn1rScws
+zZP1YTo4Lt9fVwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4
+cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQCfNdixAikrewya
+LgT7Yc3nsOvZ7QRQaI3e1IRvjDnGqNhMmKcEf+q6vqKBTfBnEScphkZuBX8rI1Fw
+/EpbtmsI74bZc+koYWx/JeHuD/yOW18LNu5KosLhUT/hVtGd10IrUF7Re2wgQ9K3
+xx4Vl98h/4DKZ7PqOtdoxoVI0W6xi8vX2F0oKOCHxMpT5MkeZjNIXESTFlHR1j5v
+N037HQ9s3sCSLzfGGIt3s2D6ZX0HInE1EivFr45Eh+X94epPfuU06ywe2ZGwgjhu
+qqbPHrxtAyfB8LxwKRFdB9nuleo7rMnO2M4ASPm/P8FDDkhCb1ELQ48cs6wjOfqr
+C1NJBtzb
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key
index 4206ee002..55aad4627 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDF9YzUTezJJ8uz6B6rG+H8o72xbwqFhLpEUUXjcHR5jvQu4U5I
-TpX5ojFg0PV7cH4kJtAfVrijcHweXtxYNB4XgrV1/9ndFu0NHLgdsS+C1Tu3h2b4
-jdcjyN/DXfRd3tIZOcYxaOhHgAz8zpb/TClKxDmP5UDmNmeMS/IZXXOOBwIDAQAB
-AoGAKUopuSCVynE0Ak7gkrUKolzu1IMCMU45YcWH68QJb09bbCnPX7KQgpSLcxOy
-mDAjB1xXHapDccelA9qqX/Vi7wsBOEhSGxaRgmP9H7tO7pJjgr4bs+Rlv1bR3foI
-1qyxHMGUqCVx3t/mvE+Vp18tBpbd7UFMkJtKvPVPWsy2nNECQQD6cRm/uU4kTg8j
-cROWfv9tyrmeob/HmtfC/3zGEmExfcnYDiH8qyLHqAK0RKTHgYZO4i1J50DH5zCn
-8yuJFnvXAkEAylpEOzaVgjIz8oadxkCF7SNE1rL2TrPcPqLhYW9g0G3krSM3c54G
-np0QFVJwTUUMT0bYon0lhfX9+1ryNei5UQJBAK4n1GYU8JgiiDh3O83eBrZM0YPU
-q06dCQmbLSN4SIpoFOLgARZ507fPyAGf8o6iLcnRUvkfjVb2GEnSuiWcswUCQAyb
-URLrVKc233ulnWDDllRu1RQXNDc1B2yzkx0R5lM19YA/6G2Ak+L/4AekCjEWMy0h
-Oc/twg+1gqxNPzfSlvECQBOPfF/dU47YThXaSzU1IYve08aapgXtxdhYqawbVHQM
-m7DH4qvsCgTU7Ct13/CdIxoXtmTpQqBlfy3v97F88k0=
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db
deleted file mode 100644
index 590c5c695..000000000
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/secmod.db
deleted file mode 100644
index b1dfe2826..000000000
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem
index c9cf7dcd9..dd4b26270 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.org/CN=clica CA rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
-oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
-bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
-sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
-Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
-n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
-Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+0
+/AXNFYu9r75ONuVA+DregT3n0YcxMQ8l+GYxgxrFkDXEl0cpmPd9G0FWOU4S/il1
+ou26A72Tk112tgy2az+353taOgRFNK69Lyo9brBYyAhGKmBJWyuwL5d3c1YY92gr
+2O2fzno7KP10byITammONZ+XHOHbKtFH6/s1Emn5B7YwkPuess92ddQAK/rWTPfG
+94h6DcCsoTViIgnOGiDSwAih2RR5+j0+4/BfpqHPZIKooslmHWj7pu9mR02bRbgA
+iXXGyaj89AfKObLHWuNC6mJb+sKsSoX+MOFCfLrIsLcxzTiZ6soB7tSiBS5EBaZ+
+w2/viGNLmDLWnd8bNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAJ+JNevMy3D+5qRSNiOu//jB
+6yuUGZJuOFA8R0A5fZpdsVwmzBDWSAjM5o4NiWBYuK47GqSz13gTbRc77X7K9Rb8
+rNoFxdxiB6XUtNoII5eMebgHOrO/eKTmn66x+yM6bD9ypR6Yz3uq2MC5yDLWT4uv
+axoL+W9E+VesTFBL9d8EezfKliHdL2Knj+NPYMQ25xRGltOZCOs/E0NIHzt4RV4z
+kHdctDkkZu5EdtsC/pZ7FQgvtDFod89uAYY3ZQ/fFaqw3XkRpkycQcYe0kSv0AZp
+padHI4kXxR4hE/tbBYipJFFoeeeXypZZ9V9V9Lps9IeJduadgXUPR07yA7XRLCA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db
deleted file mode 100644
index c06d33761..000000000
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem
index 022d98d34..29187bf7d 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: expired2.example.org
- localKeyID: DA 3D 04 40 EB 61 0E B3 5C 24 FC 91 A5 82 4E F9 D9 5A B0 A2
+ localKeyID: 35 2D FE B3 39 C0 48 0D 38 09 21 5B 3D 85 22 E9 5B AD DD D7
subject=/CN=expired2.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDEyWhcNMTIxMjAxMTIzNDEyWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwkHfZPWmAF8c
-dvzGIebqJGpq63Bx2WqsIKf08kSB3S/MQb/Pvel2qx05Tyo2P4i4rDY1kPKVnEho
-s00Oeyg2tSwUJDL2ZsPB221hwAyhZ59RjIY1t+gmn0EoiD3nhJQTODjYrvVkUN/w
-Ynx7q/eWbbJZT0nQbdLEHSUujtBeSFsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAf
-BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOB
-gQAU45FpwbYgAbq7og3APeDAVAtnNaySEndCceDkeZor/uAsxaYvYDfuVdZrMvEk
-kOtFe/+U+uz+pUthwCe/38PHMXa4TYZrvK4qJ0kDEaeR/XCp+6ek02i6sgi5A7iU
-POMVniBAvjspiafuizQ1gBVwZaA4mbOGJMyN2SbEcv0J0w==
+MTAxMTI0MDU1WhcNMTIxMjAxMTI0MDU1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOnIrMvi
+C7D5x/cms6bm57pkKtQYwIaG2d6wVZJ5B5gNsKbfbyjUkPzrsHDGR8b8z7zp4CWM
+7e/oyXqoDFC48Ollp/iZAcwn/Jaan6+Q8qlasfIPK5TV4ZSaHdFPdkwyBj2SQfhS
+QWiU+dEblCkH6nfSwb5mwU2XaJXs54AU3BSxw4/zXAq0lQO1pUY8kwI/xaQMptS4
+CQjukoc/DRUhPvdJB8D4S/dDiI/4bw3yRgrbLhB+80OezHrir4BBmcgH9dIvKTyb
+skH4O3fYD5ZiSYHqqebFGfKwf4GaaHtfcJ6zDXv4yMM8y/iorr8IHqFCZp5Y0EpH
+FaxzTI11wbIy06MCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRl
+eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAdc6tdUEMnBup
+dXrIpdh99Ia92lV2/brxUrMIy2ak6/hZdDqgoavUprzut//QASurU9bEmoR+koDr
+T03/gPvcjDGQc1wJeQnMqF93/2VGRj4HhaulXsgPHUfiX07gkwz1vAyOLm1VBlLA
+Vpdyp2IgF46rRFuiI7tTcaq+1rh1/JDAThkRMSsTjDAJJojwlpxgQHrrcNOC+O0F
+dM7j/hG4yRibxuz+J3x66NcpCUd/iR38+y9xRSpNFJPeFpM4Y8dTsKqf36NF/ciV
+m+Xxn6vzxnYAWfq/dXEbIy7QEeI/7Cf5fWyrkPM9OIFgbPAC/e+96nby0z/KEmqZ
+fJKD922TiQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key
index 562f475b1..9fee09caa 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: expired2.example.org
- localKeyID: DA 3D 04 40 EB 61 0E B3 5C 24 FC 91 A5 82 4E F9 D9 5A B0 A2
+ localKeyID: 35 2D FE B3 39 C0 48 0D 38 09 21 5B 3D 85 22 E9 5B AD DD D7
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIcVdYq6H0HFsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECK/0P0ReP0OjBIICgKmZQ2lAk8Hd
-5VVPzzbrgFWdh7GUp174PVaoWwHK6zmTNfGjhke5ydmSxVpZl0d+HroW4ExUsBNW
-/cTKCjKM/8Cq240F5y4r9ntm0B9/LJYp6A4hGk6m5Tl7WBPgpDOLPLytJ0E3YULu
-0nslg/rk+K6sfbIzau248ouULWZZSvTpppUfQWtJy2PNTg67AoyWNlZ+kC2t8oOu
-XfhmyhoA9xbKKVIyFNDUS/6XmAHpZ5P0b7RH3eDyAevnfqZX+RHBJNuI+0QxjBNk
-E5deJmDqsRh8g2pDpro09Z1UIooeOaXebeKqlRlidw3n7BOPLDs+1tms29T3huH5
-bCKLbkv/tw/LSZkunt0yMRhHo3n+lf4pVpBwxy0LQARUcOlkO5evc4DaE6hAxX5u
-78HNItoNgxF02bSSjEZHJMjxgQAkYZKoF461P3I2QGjvalpvlodq1gAl2DnsPsZc
-uzGDO2zp0YTNaFpgxT9AWaQkP3k3tj9zNz7Oy5N9kgtk8Fs3vEFA9fTOjg7YSvgD
-zidBttYYSIrOPi1OJHMmT5gXI7oDVv59vqyTsRybGriN8lwYJbsA0vfGhhezdBdY
-1EQXFk9k8T2E8MM8+8enqFW5qCdvXN7k1EyN0GBLD7A/gNQmiNb/LUriDL5WCF5j
-AtnX3jHOvJwgD7BhBUYoNLu/rGwLee3lVcvdekJt1LCEN2B5S6WU83BMtwfDVvup
-LzmiuzMVUtPSsu3Kp4sCqBJpiRbEUtF/pHsjEWu4x/t2pMobGD8pVx40lMO5U+m9
-liPEGIZqANmkLTDBVNvKlVWhN/d/IoMH5I3bBYrtWym41UIiNYKUZzzA6Mh9dWgj
-2W3LG7/KvtE=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIOL2kB79KgFgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLuEpzYRV6P9BIIEyB0wWjlSuFHH
+lDjIg/cb5Q0cc1NoIs9ixNLrLuI9gAQZVqcAiL11ogqLZ9gLwc1HNaOkHy6qR5eA
+xwwjAjNHugxAJ8oeSqF1PIE2CkxYKmIeUpyHn6odPhoWye9rUMTHAGM7xG/wpFCD
+6ihCjpmg8mfbP9gL6HQLNHL/7CkUGVTf6kNidLTrdHUf/V5vO3AW6YNloULxzApX
+r5F8ogK8IdWkWMN+r8CRwCCoa9dR8D8VWuGUTzk1Up4H9QO/4oggbqf2rWzMHGas
+BfXj6N/4bH33c/ImYLb9+qb4IyKwHB/EqyO7Y+MtbyrjURiqFpuxGS08d/tmeslL
+NUZWZWFKOD7o9GMygY3fpWuT04GNmG3teFZnQhwhdVyDc0ufRomJQqDHSoRWBjZ5
+15XQ50r76wnws0crM4KMHPxbXvZCJAakSI4UxYv/c/yCCiumuuGdfirV3pItGwbq
+kPv/0rhS07U41bWPZl/8o/AKLGmDf26RQMBVbEaSBbA3whsCwahzTqfRSdHXwtd9
+i81v+v69jfWXnrlAxZZt4orqrF843/pixwJR0Yd1m02omTeo0HXU7TAbN5SAY9Ei
+skdnIoC3ykWZsdud27lJTv+8mu1aSR3yjy9nQK9JzvT3BYDbnge/IUQ9MGuKGIj2
+kTyRaWhcd0S9re4rG55Waq/ck58CTYcfiMBi+1fjI0qGDAWY8bUQakZDqtSV1iBV
+rPwuZJl4oiBPVZ6k9uLh/Kx2VNlxcXSvttM2VEFR0zy7zwht2j6ijBH4vvMMzjQj
+60dZh/TsYRmaNrfL+rw17Aat/xs3DTBEU5XnmdPzDnKWnob6niAkre5pLUHFEbNX
+boYx+sme1mf8wy8TRXSRzaAgPpp8QmbqK+S6Dp6PWNdE2k+rVciln1evIcv9OpkX
+nw+SQauuMfWtrvHfK4P2TVzjJ4NCjjVid+sHdR6h1gssuJL2zq0/LC27klTtvhqj
+TNUu2KcVcN0cP+lPpPFI9b4ZqY6FVGTZBxyUDl0D/LPkeGVEDEKUJhlBYDyPvrfc
+tNCm1nIv7INpt7LLzeufrwO/MguOAwihI1kkjPoiJgwpioXHjRzTNryXZwpuhyQ7
+IpaQ3077d5cRMl2vZsmCD6aWrNdg3IuJmrTgA8KHb3j++9nPj9AAvwNnxIo7NUke
+wpeLQ/kPHNYdWjfFyLjKQr2MzkBTLvVWYSe0ismf2rAX0FFg6e5ZaZSGUbA4ri7I
+Ql20IP4naFnb5Bqs5IHba6WupUWKB53HQUkD49PK6thfe3Be9Vz1qlLut8bnBOYH
+IkWBL9MBtmELc2AdCQ4q3Q34efnWAKCT7W5EPQgGxdB0ijq7xVoDa8NGon50eBC3
+e7xMnixkfKt5F6hp0HE5M6N73y5XPKlBlSRoO5li0gKUeV3qVVD4RNxipCX702nd
+pAYOKNkjNexnTF0RLy0bXqkUbErIAPnOCKLe2xR2i954Ail86TnKcahXvnrSa8cE
+zZbTkMJxSKtsIFaPA/ibbzexFegmSI9iy7zgUPW7NKsZTOWjVtFR4txnpvfBp6M2
+1Z/xDLBAKzMyCsCEdDGe4ArBoUZy101Z7rrEOxtiQTQ7o+By+U16VUDmM8FmJU5d
+33VHW75/jdF4bILlHMn1sw==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp
index d9a44da42..0fa757326 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp
index cd490d2ef..d5f15992d 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req
index 302fcc660..efc46e026 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp
index cd490d2ef..d5f15992d 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp
index f5878d52b..09b2e8dc1 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp
index 1f4cb4d36..481d922ff 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp
index 1f4cb4d36..481d922ff 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp
index b33dd2b01..238920067 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp
index 52c294a6d..dfcd968d7 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp
index 52c294a6d..dfcd968d7 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12 b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12
index af2e064a4..105bdb9d4 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem
index 2d8eabb09..339566fb2 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: expired2.example.org
- localKeyID: DA 3D 04 40 EB 61 0E B3 5C 24 FC 91 A5 82 4E F9 D9 5A B0 A2
+ localKeyID: 35 2D FE B3 39 C0 48 0D 38 09 21 5B 3D 85 22 E9 5B AD DD D7
subject=/CN=expired2.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDEyWhcNMTIxMjAxMTIzNDEyWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwkHfZPWmAF8c
-dvzGIebqJGpq63Bx2WqsIKf08kSB3S/MQb/Pvel2qx05Tyo2P4i4rDY1kPKVnEho
-s00Oeyg2tSwUJDL2ZsPB221hwAyhZ59RjIY1t+gmn0EoiD3nhJQTODjYrvVkUN/w
-Ynx7q/eWbbJZT0nQbdLEHSUujtBeSFsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAf
-BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOB
-gQAU45FpwbYgAbq7og3APeDAVAtnNaySEndCceDkeZor/uAsxaYvYDfuVdZrMvEk
-kOtFe/+U+uz+pUthwCe/38PHMXa4TYZrvK4qJ0kDEaeR/XCp+6ek02i6sgi5A7iU
-POMVniBAvjspiafuizQ1gBVwZaA4mbOGJMyN2SbEcv0J0w==
+MTAxMTI0MDU1WhcNMTIxMjAxMTI0MDU1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOnIrMvi
+C7D5x/cms6bm57pkKtQYwIaG2d6wVZJ5B5gNsKbfbyjUkPzrsHDGR8b8z7zp4CWM
+7e/oyXqoDFC48Ollp/iZAcwn/Jaan6+Q8qlasfIPK5TV4ZSaHdFPdkwyBj2SQfhS
+QWiU+dEblCkH6nfSwb5mwU2XaJXs54AU3BSxw4/zXAq0lQO1pUY8kwI/xaQMptS4
+CQjukoc/DRUhPvdJB8D4S/dDiI/4bw3yRgrbLhB+80OezHrir4BBmcgH9dIvKTyb
+skH4O3fYD5ZiSYHqqebFGfKwf4GaaHtfcJ6zDXv4yMM8y/iorr8IHqFCZp5Y0EpH
+FaxzTI11wbIy06MCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRl
+eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAdc6tdUEMnBup
+dXrIpdh99Ia92lV2/brxUrMIy2ak6/hZdDqgoavUprzut//QASurU9bEmoR+koDr
+T03/gPvcjDGQc1wJeQnMqF93/2VGRj4HhaulXsgPHUfiX07gkwz1vAyOLm1VBlLA
+Vpdyp2IgF46rRFuiI7tTcaq+1rh1/JDAThkRMSsTjDAJJojwlpxgQHrrcNOC+O0F
+dM7j/hG4yRibxuz+J3x66NcpCUd/iR38+y9xRSpNFJPeFpM4Y8dTsKqf36NF/ciV
+m+Xxn6vzxnYAWfq/dXEbIy7QEeI/7Cf5fWyrkPM9OIFgbPAC/e+96nby0z/KEmqZ
+fJKD922TiQ==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key
index 3a7912b04..c4d60c62b 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db
deleted file mode 100644
index f70fe48ea..000000000
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/secmod.db
deleted file mode 100644
index 864618ea8..000000000
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem
index c9cf7dcd9..dd4b26270 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.org/CN=clica CA rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
-oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
-bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
-sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
-Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
-n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
-Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+0
+/AXNFYu9r75ONuVA+DregT3n0YcxMQ8l+GYxgxrFkDXEl0cpmPd9G0FWOU4S/il1
+ou26A72Tk112tgy2az+353taOgRFNK69Lyo9brBYyAhGKmBJWyuwL5d3c1YY92gr
+2O2fzno7KP10byITammONZ+XHOHbKtFH6/s1Emn5B7YwkPuess92ddQAK/rWTPfG
+94h6DcCsoTViIgnOGiDSwAih2RR5+j0+4/BfpqHPZIKooslmHWj7pu9mR02bRbgA
+iXXGyaj89AfKObLHWuNC6mJb+sKsSoX+MOFCfLrIsLcxzTiZ6soB7tSiBS5EBaZ+
+w2/viGNLmDLWnd8bNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAJ+JNevMy3D+5qRSNiOu//jB
+6yuUGZJuOFA8R0A5fZpdsVwmzBDWSAjM5o4NiWBYuK47GqSz13gTbRc77X7K9Rb8
+rNoFxdxiB6XUtNoII5eMebgHOrO/eKTmn66x+yM6bD9ypR6Yz3uq2MC5yDLWT4uv
+axoL+W9E+VesTFBL9d8EezfKliHdL2Knj+NPYMQ25xRGltOZCOs/E0NIHzt4RV4z
+kHdctDkkZu5EdtsC/pZ7FQgvtDFod89uAYY3ZQ/fFaqw3XkRpkycQcYe0kSv0AZp
+padHI4kXxR4hE/tbBYipJFFoeeeXypZZ9V9V9Lps9IeJduadgXUPR07yA7XRLCA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.db
deleted file mode 100644
index 3b50f3224..000000000
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db
deleted file mode 100644
index b684fa666..000000000
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem
index 7dc806ee8..502881e06 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: revoked1.example.org
- localKeyID: 9F D2 C9 4E A1 16 99 C2 3D 76 75 5F 81 F6 83 11 42 E4 BD AA
+ localKeyID: AB B7 FF D4 FF 40 8D EF 71 FA FC EB 4B BC 6F 3D 7E 3E 7A E3
subject=/CN=revoked1.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDlaFw0zNzEyMDExMjM0MDlaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxCdpAKtYBb5Bm
-4ikR0lwpZikY5FIzbKE/Eu18W89AR8WkG4eGR+g5doZynkqM5f9Mb6VD7XpfvFKk
-Alpl8/gPhap0wgYG7PZ9oXaif115z/nuzetkdnGMp4PJLBeKdvPN54pOxJ0h4PfH
-j+BJqr/m+EdpQh2ktQSXh5fOcSAFwQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
-A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-AFj9B7rrOGYWqLvl7KaDtkpJDdT0Ll36dssJzxnvx7/0Bwjxy70oi0YPy0RATdL9
-q8Y0hrFculsSbhaJg54sk+V86dFASqPRmZUr0wNFrk0hs6b664rRxtTxt3ptc6M+
-ONFWldcmvrsvnC/O1TUfPbFZzvrwjapTJyezaFzv2uWa
+MDExMjQwMzZaFw0zNzEyMDExMjQwMzZaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVOlgKCr
+2xnu1qTG/iKjpYss9Fhlfrcn2x/Jeazm7U6Z7uR+OpdkAGLDt6nJqt4htlymkC44
+i7VJbnsEP9FaUDFGl+YOFDnQRIMWxk66/grr5nXimGyUqXSkMkfOE0IQrwk7+oXu
+SxDgD+5+F6TstppbxDRDJVYO4fTZ2iKjcYDHKQ1IIPT6knvvBmWL0Q3o5APYd5Ps
+m4bfjdUTnVk1AvPSfe5QLOGg/mN9NfJTGlnVxB8HuO3qAnpyCHALliVB+Z40xPF6
+7kInFkUUtqTNc/NYuRrIZ1VMHlrQDcOydG3S9yciyjlViYvle8X0QbU5eEBczIxL
+hRw04Hdx8Tx9NQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFHJl
+dm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAPWhZMf55HKhFm
+075rhJQrpc4gMFLK7XGcXInoDvC4vtFYQw63PPs/tAa4DJCCZVK4ujtL5Ddjlh7K
+GTAj726pHAy+qcRlhX93rREGbSZnJ9BSJAZYXEeZqrqkIyzvfvuhh4oXDoHKP64r
+wOj0eBGZZhHKDVHIzf6y2Uap66GFPqBVhtvrHS6a1fyoA8g3eEnNf+RKP97ooBvv
+Vp9w4zSn414VwJK9lW66gW3TldUmV7Ly65nQQl/AvjE44YreuBe7b4nciQVL98z8
+aGWvcR+vharubKrXfsCMzUDz45N/wsLs4UJiZBqzfW4p0SoDafOOz2iY0SIqgCnM
+Sf+q7rPd
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key
index 592d069af..c60a0398d 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: revoked1.example.org
- localKeyID: 9F D2 C9 4E A1 16 99 C2 3D 76 75 5F 81 F6 83 11 42 E4 BD AA
+ localKeyID: AB B7 FF D4 FF 40 8D EF 71 FA FC EB 4B BC 6F 3D 7E 3E 7A E3
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQISr+AmHXalqICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBOAIDMHldz+BIICgKtKjSf67T/1
-EUlJp0XNXzGytbI8E5sj+WMQwJPIE0rcRFuUS+BfEnrNaXITuBmJgczomiITr2Ab
-vSK3r3+jSvjqmlpIEq87lI3/8fxZSY7WpKLtsh/tUyU8L4FGHBlP+kapiayH1KiQ
-nRd3i9cB7W/2TL0QPAewJ1gIFPCeSfUAWY306Xx520JUAeGbzT439edYFjMlkQZC
-xOMfTDYOFCJ8IynULx/4ZIwMLxdcVL+AzyOKTh18649uOodmH/24/AppvQXvl4Hi
-BnUjI5IS7WtWA0b7kpPj9D8ckVBT9MgtW08ktBKyp+bkF3cA8ehdf2yiDFTFuOMK
-3g/F2ik3pd+KRERAcajbuNFk3EshRLI6IjVpgf+lhfN0h83kI2j+9abDD1HanL9c
-JhITe8pFl/UCKA5BQO0tEsHMbbaRRwzagaby4AvE4cZAKhGciXmeAPc9rCE7o969
-F0hgzaSeLLsx6gDR4x2LJRVEbil49i48pOKUAWoR5etALECX6KN1YJhozbHLA5rB
-nErxsYsD+ghMUOz+lmYfZ62s/MTp72PZwubfXgugJE8+gGg7XzFB+asQi6mK8Oj5
-w2lvGVpsP/kXx98Fe8zVR3g/ZUPLVLDQBOXCvYbPn+18SxWHTHsS4Lb2pdRIdkJd
-V3RIvbA7xSOhaknrZIrsImdjMppnQvLxUmzQetbP245rqzEAEKblE0oI6KMgZ8uW
-yi2weYgXAsZw9UgOTyhNwZL+cHijozJ7EZFwwZXeubIK3xxO5LX0mWisJW2dzw6N
-49NH9CANR7zl+8LXb/M1d+lPyU82vOfpq5IGyWJtySXelbK3YwRgRHKDEOO5U/g+
-Bt68KLGXW3w=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIuTUtx9HjgugCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGDXYKIS5vH5BIIEyHtlfl0iKqhp
+k8MZ0a935LjrzL6dEYNHWabhSOddNAQOB0EXcgeAbsng9fd+offJxtqfYi68u9jH
+AShh1AiXfwUgjTbMqBCyAxiqzNw+uuBe8VK8xqgZNctGroca/AbjjsUoXyS6ux4B
+SB17Ee/qszq4jJBpg6k2ixyYLZHZP0Z1I4w7yVCxnvfxh5RYoohWMpQ9N41+lxDk
+9Y8l5beIqTIQHKJBfHp1FyhqTLdUL1qpJNJ+9U8DjGai1ejgUXz/dSZiFat/Z9xH
+D7KvabYSCqfybOGU0nORg0+xFJ7L0w0S7NalTEWa/hyYFt5wYxW5Ack1zRqv9jU6
+FT5s6ug+EyM833TfN6QfPUoMniFd/P2hH+NgzIQkSHU3OYqHR+XVLLa3pWc+qsrX
+XhK90N/YpEtiZ9nY50PVSDChyZjH6Y+eEgESLIDR7Uhx91bwHNMyl2R4LyyYzjd4
+W1Gyq6oLgYNI9vcb/gDdzCHakOJjkcyt0gwm1VlOZeIUsi0u34AjL0bkaqey+12p
+YRmNBm8iRTetpLW36zSole/te1BqTLxhMyOSfXagSgQ7+UyDNqa00p1IkNY/658G
+mVoYkz4V3uoy0oCA8hZ2HsmXEwOI/ZuxyUx+OYZ6IFEuN/x494lMeBiTSHyt+LIM
+elNcmsg78igdqbTPAZLYk8X2rnMYODqzDedr0c6nGSGqK/T1m2Jv5a0FOaSXd4x8
+PTlwNYCG7iTuK0as04gqA74BLWL0udHRVY1CSm1vSLTr0BJpjjzVZwqkCsdYOM47
+f1LcS8iTJS9AxufzKeL0FO0bV2rrfJLMEqC7AiRMMOr4RWl3GSJOMaZCo1tnDTmk
+BADtHxJwsVzMKi75qd9D33Lt9dndipzTr17Z7OUbhbAjbAQWtKZM4oT8XNIzF/hl
+zIu+yONbKV7bjLz1U0LEABkR+B1vWuEstfH9WU+Csag9BV12twoysxeXAGEaEP5x
+4+lcl8lM29Y+qfGYMvzdkgVHvk9JRTl5qMnzgXKLUdxtWCHcYArORz8g20vmH/Aa
+xzkFTwntl+nvw4mNh4N6AllcQuzP84zpWdETsuK1WHzzu5wtsRXUOFH8MA1Xj1ZM
+vSkuj8qaOnZEWDs0YiIMz6tQCAgqwD7p0hHXxXD7MFgAg/ZLJ0qJofUYckM2VB7d
+T2HeysRxEvOfquotKTOZUGaViY7AQR8xdpeWJoXbWUxAm7ZjVtf67/1RHzJrnDhv
+cBytQLgBhEDN83+1HJAKbDaR0kQ/d1cVvF5YE13qClw8S6lg8/3ccWBJn6UQvrpl
+c7EWctwhcVUB17BZndIPE0BfWePl9MvhjI1LSW0EsdHRjaRLXKp3BKwV5jp5RknJ
+FSSMRn+Mz6rKbAbl19GfbPYcjVlNYfcSqu1Ovcre6f2hT8IRAKwhHV5Ph0aimxTZ
+e/Ptuj+D5k46KBmIvmoEmpn/IOSJzS5dCTi12AMWt8K8afXXQjUjSxrHyORaOo/w
++/KmCI7vYvOEdKauIR7CcShE4iaj6lPmVxEc39ku8/A5vRw8el/3cZgn93bDX4EI
+rLEt45wQVh0Zfc68vEYZW/nvUf7O5GKi4RJB6wXKUAJg+ZuEstT7Y6FQz83lTo3v
+hisfNSaTLW77Snct+HY7LA==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp
index 7d9b36cf7..aef8cd989 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp
index ca45f4aac..ef9901385 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req
index 4cc8c0cf1..e373eb4d4 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp
index ceb798d9f..030442797 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp
index 87c362905..c48581398 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp
index 5a9da21bb..374c6e27a 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp
index ae2be1630..badf2e1b0 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp
index d675e9154..eab0c002b 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp
index 19dc1e41e..499c00940 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp
index 841a6c0fa..7c440714e 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12 b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12
index 8e869142d..d70701f13 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem
index 0ec9f4eb7..12cbb8e62 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: revoked1.example.org
- localKeyID: 9F D2 C9 4E A1 16 99 C2 3D 76 75 5F 81 F6 83 11 42 E4 BD AA
+ localKeyID: AB B7 FF D4 FF 40 8D EF 71 FA FC EB 4B BC 6F 3D 7E 3E 7A E3
subject=/CN=revoked1.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDlaFw0zNzEyMDExMjM0MDlaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxCdpAKtYBb5Bm
-4ikR0lwpZikY5FIzbKE/Eu18W89AR8WkG4eGR+g5doZynkqM5f9Mb6VD7XpfvFKk
-Alpl8/gPhap0wgYG7PZ9oXaif115z/nuzetkdnGMp4PJLBeKdvPN54pOxJ0h4PfH
-j+BJqr/m+EdpQh2ktQSXh5fOcSAFwQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
-A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-AFj9B7rrOGYWqLvl7KaDtkpJDdT0Ll36dssJzxnvx7/0Bwjxy70oi0YPy0RATdL9
-q8Y0hrFculsSbhaJg54sk+V86dFASqPRmZUr0wNFrk0hs6b664rRxtTxt3ptc6M+
-ONFWldcmvrsvnC/O1TUfPbFZzvrwjapTJyezaFzv2uWa
+MDExMjQwMzZaFw0zNzEyMDExMjQwMzZaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVOlgKCr
+2xnu1qTG/iKjpYss9Fhlfrcn2x/Jeazm7U6Z7uR+OpdkAGLDt6nJqt4htlymkC44
+i7VJbnsEP9FaUDFGl+YOFDnQRIMWxk66/grr5nXimGyUqXSkMkfOE0IQrwk7+oXu
+SxDgD+5+F6TstppbxDRDJVYO4fTZ2iKjcYDHKQ1IIPT6knvvBmWL0Q3o5APYd5Ps
+m4bfjdUTnVk1AvPSfe5QLOGg/mN9NfJTGlnVxB8HuO3qAnpyCHALliVB+Z40xPF6
+7kInFkUUtqTNc/NYuRrIZ1VMHlrQDcOydG3S9yciyjlViYvle8X0QbU5eEBczIxL
+hRw04Hdx8Tx9NQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
+L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
+BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFHJl
+dm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAPWhZMf55HKhFm
+075rhJQrpc4gMFLK7XGcXInoDvC4vtFYQw63PPs/tAa4DJCCZVK4ujtL5Ddjlh7K
+GTAj726pHAy+qcRlhX93rREGbSZnJ9BSJAZYXEeZqrqkIyzvfvuhh4oXDoHKP64r
+wOj0eBGZZhHKDVHIzf6y2Uap66GFPqBVhtvrHS6a1fyoA8g3eEnNf+RKP97ooBvv
+Vp9w4zSn414VwJK9lW66gW3TldUmV7Ly65nQQl/AvjE44YreuBe7b4nciQVL98z8
+aGWvcR+vharubKrXfsCMzUDz45N/wsLs4UJiZBqzfW4p0SoDafOOz2iY0SIqgCnM
+Sf+q7rPd
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key
index f3ef1b06b..0790596d7 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/secmod.db
deleted file mode 100644
index 0c4efea95..000000000
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem
index c9cf7dcd9..dd4b26270 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.org/CN=clica CA rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
-oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
-bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
-sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
-Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
-n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
-Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+0
+/AXNFYu9r75ONuVA+DregT3n0YcxMQ8l+GYxgxrFkDXEl0cpmPd9G0FWOU4S/il1
+ou26A72Tk112tgy2az+353taOgRFNK69Lyo9brBYyAhGKmBJWyuwL5d3c1YY92gr
+2O2fzno7KP10byITammONZ+XHOHbKtFH6/s1Emn5B7YwkPuess92ddQAK/rWTPfG
+94h6DcCsoTViIgnOGiDSwAih2RR5+j0+4/BfpqHPZIKooslmHWj7pu9mR02bRbgA
+iXXGyaj89AfKObLHWuNC6mJb+sKsSoX+MOFCfLrIsLcxzTiZ6soB7tSiBS5EBaZ+
+w2/viGNLmDLWnd8bNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAJ+JNevMy3D+5qRSNiOu//jB
+6yuUGZJuOFA8R0A5fZpdsVwmzBDWSAjM5o4NiWBYuK47GqSz13gTbRc77X7K9Rb8
+rNoFxdxiB6XUtNoII5eMebgHOrO/eKTmn66x+yM6bD9ypR6Yz3uq2MC5yDLWT4uv
+axoL+W9E+VesTFBL9d8EezfKliHdL2Knj+NPYMQ25xRGltOZCOs/E0NIHzt4RV4z
+kHdctDkkZu5EdtsC/pZ7FQgvtDFod89uAYY3ZQ/fFaqw3XkRpkycQcYe0kSv0AZp
+padHI4kXxR4hE/tbBYipJFFoeeeXypZZ9V9V9Lps9IeJduadgXUPR07yA7XRLCA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db
deleted file mode 100644
index e8296f575..000000000
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db
deleted file mode 100644
index a5a7acdee..000000000
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem
index 48c395b5a..e548963b7 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem
@@ -1,35 +1,46 @@
Bag Attributes
friendlyName: revoked2.example.org
- localKeyID: DB B2 47 5D 13 7D 4D 46 2D 82 3E 57 1D 3F B8 57 1E 5B 9D 76
+ localKeyID: 57 CA DE 55 5C 33 5E D8 CF 37 98 46 3C 41 11 2D 55 7A ED 59
subject=/CN=revoked2.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDExWhcNMzcxMjAxMTIzNDExWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAx8h2Y68mT7T9
-m+uR2wAtlYF/SW2H0FssMxIn7KIruc7CHyYqHKZ3bL40kgSUqztQcu6DRrgYCSCv
-6oYlN4z4S+pSTb3KyDUXS8hBVzG63N0+1v6lsQhtUR9M7VBH90HF3Von86VnUCM9
-iKkd+i3FExNn4bVAS9oLC8v9dvT8HnkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAf
-BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOB
-gQB0qObKsqYgIiuQW332sOq782QjwHmtxl0qFEsjZfaRuGlP6GP68uYeAoqug1Dn
-kfcqn1CsOizDIIqWDZLGi15UMrQ4EMbsrOJMIY1sDsg88ijILgyDAqBC7HGOP2S/
-YUaf4+vfeSkT8lDknsnhXsQCqqIaV5J0ch3vJ9f0ayy1Og==
+MTAxMTI0MDUxWhcNMzcxMjAxMTI0MDUxWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiTKHqH
+0Sn/I/dG/dktGck3eddMukOMgWFniulbSl3gI2KLF385j+6jiCjqyrqJcxTRr+wr
+XdXbl1gJzEG6zoFt7Wdgsw/oC03/lxqi1tfiJzhKy+zapHOi1KHoT+gHu/LkDFu9
+WINjJ0W+WkBs1zRm2ykkwTcgZzoqa7cZ432v1nw4p0fR1IZvbgL7aac65G3SqpRS
+L3Fho8UWOHwy2zKXdpbHcAGITUWG8c10JbHEkDNKqKaDXprsPOkiMLfe1d8dfGlM
+kpjw8bFD1W9GTcyZVli7PQBGV056AVNzV+zZtxw/LyzME0D7g65g86O7qDqQCvCM
+BLePj7peGA7xKtMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRy
+ZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAEMjEukLe8FVD
+Hk3k4aG/pc9ilCm6zkko9tFeHIK21EE5xrDbOGkABJx3v+2TguANV3RhNx9JuD5v
+GuBPFzgmC6DY3cE4SnV4CeECpilbLJsIB/xAzgaLVGvVq3HZWi4ASJgksRhqd961
+U9y0Ih27zhZWtYSSyMCe20s7sKkniWGcnV9w3sUccY+RESph+afsaUYH14TUByJt
+uTamJ8SAUQz8b95TLDesDudwUkH+qmp72lri/l11Nj9lFnlzUlP9npX2jc5BFa98
+IOUZ2gkVFGIvv6eJxlEI4nizkDXFMv6OpiGL8O6uKFs3K/Xt8QpwONO+4AcdqZi9
+HTvZbeULpA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key
index 354c53a43..044224b6e 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: revoked2.example.org
- localKeyID: DB B2 47 5D 13 7D 4D 46 2D 82 3E 57 1D 3F B8 57 1E 5B 9D 76
+ localKeyID: 57 CA DE 55 5C 33 5E D8 CF 37 98 46 3C 41 11 2D 55 7A ED 59
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhJix4vG7ViUCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAabxIYxJLdoBIICgF2TsEce9Krr
-yKZGNYWyzB6v7jOpuTIJNUguM0+dKVdUL7jWfe7AustU8fwbU6XqCQgDHhX9fvLX
-s1e5ALyxxo+hiFjjHzm+3XZ9QOms8GHU1xhU46Tc99O33IEqvj/xb96l1ZjB+90F
-ptFuglnHKc7VbA/Qh4F7Zx09HdzUvxicduRHGiVPQbQKPuFbnluwUVsI12H6SAXC
-XuytrKRuSvY+zaUfjaPmcedf87jiQq2QIfimYhJfpN/a/DvmorqenJXnQpum8OsW
-EoHSN0lfu7x20qoSibuXs23CQw651B7pHukeetAwDYDPXPhaYqg8rKxyaB1DbQ3v
-1ujCZ2yenQRM9q0TsQhoS5WXWKi50n8RPFnDcKjuwtU9rLf0ue+CxU20Sb+Xie/L
-o0vDnNIG3eFBn80KQaLwkwFZdX2lq27JmK8RLBeGNwf0H6xQOzlUbna7kqPJq2mR
-SMOntENCO2LUrW2M/2Uwbdh3ev6hpmQhWy0C++slbcolAIFCmJlCdJxZRa7YQuqV
-Oiw2b2R3gT2WjTq5afEL+raSV1lNBgjDajt8fJlyKAAJqIlRyBN7iKCavOPOysiw
-5oyq9WnssYz9BqiFyv+7nbLGJopsoZS2UEpGm/0pCw2jzVpDlGWRPhYz+EJIEtt/
-KO6oh+9nU1yL8f7/gXoVTUQIvEPRRkaPRlIV44W6TO1pL9F+dhpU5VmJeuNmJZQN
-PKt55FmQBq7ytaFT+IvASiAVqPRjaazsXnGjYjETG1mrgE/S0t41mNbg5vtINptF
-bpQN3arsgnDT8JeiKjPIsAGin1liXvF5WhYo00dd52qWMGJBL0ZCqfZpV8hRZGR7
-1tRW6aPDZaQ=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyqia+VIob7UCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJQrhikxhYiPBIIEyD18tAODQt0v
+fHvB0KTDr6/vy+vy+yTnLUgefbqi/yEAm81StZ+o8e82lQewbxTa4Db397OIwbZG
+6hcIqrQTsMIS4E4/7Qg7AO0o32EaQ1OmycN8+/WzVfUYzPfqBTuYw3oyyPtpbDOa
+88Pxm0lkomMZuYrXva/zvgHdO/nwkSv1QrdnsAsx/iw2oNZw+fB4kAfTpT1h13P/
+QcEfdsrHv1TgMcbthoMeZ4Re4V+tcBWwnwmVdOZh8wzlAE1urA+GRcWTA20Mk09r
+FEhtarLszmzBNkHyieE7VtPvOlwRPjCOLqEALCse06pZE5wR/3xp5osRmAfbEOW0
+PVNiIRNV37f/8yJRk86jnXgFBcuXMgZ2U9GEu0AWcQ13zqxnyeL7sKdHHmd7Q4Xy
+nhzhqr8Fp0AfU/3DVix3jYsJAMnXqeoyADXSAv8SoJHWkAUf6W/exnA1PLav3yO4
+tZ7vJJf4Qf0rsgjBLYgOYhD1Hq+ItLjHI+Va/Oyp6HJfsZsOxIdqD2rLYXRr2Q+z
+uDASbOP6H7zt1Co5MfX8abHohRstTPIgV3FI05KoiSqSNevizS8YHUrXcrtwW55M
+9a5PypSfBCaidACBmPEevdxjdCgIJbzg9TWrGa7T+U7Ze1R7XsmWdR5goMcU2ekY
+J5uRLmpHeDYCxCuN8GfQ1MhmtcANwUQy/PAsKSVAqWcUMeMUWg9Y+wIDTyw4CF9u
+R9RspDxam4qz4No3zhmS5iNCS8ZSoL8j5RbrV9HdvZsc4j3fL8LMDhz/llD3S2wZ
+9qsibWyuYUqas/N9MrY9ST8ODsmORGKq/qkCV44MZa2eakAWJMGJSTmVQz/AK39h
+wbQmOX+ZqLQcEoUXFVICYAmDL4inDKhQRU4fp2ABJdktfBN+klMPwoGQc0/if9ST
+woZVIPGH7UnvKtW3jcZxTndIhnXiE/v665+kY0p3w4xwaZSqupbmjFt6VwbpzWem
+trGvJ/5Z+tGJdCBdkZd3v9RUD19U8FL3/O7IEfbcpax56EWPlbpOFXcHTR+7n1bo
+F5AZEGPlP+lyz9KEQmHaFcWHZDLJlNTSiNSlzvugFYnbLhWzzkR2ig/oAUZ9PRU7
+3ZnbeUz11g0Z7TS8JfCeKF04fCewURwK4p9mtcUKWN92wVXW8P59pvZAMyPCXqpl
+uGw8C/zeSff8ScqLk8O3ThAE8Tji52dyUeI1YdNkHuDDAK4ly9L5K/6xiaGOCS8H
+Gx/S8Z9QbCW1ocfk12WmYJO82/GOqvsdSh3dvmwlcN61wRFuMpj7jcbXQXdXfim8
+VBMotE8ffEmKOx5ArxgDVOjAmPwKLXdeEvCTQaUog4DHVVEGEG+xbKV8sgFLHHHK
+QQnLMukDOZso0R5JcCTMrhQLzMYRQyADfd4i0agmzvsF0bs0OBI3rh44whn4rFdA
+RhQMHi2E3C1ldkgDw2PNQlrK12B5359fRlgvgfJB5kw1QP73US7o90dr1c+VV5Ud
+PkAQVcxo6BGbxdjnllKcAo+Go89tdbBjgwfIQ51xQY2KrGre4Jdh7+JTfp0sp5Kq
+0pty6TBJd6GpSl0o7RIelC0Pu+/RmFOfLkNnIyzEBxRChEnp+sfroVvjjK9kNF4z
+wuKsWbo7cGSGZYRr8vLsSQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp
index 7be250f3c..7d2698cf8 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp
index be000b145..fa497dcfc 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req
index 98f41d95c..8e227f012 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp
index be000b145..fa497dcfc 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp
index 0d0512244..4e522e630 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp
index 8ac381b95..c348d3861 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp
index 8ac381b95..c348d3861 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp
index ea5053243..1cf57f2df 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp
index 7785d7f89..f0d1f2452 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp
index 7785d7f89..f0d1f2452 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12 b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12
index b37b35bce..91f13cfde 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem
index c8384afe0..bd7753598 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem
@@ -1,21 +1,27 @@
Bag Attributes
friendlyName: revoked2.example.org
- localKeyID: DB B2 47 5D 13 7D 4D 46 2D 82 3E 57 1D 3F B8 57 1E 5B 9D 76
+ localKeyID: 57 CA DE 55 5C 33 5E D8 CF 37 98 46 3C 41 11 2D 55 7A ED 59
subject=/CN=revoked2.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDExWhcNMzcxMjAxMTIzNDExWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAx8h2Y68mT7T9
-m+uR2wAtlYF/SW2H0FssMxIn7KIruc7CHyYqHKZ3bL40kgSUqztQcu6DRrgYCSCv
-6oYlN4z4S+pSTb3KyDUXS8hBVzG63N0+1v6lsQhtUR9M7VBH90HF3Von86VnUCM9
-iKkd+i3FExNn4bVAS9oLC8v9dvT8HnkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAf
-BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOB
-gQB0qObKsqYgIiuQW332sOq782QjwHmtxl0qFEsjZfaRuGlP6GP68uYeAoqug1Dn
-kfcqn1CsOizDIIqWDZLGi15UMrQ4EMbsrOJMIY1sDsg88ijILgyDAqBC7HGOP2S/
-YUaf4+vfeSkT8lDknsnhXsQCqqIaV5J0ch3vJ9f0ayy1Og==
+MTAxMTI0MDUxWhcNMzcxMjAxMTI0MDUxWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALiTKHqH
+0Sn/I/dG/dktGck3eddMukOMgWFniulbSl3gI2KLF385j+6jiCjqyrqJcxTRr+wr
+XdXbl1gJzEG6zoFt7Wdgsw/oC03/lxqi1tfiJzhKy+zapHOi1KHoT+gHu/LkDFu9
+WINjJ0W+WkBs1zRm2ykkwTcgZzoqa7cZ432v1nw4p0fR1IZvbgL7aac65G3SqpRS
+L3Fho8UWOHwy2zKXdpbHcAGITUWG8c10JbHEkDNKqKaDXprsPOkiMLfe1d8dfGlM
+kpjw8bFD1W9GTcyZVli7PQBGV056AVNzV+zZtxw/LyzME0D7g65g86O7qDqQCvCM
+BLePj7peGA7xKtMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRy
+ZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAEMjEukLe8FVD
+Hk3k4aG/pc9ilCm6zkko9tFeHIK21EE5xrDbOGkABJx3v+2TguANV3RhNx9JuD5v
+GuBPFzgmC6DY3cE4SnV4CeECpilbLJsIB/xAzgaLVGvVq3HZWi4ASJgksRhqd961
+U9y0Ih27zhZWtYSSyMCe20s7sKkniWGcnV9w3sUccY+RESph+afsaUYH14TUByJt
+uTamJ8SAUQz8b95TLDesDudwUkH+qmp72lri/l11Nj9lFnlzUlP9npX2jc5BFa98
+IOUZ2gkVFGIvv6eJxlEI4nizkDXFMv6OpiGL8O6uKFs3K/Xt8QpwONO+4AcdqZi9
+HTvZbeULpA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key
index 0421ec516..a273b3913 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDHyHZjryZPtP2b65HbAC2VgX9JbYfQWywzEifsoiu5zsIfJioc
-pndsvjSSBJSrO1By7oNGuBgJIK/qhiU3jPhL6lJNvcrINRdLyEFXMbrc3T7W/qWx
-CG1RH0ztUEf3QcXdWifzpWdQIz2IqR36LcUTE2fhtUBL2gsLy/129PweeQIDAQAB
-AoGAHZ6qctASgYnHefj8mHgXyg03hnbvRmRmErJT6gEHM5akcELTxoiltyEiIS39
-rr9uB4Q2QWNk6OGIQ2CdHvXPEArqolzA5XBxVhpgEp1/U5tuMZkHz1df0C8Dqe3Y
-xMS3/12Ndt15xCzM/v6poccVK9lYFUYACw+cHCx/8oFdkSMCQQD52eNc/CdTbcW5
-2tiEB4Cr8WtiiQGMyt9wWNhZVldKfXJ6YBgxJvGbmktZB7MokW74uZ5Lb4oo1XI7
-PkuBq7vTAkEAzLMisOveU6h7U9VFUcO4BJ+OYcGKqIMx8QkbtYuowMOZsPrXOh0M
-FqhREaDWaGmWkx1F5qOOjH2Lvlmg5ZeJAwJBAPkyBaAXas2+PaiKCstchEx6RKWJ
-in83VLXEFzy7beLAze4aa+aSNgYBVUdd86Xxr+HpmGUawYzKnt1R25NgirsCQHta
-c8xTxv146SDCw2wbWlgG4qFMJUeZD85lo7oKOB45gPNipbJScMdylK/f0XTINEHh
-AQ+UfkFxInYJwui4IYsCQBGgTluLfY1W/U6Y1WuEKEUGeeEFrHVQZQBi0BflnBxW
-PD00/7UEodbhI/Zuel4YFg0g0sQcXIwXM0nC3MsmrIU=
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/secmod.db
deleted file mode 100644
index 765195495..000000000
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem
index c9cf7dcd9..dd4b26270 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.org/CN=clica CA rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
-oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
-bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
-sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
-Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
-n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
-Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+0
+/AXNFYu9r75ONuVA+DregT3n0YcxMQ8l+GYxgxrFkDXEl0cpmPd9G0FWOU4S/il1
+ou26A72Tk112tgy2az+353taOgRFNK69Lyo9brBYyAhGKmBJWyuwL5d3c1YY92gr
+2O2fzno7KP10byITammONZ+XHOHbKtFH6/s1Emn5B7YwkPuess92ddQAK/rWTPfG
+94h6DcCsoTViIgnOGiDSwAih2RR5+j0+4/BfpqHPZIKooslmHWj7pu9mR02bRbgA
+iXXGyaj89AfKObLHWuNC6mJb+sKsSoX+MOFCfLrIsLcxzTiZ6soB7tSiBS5EBaZ+
+w2/viGNLmDLWnd8bNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAJ+JNevMy3D+5qRSNiOu//jB
+6yuUGZJuOFA8R0A5fZpdsVwmzBDWSAjM5o4NiWBYuK47GqSz13gTbRc77X7K9Rb8
+rNoFxdxiB6XUtNoII5eMebgHOrO/eKTmn66x+yM6bD9ypR6Yz3uq2MC5yDLWT4uv
+axoL+W9E+VesTFBL9d8EezfKliHdL2Knj+NPYMQ25xRGltOZCOs/E0NIHzt4RV4z
+kHdctDkkZu5EdtsC/pZ7FQgvtDFod89uAYY3ZQ/fFaqw3XkRpkycQcYe0kSv0AZp
+padHI4kXxR4hE/tbBYipJFFoeeeXypZZ9V9V9Lps9IeJduadgXUPR07yA7XRLCA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db
deleted file mode 100644
index 68746c6a7..000000000
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem
index 50df1b6d7..d3ea16bd2 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem
@@ -1,58 +1,73 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 2B 8F A4 9B A7 D8 B5 4E 29 AC DD 14 26 74 78 D5 5D 45 EE FB
+ localKeyID: AA 67 16 A4 F2 AF E2 1E A7 AE 32 5C 81 C6 6A 11 21 A7 B3 77
subject=/CN=server1.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDlaFw0zNzEyMDExMjM0MDlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL0Ywr6PBHFvVzhP
-yxeGwAH2qZjiJ3QAwAKVF/zVQqS90q4IGln8Rzt6ds6WFt6ftcCI0ZQ2Kg9e4jak
-FTz2ag6v1+AkMe29C8t+zVXZuXsEOu14KQsu4iN4XvmXSPyxLhcUi4tFDDBfUome
-1SqG+3MPrXttDyPQwf8WDVvOmAA7AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5vcmeCCSou
-dGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLm9yZ4ITc2Vy
-dmVyMS5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOBgQA4XtC8Xfh+5q1Xl1oc
-U4ebmYB9soSATYXpQtudXvXOMywlLVtHtuCETeVIWN6mE6KDXQAuOZIurjo1nCVs
-QVAFAKZGw5Uw5MZbNuLkTNEoJqwFNaDH27Ej3fkjuYNmxaD1YPhGnFOlaWBV+pVt
-FkvDF8LJUxxuoZVh011d2bd1jg==
+MDExMjQwMzBaFw0zNzEyMDExMjQwMzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ4VCSLeZK
+uIieeuAEGz+CB9nyP2c1+nDAexENpSmCXpJUZrN+bwuBp097Q4YR0saKLu8NT4pN
+Lst0UsePLMn4l5idvAkljkidUEdn39qEmEjrLy4jRB/Ht5GnTnP1YwdALrlbU9Xf
+lNCBipTNgbB+ComH3NV8ihBaAJd+r3HAdvTn82dnFED8H2Jzb/W4ewWgMghBvW02
+590vEaSjodm3+lHf2hlJQC5vDEs59B2ct4ADf/gQHbwDENrUnRkd8KR6OVojqqfe
+m/vJetKedD+cCqqZSTQMoojqWAePNhGlbdjwDw1IiQ2B0GGtnYBpIMKD+js2bGGZ
+73XYD80+vQqvAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBngiJh
+bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUub3JngiFhbHRlcm5hdGVuYW1l
+LnNlcnZlcjEuZXhhbXBsZS5vcmeCE3NlcnZlcjEuZXhhbXBsZS5vcmeCCSoudGVz
+dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAOXC+rNyOwjF1OZp4gxOeNQXzx62bXFJA
+EHzxSeMW6rRH4LQZF+YDTwvnHied2S6lWj0+Od6IfVElT/uww1GfN3fZm7pKFwcX
+I14lKRdLAte3BnaRaFke0thP7p+/Nc3VYv5iMBUqT3JRPofGU2DJO1TzLVhr/jG0
+zom00hCzA0SXZT10wHFmz2EpLCUJpEqmtdAC5DdS+sSM+4YI3V37QKrGftVZM7OY
+yMXk+kxTLRcRPWVmXXfYHTyIb6rWWyJYIP52cZCPAVVaWF0xR9mqT1NvEzFl0uYg
+IuHSZmY3gyKna6TcfstrC3eU/6ujL2HjIFajKiX6UXMidHEDeBoi3A==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
subject=/O=example.org/CN=clica Signing Cert rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.org/CN=clica CA rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
-oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
-bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
-sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
-Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
-n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
-Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+0
+/AXNFYu9r75ONuVA+DregT3n0YcxMQ8l+GYxgxrFkDXEl0cpmPd9G0FWOU4S/il1
+ou26A72Tk112tgy2az+353taOgRFNK69Lyo9brBYyAhGKmBJWyuwL5d3c1YY92gr
+2O2fzno7KP10byITammONZ+XHOHbKtFH6/s1Emn5B7YwkPuess92ddQAK/rWTPfG
+94h6DcCsoTViIgnOGiDSwAih2RR5+j0+4/BfpqHPZIKooslmHWj7pu9mR02bRbgA
+iXXGyaj89AfKObLHWuNC6mJb+sKsSoX+MOFCfLrIsLcxzTiZ6soB7tSiBS5EBaZ+
+w2/viGNLmDLWnd8bNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAJ+JNevMy3D+5qRSNiOu//jB
+6yuUGZJuOFA8R0A5fZpdsVwmzBDWSAjM5o4NiWBYuK47GqSz13gTbRc77X7K9Rb8
+rNoFxdxiB6XUtNoII5eMebgHOrO/eKTmn66x+yM6bD9ypR6Yz3uq2MC5yDLWT4uv
+axoL+W9E+VesTFBL9d8EezfKliHdL2Knj+NPYMQ25xRGltOZCOs/E0NIHzt4RV4z
+kHdctDkkZu5EdtsC/pZ7FQgvtDFod89uAYY3ZQ/fFaqw3XkRpkycQcYe0kSv0AZp
+padHI4kXxR4hE/tbBYipJFFoeeeXypZZ9V9V9Lps9IeJduadgXUPR07yA7XRLCA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db
deleted file mode 100644
index e1d0167e9..000000000
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/secmod.db
deleted file mode 100644
index 64cb03c20..000000000
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem
index d70f40df4..dc4ebdcf9 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem
@@ -1,37 +1,47 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 2B 8F A4 9B A7 D8 B5 4E 29 AC DD 14 26 74 78 D5 5D 45 EE FB
+ localKeyID: AA 67 16 A4 F2 AF E2 1E A7 AE 32 5C 81 C6 6A 11 21 A7 B3 77
subject=/CN=server1.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDlaFw0zNzEyMDExMjM0MDlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL0Ywr6PBHFvVzhP
-yxeGwAH2qZjiJ3QAwAKVF/zVQqS90q4IGln8Rzt6ds6WFt6ftcCI0ZQ2Kg9e4jak
-FTz2ag6v1+AkMe29C8t+zVXZuXsEOu14KQsu4iN4XvmXSPyxLhcUi4tFDDBfUome
-1SqG+3MPrXttDyPQwf8WDVvOmAA7AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5vcmeCCSou
-dGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLm9yZ4ITc2Vy
-dmVyMS5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOBgQA4XtC8Xfh+5q1Xl1oc
-U4ebmYB9soSATYXpQtudXvXOMywlLVtHtuCETeVIWN6mE6KDXQAuOZIurjo1nCVs
-QVAFAKZGw5Uw5MZbNuLkTNEoJqwFNaDH27Ej3fkjuYNmxaD1YPhGnFOlaWBV+pVt
-FkvDF8LJUxxuoZVh011d2bd1jg==
+MDExMjQwMzBaFw0zNzEyMDExMjQwMzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ4VCSLeZK
+uIieeuAEGz+CB9nyP2c1+nDAexENpSmCXpJUZrN+bwuBp097Q4YR0saKLu8NT4pN
+Lst0UsePLMn4l5idvAkljkidUEdn39qEmEjrLy4jRB/Ht5GnTnP1YwdALrlbU9Xf
+lNCBipTNgbB+ComH3NV8ihBaAJd+r3HAdvTn82dnFED8H2Jzb/W4ewWgMghBvW02
+590vEaSjodm3+lHf2hlJQC5vDEs59B2ct4ADf/gQHbwDENrUnRkd8KR6OVojqqfe
+m/vJetKedD+cCqqZSTQMoojqWAePNhGlbdjwDw1IiQ2B0GGtnYBpIMKD+js2bGGZ
+73XYD80+vQqvAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBngiJh
+bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUub3JngiFhbHRlcm5hdGVuYW1l
+LnNlcnZlcjEuZXhhbXBsZS5vcmeCE3NlcnZlcjEuZXhhbXBsZS5vcmeCCSoudGVz
+dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAOXC+rNyOwjF1OZp4gxOeNQXzx62bXFJA
+EHzxSeMW6rRH4LQZF+YDTwvnHied2S6lWj0+Od6IfVElT/uww1GfN3fZm7pKFwcX
+I14lKRdLAte3BnaRaFke0thP7p+/Nc3VYv5iMBUqT3JRPofGU2DJO1TzLVhr/jG0
+zom00hCzA0SXZT10wHFmz2EpLCUJpEqmtdAC5DdS+sSM+4YI3V37QKrGftVZM7OY
+yMXk+kxTLRcRPWVmXXfYHTyIb6rWWyJYIP52cZCPAVVaWF0xR9mqT1NvEzFl0uYg
+IuHSZmY3gyKna6TcfstrC3eU/6ujL2HjIFajKiX6UXMidHEDeBoi3A==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key
index 4649a58dd..989e75afb 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 2B 8F A4 9B A7 D8 B5 4E 29 AC DD 14 26 74 78 D5 5D 45 EE FB
+ localKeyID: AA 67 16 A4 F2 AF E2 1E A7 AE 32 5C 81 C6 6A 11 21 A7 B3 77
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI1ZychNpgIw0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECB9HLhqNuvwMBIICgCy+Rdz2K6A3
-TBzWi7pPXZCebMtYRY5OcB6VdewbePbspcDYq57QIfbecHvSaJfsxrYet2lVXiAX
-QlE1b8Cs7sDExzq60GlMD4c6fMSsl76DgRZlNUyZ5F2qMIlouHB1Ey5yf71PsvhR
-G0OcoLmUsF4sAQX1jKdYr0sGknG0PPu4BVhao5BDeF/XlhWCgNOUq4EpuCEFLrqR
-VqXQLZgmbk/9G64Pz6de9lRhlx7YjpGKteKOXPapdW3qLGNNe+1LFwfoJ36AWOZG
-J7gChtXsuVMIvCIcpVgHHjm7ka0yCSJHm5jNE7u+v5pU+77QqbZXEe95zq4gtKxA
-YCM7U8wBPF5dUTBPi2BYAOtFTV8xyfLruUU3/uyHsP4rIpcsusZUc0Jp46ygaoit
-tIRc9uOYgIhqxzdjeGKB8wt46z7qSr2YEull7MRvH64+6Ou9oRsCXahCA8WEdivt
-Y62uEyu4n7Ap83X5/3Ul55rKlabBFyZ6HDtdmIL5L9CxqNpU4fBB0UuC+k8HraWr
-o3aH8/xbrPLDSvqcBiL2yEFgRjjEdOLbOAplgi6dxwiXF+DF78TWM3i68OBxZ5lp
-ALcXfo0Wlb8fZYwumlq5O6X5YTShPzZbINFQBA3woUnhzldAJJ0uVypYSicj2r1+
-DDrM4Qw71IRto1goyIxfqr6+cnJMU3UkA+pm+ySENBTFRsDSC9QauSCg3O33clqs
-F/q97+orB2ETAmMx6b43Vqxd/OnJ9L+1hZaom0Zg0RsfdeaemzuAfMmjNUmi0lA7
-IykOyvGQhESksedbyYUEOLm5fjj35oJhEBwVQoFdUGHXGW6DCwlQbC6vme36kp+e
-wbX4sa0yBPs=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIVUraPLS6TKYCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDnt3FqESXqIBIIEyM4jReKmUZ9p
+if2qorkrlM3Na1NTeh82QD/JYHd3ThSTS7OcxUxzx/d+EIRuJf4WUvS/9aoFi/nK
+1c2sP0nGKgX0hRx2oioP4CrgbuVKD+XROBEdqIYGahS64exkKXXzhly6nbkD46iQ
+1hLEwoGRWxLOs/Kc3Tchczb2zsg91Wac3wdwTqJ+wJ5WED2PB3s7a/LeroGHrhMT
+sVPSj64WQcGmGo+/pPnLf3ByqqDKVCwl2yPRHqvNAEaej6vQ9gS82BkG63/6w9oI
+mWt8r4Yy1aIIa6lGnAj/L/rxphinjodG1uMMFnABkCtp/9/HAAUV/zmC8SYEhjyq
+qfMPsTLGusOfHFbqrdj05deVdKmJEgeWSADq5mG5flKc2WRZMCzYDS6XZceQ9LDo
+3fB3xUlnOo6vWR7Wp3TwSJIlY6YV/7R6GBsVZ4lrXKdZLMifVLYfAVdoqHqdr0J6
+JWUcc5N00xYzu4e643lo/wfxueqNdxCFClyFLfLILVOaMQYW/n5vScUq0HmVgryK
+2PiOHL5tQGIKr4HUzLJzNGMzk/zU6CAAPc+BxQkresfX9SQiKuRaasmSKsSWefE6
+v1qJp18oOtk7A/a84tUJv9KNsVpG61TSvsgPEck2gijkXJYW+/A/oMaIDfLA+OKD
+/tUQhsLfCvy07XeYNX+aT5i+552o51VbuLYcSvRPNajM21dA5fr+4WTHTKwob/wv
+h5U/DiI/x6xQ9gVriaV1Dhm6mCC+KQFWRFrr7RVg96B4cZ+rV7kX1m53DTY7MQpG
+PVloIjRE+ptoP24WaFOZlbSBjzofRs5reqndoAiZB3E0nqCCZDMyJDXrL9yetRCJ
+k/cZu67Qyj+oK7vWmuVOTgEyiP5wORxi02eEiD6APZqN72OD44U6OcnPLhOnZxym
+uKyNeBSvUtKdKzDkoEF9p42qjcHkzzAx/DN1vG2gDV46TsJygYP4LkyD0PPQ90xp
+NMS9lcY3RukJJMT8vtyG83JayQQHINqmIrz+hlOh1eI8//Ar/1qlj1t6pdepCJba
+/gdVofxQpMrWtGdgQnqK4ylGEUgtph+3LM1nieVNTSdCdFdgxtn04dHBAC4/xCEe
+WwVb2O2laKS5L3MLmMmmlIQRAxlIj1Rw17ZWZZB8pnWgw5FvrrtuVYoslb5UdnG8
+sJWxuzv3lmkSPYd1et6Df4ySz1gjZbjTXr/zRPMEPE3R+VGMrb4cLnomQvHNIZ0+
+jtgkejVLnNgilkIJ8i8+XQr7yDIgkOwqNJmD5B/q0etuM6vDTFIzUBbrAkmMSZCm
+RJI1inOP38xRBCyUDg7XApWBFzePTWHsZPAqB6xB3HEj2lrw+s2yXPTiVL9naxhO
+RrXgM56CeQdTvEA5PXygLzGto4AXHIQSwsZ5TFH55wUFOqbbJWd4I0m6qZWxvhEA
+RokJcRtWf7lHRR1IVc3CxK66EA4sFKvNavP3D1ST9/nAmrRbJg6wp+A4iU1JMeKD
+qQip1S8kTYpSlOCsidd7zX5Wy1T+2O1B2mKNFEDbMlHpeWiQOM69iGWd16uJ8QCc
+BTGuTaBSvX6aVXGLpMHYVEJcCmUZIu03ZJFx8myJ4RKWbuR5mP16R17rd9XNUpDO
+VwfmIBTXUiL7WPXRum9XJQ==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp
index 63188e8a2..1551b2622 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp
index 72424214d..2353fe55e 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req
index 5699cb407..fe29c1acb 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp
index cfd76f56c..cf3405a29 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp
index e301785cb..e8bcc0707 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp
index 02fa79d85..ff179285f 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp
index fc80841bc..f56bad77b 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp
index f79d51bf4..560da6e1e 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp
index 498eac541..ac9da6065 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp
index 2e278380e..ca670977e 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12 b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12
index f0e9e98e2..6910e47b2 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem
index 94e267c72..e9e31faca 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem
@@ -1,23 +1,28 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 2B 8F A4 9B A7 D8 B5 4E 29 AC DD 14 26 74 78 D5 5D 45 EE FB
+ localKeyID: AA 67 16 A4 F2 AF E2 1E A7 AE 32 5C 81 C6 6A 11 21 A7 B3 77
subject=/CN=server1.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDlaFw0zNzEyMDExMjM0MDlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL0Ywr6PBHFvVzhP
-yxeGwAH2qZjiJ3QAwAKVF/zVQqS90q4IGln8Rzt6ds6WFt6ftcCI0ZQ2Kg9e4jak
-FTz2ag6v1+AkMe29C8t+zVXZuXsEOu14KQsu4iN4XvmXSPyxLhcUi4tFDDBfUome
-1SqG+3MPrXttDyPQwf8WDVvOmAA7AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
-BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
-J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
-BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5vcmeCCSou
-dGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLm9yZ4ITc2Vy
-dmVyMS5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOBgQA4XtC8Xfh+5q1Xl1oc
-U4ebmYB9soSATYXpQtudXvXOMywlLVtHtuCETeVIWN6mE6KDXQAuOZIurjo1nCVs
-QVAFAKZGw5Uw5MZbNuLkTNEoJqwFNaDH27Ej3fkjuYNmxaD1YPhGnFOlaWBV+pVt
-FkvDF8LJUxxuoZVh011d2bd1jg==
+MDExMjQwMzBaFw0zNzEyMDExMjQwMzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ4VCSLeZK
+uIieeuAEGz+CB9nyP2c1+nDAexENpSmCXpJUZrN+bwuBp097Q4YR0saKLu8NT4pN
+Lst0UsePLMn4l5idvAkljkidUEdn39qEmEjrLy4jRB/Ht5GnTnP1YwdALrlbU9Xf
+lNCBipTNgbB+ComH3NV8ihBaAJd+r3HAdvTn82dnFED8H2Jzb/W4ewWgMghBvW02
+590vEaSjodm3+lHf2hlJQC5vDEs59B2ct4ADf/gQHbwDENrUnRkd8KR6OVojqqfe
+m/vJetKedD+cCqqZSTQMoojqWAePNhGlbdjwDw1IiQ2B0GGtnYBpIMKD+js2bGGZ
+73XYD80+vQqvAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
+Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBngiJh
+bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUub3JngiFhbHRlcm5hdGVuYW1l
+LnNlcnZlcjEuZXhhbXBsZS5vcmeCE3NlcnZlcjEuZXhhbXBsZS5vcmeCCSoudGVz
+dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAOXC+rNyOwjF1OZp4gxOeNQXzx62bXFJA
+EHzxSeMW6rRH4LQZF+YDTwvnHied2S6lWj0+Od6IfVElT/uww1GfN3fZm7pKFwcX
+I14lKRdLAte3BnaRaFke0thP7p+/Nc3VYv5iMBUqT3JRPofGU2DJO1TzLVhr/jG0
+zom00hCzA0SXZT10wHFmz2EpLCUJpEqmtdAC5DdS+sSM+4YI3V37QKrGftVZM7OY
+yMXk+kxTLRcRPWVmXXfYHTyIb6rWWyJYIP52cZCPAVVaWF0xR9mqT1NvEzFl0uYg
+IuHSZmY3gyKna6TcfstrC3eU/6ujL2HjIFajKiX6UXMidHEDeBoi3A==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key
index 0c197d54a..eba8107ef 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+MIIEpAIBAAKCAQEA0OFQki3mSriInnrgBBs/ggfZ8j9nNfpwwHsRDaUpgl6SVGaz
+fm8LgadPe0OGEdLGii7vDU+KTS7LdFLHjyzJ+JeYnbwJJY5InVBHZ9/ahJhI6y8u
+I0Qfx7eRp05z9WMHQC65W1PV35TQgYqUzYGwfgqJh9zVfIoQWgCXfq9xwHb05/Nn
+ZxRA/B9ic2/1uHsFoDIIQb1tNufdLxGko6HZt/pR39oZSUAubwxLOfQdnLeAA3/4
+EB28AxDa1J0ZHfCkejlaI6qn3pv7yXrSnnQ/nAqqmUk0DKKI6lgHjzYRpW3Y8A8N
+SIkNgdBhrZ2AaSDCg/o7Nmxhme912A/NPr0KrwIDAQABAoIBAAdINWj95OFUcPNR
+BnGhwuNf9SRqkFcjvpM5E5SRM5oK7xyZ8HEjopgPG7peR39Hy/vuZroBg8XQaQwR
+ryzrpgoJZvIg0i96qdWjEIMdVftAThmZWAk1mZII/4YrVpJ4e+dzQKtDMtm2tFTc
+QhOSRjqSO7HiFu3s6A95bLI1oEhgYoB+4HsIwiIH9doBPDMw4I2M5c3KoRGGdB6o
+vW96VanbMoe5q2NMuYnUq2lpZIifU54Js7xmHBMloDVwwHatMIis04G4s/sgYEkl
+nXWeOojZ8zl4FH4pPKQaRDK/XJ7Ot2YtF+6fsOLKVvK+ttdxCI53UnOPjfY3CVwc
+hpFHYqECgYEA7y1Z5gLr6u30mUUQg92GYRzRHmqY/09ORegTvT23FVNLsbm8Bi4J
+0vHr+2GzAFVG0jB4r50f30LEgBbt4Rhc7GlokelBGNt4SiSRdchzIS35xPZAxBkg
+EhF10NoExPvqnO4LqktARYdUQTbaMjvgn066YFPpzuPAtQ2BB0pskxECgYEA35Ju
+q1GeShCr5ppzN3Gvo3tV4Xv2jlS2JxHCxTl/eT0ocD1AUrbn+xEqVN2BTEMPpTF8
+FcfaRAqLJb+OaZ9hVkb31BS9zPr1GVCwZnh+Ubzt6vF0s+xxlHbHdpjoHf6nme1E
+UuYe3mItQDnF52NoWYtKFdi2Ku7j922cGvgkQb8CgYEAucJrU+1o9amik3fEf+YJ
+fFs5P3pjIceib0D0M8I+890hqQMsOVCAaMlkEnWq5NNWkeD7mslZ+7iLjUBBuNWH
+NkYX5VtYJ8os/siwAN6SLG7c0lC/tI4fDmlpK7Boi+VsLj3j6XtQi6+zjILhrKo8
+pv4qWq5RpVHWVcgLMnJnKUECgYABdqbszir4FyXY65fnfAIHUu5b/IC/q8RJey9I
+NTklZQYXvf7my7W3CgS5631GL4YxsaI7TkSaf2srwxY+kMGFXA+RPtWDOv1Rvhp5
+gT5qcI8qI4x9BQY1T5W8rAGQ+LLGKixxUnpPQFtFeVtXSWpMc8H3ZKTEoS2y1+/W
+qVsrZwKBgQCJ5pgl9aw6TGSRfMWwB1R8vSuEhOBnpsx1ATfYK5dDdDFC3zgxnyyn
+7sS0FdGLO5PmAucjJKi8j32sKrDkd62yZDqWZuhc4Whmp9dQSYf+mYt7cmarqK5O
+qaoRvxi1fCYDJ7Gan+rN1G0CtDISloZc/JyCsVAqlMd75D6Z01rVoA==
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
index c9cf7dcd9..dd4b26270 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
@@ -3,33 +3,43 @@ Bag Attributes
subject=/O=example.org/CN=clica Signing Cert rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.org/CN=clica CA rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
-oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
-bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
-sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
-Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
-n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
-Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+0
+/AXNFYu9r75ONuVA+DregT3n0YcxMQ8l+GYxgxrFkDXEl0cpmPd9G0FWOU4S/il1
+ou26A72Tk112tgy2az+353taOgRFNK69Lyo9brBYyAhGKmBJWyuwL5d3c1YY92gr
+2O2fzno7KP10byITammONZ+XHOHbKtFH6/s1Emn5B7YwkPuess92ddQAK/rWTPfG
+94h6DcCsoTViIgnOGiDSwAih2RR5+j0+4/BfpqHPZIKooslmHWj7pu9mR02bRbgA
+iXXGyaj89AfKObLHWuNC6mJb+sKsSoX+MOFCfLrIsLcxzTiZ6soB7tSiBS5EBaZ+
+w2/viGNLmDLWnd8bNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAJ+JNevMy3D+5qRSNiOu//jB
+6yuUGZJuOFA8R0A5fZpdsVwmzBDWSAjM5o4NiWBYuK47GqSz13gTbRc77X7K9Rb8
+rNoFxdxiB6XUtNoII5eMebgHOrO/eKTmn66x+yM6bD9ypR6Yz3uq2MC5yDLWT4uv
+axoL+W9E+VesTFBL9d8EezfKliHdL2Knj+NPYMQ25xRGltOZCOs/E0NIHzt4RV4z
+kHdctDkkZu5EdtsC/pZ7FQgvtDFod89uAYY3ZQ/fFaqw3XkRpkycQcYe0kSv0AZp
+padHI4kXxR4hE/tbBYipJFFoeeeXypZZ9V9V9Lps9IeJduadgXUPR07yA7XRLCA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db
deleted file mode 100644
index fdb4d69bb..000000000
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem
index f0053bd15..f2da6a25a 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem
@@ -1,57 +1,72 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 47 5B FC F4 25 CB 73 1B B7 F6 A3 FC 30 38 7A 68 BC CC F8 36
+ localKeyID: 16 09 2F F5 E9 1D A9 61 59 C1 26 78 41 9A 8D 57 2D A7 07 B2
subject=/CN=server2.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDExWhcNMzcxMjAxMTIzNDExWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC70Nv1NGdZdi8F
-z6rvHHUc2xgq0KiMqjlW78JzKFmN5wgTReCtwHwlRA/32vOyGy1CjDzKzPaRVFCW
-zczMymPoWXFRTctjm1Rd1CMDRCfkzcM4xrYbGW0x442KbR3lmR26tyx7QGU63hSn
-U9+7krRwZOa8YX6PKqD4mSt8H40XZwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
-QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
-BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
-YW1wbGUub3JnggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAA9xxXPwknAZ8
-X9oVnp6Fi4CPb+GUxm1CLDsOhWwdshzhQ9m+pa1Y1BSDIqxS9ZZ2o7J1OG7ZP5K3
-H7P4vFC4mEfHX5LsVBclVDzIjgzTbBCjDslwZwh5tS+l68brqRGgtPoFEpIJNZ17
-8/GHhJrBr04AOWFaa11qPKAHtWcGzoA=
+MTAxMTI0MDQ2WhcNMzcxMjAxMTI0MDQ2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwoqNsFYd
+wEUPKC1Y14NetR8APh/ZU1Sg7LfHGffibiV4Ofwsvgtl9k4tb4a4EsUDGSfPdDMz
+33QaPb3Q4Z1AbZd2I9G44Vga9OevuCxw/2/F2E4lIgRfA/kMhixmjFlAdXDpxdMy
+nCVhXGy2q/c0Z1pdIGvls+pEhbokUW//Kzb1b9yM+cal761nYECYD8Gmj4sGemSl
++cEbYY7j77AGuytW4wxXXCV+aJ7CTfIEt3TFy6J3/1lOlTduMeeEx/vh9X5wSRJf
+prAWAG1m1jHTjCZA7npMbeYJ6PbCTLe9qPQf6ygZCTr5Dhvam7z2qgzwQQ8Uex7N
++Dc/4WDHs46sTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
+LmV4YW1wbGUub3JnLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUub3Jnggkq
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALWZSoyPvTMkyTFZudkvqgCfXv1X
+nti4C9oRi03DotRo3Vbgl+D7y0QLKGMPZFTWp8jStwmzoQTWrpMIk+boMJNHncTU
+4Aw9GeaKr93s226W74p9kEo4MJ2H7w2mozJvOGz1ZUU5u5+1kfgZbkH27HxPvyCJ
+mbT1lssbZdbyXlpa0hJAnMuClrNtpe4Tdz6vFScH7vpcT0UZL3c9GDN78144uP8T
+VJWbNYLkfeTkStqcwvUDwQsrvN0wrj+fj5+u7e8o0Om9nERe/huW3HhZb8Zq0spI
+SVsXg2sGevkVEcgZC8o4OQ3fYwSFVl6cUSXzu2lgOZBMIrB5dcFAwgnWbVg=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
subject=/O=example.org/CN=clica Signing Cert rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.org/CN=clica CA rsa
issuer=/O=example.org/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
-oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
-bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
-sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
-Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
-n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
-Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
+MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+0
+/AXNFYu9r75ONuVA+DregT3n0YcxMQ8l+GYxgxrFkDXEl0cpmPd9G0FWOU4S/il1
+ou26A72Tk112tgy2az+353taOgRFNK69Lyo9brBYyAhGKmBJWyuwL5d3c1YY92gr
+2O2fzno7KP10byITammONZ+XHOHbKtFH6/s1Emn5B7YwkPuess92ddQAK/rWTPfG
+94h6DcCsoTViIgnOGiDSwAih2RR5+j0+4/BfpqHPZIKooslmHWj7pu9mR02bRbgA
+iXXGyaj89AfKObLHWuNC6mJb+sKsSoX+MOFCfLrIsLcxzTiZ6soB7tSiBS5EBaZ+
+w2/viGNLmDLWnd8bNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAJ+JNevMy3D+5qRSNiOu//jB
+6yuUGZJuOFA8R0A5fZpdsVwmzBDWSAjM5o4NiWBYuK47GqSz13gTbRc77X7K9Rb8
+rNoFxdxiB6XUtNoII5eMebgHOrO/eKTmn66x+yM6bD9ypR6Yz3uq2MC5yDLWT4uv
+axoL+W9E+VesTFBL9d8EezfKliHdL2Knj+NPYMQ25xRGltOZCOs/E0NIHzt4RV4z
+kHdctDkkZu5EdtsC/pZ7FQgvtDFod89uAYY3ZQ/fFaqw3XkRpkycQcYe0kSv0AZp
+padHI4kXxR4hE/tbBYipJFFoeeeXypZZ9V9V9Lps9IeJduadgXUPR07yA7XRLCA=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db
deleted file mode 100644
index 52d8c28d1..000000000
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/secmod.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/secmod.db
deleted file mode 100644
index b42fbb600..000000000
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
index c41ce4250..e2613add4 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
@@ -1,36 +1,46 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 47 5B FC F4 25 CB 73 1B B7 F6 A3 FC 30 38 7A 68 BC CC F8 36
+ localKeyID: 16 09 2F F5 E9 1D A9 61 59 C1 26 78 41 9A 8D 57 2D A7 07 B2
subject=/CN=server2.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDExWhcNMzcxMjAxMTIzNDExWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC70Nv1NGdZdi8F
-z6rvHHUc2xgq0KiMqjlW78JzKFmN5wgTReCtwHwlRA/32vOyGy1CjDzKzPaRVFCW
-zczMymPoWXFRTctjm1Rd1CMDRCfkzcM4xrYbGW0x442KbR3lmR26tyx7QGU63hSn
-U9+7krRwZOa8YX6PKqD4mSt8H40XZwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
-QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
-BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
-YW1wbGUub3JnggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAA9xxXPwknAZ8
-X9oVnp6Fi4CPb+GUxm1CLDsOhWwdshzhQ9m+pa1Y1BSDIqxS9ZZ2o7J1OG7ZP5K3
-H7P4vFC4mEfHX5LsVBclVDzIjgzTbBCjDslwZwh5tS+l68brqRGgtPoFEpIJNZ17
-8/GHhJrBr04AOWFaa11qPKAHtWcGzoA=
+MTAxMTI0MDQ2WhcNMzcxMjAxMTI0MDQ2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwoqNsFYd
+wEUPKC1Y14NetR8APh/ZU1Sg7LfHGffibiV4Ofwsvgtl9k4tb4a4EsUDGSfPdDMz
+33QaPb3Q4Z1AbZd2I9G44Vga9OevuCxw/2/F2E4lIgRfA/kMhixmjFlAdXDpxdMy
+nCVhXGy2q/c0Z1pdIGvls+pEhbokUW//Kzb1b9yM+cal761nYECYD8Gmj4sGemSl
++cEbYY7j77AGuytW4wxXXCV+aJ7CTfIEt3TFy6J3/1lOlTduMeeEx/vh9X5wSRJf
+prAWAG1m1jHTjCZA7npMbeYJ6PbCTLe9qPQf6ygZCTr5Dhvam7z2qgzwQQ8Uex7N
++Dc/4WDHs46sTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
+LmV4YW1wbGUub3JnLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUub3Jnggkq
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALWZSoyPvTMkyTFZudkvqgCfXv1X
+nti4C9oRi03DotRo3Vbgl+D7y0QLKGMPZFTWp8jStwmzoQTWrpMIk+boMJNHncTU
+4Aw9GeaKr93s226W74p9kEo4MJ2H7w2mozJvOGz1ZUU5u5+1kfgZbkH27HxPvyCJ
+mbT1lssbZdbyXlpa0hJAnMuClrNtpe4Tdz6vFScH7vpcT0UZL3c9GDN78144uP8T
+VJWbNYLkfeTkStqcwvUDwQsrvN0wrj+fj5+u7e8o0Om9nERe/huW3HhZb8Zq0spI
+SVsXg2sGevkVEcgZC8o4OQ3fYwSFVl6cUSXzu2lgOZBMIrB5dcFAwgnWbVg=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
-DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
-bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
-vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
-NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
-b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
-tzM43Bo0kuWzn62i
+MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDAyNVoX
+DTM4MDEwMTEyNDAyNVowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDGwlUZM/hbcUJ84Ey+pyJSmVlHlli+3Sb3P2tMbn99G7tiTNrPN49K
+AJiC4WRhX5+sbvjWK9XeDZEbVCtBOFodukipUwAPQAdcOdsehmAvZJtaEihjUst3
+oreVGBCxEgyJs/aTT7Jtlav3SgShxcLu9fPT5nPMAOtjk0QZQFU51ksU5R8XRxRJ
+8KFs1wtSoG8UZiiOhEvCVNphRy0g38gfGUB7pJvv9ZS/tZKsO1JlDs2Dk8cyvE6W
+UW2yFVes4WotOa9ZjO3GHWV8Vw0mRVUsyFVeMKBBuIsDyCxkz55lDEswxRSlG50n
+BL0OPz2cVn0BgBMLPMFZUJFz+9ih/QlNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
+CSqGSIb3DQEBCwUAA4IBAQBPpLcd29CppI1b4Ht/CKgHe1k0L0MXVAr2BdxYKgJb
+q3N7WgC8QshXIL1+Gl2Jd14caHVetC53q/WvHMHtWlhAEd/I2alJdyc+mIQPlvEI
+jYAklrM61IcqywcMoRn1T3t2mSb1FPZkvDz8dieUIS496sWxbXpE3drdsSxcQJvM
+f8qCXgbt0BOU5HHmVXACVoghZXFC3+2rF//GAEhyxdYbG2gK4THbVZmg31AuvAOB
+d6v69qbxd2hupDzaa8sH3zVBftIGEHnWtQgk5vVYQbkp9Uv05U/4TilLOIzv1Tih
+KoEK6ReT6HIDDPu9oF+/vL428nLugO7edomrAX5emcyB
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
index 5d2143e14..bc320c986 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
@@ -1,22 +1,34 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 47 5B FC F4 25 CB 73 1B B7 F6 A3 FC 30 38 7A 68 BC CC F8 36
+ localKeyID: 16 09 2F F5 E9 1D A9 61 59 C1 26 78 41 9A 8D 57 2D A7 07 B2
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIbipttOeyKOICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECH4Sr0ESzFsuBIICgCHzNfmYOZH/
-iEYIEL/LAj2di76rJJQvUyKv2pfXpZlQyVFShRlOgzIjfsM1zjWNuwfkCNW0s9N1
-OX5CwIoPSCKTNs6A2H5cnTrMrnD6B7LlppbBwKtmCZyIAgAM8GvmkltVX8tr1+q9
-9i7zOZgfkVb1YICwKbceNJw4U6kWrIOBqZd9IVc11Dafyw1K01g1H+/dm/gP4kNh
-WOLDkeetXyZnLym/FPAE7VHR47FlC91VlMrgskIfHVYZnGQTLQRGJRHg6JauKulI
-AQOukDPpcMWxsGfHqhu+Djb7HDYx/KVIL+JrlCeKuMx2Er61q7WvRPS8XM97FkHF
-RkH7jNjRNUgFnZ1/UxbYm/jjJ3Y8mBmE7sHdYK1erSyln1k6/aEnGT4STEVCzLqP
-MVUa8EZQN2o0lnx5JoEbmCgQY4uPXy+1BDupnN0Prh/hHXWtPSsHOljOGIhwB6EQ
-u3lV+0OZ+s8Ve7C142bk4cOo+QASs4KR1YbYhgOc3L5/63xS8VgXjTpNcdd0MI6E
-V40OrfF8XSBB0w5bm9U5SibfHf/kY4EhOcZ7o2q2Qjz/yY/T0f081B+i9i49/36n
-bTcaoZtRcVV7xZPRu/SOe9lnMSzpC0POmzN/vLLhuYpJgZdQP0hl8TKqb1PAtSVn
-kns9rTnDp47ESJDPfkdbK/+ssfyC5RzSgKI7snumIHXdmx3bhdfaFj9GEiR6fjSR
-sWJTi3N2WJ9AlehxTtsspZ9Oe8tBDNGj8E/Y/cXbZu64d9B5ZNpBdhRL8CkYNaVK
-Sji8cGL0HGLFNbaC0it+lo6IsxLyynUnZ3KtyTkgbOP0KqwIBjcki2uJK3VDPOFV
-W2XgFtkXJBk=
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI58WO+KpH9e0CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECA7LYIB/AG+uBIIEyDCzuAftHS9A
+Ez1wGhDFtGZvZUAKc2CeDQE2TM0hZe3VFgCho9HlePTHoWIeo2drHBHevjcs1aK2
+6nCHhKjc8DUpCYi8Gz/nvxp/s9/NvmkF+9Ds9vB8XtijtyM8rTP98p/8VhPD6UMt
+DxPLcM2CDMhVwRpi0JcKiFG9Hieio8wYwMx/TPcvNLmAKyXhdsqGBsAOA2QCjBkx
+ONBwctfaJrE6Ap/WCCTcVeC0zJiUd1a+76mJZoJs5qir7uwWaMoJIRQEp1afjh0U
+aF1jgdgxZK/T1NpoUzXK2rYiLjSeFdJqduoVkmfThyJbVnBeiI7OHDnP8geMh5rw
+qLEImNwSFI3UcOxWuOODrJ7Nf2GjO51/1URCficvHtFRjAB/b1mbwpXlnjrQtfs8
+iXA+t1ahbLdTj8ynFA2IjSFZTf3NpakFUy19TL/adA/3FdqPVIWJgxf4oXwQ7X+T
++VHyEO9TfrD2eFwTG3j2fbSMA5UX85ZDjxaEt2Jcm8VK9TNTciipSlmY+MCCqyFw
+tiEM0ZNxD5e24lAWC8+QtaMVIBJLzwjuVsLs46r8d9a8IcH+NN/ALdQ9KAYw0Iu2
+kSzMc3vhJAzId9e8nsfG4kNtJA/vI/TlcQhhzQqHcd67BwrOdElLGuvqPtMpb6Ow
+m3KPFny9iS0zXY1X6bHwRA14xhb9vDlPl6TOiVIUV1laE6NoAeEVc3Y5uWve4yBL
+1y6lSTnlT5paVwChmc6TwdkUyUBcooUQBJx2Sz1n0eE1y/76z23QsiOpQFE6qIDP
+mECduvBqHpulYwqroAScGQTXPCy3uRPmtUM/KYie6q/7x6lY675+gPUOyypz8/NC
+gqj53s1lD4ABQmBfrOGIXTbqO5E5gswIXPVZYTMvMMxuTQYA9E7C8Zf1WupTQUd8
+Ly+9Yxk4hpnTE3XmPAKFFMuTwDPsjeOhMk944aCFDVydy4Rkc+Nt/u2BYY7wbPS0
+i5EEiVE2sHzFnRWaRnASG+bxvJhRy2Ie9jlrzlECXUWWbDBYz09rB6LSiYD6re0O
+OuWv9eHUe59UMjP9XmzjIsz95kJQ15fmTS62VK5hhkmfr8/RD3Ng/W0/baFbHdBa
+83M/OWEIWnxotwuoArLiHBRv9uyjFhfeEepD8QTNt3N8NfYFxXVkSbRR4WvLpAGe
+PBM7US0Le49TY5+h+cD96ZrrSvywEOJ271NUqcq9dzpyARwATwJn8otfXGnVrGMg
+gnMB6Tfc39WwsRkvPI7+IEBnhKzDOENXYeQoyITaB+1nGGu4nEM/LXINCDBj9+Xz
+UijPLCQFS4cKBc//89U6dxcBo24tCtF2Jn8/pldqt72OrMjqSlUTUcYDnqnM1Gdp
+1igP1y/mJ2PIB6hiUHGl5jU42zgdAXBAEXPeBBSwM8sZOcoamK81SDYbQOOCpudy
+j5OB9GI7sAIbBI9ei4HrgRMesZ32tVJaOkiY7coYBtmaY3OJcV+9mleT4XAHd8UZ
+olJ4dVzmbGM/mzFgsAgAAYaUMqWYVXcUDc9Xv1BGvraP8bk0bZD5Xk73ddk6WLCQ
+eoJygPXAEhqe+fz3FCDDK04tpgBT3fj2b4yLVy2Myn17AxmeYh27CEbCbU7GLhvL
+C+z80l9iGa0PLSZV2tT5+w==
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp
index 869c68828..d6801a6c9 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp
index fc65cf884..82e98d075 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req
index 1e47dbae9..2e151ae57 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp
index fc65cf884..82e98d075 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp
index 797095234..64bd42517 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp
index 58e49b81c..dc4abfeef 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp
index 58e49b81c..dc4abfeef 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp
index f7a1bc0ca..126b0cb2e 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp
index 4a470f476..45458b9c6 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp
index 4a470f476..45458b9c6 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12 b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12
index 819aeb2bd..d0504925e 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
index 6d9e39f70..6ad0da088 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
@@ -1,22 +1,27 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 47 5B FC F4 25 CB 73 1B B7 F6 A3 FC 30 38 7A 68 BC CC F8 36
+ localKeyID: 16 09 2F F5 E9 1D A9 61 59 C1 26 78 41 9A 8D 57 2D A7 07 B2
subject=/CN=server2.example.org
issuer=/O=example.org/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDExWhcNMzcxMjAxMTIzNDExWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC70Nv1NGdZdi8F
-z6rvHHUc2xgq0KiMqjlW78JzKFmN5wgTReCtwHwlRA/32vOyGy1CjDzKzPaRVFCW
-zczMymPoWXFRTctjm1Rd1CMDRCfkzcM4xrYbGW0x442KbR3lmR26tyx7QGU63hSn
-U9+7krRwZOa8YX6PKqD4mSt8H40XZwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
-QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
-BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
-YW1wbGUub3JnggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAA9xxXPwknAZ8
-X9oVnp6Fi4CPb+GUxm1CLDsOhWwdshzhQ9m+pa1Y1BSDIqxS9ZZ2o7J1OG7ZP5K3
-H7P4vFC4mEfHX5LsVBclVDzIjgzTbBCjDslwZwh5tS+l68brqRGgtPoFEpIJNZ17
-8/GHhJrBr04AOWFaa11qPKAHtWcGzoA=
+MTAxMTI0MDQ2WhcNMzcxMjAxMTI0MDQ2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwoqNsFYd
+wEUPKC1Y14NetR8APh/ZU1Sg7LfHGffibiV4Ofwsvgtl9k4tb4a4EsUDGSfPdDMz
+33QaPb3Q4Z1AbZd2I9G44Vga9OevuCxw/2/F2E4lIgRfA/kMhixmjFlAdXDpxdMy
+nCVhXGy2q/c0Z1pdIGvls+pEhbokUW//Kzb1b9yM+cal761nYECYD8Gmj4sGemSl
++cEbYY7j77AGuytW4wxXXCV+aJ7CTfIEt3TFy6J3/1lOlTduMeeEx/vh9X5wSRJf
+prAWAG1m1jHTjCZA7npMbeYJ6PbCTLe9qPQf6ygZCTr5Dhvam7z2qgzwQQ8Uex7N
++Dc/4WDHs46sTwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
+UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
+IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
+LmV4YW1wbGUub3JnLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUub3Jnggkq
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBALWZSoyPvTMkyTFZudkvqgCfXv1X
+nti4C9oRi03DotRo3Vbgl+D7y0QLKGMPZFTWp8jStwmzoQTWrpMIk+boMJNHncTU
+4Aw9GeaKr93s226W74p9kEo4MJ2H7w2mozJvOGz1ZUU5u5+1kfgZbkH27HxPvyCJ
+mbT1lssbZdbyXlpa0hJAnMuClrNtpe4Tdz6vFScH7vpcT0UZL3c9GDN78144uP8T
+VJWbNYLkfeTkStqcwvUDwQsrvN0wrj+fj5+u7e8o0Om9nERe/huW3HhZb8Zq0spI
+SVsXg2sGevkVEcgZC8o4OQ3fYwSFVl6cUSXzu2lgOZBMIrB5dcFAwgnWbVg=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
index 9cc6efaa2..dd3431f98 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem b/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem
index f0268a6eb..9a525b50b 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem
@@ -1,13 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAAXQLXIfCeo
-dnmboScyJ5dutaJijb0+oh2RbMyC6wf+05xD0aR1ioteDwz+BL6tIAd8m/8ILrfh
-LpQbdCjS7k+0BwE1EqYUBN8WYWC59RcaA0CmhDaDybQYTlj1gZtBtA2H3wagWHrZ
-hKiZzX2xUfaTNHokyMRDzOA0FGkKj3djDMc9xaMmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIBJxJzvmFu
-PGMjQKq8PANizWysjs/wS/RJC+GLLI117h3F2o/+eEK8vrQWqA6dxpOuXL17N48p
-PDvrjw1xwuW/PYsCQgD29BcHYyxgEnbvHdsKhD27J1y3ruVjYH64KhNzM/hmwnve
-wIMlDH5gu/t7HjKVJyEv2NpUvGPWtIaMupIHtwAMlQ==
+MIIB+TCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
+MzgwMTAxMTI0MTQ0WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFDi8N5vtSw
+rsLcxFukUKE0DsbE7+VgzspymXGq1HBDmJd7vF0RgauqGxDRblOncvoQDv9vMlqS
+ZoRDFRh/mF5CmQC0gzFmTrmOpU5dlT9EaDZHy1d1i04IM/w9Ty/iwYuyd5SH8VMP
+/X+4xJlBEd0WT5FsgLpXd0XsXBXywoX0fwQmu6MmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYoAMIGGAkFBGllQl88w
+HC8p3UBcGhFrMElDcTcq4hUx7kAbspXRllyjxMZmlOJItgmWDz5A6t93QqdYUV66
+/2fiPRVhF96rLQJBLpEI3T9rKt0KpOAcYHtHU14heltCPsrCAETwclVK0TeuNwV3
+mYNiwo/a4W81R2retIA44emhUzgTbyrkbz2TQvk=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem
index 6941a5ec0..5c43972e4 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
+MzgwMTAxMTI0MTQ0WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQAw20Nx/YXlmEa0JcVzx0RJJR0Q0WJAI0r6IaTktmSGBaI7xjWAz+FQnOmhnTT
-f6fmr6Y30JkXMx0a1jbT8xbkabMA1cwE3+sPGmJb5U8u7LSQLtoBqGu/wJcJzgxh
-Hjfu6dWTvQy9XGwJ9zfUYO6OCqxOCwPDUwclf6ATkR/+CYNKtQKjPjA8MA4GA1Ud
+AAQBM6M4ujO4uNE0fr8aNxWuKobKbLuHbJrnNKMA2WvwGAux0Z1n0aDssuKLbwoi
+J6VwSNd9ediiq0v/G5JQjH/Uzx8BgvzxE2Zc49nMjyzwqIDQyHQgFKa0Q5kNfbEV
+vYn/NnmqlD8jtgdkKD+s0qYW7TXDXlqdzzkRQYTM3oCI1GRK0HujPjA8MA4GA1Ud
DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJCAJu3rvJkTBkF1a2NSnfBMsohguO1
-1WcdT7ltCQDPRPWkZGWSpgEWoUG2TRQxFh2pOO6J/NPWiny7u+ZwBExF2sZ1AkEq
-dxwepzCXqpqKoICJiX1F2974SRgmDNfSmzNG0X/d2d0Z2X15va5vK0oBH8rvIlmw
-mdV3uhlmoNhmqUHEuqKUhA==
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCANdz9aWubsGdfcPT1bkbkR6v9dSn
+OSDxRsgQSigvDq9OKHi9PtESeQVm5rBB2kOt3TyzU+H4JxIjrZ0UUUqL8s7DAkIB
+wpPmJXvygl9kkjY9xkCp7SniF3zyJpo6FU1yEWP8z+7r22Zt+tVAVxH9FEujNTJp
+MvHjwPdyBJcANrlU1kf+Lus=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert8.db b/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert8.db
deleted file mode 100644
index 61e31f072..000000000
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/key3.db b/test/aux-fixed/exim-ca/example_ec.com/BLANK/key3.db
deleted file mode 100644
index ab4379d1f..000000000
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/secmod.db b/test/aux-fixed/exim-ca/example_ec.com/BLANK/secmod.db
deleted file mode 100644
index b709dd8a5..000000000
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem b/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem
index f0268a6eb..9a525b50b 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem
@@ -1,13 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAAXQLXIfCeo
-dnmboScyJ5dutaJijb0+oh2RbMyC6wf+05xD0aR1ioteDwz+BL6tIAd8m/8ILrfh
-LpQbdCjS7k+0BwE1EqYUBN8WYWC59RcaA0CmhDaDybQYTlj1gZtBtA2H3wagWHrZ
-hKiZzX2xUfaTNHokyMRDzOA0FGkKj3djDMc9xaMmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIBJxJzvmFu
-PGMjQKq8PANizWysjs/wS/RJC+GLLI117h3F2o/+eEK8vrQWqA6dxpOuXL17N48p
-PDvrjw1xwuW/PYsCQgD29BcHYyxgEnbvHdsKhD27J1y3ruVjYH64KhNzM/hmwnve
-wIMlDH5gu/t7HjKVJyEv2NpUvGPWtIaMupIHtwAMlQ==
+MIIB+TCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
+MzgwMTAxMTI0MTQ0WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFDi8N5vtSw
+rsLcxFukUKE0DsbE7+VgzspymXGq1HBDmJd7vF0RgauqGxDRblOncvoQDv9vMlqS
+ZoRDFRh/mF5CmQC0gzFmTrmOpU5dlT9EaDZHy1d1i04IM/w9Ty/iwYuyd5SH8VMP
+/X+4xJlBEd0WT5FsgLpXd0XsXBXywoX0fwQmu6MmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYoAMIGGAkFBGllQl88w
+HC8p3UBcGhFrMElDcTcq4hUx7kAbspXRllyjxMZmlOJItgmWDz5A6t93QqdYUV66
+/2fiPRVhF96rLQJBLpEI3T9rKt0KpOAcYHtHU14heltCPsrCAETwclVK0TeuNwV3
+mYNiwo/a4W81R2retIA44emhUzgTbyrkbz2TQvk=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key
index 170a27bb4..641312320 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key
@@ -1,12 +1,12 @@
Bag Attributes
friendlyName: OCSP Signer ec
- localKeyID: BC D3 C4 37 52 87 1A C3 A8 63 06 2D 55 80 03 A5 3A C6 83 E0
+ localKeyID: 58 98 F6 0B D4 18 4B 9F 6F 78 69 F0 D5 56 12 E7 86 5A D8 19
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBy3XpuL9qUDls6t3P
-iapcTXtlxgZba66o5X7zU6xusnPlNmpQUHzzQS+g1wXC6QMn+wy/EzD3SE+QqxXN
-ZJBQIQihgYkDgYYABAAdYRQlRVlZgKT0o9gJUDkDjM+ixLwCZHn7FcoC7U/DVq6n
-UPJP1IjGMyVMO7/PBRCrAVgBnro2X8UmGSEKpTsV5QGYaE2xnHczPpzYxRU9HKJ0
-X7BSCDeDCfuSK0W0TNVIEty56PrDedL/BDEixHOEiggt4vfyxFFzyALgTQvkdbQ8
-gQ==
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBCVb0Lphosni8iTzX
+AhM69kIKCHLiyqqjvNDRKCbY9+qUDh5mhJgL69WsIsTXF93iLYUilOyui+xakbJg
+9wXuZ86hgYkDgYYABAAA/0l/3VvmG7DYoSzZKwsLvk/DtEk3kiNjcdbbmhacN5I0
+8ELigPSQZIqF646lVE3gEeoCGuoJhd7/J5PG2wfb6gFbHwBzmcs8ZVPfFOrXgEvN
+DaNcW4fk/2E74daf0NmpLJ86TPhyF1e/XVXNBZxVUiWzcOKnFpGKCuzhn5rD/usv
+8g==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12
index bf832fbc5..23e6d55f9 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem
index 5795374a5..27fa05681 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIICEDCCAXOgAwIBAgIBQzAKBggqhkjOPQQDAjA5MRcwFQYDVQQKDA5leGFtcGxl
+MIICETCCAXOgAwIBAgIBQzAKBggqhkjOPQQDAjA5MRcwFQYDVQQKDA5leGFtcGxl
X2VjLmNvbTEeMBwGA1UEAxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMB4XDTEyMTEw
-MTEyMzQyMFoXDTM4MDEwMTEyMzQyMFowODEXMBUGA1UECgwOZXhhbXBsZV9lYy5j
+MTEyNDE0NVoXDTM4MDEwMTEyNDE0NVowODEXMBUGA1UECgwOZXhhbXBsZV9lYy5j
b20xHTAbBgNVBAMTFGNsaWNhIE9DU1AgU2lnbmVyIGVjMIGbMBAGByqGSM49AgEG
-BSuBBAAjA4GGAAQAHWEUJUVZWYCk9KPYCVA5A4zPosS8AmR5+xXKAu1Pw1aup1Dy
-T9SIxjMlTDu/zwUQqwFYAZ66Nl/FJhkhCqU7FeUBmGhNsZx3Mz6c2MUVPRyidF+w
-Ugg3gwn7kitFtEzVSBLcuej6w3nS/wQxIsRzhIoILeL38sRRc8gC4E0L5HW0PIGj
+BSuBBAAjA4GGAAQAAP9Jf91b5huw2KEs2SsLC75Pw7RJN5IjY3HW25oWnDeSNPBC
+4oD0kGSKheuOpVRN4BHqAhrqCYXe/yeTxtsH2+oBWx8Ac5nLPGVT3xTq14BLzQ2j
+XFuH5P9hO+HWn9DZqSyfOkz4chdXv11VzQWcVVIls3DipxaRigrs4Z+aw/7rL/Kj
KjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAKBggq
-hkjOPQQDAgOBigAwgYYCQTbWMszoda9R/XXyM95MExJSXbWeyKQM2J260YguzZEo
-hfL/+hUFIsPur5ni7+0JFfEabOj6vIiK2hm0cKcc5I0YAkFOw6ZjsDlPtGtQ+NMU
-1598oZuBl0V1JlBkQbNmRUUN/vbO0ixvD6e52NeGt0oPsrD6gA8mUjqjlO/p+/Pt
-um9xmg==
+hkjOPQQDAgOBiwAwgYcCQQG3B4qSOXlBkO+SPEzLsrokHuMa63nhJollaEkJCg3f
+V1zClus/Qz79hFDRUPm19XraNWKAlRBWIW+af5B7N62QAkIB8DJhBuT7QyDfrOpu
+robiUZTZZ9uh4PEWz4c2rqDhXqXC+Va26HrBsqyDOPZrJyQkETR3VgqygZRzTko0
+Sk2OjDQ=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem b/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem
index 6941a5ec0..5c43972e4 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
+MzgwMTAxMTI0MTQ0WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQAw20Nx/YXlmEa0JcVzx0RJJR0Q0WJAI0r6IaTktmSGBaI7xjWAz+FQnOmhnTT
-f6fmr6Y30JkXMx0a1jbT8xbkabMA1cwE3+sPGmJb5U8u7LSQLtoBqGu/wJcJzgxh
-Hjfu6dWTvQy9XGwJ9zfUYO6OCqxOCwPDUwclf6ATkR/+CYNKtQKjPjA8MA4GA1Ud
+AAQBM6M4ujO4uNE0fr8aNxWuKobKbLuHbJrnNKMA2WvwGAux0Z1n0aDssuKLbwoi
+J6VwSNd9ediiq0v/G5JQjH/Uzx8BgvzxE2Zc49nMjyzwqIDQyHQgFKa0Q5kNfbEV
+vYn/NnmqlD8jtgdkKD+s0qYW7TXDXlqdzzkRQYTM3oCI1GRK0HujPjA8MA4GA1Ud
DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJCAJu3rvJkTBkF1a2NSnfBMsohguO1
-1WcdT7ltCQDPRPWkZGWSpgEWoUG2TRQxFh2pOO6J/NPWiny7u+ZwBExF2sZ1AkEq
-dxwepzCXqpqKoICJiX1F2974SRgmDNfSmzNG0X/d2d0Z2X15va5vK0oBH8rvIlmw
-mdV3uhlmoNhmqUHEuqKUhA==
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCANdz9aWubsGdfcPT1bkbkR6v9dSn
+OSDxRsgQSigvDq9OKHi9PtESeQVm5rBB2kOt3TyzU+H4JxIjrZ0UUUqL8s7DAkIB
+wpPmJXvygl9kkjY9xkCp7SniF3zyJpo6FU1yEWP8z+7r22Zt+tVAVxH9FEujNTJp
+MvHjwPdyBJcANrlU1kf+Lus=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf b/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf
index 3b92e93ae..320148bb2 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf
@@ -1,18 +1,18 @@
; Config::Simple 4.59
-; Thu Nov 1 12:34:20 2012
+; Thu Nov 1 12:41:44 2012
+
+[CA]
+org=example_ec.com
+subject=clica CA
+bits=2048
+name=Certificate Authority ec
[CLICA]
signer=Signing Cert ec
-crl_url=http://crl.example.com/latest.crl
-level=1
-sighash=SHA256
ocsp_signer=OCSP Signer ec
+sighash=SHA256
+level=1
+crl_url=http://crl.example.com/latest.crl
ocsp_url=http://oscp.example.com/
-[CA]
-org=example_ec.com
-name=Certificate Authority ec
-bits=1024
-subject=clica CA
-
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/cert8.db b/test/aux-fixed/exim-ca/example_ec.com/CA/cert8.db
deleted file mode 100644
index 4def9efbf..000000000
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/key3.db b/test/aux-fixed/exim-ca/example_ec.com/CA/key3.db
deleted file mode 100644
index 501f8b190..000000000
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file b/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file
index 2115608e5..a1f40247a 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file
@@ -4,8 +4,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 2428.058
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -17,8 +17,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -31,8 +31,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1957.721
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -44,8 +44,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -58,8 +58,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 2463.970
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -71,8 +71,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -85,8 +85,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1956.290
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -98,8 +98,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -112,8 +112,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 2515.935
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -125,8 +125,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -139,8 +139,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1678.780
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -152,8 +152,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -166,8 +166,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 2838.108
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -179,8 +179,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -193,8 +193,8 @@ cpu family : 6
model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
-microcode : 0xba
-cpu MHz : 2700.000
+microcode : 0xc6
+cpu MHz : 1838.913
cache size : 8192 KB
physical id : 0
siblings : 8
@@ -206,8 +206,8 @@ fpu : yes
fpu_exception : yes
cpuid level : 22
wp : yes
-flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
-bugs :
+flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb invpcid_single pti ssbd ibrs ibpb stibp tpr_shadow vnmi flexpriority ept vpid ept_ad fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt intel_pt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp flush_l1d
+bugs : cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf
bogomips : 5424.00
clflush size : 64
cache_alignment : 64
@@ -215,79 +215,82 @@ address sizes : 39 bits physical, 48 bits virtual
power management:
CPU0 CPU1 CPU2 CPU3 CPU4 CPU5 CPU6 CPU7
- 0: 75 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
- 1: 69775 6441 4183 4351 8821 6710 4808 2655 IR-IO-APIC 1-edge i8042
- 8: 1 0 0 0 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 116964 16080 12437 10549 27759 16386 11560 7036 IR-IO-APIC 9-fasteoi acpi
- 12: 5146732 362636 240016 241533 534196 383274 265445 167959 IR-IO-APIC 12-edge i8042
- 16: 3 0 0 0 0 0 0 0 IR-IO-APIC 16-fasteoi i801_smbus
+ 0: 23 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
+ 1: 0 0 0 0 0 20904 0 0 IR-IO-APIC 1-edge i8042
+ 8: 0 0 0 0 0 0 1 0 IR-IO-APIC 8-edge rtc0
+ 9: 0 17296 0 0 0 0 0 0 IR-IO-APIC 9-fasteoi acpi
+ 12: 0 0 0 0 975537 0 0 0 IR-IO-APIC 12-edge i8042
+ 16: 0 0 0 0 0 1 0 0 IR-IO-APIC 16-fasteoi i801_smbus
120: 0 0 0 0 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 0 0 0 0 DMAR-MSI 1-edge dmar1
- 122: 40662 2645 2048 8326198 3083 2651 2210 2042 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 123: 50 3 7 1 9 3 5 0 IR-PCI-MSI 327680-edge xhci_hcd
- 124: 269 24 28 20 104 171 22 48 IR-PCI-MSI 2097152-edge rtsx_pci
- 125: 38 0 0 0 0 10 0 4 IR-PCI-MSI 360448-edge mei_me
- 126: 2 0 3 0 1 2 24 0 IR-PCI-MSI 1048576-edge
- 127: 2247 56 54 23 3783066 37 26 18 IR-PCI-MSI 32768-edge i915
- 128: 77 0 0 0 2 32 8 1 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- 129: 18 2 0 4 8 0 4 24684 IR-PCI-MSI 1572864-edge iwlwifi
- 130: 658 1 0 0 0 8 5 13518769 IR-PCI-MSI 520192-edge enp0s31f6
- NMI: 607 2649 2621 2523 2485 2424 2424 2470 Non-maskable interrupts
- LOC: 29015073 29911050 29754937 28954670 29025214 28522599 28469458 28816918 Local timer interrupts
+ 122: 0 0 30204 287255 0 0 0 0 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 123: 0 0 0 54 0 0 0 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 124: 0 0 0 0 0 0 0 459 IR-PCI-MSI 2097152-edge rtsx_pci
+ 125: 0 168 0 0 0 0 0 60680 IR-PCI-MSI 520192-edge enp0s31f6
+ 126: 0 0 3771 0 0 0 457982 0 IR-PCI-MSI 32768-edge i915
+ 127: 0 0 0 18 0 0 0 0 IR-PCI-MSI 1048576-edge nvkm
+ 128: 0 0 0 0 52 0 0 0 IR-PCI-MSI 360448-edge mei_me
+ 129: 0 0 0 0 0 0 45 0 IR-PCI-MSI 1572864-edge iwlwifi
+ 130: 0 0 0 0 0 0 0 636 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ NMI: 16 14 15 18 17 14 15 14 Non-maskable interrupts
+ LOC: 912665 936139 939889 991828 1037068 902298 964644 945428 Local timer interrupts
SPU: 0 0 0 0 0 0 0 0 Spurious interrupts
- PMI: 607 2649 2621 2523 2485 2424 2424 2470 Performance monitoring interrupts
- IWI: 6 4 3 2 10 4 3 1 IRQ work interrupts
- RTR: 18 0 0 0 0 0 0 0 APIC ICR read retries
- RES: 7886120 3950261 2715262 2193596 2474058 1957554 1665522 1988059 Rescheduling interrupts
- CAL: 987292 866818 901402 885321 915800 938469 935941 966681 Function call interrupts
- TLB: 231525 195523 218511 215448 205511 204323 194089 201607 TLB shootdowns
- TRM: 1628003 1628003 1628003 1628003 1628003 1628003 1628003 1628003 Thermal event interrupts
+ PMI: 16 14 15 18 17 14 15 14 Performance monitoring interrupts
+ IWI: 0 0 0 0 3 0 1 0 IRQ work interrupts
+ RTR: 4 0 0 0 0 0 0 0 APIC ICR read retries
+ RES: 244370 93436 40246 24369 17709 13149 11666 11188 Rescheduling interrupts
+ CAL: 33878 31862 33707 32843 33596 33545 32153 32444 Function call interrupts
+ TLB: 16415 15608 17440 17663 21127 17152 16593 16540 TLB shootdowns
+ TRM: 0 0 0 0 0 0 0 0 Thermal event interrupts
THR: 0 0 0 0 0 0 0 0 Threshold APIC interrupts
DFR: 0 0 0 0 0 0 0 0 Deferred Error APIC interrupts
MCE: 0 0 0 0 0 0 0 0 Machine check exceptions
- MCP: 202 200 200 200 200 200 200 200 Machine check polls
+ MCP: 29 30 30 30 30 30 30 30 Machine check polls
HYP: 0 0 0 0 0 0 0 0 Hypervisor callback interrupts
+ HRE: 0 0 0 0 0 0 0 0 Hyper-V reenlightenment interrupts
+ HVS: 0 0 0 0 0 0 0 0 Hyper-V stimer0 interrupts
ERR: 0
MIS: 0
PIN: 0 0 0 0 0 0 0 0 Posted-interrupt notification event
NPI: 0 0 0 0 0 0 0 0 Nested posted-interrupt event
PIW: 0 0 0 0 0 0 0 0 Posted-interrupt wakeup event
-MemTotal: 16293504 kB
-MemFree: 932716 kB
-MemAvailable: 13702560 kB
-Buffers: 452240 kB
-Cached: 12442300 kB
-SwapCached: 101680 kB
-Active: 2600080 kB
-Inactive: 12196736 kB
-Active(anon): 1356440 kB
-Inactive(anon): 589480 kB
-Active(file): 1243640 kB
-Inactive(file): 11607256 kB
-Unevictable: 64 kB
-Mlocked: 64 kB
+MemTotal: 16284452 kB
+MemFree: 10018316 kB
+MemAvailable: 13200712 kB
+Buffers: 265192 kB
+Cached: 3329440 kB
+SwapCached: 0 kB
+Active: 3262976 kB
+Inactive: 2458200 kB
+Active(anon): 2128304 kB
+Inactive(anon): 246368 kB
+Active(file): 1134672 kB
+Inactive(file): 2211832 kB
+Unevictable: 80 kB
+Mlocked: 80 kB
SwapTotal: 8212476 kB
-SwapFree: 7376112 kB
-Dirty: 11472 kB
-Writeback: 40 kB
-AnonPages: 1871864 kB
-Mapped: 415980 kB
-Shmem: 290896 kB
-Slab: 351292 kB
-SReclaimable: 257268 kB
-SUnreclaim: 94024 kB
-KernelStack: 12920 kB
-PageTables: 58508 kB
+SwapFree: 8212476 kB
+Dirty: 936 kB
+Writeback: 128 kB
+AnonPages: 2126892 kB
+Mapped: 481352 kB
+Shmem: 248104 kB
+Slab: 324588 kB
+SReclaimable: 173252 kB
+SUnreclaim: 151336 kB
+KernelStack: 10080 kB
+PageTables: 39644 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 16359228 kB
-Committed_AS: 7890372 kB
+CommitLimit: 16354700 kB
+Committed_AS: 6626684 kB
VmallocTotal: 34359738367 kB
VmallocUsed: 0 kB
VmallocChunk: 0 kB
+Percpu: 4256 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 0 kB
+AnonHugePages: 806912 kB
ShmemHugePages: 0 kB
ShmemPmdMapped: 0 kB
CmaTotal: 0 kB
@@ -297,14 +300,15 @@ HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 523752 kB
-DirectMap2M: 16115712 kB
-DirectMap1G: 1048576 kB
+Hugetlb: 0 kB
+DirectMap4k: 282088 kB
+DirectMap2M: 7968768 kB
+DirectMap1G: 9437184 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
-enp0s31f6: 9760816648 13664538 0 0 0 0 0 8965 118421394195 83833297 0 0 0 0 0 0
-wlp3s0: 3643580 7768 0 0 0 0 0 0 4732829 8244 0 0 0 0 0 0
- lo: 9996035 41708 0 0 0 0 0 0 9996035 41708 0 0 0 0 0 0
+ vnet0: 1155867 4102 0 0 0 0 0 0 960308 10312 0 0 0 0 0 0
+wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+virbr0: 1098439 4102 0 0 0 0 0 0 735824 6022 0 0 0 0 0 0
+ lo: 7424702 45950 0 0 0 0 0 0 7424702 45950 0 0 0 0 0 0
virbr0-nic: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- tun0: 20139456 21861 0 0 0 0 0 0 3370846 19686 0 0 0 0 0 0
-virbr0: 47538577 146404 0 0 0 0 0 0 164360816 210422 0 0 0 0 0 0
+enp0s31f6: 39251323 34779 0 0 0 0 0 0 5044761 25668 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/secmod.db b/test/aux-fixed/exim-ca/example_ec.com/CA/secmod.db
deleted file mode 100644
index f8cc0e78b..000000000
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem
index 3f4a5a533..50457f2ef 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example_ec.com/CN=clica Signing Cert ec
issuer=/O=example_ec.com/CN=clica CA ec
-----BEGIN CERTIFICATE-----
-MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
+MzgwMTAxMTI0MTQ0WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQAw20Nx/YXlmEa0JcVzx0RJJR0Q0WJAI0r6IaTktmSGBaI7xjWAz+FQnOmhnTT
-f6fmr6Y30JkXMx0a1jbT8xbkabMA1cwE3+sPGmJb5U8u7LSQLtoBqGu/wJcJzgxh
-Hjfu6dWTvQy9XGwJ9zfUYO6OCqxOCwPDUwclf6ATkR/+CYNKtQKjPjA8MA4GA1Ud
+AAQBM6M4ujO4uNE0fr8aNxWuKobKbLuHbJrnNKMA2WvwGAux0Z1n0aDssuKLbwoi
+J6VwSNd9ediiq0v/G5JQjH/Uzx8BgvzxE2Zc49nMjyzwqIDQyHQgFKa0Q5kNfbEV
+vYn/NnmqlD8jtgdkKD+s0qYW7TXDXlqdzzkRQYTM3oCI1GRK0HujPjA8MA4GA1Ud
DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJCAJu3rvJkTBkF1a2NSnfBMsohguO1
-1WcdT7ltCQDPRPWkZGWSpgEWoUG2TRQxFh2pOO6J/NPWiny7u+ZwBExF2sZ1AkEq
-dxwepzCXqpqKoICJiX1F2974SRgmDNfSmzNG0X/d2d0Z2X15va5vK0oBH8rvIlmw
-mdV3uhlmoNhmqUHEuqKUhA==
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCANdz9aWubsGdfcPT1bkbkR6v9dSn
+OSDxRsgQSigvDq9OKHi9PtESeQVm5rBB2kOt3TyzU+H4JxIjrZ0UUUqL8s7DAkIB
+wpPmJXvygl9kkjY9xkCp7SniF3zyJpo6FU1yEWP8z+7r22Zt+tVAVxH9FEujNTJp
+MvHjwPdyBJcANrlU1kf+Lus=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority ec
subject=/O=example_ec.com/CN=clica CA ec
issuer=/O=example_ec.com/CN=clica CA ec
-----BEGIN CERTIFICATE-----
-MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAAXQLXIfCeo
-dnmboScyJ5dutaJijb0+oh2RbMyC6wf+05xD0aR1ioteDwz+BL6tIAd8m/8ILrfh
-LpQbdCjS7k+0BwE1EqYUBN8WYWC59RcaA0CmhDaDybQYTlj1gZtBtA2H3wagWHrZ
-hKiZzX2xUfaTNHokyMRDzOA0FGkKj3djDMc9xaMmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIBJxJzvmFu
-PGMjQKq8PANizWysjs/wS/RJC+GLLI117h3F2o/+eEK8vrQWqA6dxpOuXL17N48p
-PDvrjw1xwuW/PYsCQgD29BcHYyxgEnbvHdsKhD27J1y3ruVjYH64KhNzM/hmwnve
-wIMlDH5gu/t7HjKVJyEv2NpUvGPWtIaMupIHtwAMlQ==
+MIIB+TCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
+MzgwMTAxMTI0MTQ0WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFDi8N5vtSw
+rsLcxFukUKE0DsbE7+VgzspymXGq1HBDmJd7vF0RgauqGxDRblOncvoQDv9vMlqS
+ZoRDFRh/mF5CmQC0gzFmTrmOpU5dlT9EaDZHy1d1i04IM/w9Ty/iwYuyd5SH8VMP
+/X+4xJlBEd0WT5FsgLpXd0XsXBXywoX0fwQmu6MmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYoAMIGGAkFBGllQl88w
+HC8p3UBcGhFrMElDcTcq4hUx7kAbspXRllyjxMZmlOJItgmWDz5A6t93QqdYUV66
+/2fiPRVhF96rLQJBLpEI3T9rKt0KpOAcYHtHU14heltCPsrCAETwclVK0TeuNwV3
+mYNiwo/a4W81R2retIA44emhUzgTbyrkbz2TQvk=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert8.db b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert8.db
deleted file mode 100644
index 8774b5d05..000000000
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert8.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem
index 2efc0c0ab..109d4e474 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem
@@ -1,59 +1,59 @@
Bag Attributes
friendlyName: server1.example_ec.com
- localKeyID: C0 8B 08 6B D5 CF 5D 2E E2 2F 0A 08 B7 B7 71 96 91 D0 F8 30
+ localKeyID: D6 46 1B EF 9D FA B1 F4 11 76 3E EA B9 87 4F E7 9A F4 01 FD
subject=/CN=server1.example_ec.com
issuer=/O=example_ec.com/CN=clica Signing Cert ec
-----BEGIN CERTIFICATE-----
MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xMjEx
-MDExMjM0MjBaFw0zNzEyMDExMjM0MjBaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABABgtAjdg51cTCVW
-Jf8pJI+4k4L2N8bPUBLkeihUJN4q9aCkPPn9vV2bgJB0UHhQLSgt4yAYaCFnMpB4
-+wM1B0N57AEIUQDu5LCqokagPMgJKAxiJyEHemcFqCqtLlWnvkNqS1bM214WvX7r
-nhyBQ4PvNvEY5SlEZuQsIZL1kYM6lLRXo6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjQxNDZaFw0zNzEyMDExMjQxNDZaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAE9zdvyyhVXrrfD
+WSISI3makfsVDo9g202zPmn/MM3SdBqmM+rASyMhXYDtijSYuSNaS29jDSlAMC2C
+Pqq88PHWXwBH+U7D9QnenDlN2kEDokbJ/lgXSzF4+NOoIcwh+DIr20QuTM3hGfCJ
+tctRfVvdjRfa4Quj7hkG56ajsBz/Osi6i6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4ITc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIu
-c2VydmVyMS5leGFtcGxlLmNvbYIhYWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1w
-bGUuY29tggkqLnRlc3QuZXiCFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkIBx9EGz2ocLlfqVFWXKF4hppY1v54q9i0nA+2xCEsp4Lb/
-Z9gSZMvqru5Xu6FWrQ/loTv4CmE+SjWRnfjUU+VSoqsCQUyZmyJfRhZr8G7x1I7d
-Vulk/xvy3d8XhoajVS0s2g5xpyMfUknOEhaSNaMXUZW/8ZjbW2BjbNoZQxVwS6h0
-aIrz
+BgNVHREEgYEwf4IWc2VydmVyMS5leGFtcGxlX2VjLmNvbYITc2VydmVyMS5leGFt
+cGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIJKi50
+ZXN0LmV4giFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb20wCgYIKoZI
+zj0EAwIDgYsAMIGHAkIBWndSdGp1lFxScamCi0sgysif3SPRt68d+cIKty3pUvEs
+kZspf26wooCAe2wELgg8UqAciEA8phO99sEaFsn3bjACQVCuUx8gyMvuqOf0tZMM
+UzhcceUCLOmde8yy5oUK/GQUqG2LdD65D4AlR+aXuOiSg17t4q/quILUcU+tSK/X
+wXvO
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert ec
subject=/O=example_ec.com/CN=clica Signing Cert ec
issuer=/O=example_ec.com/CN=clica CA ec
-----BEGIN CERTIFICATE-----
-MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
+MzgwMTAxMTI0MTQ0WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQAw20Nx/YXlmEa0JcVzx0RJJR0Q0WJAI0r6IaTktmSGBaI7xjWAz+FQnOmhnTT
-f6fmr6Y30JkXMx0a1jbT8xbkabMA1cwE3+sPGmJb5U8u7LSQLtoBqGu/wJcJzgxh
-Hjfu6dWTvQy9XGwJ9zfUYO6OCqxOCwPDUwclf6ATkR/+CYNKtQKjPjA8MA4GA1Ud
+AAQBM6M4ujO4uNE0fr8aNxWuKobKbLuHbJrnNKMA2WvwGAux0Z1n0aDssuKLbwoi
+J6VwSNd9ediiq0v/G5JQjH/Uzx8BgvzxE2Zc49nMjyzwqIDQyHQgFKa0Q5kNfbEV
+vYn/NnmqlD8jtgdkKD+s0qYW7TXDXlqdzzkRQYTM3oCI1GRK0HujPjA8MA4GA1Ud
DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJCAJu3rvJkTBkF1a2NSnfBMsohguO1
-1WcdT7ltCQDPRPWkZGWSpgEWoUG2TRQxFh2pOO6J/NPWiny7u+ZwBExF2sZ1AkEq
-dxwepzCXqpqKoICJiX1F2974SRgmDNfSmzNG0X/d2d0Z2X15va5vK0oBH8rvIlmw
-mdV3uhlmoNhmqUHEuqKUhA==
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCANdz9aWubsGdfcPT1bkbkR6v9dSn
+OSDxRsgQSigvDq9OKHi9PtESeQVm5rBB2kOt3TyzU+H4JxIjrZ0UUUqL8s7DAkIB
+wpPmJXvygl9kkjY9xkCp7SniF3zyJpo6FU1yEWP8z+7r22Zt+tVAVxH9FEujNTJp
+MvHjwPdyBJcANrlU1kf+Lus=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority ec
subject=/O=example_ec.com/CN=clica CA ec
issuer=/O=example_ec.com/CN=clica CA ec
-----BEGIN CERTIFICATE-----
-MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAAXQLXIfCeo
-dnmboScyJ5dutaJijb0+oh2RbMyC6wf+05xD0aR1ioteDwz+BL6tIAd8m/8ILrfh
-LpQbdCjS7k+0BwE1EqYUBN8WYWC59RcaA0CmhDaDybQYTlj1gZtBtA2H3wagWHrZ
-hKiZzX2xUfaTNHokyMRDzOA0FGkKj3djDMc9xaMmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIBJxJzvmFu
-PGMjQKq8PANizWysjs/wS/RJC+GLLI117h3F2o/+eEK8vrQWqA6dxpOuXL17N48p
-PDvrjw1xwuW/PYsCQgD29BcHYyxgEnbvHdsKhD27J1y3ruVjYH64KhNzM/hmwnve
-wIMlDH5gu/t7HjKVJyEv2NpUvGPWtIaMupIHtwAMlQ==
+MIIB+TCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
+MzgwMTAxMTI0MTQ0WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFDi8N5vtSw
+rsLcxFukUKE0DsbE7+VgzspymXGq1HBDmJd7vF0RgauqGxDRblOncvoQDv9vMlqS
+ZoRDFRh/mF5CmQC0gzFmTrmOpU5dlT9EaDZHy1d1i04IM/w9Ty/iwYuyd5SH8VMP
+/X+4xJlBEd0WT5FsgLpXd0XsXBXywoX0fwQmu6MmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYoAMIGGAkFBGllQl88w
+HC8p3UBcGhFrMElDcTcq4hUx7kAbspXRllyjxMZmlOJItgmWDz5A6t93QqdYUV66
+/2fiPRVhF96rLQJBLpEI3T9rKt0KpOAcYHtHU14heltCPsrCAETwclVK0TeuNwV3
+mYNiwo/a4W81R2retIA44emhUzgTbyrkbz2TQvk=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key3.db b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key3.db
deleted file mode 100644
index 14f05dbd7..000000000
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key3.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/secmod.db b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/secmod.db
deleted file mode 100644
index f85d8feef..000000000
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/secmod.db
+++ /dev/null
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem
index f6558807d..044b737b0 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem
@@ -1,38 +1,38 @@
Bag Attributes
friendlyName: server1.example_ec.com
- localKeyID: C0 8B 08 6B D5 CF 5D 2E E2 2F 0A 08 B7 B7 71 96 91 D0 F8 30
+ localKeyID: D6 46 1B EF 9D FA B1 F4 11 76 3E EA B9 87 4F E7 9A F4 01 FD
subject=/CN=server1.example_ec.com
issuer=/O=example_ec.com/CN=clica Signing Cert ec
-----BEGIN CERTIFICATE-----
MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xMjEx
-MDExMjM0MjBaFw0zNzEyMDExMjM0MjBaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABABgtAjdg51cTCVW
-Jf8pJI+4k4L2N8bPUBLkeihUJN4q9aCkPPn9vV2bgJB0UHhQLSgt4yAYaCFnMpB4
-+wM1B0N57AEIUQDu5LCqokagPMgJKAxiJyEHemcFqCqtLlWnvkNqS1bM214WvX7r
-nhyBQ4PvNvEY5SlEZuQsIZL1kYM6lLRXo6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjQxNDZaFw0zNzEyMDExMjQxNDZaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAE9zdvyyhVXrrfD
+WSISI3makfsVDo9g202zPmn/MM3SdBqmM+rASyMhXYDtijSYuSNaS29jDSlAMC2C
+Pqq88PHWXwBH+U7D9QnenDlN2kEDokbJ/lgXSzF4+NOoIcwh+DIr20QuTM3hGfCJ
+tctRfVvdjRfa4Quj7hkG56ajsBz/Osi6i6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4ITc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIu
-c2VydmVyMS5leGFtcGxlLmNvbYIhYWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1w
-bGUuY29tggkqLnRlc3QuZXiCFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkIBx9EGz2ocLlfqVFWXKF4hppY1v54q9i0nA+2xCEsp4Lb/
-Z9gSZMvqru5Xu6FWrQ/loTv4CmE+SjWRnfjUU+VSoqsCQUyZmyJfRhZr8G7x1I7d
-Vulk/xvy3d8XhoajVS0s2g5xpyMfUknOEhaSNaMXUZW/8ZjbW2BjbNoZQxVwS6h0
-aIrz
+BgNVHREEgYEwf4IWc2VydmVyMS5leGFtcGxlX2VjLmNvbYITc2VydmVyMS5leGFt
+cGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIJKi50
+ZXN0LmV4giFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb20wCgYIKoZI
+zj0EAwIDgYsAMIGHAkIBWndSdGp1lFxScamCi0sgysif3SPRt68d+cIKty3pUvEs
+kZspf26wooCAe2wELgg8UqAciEA8phO99sEaFsn3bjACQVCuUx8gyMvuqOf0tZMM
+UzhcceUCLOmde8yy5oUK/GQUqG2LdD65D4AlR+aXuOiSg17t4q/quILUcU+tSK/X
+wXvO
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
-FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
-lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
-YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
-/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
-oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
-hdqYsdjjnBy/6U5g
+MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTI0MTQ0WhcN
+MzgwMTAxMTI0MTQ0WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
+AAQBM6M4ujO4uNE0fr8aNxWuKobKbLuHbJrnNKMA2WvwGAux0Z1n0aDssuKLbwoi
+J6VwSNd9ediiq0v/G5JQjH/Uzx8BgvzxE2Zc49nMjyzwqIDQyHQgFKa0Q5kNfbEV
+vYn/NnmqlD8jtgdkKD+s0qYW7TXDXlqdzzkRQYTM3oCI1GRK0HujPjA8MA4GA1Ud
+DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCANdz9aWubsGdfcPT1bkbkR6v9dSn
+OSDxRsgQSigvDq9OKHi9PtESeQVm5rBB2kOt3TyzU+H4JxIjrZ0UUUqL8s7DAkIB
+wpPmJXvygl9kkjY9xkCp7SniF3zyJpo6FU1yEWP8z+7r22Zt+tVAVxH9FEujNTJp
+MvHjwPdyBJcANrlU1kf+Lus=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key
index 8d4bdac49..0e70cf5bc 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key
@@ -1,13 +1,13 @@
Bag Attributes
friendlyName: server1.example_ec.com
- localKeyID: C0 8B 08 6B D5 CF 5D 2E E2 2F 0A 08 B7 B7 71 96 91 D0 F8 30
+ localKeyID: D6 46 1B EF 9D FA B1 F4 11 76 3E EA B9 87 4F E7 9A F4 01 FD
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIknS3YlrTLAQCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECE6j/3EHWtp4BIH4In1m3nH7OsdI
-BE2V4m02juya2M//+pYWyjFjvYgb+qA7r6BkAarbIebHQPsF567TOorU3N/eAqes
-b8ieyw7xuw3zvsjOeNZVrtcovl2Fu7/XW77XB3dN8pcrM1t0dwPSdsoIF0asStrH
-6Ql50oYYx+3QMy3fHB/YBKHhW7kViYOKXkafIE/VAmZrejOqaFDVAdrue9E1zJSi
-BhPNND87i5a+jXnq2pzG0VTYQJ2aUyTBV7gzUzKVXCZUUQMfwkPbn6FEcJNDB2sV
-IkQnjMeCqsD+jRpW7jPT9Y9+8hj5pUxgQpgcOkM/0GQopG4Jt3Uc+Jv6oZfNPAk=
+MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyn+t6fno4A4CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHj42fAyK5q9BIH4VNdep8rufog4
+8ESh/v2V9cRmWnfq79g1YZB7szLp4vGsDsSnPhIsqTp9D5CmTN4xgZfUj/M7HVDf
+Hx0Hdu7zqfTszyS8hqwOfWaFbSzhtqUwNX95L+4QdzUY75u7G3FepEcyCZz1iXZ6
+ZC5KjtPxLAq9Rx8s/544cW9ELykKfsgLLeIVpoT2DZH85bO36L0uClXkLKBDeNq0
+BgozXR7IaIgXs5FDJrxLKHkoA3eFdH5GT5Fv3EBhisup72dfe0YQ6CMvf//dgN0O
+weBpJswOOP9xnTefuRNugKuJnWHYDSqysxCmJYgyqz5W3mHQo4kQtCCjDJgQrA4=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp
index 276c8b26d..d129311d1 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req
index f60d3923c..4cfefd2c6 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12 b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12
index 1952284f1..cbb748c1f 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem
index 7de3ec2c6..71cb50567 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem
@@ -1,24 +1,24 @@
Bag Attributes
friendlyName: server1.example_ec.com
- localKeyID: C0 8B 08 6B D5 CF 5D 2E E2 2F 0A 08 B7 B7 71 96 91 D0 F8 30
+ localKeyID: D6 46 1B EF 9D FA B1 F4 11 76 3E EA B9 87 4F E7 9A F4 01 FD
subject=/CN=server1.example_ec.com
issuer=/O=example_ec.com/CN=clica Signing Cert ec
-----BEGIN CERTIFICATE-----
MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xMjEx
-MDExMjM0MjBaFw0zNzEyMDExMjM0MjBaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABABgtAjdg51cTCVW
-Jf8pJI+4k4L2N8bPUBLkeihUJN4q9aCkPPn9vV2bgJB0UHhQLSgt4yAYaCFnMpB4
-+wM1B0N57AEIUQDu5LCqokagPMgJKAxiJyEHemcFqCqtLlWnvkNqS1bM214WvX7r
-nhyBQ4PvNvEY5SlEZuQsIZL1kYM6lLRXo6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjQxNDZaFw0zNzEyMDExMjQxNDZaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAE9zdvyyhVXrrfD
+WSISI3makfsVDo9g202zPmn/MM3SdBqmM+rASyMhXYDtijSYuSNaS29jDSlAMC2C
+Pqq88PHWXwBH+U7D9QnenDlN2kEDokbJ/lgXSzF4+NOoIcwh+DIr20QuTM3hGfCJ
+tctRfVvdjRfa4Quj7hkG56ajsBz/Osi6i6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4ITc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIu
-c2VydmVyMS5leGFtcGxlLmNvbYIhYWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1w
-bGUuY29tggkqLnRlc3QuZXiCFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkIBx9EGz2ocLlfqVFWXKF4hppY1v54q9i0nA+2xCEsp4Lb/
-Z9gSZMvqru5Xu6FWrQ/loTv4CmE+SjWRnfjUU+VSoqsCQUyZmyJfRhZr8G7x1I7d
-Vulk/xvy3d8XhoajVS0s2g5xpyMfUknOEhaSNaMXUZW/8ZjbW2BjbNoZQxVwS6h0
-aIrz
+BgNVHREEgYEwf4IWc2VydmVyMS5leGFtcGxlX2VjLmNvbYITc2VydmVyMS5leGFt
+cGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIJKi50
+ZXN0LmV4giFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb20wCgYIKoZI
+zj0EAwIDgYsAMIGHAkIBWndSdGp1lFxScamCi0sgysif3SPRt68d+cIKty3pUvEs
+kZspf26wooCAe2wELgg8UqAciEA8phO99sEaFsn3bjACQVCuUx8gyMvuqOf0tZMM
+UzhcceUCLOmde8yy5oUK/GQUqG2LdD65D4AlR+aXuOiSg17t4q/quILUcU+tSK/X
+wXvO
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key
index a568297a1..70c4009bf 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key
@@ -1,7 +1,7 @@
-----BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIB3UGJ/6oisU7pHhxz99/n9IIb96iUAItm2n/rUMqFX55MbhOkQfAc
-necalYgGMsVQ8ThKEcfCHWkIYpzf2KI+8hGgBwYFK4EEACOhgYkDgYYABABgtAjd
-g51cTCVWJf8pJI+4k4L2N8bPUBLkeihUJN4q9aCkPPn9vV2bgJB0UHhQLSgt4yAY
-aCFnMpB4+wM1B0N57AEIUQDu5LCqokagPMgJKAxiJyEHemcFqCqtLlWnvkNqS1bM
-214WvX7rnhyBQ4PvNvEY5SlEZuQsIZL1kYM6lLRXow==
+MIHcAgEBBEIAKK8Hj471sHschNupNRmwYYrY9JSFkTlZMhsNg8zcQPkCfGEuxHkz
+ReLdG4dy8bBJA6CGDvKRJ0hFMPF++RNU+sGgBwYFK4EEACOhgYkDgYYABAE9zdvy
+yhVXrrfDWSISI3makfsVDo9g202zPmn/MM3SdBqmM+rASyMhXYDtijSYuSNaS29j
+DSlAMC2CPqq88PHWXwBH+U7D9QnenDlN2kEDokbJ/lgXSzF4+NOoIcwh+DIr20Qu
+TM3hGfCJtctRfVvdjRfa4Quj7hkG56ajsBz/Osi6iw==
-----END EC PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/genall b/test/aux-fixed/exim-ca/genall
index e81e2f385..a5e51e3e5 100755
--- a/test/aux-fixed/exim-ca/genall
+++ b/test/aux-fixed/exim-ca/genall
@@ -26,7 +26,7 @@ do
rm -fr "$idir"
# create CA cert + templates
- clica $V -D "$idir" -p password -B 1024 -I -N $iname -F -C http://crl.$iname/latest.crl -O http://oscp.$iname/
+ clica $V -D "$idir" -p password -B 2048 -I -N $iname -F -C http://crl.$iname/latest.crl -O http://oscp.$iname/
# create server certs
# -m <months>
@@ -160,7 +160,7 @@ do
rm -fr "$idir"
# create CA cert + templates
- clica $V -D "$idir" -p password -B 1024 -I -N $iname -F \
+ clica $V -D "$idir" -p password -B 2048 -I -N $iname -F \
-k ec -q nistp521 \
-C http://crl.example.$tld/latest.crl -O http://oscp.example.$tld/