summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-10-23 14:51:33 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2022-11-22 18:44:26 +0000
commit3b46b0914f7161a1011a642d3b90923b15ad85b8 (patch)
tree61955ac6d883aa387ba0cfe5f9e4726a028bd8ae
parent6d38582bcea0a891244cf24b0b39d5bb310464e9 (diff)
Testsuite: regenerate OCSP proofs with proof-signer certs
-rw-r--r--.gitignore2
-rwxr-xr-xtest/aux-fixed/exim-ca/README.regenerate2
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/CA.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/CA.key54
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/CA.p12bin2689 -> 2689 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/CA.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.key54
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.p12bin4445 -> 4445 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.pem26
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.key54
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.respbin510 -> 510 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp.pem31
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.respbin533 -> 533 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.p12bin3567 -> 3567 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/ca.conf12
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/cert9.dbbin49152 -> 49152 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.Signerbin364 -> 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.pem14
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.emptybin0 -> 374 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt1
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem10
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.v2bin422 -> 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/key4.dbbin94208 -> 94208 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/noise.file124
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key58
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.reqbin96 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.respbin1340 -> 2100 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.respbin1352 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.respbin543 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key58
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.reqbin97 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key58
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.reqbin96 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.respbin1340 -> 2100 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.respbin1352 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.respbin543 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key58
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.reqbin97 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.reqbin282 -> 282 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.respbin768 -> 768 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem46
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem94
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem64
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key58
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.reqbin96 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.respbin1340 -> 2100 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.respbin1352 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.respbin543 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12bin4661 -> 4677 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem54
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key18
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12bin3531 -> 3531 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem26
-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.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem88
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key58
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.reqbin97 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12bin4629 -> 4629 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/CA.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/CA.key54
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/CA.p12bin2689 -> 2689 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/CA.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.key54
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.p12bin4445 -> 4445 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.pem26
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.key54
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.respbin510 -> 510 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem26
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.respbin533 -> 533 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.p12bin3567 -> 3567 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/ca.conf15
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/cert9.dbbin49152 -> 49152 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.Signerbin364 -> 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.pem14
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.emptybin374 -> 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.v2bin422 -> 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/key4.dbbin94208 -> 94208 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/noise.file124
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.reqbin96 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.respbin1340 -> 2100 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.respbin1352 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.respbin543 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.reqbin97 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.reqbin96 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.respbin1340 -> 2100 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.respbin1352 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.respbin543 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.reqbin97 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.reqbin282 -> 282 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.respbin768 -> 768 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem46
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem94
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem64
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.reqbin96 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.respbin1340 -> 2100 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.respbin1352 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.respbin543 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12bin4677 -> 4677 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem88
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.reqbin97 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12bin4613 -> 4629 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.org/BLANK/CA.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.org/BLANK/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/BLANK/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/CA.key54
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/CA.p12bin2689 -> 2689 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/CA.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/OCSP.key54
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/OCSP.p12bin4445 -> 4445 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/OCSP.pem26
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.key54
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.respbin510 -> 510 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp.pem26
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.respbin533 -> 533 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.p12bin3567 -> 3567 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/Signer.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/ca.conf14
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/cert9.dbbin49152 -> 49152 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.Signerbin364 -> 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.pem14
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.chain.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/crl.emptybin374 -> 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.v2bin422 -> 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/key4.dbbin94208 -> 94208 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/CA/noise.file124
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key58
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.reqbin96 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.respbin1340 -> 2100 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.respbin1352 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.respbin543 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key58
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.reqbin97 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key58
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.reqbin96 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.respbin1340 -> 2100 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.respbin1352 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.respbin543 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key58
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.reqbin97 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.reqbin282 -> 282 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.respbin768 -> 768 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp.pem46
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem94
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem64
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key58
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.respbin1317 -> 2078 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.reqbin96 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.respbin1340 -> 2100 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.respbin1329 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.respbin1352 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.respbin520 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.respbin543 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12bin4677 -> 4677 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem88
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key58
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.reqbin97 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.respbin1318 -> 2079 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.respbin1330 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.respbin521 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12bin4629 -> 4629 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key52
-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/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/BLANK/key4.dbbin36864 -> 36864 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.p12bin2699 -> 2699 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem16
-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/cert9.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/CA/noise.file122
-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/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem70
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem48
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key18
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.respbin942 -> 941 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.p12bin2971 -> 2971 bytes
-rw-r--r--test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem28
-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/genall5
-rw-r--r--test/dnszones-src/db.example.com4
-rw-r--r--test/dnszones-src/db.test.ex28
-rw-r--r--test/log/2102.openssl_1_1_122
-rw-r--r--test/log/572018
-rw-r--r--test/stdout/58002
478 files changed, 3988 insertions, 3944 deletions
diff --git a/.gitignore b/.gitignore
index 3fd0b2440..8c2660a9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ exim-*
*.orig
*.rej
.gdb_history
+.xauth*
+cscope.out
diff --git a/test/aux-fixed/exim-ca/README.regenerate b/test/aux-fixed/exim-ca/README.regenerate
index 7a1ef2936..abbb8cd3e 100755
--- a/test/aux-fixed/exim-ca/README.regenerate
+++ b/test/aux-fixed/exim-ca/README.regenerate
@@ -1,5 +1,5 @@
WARNING for Exim Testsuite:
-If you change these certificates you will also need to update the TLSA records in dnszone-src/db.test.ex
+If you change these certificates you will also need to update the TLSA records in dnszones-src/db.test.ex
and dnszones-src/db.example.com (the commands are next to each one).
The script "tlsa_regenerate" automates this.
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 ba4a43179..43a5bec18 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
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
-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
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzUxMloX
+DTM4MDEwMTEyMzUxMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPU
+5wkw96hBYOM63HFoalJDx/oULicEpFoGY+A51kUCQG1gL9yQ10jB8DwhIaLy7uaU
+jsto3V1t9i9YSp4BI8TXXd2GQezjz/s8PpvmJK5NK8MPqA1pnW7avDnEcXIzvv7x
++Q9A1vhOVpmSVAC3DeQz9ja0yQDtYCaioLvWcA93ebgA1GVojtng8OTv+stodniQ
+QvkCGz+nRG+3F+BZNp8DhFg66NnV1bDz7px9FaG8yAOE/KTkD/tTNcy1NSbDjWJ4
+L/fPWtby9A0vLQcVwSzZe9OPxP4oYavtzjetvrRbgHme4P4iEAD4qOFRDuaUUV+P
+OjVGhKilZxjdWOORx18CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAK6TRRonHr3X8xrgI0YRuSc1
+xVEfUUwLym1MEqA5IZl1Qywc4FsOZKtiqli7vtjOB6Zw0hn3UVNHWesr8UsooITv
+K5vKoNvzfwmslwwaX2WDonGgjgU4596xuVnUkDJqdmzjXVEwh5jijIWG+BOwonhL
+HfNqWf5sg4UMEjRqRihE7HvPkjmVdwBDpMUxAHTORjvrFXTCnrTQT5qbUxvJsu7a
+pDJFx7QOUaL621WVL54CYWoJrm9+YRS5NKM+sBRIHc78+5sLkY+hk2WI4/QjVwmC
+Nk03J1GwA65oOo3MzMvQIIEsL4U8E1I6bKnwK4KGJtK+MHBMVkgyRO2P5GjYCnw=
-----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 72949b2fb..b29db3076 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/cert9.db b/test/aux-fixed/exim-ca/example.com/BLANK/cert9.db
index 9ce1771a9..108cfbd5c 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/cert9.db
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/key4.db b/test/aux-fixed/exim-ca/example.com/BLANK/key4.db
index 7f0108131..ce2386469 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/key4.db
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/CA.key b/test/aux-fixed/exim-ca/example.com/CA/CA.key
index 464a4ba56..70c935c89 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/CA.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/CA.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: Certificate Authority rsa
- localKeyID: F8 4B 34 D8 F0 7F 55 21 1C EB 00 E8 DE 77 60 72 CB CF 97 71
+ localKeyID: 90 3E AB C3 11 BD 77 AC DD B6 0A EE AD D2 37 49 D7 92 94 4C
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCxf5om4LwhmMKg
-KV5ze7A+d0H2dJbiKMxGp/xbDZk1xsqx+hyCWj0paJ9Ztvp47RGrEyynhYi/4RU8
-lTlSLHABBvM5z3BZVT9VCcD1UHx+TpBW8jKde2Is/0R0EIxHY0LnKBcXOjzwW63a
-4eIiz9mC30RmOPlL56Ke5xx5AlYcabUWcHmbQhMjmmjr+VuT9wcvuqrNY+hIkHUm
-wf9zEtCiQXJDajHruC/d1IGpNxANkCHF+hUCqxI03E6x0cGX3dCvVv8o7ZDio+pM
-0wKTe8vwMp6Kan1qB10ZUZlVxvNdWgXuBaUbC66Y3GyIIIjEkB41NZw2eg53wXG7
-D16gPTBVAgMBAAECggEADMb1uXoQsOPGkYbzgKFVFOS61TCcB+24lBbVngGtl2cX
-AkF8jzmgZicHiYrCybUEbOngG122dAbnjh6OgMbSzTrLLsyATD33ECUNRIYltWXs
-aAXen42D319aIHdsfFsTNCv49Y1rWOtl6XgR3Or/amIDZ3m5yxKtQdO7Lfl9ahAR
-6O8US1r3Sx9ralbzXx/whSA+tkIfJ6IIZOfCR+XvmvGFUSZPmGoma2CTEl6g9fkg
-D7ymJfAxoPiStR0d5BO02rUa6lAY42rGaRkEQwSkYvdXh+abokMlqiYmyiEj05mv
-OWPyMNDj65A2QTzKDgft1j9L6gnHknQyQp+HRrnzJQKBgQDdE8vmVcR3FzKF/rm9
-2S5BCWNQpfdH1kNvtIeVsipfVctL8A/mXc7r17e5tEGSxzDb7wAVuYea+31/I3ih
-xFMCzTjOd+g7uoWD3jYgi2KA5RA1686ctn9DQQP2NUOzH4usc1Z98BYE7YfVmzVC
-463Hzwjghgqyt7Lp/4KBlPa95wKBgQDNiYIDxgc5bXtWilwDDgIvx8WJAsl342nM
-QVPxfJiFOFvfKsPoLOs6bTuPhnUQfzfbas7F5YuanQrmU+pMdQSTnglo0GckTycl
-YFYVvlKqHg0Xkm2Y/UCVtr3pujqKF0TV8F+yZ4OT5x9P4y9uUKIGCuCOQIE238cU
-cwK2ZOhAYwKBgBKfxVCdLxTdRmtVXy5oKmZeNRipMqDBoyK48achwEIRxzOZgK1m
-f7UMkjS5w8BquWn9w2MRIyRiRVs9kL8H+/pDcaKrJUxK1U6bnLG3LFAxe+EfAWPg
-V+5BfuTx7cccRDb97G5lmGVH4WaUUbNV3OD1RwkrIaGWqiLeXI8wDm1HAoGAI/jj
-BmIMNaLRqU3B2M8E1vPxwI76T78/bv4oAOW7k+VPPvmvG91wteMUP4RazK5XSlGh
-KsWH72F43OLm6Ma6LFPGdc+znYk04re/mUKcGSX1SKDaCaKZQRqgll1/jVeRNphB
-R2oSfzo+Iq8yR+5YzRHuRzdG5iG4J/4RBXcXpt0CgYEA1O0OxLAlU3JHG8mfno0w
-x9ZFOkh5/fz8tVcOtdTWTGaOnFc8C10jqrL8eAhqTcZblGl0GHJUgqPAe+wzyNZ9
-gliMTpVK1OceVVDfacfjy+e/GN/7xOcju4DbsjBQgWKRtNHyqS6+DRlpgPWIPl5e
-TqFA68N1Ss2ludhOqF/CLVk=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCz1OcJMPeoQWDj
+OtxxaGpSQ8f6FC4nBKRaBmPgOdZFAkBtYC/ckNdIwfA8ISGi8u7mlI7LaN1dbfYv
+WEqeASPE113dhkHs48/7PD6b5iSuTSvDD6gNaZ1u2rw5xHFyM77+8fkPQNb4TlaZ
+klQAtw3kM/Y2tMkA7WAmoqC71nAPd3m4ANRlaI7Z4PDk7/rLaHZ4kEL5Ahs/p0Rv
+txfgWTafA4RYOujZ1dWw8+6cfRWhvMgDhPyk5A/7UzXMtTUmw41ieC/3z1rW8vQN
+Ly0HFcEs2XvTj8T+KGGr7c43rb60W4B5nuD+IhAA+KjhUQ7mlFFfjzo1RoSopWcY
+3VjjkcdfAgMBAAECggEAGFecMyR45EJ+oh47GHIpBjFc9e8vtMy45I4TN0G3oogP
+VDQzdlii05tGRhVkBLcmpc6mf5vrxF8DS92t3V0hIYmCOrTBjWvkS3Pts6j/qRpo
+GejaIiqm4ApldS+v/Y9J7h+vS3nG6j33FKWij6WNEKlZ+DDDjp0TKVeqiJKagPU8
+lBk99HLRJAY3rrklKtTSE3GaQTfh/E2xX3YJu6IQ5m2NZXA016xP1sI74fbhiiEK
+/dJcmRPe7APAZ1OI0ZGrRG9xpBTt8sJYLS+n9gZ9yVHIWvH/+BeGvX2SN4wh0pod
+GGbQL/ezxWsNSsYwi7HJz4l96QjS6mPIH9EvsBd8iQKBgQDgaSbgy4FnnDGrp8jl
+Sv2rG3TxCjGQtplw6fRKfcqvVfYJxtih871bW/N+bNpkbSeyuJ+Jxb9u1cJiRnNw
+AU2iBdusx6egVzAyK207ohBULKmWExTbipgcudDnTBl3bEYAo0kD/0lOtzEAEoSW
+qaPLn9Eltq1ym7dJ7kMVxtAl2QKBgQDNJU08Yk5NTcbden/H4V6Ep7U52gOUVjTp
+281gtlJQ9hL9p02T92Gy3eFpjEUsqFs9VNx2P+6h2izbRAB2GQX8WKHveuYjp8Dw
+8VwjkVy3NCcYfv83cOnhsdBrNF346YUJpCKzewsISyLy7vOLDTuzdGplDLDDlKkh
+LL0bhD579wKBgBEz/mb9Ms5eivA9zIjHVurnD+/qeCI/3UNqq++J9R+710ConbLM
+nJeEVQY8EgHg3Eo3HQPSxPoaKOyfufm8H9dr24tDQvZnuKof6h/ILLhHNDjs/YxW
+85JALGOO0eT1x+gEnHRR/ayrHnaC9OcX2haiCcZ6WpGOnl5shXgF5a8BAoGBAMtB
+Sx4p9JTpG8DzD0nWRNTAaXGRTXyaUUDns7w/yJ1IwhYpvlZ9g4I6Do2KGjud7xB8
+VRagT2pzhYAWBzL7pg+ZLZDePslS+3p+WSEwdCFcfePqaCnhKQmiKPMe5oCptlOQ
+GYWkwpCMCWuTTyAVk3JBRO0rvrN5Rn2FGzT5OQOPAoGBAOBUbKQs7ekLzM4ZI5Bu
+pvFpj282ugVkokymPh5e6nNS/ttVC1FbSNOWWMMa11xQLXF0UgfR0CMW2pa0tiiV
+zjdq2HFkTaF6udT6s81mMSpn/Aup5WZldw/MzGQz/KJpNKywi/4RwXxyNXpge+HJ
+jEi7OwPf7qw7+iJXcJk6LBB5
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/CA.p12 b/test/aux-fixed/exim-ca/example.com/CA/CA.p12
index c242e9023..a55bf5bf1 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/CA.p12
+++ b/test/aux-fixed/exim-ca/example.com/CA/CA.p12
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 ba4a43179..43a5bec18 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
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
-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
+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
-----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 efcebc779..91948bac2 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: A0 1D E4 CE E0 08 C5 4F 51 14 6D 1E E5 92 A9 C6 3E 60 4D 2F
+ localKeyID: 48 BE EB 73 B0 9A E0 B2 57 FA AD 6B AD 00 2B B2 B6 6D 67 D1
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQChb7yTcuZJG8Rx
-wLg+XmxiQLiTNMFE7ze77NkrVDQd4YYKBSCv1NpT9SQfUsSdfm2pypT7d0WhYf4x
-dl/vlhfeVgZ/XTRbYyolswlC+mD1zmsg2k3y4xr48NtPGykxlXafuTp8yi8kbJqs
-jOgvBpJvFQb9y+6b3ME9pE2GyW3VHTdw9tePuaPp7aNetc13j1coTAMUV/ZudgwV
-7ArdO23Al0Zq+td6NSWEFcswKeEG9CU4VIOqp2rPz8GSkOa1VpD5ZokirOO4B0SW
-6QDdROyT8TV50wADGTviLpB832zhzoEzzhRYx/CUIejBBGwjLSeKrfYYehV+TTVr
-YhC9kHNrAgMBAAECggEAB4FxbA2QhV+kH4HNTyEGuv61VirCvZi9p6AYbLpKfgUp
-PTgF0Ab+a57fIhGwEH57TMSdbp+Z/inXLqeJSFNbIrwvKybDM2iF4iDT0mhfr638
-LxfXPe6vJ1nTaHcj0ClZzY1IGdswm+nsuw8GEIGmt0FsBMrBej+mQF5uOFEPKTRS
-okUAp9oGru5ph3rwLQboDndfcatukqGJafTndhlYOIlBsL4OoJ9iDmKABeEQtvZo
-CNWeqbhpChwU4esLNAQKF427s0JPbXHm0NqXxL7zfaXHH5sdbmGUHQREzL5vL7RM
-e+8UkmXSD74UFicFVO29lhic7Ai3btos+7g9Ltx1gQKBgQDPbPOMAXF38vbC3uKS
-E1Ov9GaWK8NODo7f2rech3Bl3n8i5W6NtmlG8EUQBP0dElkcS+6zkPuaqyrfnHK8
-7dqqGZYRSFxj7L6JbGzS9IxR05oYM/NQAjQqum24055G5p3azFx6gnMR6PIN1X04
-hF+2/BvPdC8DzfNrbHG/zFKKqwKBgQDHPcNdS67hMW6lh0Nsdd6jpIbp7B6taQ06
-joXkdn311FwBaSvjtgRFmhHk5K1Yfs2yiJ1ObvE7OKFFRQQbk0n8lbnYpB9gI+T7
-H5zPRwMGEyiWj7RqZUtbtmHVpMgrbkCucz4j1kxt9FqiW24KNENFuNCS+CwyElj2
-cx2cC5G6QQKBgG47+67DMZdKkyN7KjPxe38+Rqq2NUQtbna/GOdh/zTUKwLTpY5A
-i/B8Tme2DwI9NwhXvlLF0UEgiFdwIHYRfiz6Dgu/RgKA1b3Y1njCKDRwXStRqJQz
-p5+xlhAsvqf1dZzLELa2zwqMnt8FP1gi2W84ylrU5wuBj0TezBDfOFqjAoGBAIoT
-qZK8YoO56D5a0UUXIqYx3TW75z6yMPLF1tCPtZdqBiEMK9hxSeCad5AzUlaj+hWi
-S7IRfKhYBJumysP5fSrI8LTMeNn9xjCqpdeYFOZe3KALEzMw49q5OHAA9J/0lmrP
-ft8DIpCI6U7fIhF8SqrE+/b+elJxGKoi+QAtnF6BAoGBAKir49M5rpRxte3WSXqs
-HwHf/44WCtrW9DkxmKWUPf8Z7qJDc8V2bAItean2kbkAs9mNosWXj8WL3vz6oKcJ
-ovig1jFNpow3B7oV//qz0zdwdL31ty6ajjT9pn0P98UI5kDDU2WgN4rPIl0444Vv
-fY7Ib38r7SRh6zrAxYqGXwvC
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC9BUJ0Zi+U+3FN
+7jukew7rvqHPFnjdPNaN3zcovrYkMC9eime9a0j3ni1RwxbYaP/Ts8Ln97tYAGa+
+YC3UTEvG+4zJ+tlnqId/TNgSFDrOlj2UTvS0tQ+j78xYF8xLV5jyYAVzO9A1zT8o
+YCUMZN9DEnDPDUjI7Dd+HUO5axO6g6ktbIW3q6PePhpubniPD1SOGPKSxRNj2Znp
+KW42ODuNV8oE/RcbvQcGlBLIoEebsQC+xxj4W8biKXzBueg8mqJc3WJKyF1tLLTM
+FUbQukzfWEdZtTHeit6ZH87MEnLDGyzq/4t91YF1VfaWyZSw2m7WP96/be2qEgmQ
+lh+cVAdfAgMBAAECggEACC7ESbWxTInHgBX5jwGkxeWolExEBQQvZZZWWsamwy6n
+L8QvjGjCBPv+51eUKrFyZ4tluyxMGtPjzUzsl7Ny7oaiVrwUi9SZVKukCR6BQZSV
+QvQq+ZNUSUa0n7uoAYDIjvWJL5eDpWfg2pr3oobPvaVlRBFc+OcvfOVuspGiSEc2
+Qb9iOKT8t/HSpW8InQaKF/su6nQHuTB30uF2KsYp1G4ZnNQkrGCRqXqsK8BJDkU6
+h5IJ06feuo/aqSbZPG1P1wsoWa9enCmmDh1sjTrOFrOjnirezMtjFp3LJFx/hgya
+W64K89Veg9dS5oqjVUq46Ueh06Zlzx1o+OVtzrGVwQKBgQDxPKJzPgyWZzuTPr+Z
+ZDG43eYdGMJvDoOKg4Nj/i3E/lWXmUrDLCuiRpSln7pq45zMaOgnIe+7Cdb2mPmp
+yYxFcKVXhp42g3v9ltiqxnJTul0eKG+6FEtrZaFFPWKEVUqMLrujplzMw5kykGU/
+m2b2I5gu7czoBvPVXRvtTt3jpQKBgQDIlpJ1XkMF3eizax5H7l73oUj7r7AFgtyx
++WJJbTMQFQT/oDOab1MYo1KWYfuLNn6j7ENa2PWkVUR39Y8jcd/o5l7QpUfrNEgb
+gMjOANLc2xBHi3G1tDKZJeVondAyL48ZIVsg9ln6ilxpZMjldp58eJgdtKsgs7Fk
+INpjJhN/swKBgARmEaQ+TmZzrW9q5n16iTmQukBvkiQKRLXC3iN1oAoGhTMFdYqH
+hKgp104J0pFeYx6LDyifgsqLTGMkuPCynx8pBarJ5pqh3SHrnTnH8o+6RzZkkFz5
+P8LOkJk9nE1DbN+PfpZmUyzcqC922JHHWKJGVeENLv5QGiQa1YaHOJ6NAoGBAMYM
+PNDbX+tz/aTgd4Zn6aYvvYKbJX1bhpHGe++pfMg9KLFHuIubrPzfjNRkK9t407L/
+vET/gBFgCvkyH8DMV1p50lXJSugEt8lH73vOPmPHexxYps3T/D1PuGEBqCVU5cHX
+OEWkVpTTdYit9NjytGqLGw4BaxEful71PQq19nyXAoGAOqyqMChXQQKvEPcVreNj
+LqsoXYKpZSaawYZlEnzCBbWcO6qH4ODxRnzyZrv2bH13DH/HFJ8WJAt+RoJ9gBKH
+FIWu+Gj48VUSVE1s5t3eiPfDs9XXMX7kgWr828dEefcg42A6j1GWbezaiW1dyekz
+xVYh+vZFDKjsxHnbsCvmuhc=
-----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 98e01a070..a671d3849 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 701fa9d03..90a7f0cfb 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDEjCCAfqgAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM0MjBaFw0zODAxMDExMjM0MjBaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t
+MDExMjM1MTZaFw0zODAxMDExMjM1MTZaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t
MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQChb7yTcuZJG8RxwLg+XmxiQLiTNMFE7ze77NkrVDQd
-4YYKBSCv1NpT9SQfUsSdfm2pypT7d0WhYf4xdl/vlhfeVgZ/XTRbYyolswlC+mD1
-zmsg2k3y4xr48NtPGykxlXafuTp8yi8kbJqsjOgvBpJvFQb9y+6b3ME9pE2GyW3V
-HTdw9tePuaPp7aNetc13j1coTAMUV/ZudgwV7ArdO23Al0Zq+td6NSWEFcswKeEG
-9CU4VIOqp2rPz8GSkOa1VpD5ZokirOO4B0SW6QDdROyT8TV50wADGTviLpB832zh
-zoEzzhRYx/CUIejBBGwjLSeKrfYYehV+TTVrYhC9kHNrAgMBAAGjKjAoMA4GA1Ud
+AQUAA4IBDwAwggEKAoIBAQC9BUJ0Zi+U+3FN7jukew7rvqHPFnjdPNaN3zcovrYk
+MC9eime9a0j3ni1RwxbYaP/Ts8Ln97tYAGa+YC3UTEvG+4zJ+tlnqId/TNgSFDrO
+lj2UTvS0tQ+j78xYF8xLV5jyYAVzO9A1zT8oYCUMZN9DEnDPDUjI7Dd+HUO5axO6
+g6ktbIW3q6PePhpubniPD1SOGPKSxRNj2ZnpKW42ODuNV8oE/RcbvQcGlBLIoEeb
+sQC+xxj4W8biKXzBueg8mqJc3WJKyF1tLLTMFUbQukzfWEdZtTHeit6ZH87MEnLD
+Gyzq/4t91YF1VfaWyZSw2m7WP96/be2qEgmQlh+cVAdfAgMBAAGjKjAoMA4GA1Ud
DwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsF
-AAOCAQEAVV5xMKcGMoBkUt4u5PosFVEGXZWoy2DfxjlJCDJ6icazGHCPtMrbqqW5
-XRuyDOOnZbyo0vHb1hTt6p36VXBiZ5bZj5G8mphXDTV7NO6FO8CpWzOFg+IM+/t8
-7Or76mJb1VX6NeWRlCfA8ex7N7prIfQeU2BznEogEZ9c/gmUYpCVs0oB40UbGD5B
-dvU0pj0uJ5kr6T/0XKUmN1z3H3d3dYRG/Ptr9qCLOSE3SA1sFj62bm6pWqYEYMGB
-tLu+tcimLmLMvCGyCwHWoiZxpGxRUlyCA6Cavl/KDY/2zwB64PH7ShZPJ2LSsdU+
-rZDwrx2WBZpYMA9IOPRd97qp3G+SXQ==
+AAOCAQEAOaBY+IPJvG8KjgwukYgMuL6PqGPpVvXLKHkf6qw7YKHy6w+JaCdegc8k
+UIuDKSLOmq4+NN+CFH63cnd4LW0pjoyhSZ26HteVDTvgaDczeAccclojaYQQYmmw
+UeGkQOuQxtxPa5dVs3KL3heR/pjagdzff2ffTgrwzyMpKLqhB7agdbgVBNuvHgDL
+r8iCO9JfOm13s0cvyD/riCxE580JVZ7RNcqvdmsMat9GpCA6z5ZEyDF6wgzFzUQl
+subGRLVRjPbD3/OoYedqkDF/1W5o9Aabq3wkTyd2z0haGEFzpMRw+DKDkeyvlKgw
+YWbXLeII8ybeLQw0+a6x5xQQcGJ+lw==
-----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 de15f318f..c9825fbe0 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: 49 42 6A E3 18 0C E5 72 CF 23 FA F5 79 B2 A3 F3 49 59 B0 24
+ localKeyID: D5 C3 E8 47 3F D4 30 81 C2 41 EC 76 F9 FC AB 98 1B 8B 76 A6
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDH4/22rWiPmzi+
-0YENH2hU5H488P2jxPcKMrCTD8SVvBS3G+G1auz1FoH//iFMU/Q09ket3Z5cJs/G
-aCztU5ZxC3BQ89OOWyyQ0NXWFjMM4YrRwSJu3Tijbxz5E8zlc/Z+AJn/VT+3+WQ9
-MD+9u2+GHxfEHk+p9pI0ELrZWj2mH+lhH9QjcP5zSmeeiViO7fy+y35CtIbKP2uO
-XrjgYKHemkbTfa96psdkh4UGkEOsmvZhi1fOaqUjhu8eIsCWLPWBEjV/E/Od2RKf
-ADNcyAKZKYdD4oa6hv7+XA8q6x8WOA389mEsXov4RUbqLBPzDZoMWYuB9Syl3kqK
-NP/zMjaHAgMBAAECggEAQA/B8qdNoOSKwaDsHpQHwFlAWfCUIUXRNIv9SgxeIOzX
-qL1/T0CW849El5HPAyLO26BoZYDmrTrlEP23FFJbHxye4Nrb3L48oKbFOWkA8Gpi
-LooaqnQsoDhOjUb6vji1cTlpIUslciUzqmaJrxlgixfw6nIabuqufZA1Cc6hflkf
-a2OT+GJovNMdlsqCyWsOHclviBgHH+hqE+DSRIhvOv/tgX2KxsB2myH3MBBCX7rN
-VaDFQ3+Xt32hgY+LaEM3P6BF4HS/NqVK0wV0RuyouMEsqhjdlisrTNUpSX+FS+FG
-rSfC8/yk1mdY9F7defSy4538x3jof81i0aGvqoH52QKBgQD0LXSuDYW6py00v80P
-TizVXCDc145xc+VqYRi5KBaZ3k1popn6K2DefQc49a+jy2sPKjoMmH1m84UR8wAw
-luZ7L4eKf8k4+/zqMho2SyoLv1IH2YLafw2nnFABPiSgajvACZVnyNHmsWE7UKRu
-1E68l18akRL3N6ii7fkzkJyxmQKBgQDRkZrcUlUet5vZkpMkojWKd5sLMhNdhi9F
-p3B/jEfEX9fyQOw8pYWNsN8mWTK+tFAu+fWrIWQVbzfp5BHVkKhWtLA1VVKR+qDc
-itqsja2Ln8iMsQefCCU0c22jxIgOUFiKNIIuJk0grzDwFnavx/Si4zr5Yo6PTKf8
-qTn13Cl9HwKBgB0WWSLuy3Jrvc/d1VCwcFjOS7/jEb3kH30nqelMpDyaJcCitRL/
-HeADJtwbMFwjvFInJpkfhTjBY6W6u9gN8dDU3aGbDV5zbjJ723GCTLTvipcSyyq6
-HedMkJ9FRtmxLgL3YUvmuVJw6PNG7P+i3OpMYfDpPUgj4jvee2QwIuppAoGAEZZi
-pLLUKevGzI+cgaqLS7+V526gaWzlcrcGne2r6DMS8GW6bayGdMmvMIyz0YVYZVjc
-4SvANnxK+PoG9SFav0wSracnctDRxzBwAaMyOVGDhyskNJh+ZtR5ExFfSbQ8efzG
-IBFez6tkNAHum/nv8euX+23mAOiyAGZDUvrTEIkCgYEAjhCCLEc7KPTQSa7LLEdn
-t138NM6k/K0vbnfqp7y1vxVa97hmKlC4ZIryK4Vc/aICrofAcmm/8um5Ht6AH26w
-QK/Mdh6Kk+Pm9ekKjPNLUiO8bDFWOV8mxHjFGCY8IAPO84le0toSttHJHnMdPvnn
-spvSnDo/NWSApiWfGtZOlZY=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDPKciMVG4YnWPq
+4UAupPHOTXh8rWhYeOSHxJWLIvw0ZchJl5S/3YqXkD4WqFugpHj6JC9HirffLhPf
+dfFRM83U8O+RHTdTfAX6avCLijWzvXoWzqUe93j5fOM4M3Iyy9Dvyc2tEsg6qiI5
+4HaoIRgEcPA3DsXFtvAX+LiSMbpxjxWNWt6OxvLy7mYYZJn4tWq9wuWq1l9kShSG
+AMvsSU1PNv/NK0SUPhDgh2PVCzUzc+I1ETZ5yaBuXiBRIDobsaDx62TB9uuRof6m
+nqTgOV6PuXb5Pma0Y95CuDNwZRBONzDqrwOpsU1YruQTVmfLLo3RP5CbgDQpKvG7
+x/MMukGFAgMBAAECggEADbvJYx7dxZ1O2G1iYd/myonG6Q0Ik9o/3DhOFFFCGFR/
+DfyR4ej/8m2fkBpNKL3T6fv9c71gfy0rfW7w4TSRUAKWVIUepoGHAUOW+skzfNzy
+JmeV+Wg9NDJGpfJ91EbqwlrF2ylu7g9arCzom4YbdNU/4jEv2fGiF79nYlm68Hgw
+qYc6Auw33M3tzLSu9ziSvyxO08u987jMrDQTihxRjRqAAZQgREMkC6qd/nfBs+YN
+Okk778wRcAQ1PhjLB0MRrA9k4Md+zeNBSXZHbuiHfw8BSu1Rk/S78f/rxYuA+svc
+dfQZMF6ZTwJ0IbpgVy66YLFRYlxQSa1xKJvLbg5LgQKBgQDm7ICPyzvVJMp4HewT
+52mxGqj/B1U20r0fv1fOGIcOTggKHUT6cRJoDS/7YeoN7NG3/wFOTRxkD12VHaOu
+yaiR6QMaPM8bVQqB+ByG+AkRUtR/NZXZ9MeDN3jIK35gDYlNwVN6wS+ne//AdA85
+4MY0LhDQjJw4w0xa95XNjAb+9QKBgQDlqMFF4Jk2LaWaT1SZorSH9eJvVWDsQ1/q
+dt+v4YQLJbZqtAQxNbUMoezRJotmnl1G0+imtZzwjVYao/zZ4Ya+tyNk8lZO9QRE
+lYzx9Yv2NqiIFwSOt03MNgiYUVFO0N9tIWPBhm6depJvdvvzVUUZ1qjpjwu8ghb8
+22UDpot+UQKBgQDFwMS730Qm3HHS+XTg+qzFMNqGQ4ZTA5dYJ6kO4mxN8L7rwnL+
+sXQczSZI9WnVcPeLxQIeRuTIP2xZtV8l4KXOBihVALwvYN01vf7YCnLhdfhp0763
+PurYUNnLOYvov87UWnmdxvCDUioLaphbbUTvDH/zyGZEKeMqh5muw3p+PQKBgFz2
+9+2yYjLFPZD+Ze+fJlcXGKcat5ZMG6qMnjXTIyFkDbiZ0EyfQf+wGG39nVZX6sg+
+BaJeR/40KFO2aCdGnMXc2o4FbxydIDInG5viWtq6+3PDZYvj9bEhek82M6Sk9px1
+dK0lHufOczJ9xrWUodk4xL1us0CGpImMwhI9O6BRAoGAIfzMJjJQO8HVi3uGlTx6
+6+MauZhmUPr/ZBSQK1REjG/zd5zzP4NESWaem5N7OMKWrPKP6kInO2tu6DHADt3V
+K6XFp5wnehHREgS8zCf4Jg5GAiwrW9axMagbx1MMJtWY/nEU3TLpWNEVh6lFGGc7
+V4OcESVICg+ah2Hes400isE=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.req b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.req
index 8743a1896..368c558c2 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp
index ea7a33f98..ed69b11ad 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp.pem
new file mode 100644
index 000000000..3d37d0fcd
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.good.resp.pem
@@ -0,0 +1,31 @@
+OCSP Response Information:
+ Response Status: Successful
+ Response Type: Basic OCSP Response
+ Version: 1
+ Responder ID: CN=clica CA rsa,O=example.com
+ Produced At: Fri Nov 01 12:36:47 UTC 2019
+ Responses:
+ Certificate ID:
+ Hash Algorithm: SHA256
+ Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109
+ Issuer Key Hash: e5fd33f7390a423c4b8a39439ac0a7b7f407384572faadc482219bd0853e4c97
+ Serial Number: 42
+ Certificate Status: good
+ This Update: Fri Nov 01 12:36:47 UTC 2019
+ Next Update: Wed Oct 31 12:36:47 UTC 2029
+ Extensions:
+ Signature Algorithm: RSA-SHA256
+
+-----BEGIN OCSP RESPONSE-----
+MIIB+goBAKCCAfMwggHvBgkrBgEFBQcwAQEEggHgMIIB3DCBxaEvMC0xFDASBgNV
+BAoTC2V4YW1wbGUuY29tMRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAx
+MTIzNjQ3WjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIL+nJ1pWbv1L4t+C29nRKQ1H
+AYb2/yrNjBZlnzQqtWEJBCDl/TP3OQpCPEuKOUOawKe39Ac4RXL6rcSCIZvQhT5M
+lwIBQoAAGA8yMDE5MTEwMTEyMzY0N1qgERgPMjAyOTEwMzExMjM2NDdaMA0GCSqG
+SIb3DQEBCwUAA4IBAQAnPAzcY4SVRC1R1zfTrXaVp7j16Uk3YXrq8YqbWrOaaccF
+e2xUxmVdcBX43u10NvS2hFkv0JXEZ9zSApJ+pUsSZp7kEhf+ykHcqQhT2iuNbRae
+IF0p/nWXLz0JJZlJJfHTh0dVvGa6/SjEnGprjYSF1U9FqTigT8qFltUEs6XA01OO
+GV0if9PZ9ODqyfsvYsBWlH+pUAnHp7eQGbm9j6oRIdW1SLc1+StMS83Z0yiYVTKU
+oYXR8TTaz3FlP0A4Os0dsUvr2broV0nLdgMxb6GF+uAdxHgD0gmd69nK2yJIrK/f
+Y7CNRg1NsjBrqNI1xNMTwAUXJHs7l5rKbVRPeIvM
+-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp
index 9277cbf8d..c857caf7c 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp.pem b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp.pem
index 279af863a..92e75ee45 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.ocsp.signernocert.revoked.resp.pem
@@ -3,31 +3,31 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.com
- Produced At: Fri Nov 01 12:35:51 UTC 2019
+ Produced At: Fri Nov 01 12:36:47 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109
- Issuer Key Hash: f0d8f45a4e6b3ab4652ef19a6bc57797fd8faa4f45e33403487a0172f6b6dd49
+ Issuer Key Hash: e5fd33f7390a423c4b8a39439ac0a7b7f407384572faadc482219bd0853e4c97
Serial Number: 42
Certificate Status: revoked
Revocation time: Mon Feb 01 14:27:09 UTC 2010
- This Update: Fri Nov 01 12:35:51 UTC 2019
- Next Update: Wed Oct 31 12:35:51 UTC 2029
+ This Update: Fri Nov 01 12:36:47 UTC 2019
+ Next Update: Wed Oct 31 12:36:47 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIICEQoBAKCCAgowggIGBgkrBgEFBQcwAQEEggH3MIIB8zCB3KEvMC0xFDASBgNV
BAoTC2V4YW1wbGUuY29tMRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAx
-MTIzNTUxWjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCC/pydaVm79S+LfgtvZ0SkN
-RwGG9v8qzYwWZZ80KrVhCQQg8Nj0Wk5rOrRlLvGaa8V3l/2Pqk9F4zQDSHoBcva2
-3UkCAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTkxMTAxMTIzNTUxWqAR
-GA8yMDI5MTAzMTEyMzU1MVowDQYJKoZIhvcNAQELBQADggEBACXgZY+lNneFtS/0
-+nPl+Hnx0t0zx9+MPphmH0Z8cb/99ess3VD6c+5Lu1U1zJfT4baQUwiBmchhLCbk
-IlZ/HpctOe9mK1q7gFvOHxb4ZPB3p/tRuSJnLld9YPYot3NTuUstlUT5x4Bbkhvq
-q5BkJoO/cNN2eKJGq7bKpxwb6JWFUkelVKEiQUZAfQ9jRKvM8+XXk3nuBM6qrl5Q
-1ZSkKUuGZ6nfAmAZRFqJLz/50TbOayKJspoiqoBlurY3yPYJB0LXiY5r0263oLiF
-D0cQiXsrR/DecRGeYNNJOgSjpdkkRLZ+sIjj5yFsA5BqGprsPqCLJ5j0F2wKcyLm
-jkbFFkQ=
+MTIzNjQ3WjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCC/pydaVm79S+LfgtvZ0SkN
+RwGG9v8qzYwWZZ80KrVhCQQg5f0z9zkKQjxLijlDmsCnt/QHOEVy+q3EgiGb0IU+
+TJcCAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTkxMTAxMTIzNjQ3WqAR
+GA8yMDI5MTAzMTEyMzY0N1owDQYJKoZIhvcNAQELBQADggEBAHZEKB1X+WUrD33i
+Do4G+7L713Zh9YJmAeFrUa12sGbo97m9JVEnYEFZGkN9jtCq1kxymrj3PETxb9HO
+HojY0n0npS9p8OUF+bXFrayHRVbmD2iu6cva9ukEGm4H1stAqTh4HAJhSjV/8p4L
+6CUZd5OJ5BjfwQSr2wbwhEyGo7xso8LJoB4rnAzdKOcCPnUnzPVceIpQQD9W8L3t
+ol83LD4n2eVDhsvO3puTcixy6ni0SfBHDUaOePdFDUZfc1F2xV3eAoG62Mpx2HxV
+gO1xHRbvaB7pECesENs3HCl9ZYWrpfH6/TA5bWy7a6DHghXd1Y31Ot7xwgvX1jmh
+XsLjF/A=
-----END OCSP RESPONSE-----
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 405e5e4f6..d3f06b414 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 72949b2fb..b29db3076 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
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
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzQxOFoX
-DTM4MDEwMTEyMzQxOFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+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
-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
+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
-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
+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
-----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 b5195be9c..f3c3a3eaf 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
-; Fri Nov 1 12:34:15 2019
+; Fri Nov 1 12:35:11 2019
[CLICA]
-ocsp_url=http://oscp.example.com/
-ocsp_signer=OCSP Signer rsa
sighash=SHA256
-level=1
-signer=Signing Cert rsa
crl_url=http://crl.example.com/latest.crl
+signer=Signing Cert rsa
+ocsp_url=http://oscp.example.com/
+level=1
+ocsp_signer=OCSP Signer rsa
[CA]
+org=example.com
name=Certificate Authority rsa
subject=clica CA
bits=2048
-org=example.com
diff --git a/test/aux-fixed/exim-ca/example.com/CA/cert9.db b/test/aux-fixed/exim-ca/example.com/CA/cert9.db
index 801892c6f..63ae5e744 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/cert9.db
+++ b/test/aux-fixed/exim-ca/example.com/CA/cert9.db
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 c746b1071..10f8e636f 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 643115630..4e32a860d 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=20221103224953Z
+update=20191101124302Z
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 ae45a26a8..070a5dfe2 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,10 +1,10 @@
-----BEGIN X509 CRL-----
MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUuY29t
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjIxMTAzMjI0OTUzWjANBgkqhkiG
-9w0BAQsFAAOCAQEAjUCVnYO7viYn2fwQfusH78IcEeT8xnZws0gUb1YWmtSw2MMy
-DMfAyLLz+sBga/ZxRiwMWch+EzhnpxAWvlA8Twyn9jCjgOxQUpsHy2g+KzNxMgL4
-7HSOEzMeCrpLrg8bFV2vJJvcU8i1WRbq1uoItaHb69LTx7IYJ5qbeAHDEapCk3Y0
-1lHcuxvg+qyj43yV8bIqbablVeizIV2b/lETv5AECXGpdrhPDYdsKheRyzvjuFQc
-zEZjA4fHXvbHyIZ1sKFvKF5nR5LQHr/IC/iWWaQsn7pJTTSalEO9+0sHCvC2F3dZ
-zMPy5BvnWWSIFBajhlNyUFxIf54i/x0zcktEjg==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAxMTI0MzAyWjANBgkqhkiG
+9w0BAQsFAAOCAQEAALglowR5fun1YiRPdVxp/pUguwxehpsAfhz4SQcy0Nh7ZNoq
+AxiYUqLymcIozp3dWFWTisT5I9tUJzhSmQcZTseGujDkNBDkhgyuQpwdMuBR6W+d
+U2mtkkgLqrhm8w7WLAnKpTM3r4koCtshiWcTKjFHtEJyl2hU5n+vwfnP1hrx7EdV
+XTpaQtaGms2quEuWHssbd9W7+qTGT1biBr9pRwZNLaF/XjGxPC1O2lND/23/lBnH
+p8smwCgpg9Bq1XRmRyWYnEDYJUmYnsR5T9vJDb+rXylVYuxvvm2AOoC8JtN5BKF6
++T6wmU2BIDB5cwG9335kPnqmkWEMBb7IhUe1Tg==
-----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 7da171866..e34cb1ecd 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,21 +1,21 @@
-----BEGIN X509 CRL-----
MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUuY29t
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjIxMTAzMjI0OTUzWjANBgkqhkiG
-9w0BAQsFAAOCAQEAjUCVnYO7viYn2fwQfusH78IcEeT8xnZws0gUb1YWmtSw2MMy
-DMfAyLLz+sBga/ZxRiwMWch+EzhnpxAWvlA8Twyn9jCjgOxQUpsHy2g+KzNxMgL4
-7HSOEzMeCrpLrg8bFV2vJJvcU8i1WRbq1uoItaHb69LTx7IYJ5qbeAHDEapCk3Y0
-1lHcuxvg+qyj43yV8bIqbablVeizIV2b/lETv5AECXGpdrhPDYdsKheRyzvjuFQc
-zEZjA4fHXvbHyIZ1sKFvKF5nR5LQHr/IC/iWWaQsn7pJTTSalEO9+0sHCvC2F3dZ
-zMPy5BvnWWSIFBajhlNyUFxIf54i/x0zcktEjg==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAxMTI0MzAyWjANBgkqhkiG
+9w0BAQsFAAOCAQEAALglowR5fun1YiRPdVxp/pUguwxehpsAfhz4SQcy0Nh7ZNoq
+AxiYUqLymcIozp3dWFWTisT5I9tUJzhSmQcZTseGujDkNBDkhgyuQpwdMuBR6W+d
+U2mtkkgLqrhm8w7WLAnKpTM3r4koCtshiWcTKjFHtEJyl2hU5n+vwfnP1hrx7EdV
+XTpaQtaGms2quEuWHssbd9W7+qTGT1biBr9pRwZNLaF/XjGxPC1O2lND/23/lBnH
+p8smwCgpg9Bq1XRmRyWYnEDYJUmYnsR5T9vJDb+rXylVYuxvvm2AOoC8JtN5BKF6
++T6wmU2BIDB5cwG9335kPnqmkWEMBb7IhUe1Tg==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
-bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMjExMDMyMjQ5
-NTNaMC0wFAIBZhgPMjAyMjExMDMyMjQ5NTNaMBUCAgDKGA8yMDIyMTEwMzIyNDk1
-M1owDQYJKoZIhvcNAQELBQADggEBAEMxyZSpQ+VQapX5JOga5H6m7yOgV7UIw+2U
-NntOZw1VFsQeZDL6RIFri3ZfkUw/WjmWgtXyhxm81aueCOtIQ98mgLCVdqxQ7859
-LLZowDV55bkQczeVnGutULFLmjzVV/tq+SIAs9Xr8TsEAvU/uBW9WdDl8FthOufe
-GNJH1s+gb6I7o89ROGVHsHNoOgybJ/9vi/zdS8AkBwiwYmWxykr8kRsWpBooaefX
-qXT6t+4mgE+8grm+gSZAjCGNKyJRYonFw+99Oig/WzpthJVSsxf12wE3JatyIa6N
-Pco1APv7g5IL4RWlDl3yFEt+A630rOjbV1S3sMQcjBrEP8HpeiA=
+bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxOTExMDExMjQz
+MDJaMC0wFAIBZhgPMjAxOTExMDExMjQzMDJaMBUCAgDKGA8yMDE5MTEwMTEyNDMw
+MlowDQYJKoZIhvcNAQELBQADggEBABpz3Lk8bf/sqwJ7DAwh/gapo4w+TGblLxR4
+8t9GazlR5IsYwcCt5325UT4Asi9TlPGL08zk2MzokWYm7/ybK4UBHtKmBBe7fBxD
+jb6FCDCuEzh98ypioHYYiqC/PR30LmLQQpBZfkNCedz7AXyhSdglqFPoXCqfH2CX
+q/9cf6sPyLxUtzjH5hri99FABUB6tF4WiuFt9FvcxW07RhImLTyYq+uNXXkq/dDY
+PEv/3x8hSuFhf9kzodrxIXBhkOnosokne9L97Tajd/BYLPglD3WP2bImlwnUmx+d
+CqNuMUFFmXbtQIEVDrFj2P8mIw4FfpEyeiRPchi9iphfeIb+cX4=
-----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
new file mode 100644
index 000000000..6e70603b8
--- /dev/null
+++ 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
new file mode 100644
index 000000000..f0012b670
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
@@ -0,0 +1 @@
+update=20191101124259Z
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
new file mode 100644
index 000000000..5d73f347d
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
@@ -0,0 +1,10 @@
+-----BEGIN X509 CRL-----
+MIIBcjBcAgEBMA0GCSqGSIb3DQEBCwUAMDcxFDASBgNVBAoTC2V4YW1wbGUuY29t
+MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDE5MTEwMTEyNDI1
+OVowDQYJKoZIhvcNAQELBQADggEBAC28Z3JgW309qhNSaUahnmOPTaHAMQkAh7Hi
+cG4iW9dY0tJ0IZnbGSt6T+igqEwgdbrtlvbsndQJScAZDSkgdWu7+OQ6yQfE8AkN
+5P7+kGuIBJ1foljh4rCcJI4puxADam2kCzFNRiHVctBloJoR6mFha9SLQ2vEw2Cj
+bE1H+iCsyTUaPQx38+KDDNbYsPUi4kdTpDZy4UimRJ2GGx8xfG8RXqZCyKPvNXIq
+8T1cxgjImujWdSbKvSUp3NLTI5LyVTBcw9Pzl/TmFb+4KkqZIfYpbeRSgF3EAllp
+AQ8QZ2lFXBTBeJlXtPtUVgZ5MMumK06ppv0uVDLOLIAFPultKKY=
+-----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 594ba0cfd..140ca94e6 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 103579818..9f54f912c 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=20221103224953Z
-addcert 102 20221103224953Z
-addcert 202 20221103224953Z
+update=20191101124302Z
+addcert 102 20191101124302Z
+addcert 202 20191101124302Z
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 f92bbbc7d..a19b545ed 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,11 +1,11 @@
-----BEGIN X509 CRL-----
MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
-bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMjExMDMyMjQ5
-NTNaMC0wFAIBZhgPMjAyMjExMDMyMjQ5NTNaMBUCAgDKGA8yMDIyMTEwMzIyNDk1
-M1owDQYJKoZIhvcNAQELBQADggEBAEMxyZSpQ+VQapX5JOga5H6m7yOgV7UIw+2U
-NntOZw1VFsQeZDL6RIFri3ZfkUw/WjmWgtXyhxm81aueCOtIQ98mgLCVdqxQ7859
-LLZowDV55bkQczeVnGutULFLmjzVV/tq+SIAs9Xr8TsEAvU/uBW9WdDl8FthOufe
-GNJH1s+gb6I7o89ROGVHsHNoOgybJ/9vi/zdS8AkBwiwYmWxykr8kRsWpBooaefX
-qXT6t+4mgE+8grm+gSZAjCGNKyJRYonFw+99Oig/WzpthJVSsxf12wE3JatyIa6N
-Pco1APv7g5IL4RWlDl3yFEt+A630rOjbV1S3sMQcjBrEP8HpeiA=
+bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxOTExMDExMjQz
+MDJaMC0wFAIBZhgPMjAxOTExMDExMjQzMDJaMBUCAgDKGA8yMDE5MTEwMTEyNDMw
+MlowDQYJKoZIhvcNAQELBQADggEBABpz3Lk8bf/sqwJ7DAwh/gapo4w+TGblLxR4
+8t9GazlR5IsYwcCt5325UT4Asi9TlPGL08zk2MzokWYm7/ybK4UBHtKmBBe7fBxD
+jb6FCDCuEzh98ypioHYYiqC/PR30LmLQQpBZfkNCedz7AXyhSdglqFPoXCqfH2CX
+q/9cf6sPyLxUtzjH5hri99FABUB6tF4WiuFt9FvcxW07RhImLTyYq+uNXXkq/dDY
+PEv/3x8hSuFhf9kzodrxIXBhkOnosokne9L97Tajd/BYLPglD3WP2bImlwnUmx+d
+CqNuMUFFmXbtQIEVDrFj2P8mIw4FfpEyeiRPchi9iphfeIb+cX4=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/key4.db b/test/aux-fixed/exim-ca/example.com/CA/key4.db
index 4f69c24bb..086b80e55 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/key4.db
+++ b/test/aux-fixed/exim-ca/example.com/CA/key4.db
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 2b42ce56d..8c8211b64 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.com/CA/noise.file
@@ -5,7 +5,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 3000.006
+cpu MHz : 3305.660
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -33,7 +33,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 3000.108
+cpu MHz : 3199.844
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -61,7 +61,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 2999.999
+cpu MHz : 3356.620
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -89,7 +89,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 3000.032
+cpu MHz : 3299.257
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -111,80 +111,80 @@ address sizes : 39 bits physical, 48 bits virtual
power management:
CPU0 CPU1 CPU2 CPU3
- 0: 39 0 0 0 IR-IO-APIC 2-edge timer
- 1: 0 0 0 28568 IR-IO-APIC 1-edge i8042
- 8: 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 0 169958 0 0 IR-IO-APIC 9-fasteoi acpi
- 12: 0 0 1882987 0 IR-IO-APIC 12-edge i8042
+ 0: 38 0 0 0 IR-IO-APIC 2-edge timer
+ 1: 0 0 0 1001 IR-IO-APIC 1-edge i8042
+ 8: 1 0 0 0 IR-IO-APIC 8-edge rtc0
+ 9: 0 139082 0 0 IR-IO-APIC 9-fasteoi acpi
+ 12: 0 0 203329 0 IR-IO-APIC 12-edge i8042
16: 0 0 3 0 IR-IO-APIC 16-fasteoi i801_smbus
120: 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 DMAR-MSI 1-edge dmar1
- 126: 0 0 0 1963404 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 127: 0 1368 1116015 0 IR-PCI-MSI 327680-edge xhci_hcd
- 128: 0 556 0 0 IR-PCI-MSI 2097152-edge rtsx_pci
- 129: 0 0 17 5611236 IR-PCI-MSI 520192-edge enp0s31f6
- 130: 31 0 0 5 IR-PCI-MSI 1048576-edge nvkm
- 131: 626 0 13680247 0 IR-PCI-MSI 32768-edge i915
- 132: 0 63 0 0 IR-PCI-MSI 360448-edge mei_me
- 133: 0 0 0 46 IR-PCI-MSI 1572864-edge iwlwifi
- 134: 1333 0 0 0 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- NMI: 851 840 852 825 Non-maskable interrupts
- LOC: 30586929 29801489 30189744 28623188 Local timer interrupts
+ 126: 0 0 0 696064 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 127: 0 5232 631836 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 128: 0 506 0 0 IR-PCI-MSI 2097152-edge rtsx_pci
+ 129: 0 0 15 1152236 IR-PCI-MSI 520192-edge enp0s31f6
+ 130: 13 0 0 5 IR-PCI-MSI 1048576-edge nvkm
+ 131: 629 0 9207357 0 IR-PCI-MSI 32768-edge i915
+ 132: 0 65 0 0 IR-PCI-MSI 360448-edge mei_me
+ 133: 0 0 0 49 IR-PCI-MSI 1572864-edge iwlwifi
+ 134: 1177 0 0 0 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ NMI: 423 424 431 418 Non-maskable interrupts
+ LOC: 24585339 23705677 23096895 22481677 Local timer interrupts
SPU: 0 0 0 0 Spurious interrupts
- PMI: 851 840 852 825 Performance monitoring interrupts
- IWI: 304959 284089 5537634 310094 IRQ work interrupts
+ PMI: 423 424 431 418 Performance monitoring interrupts
+ IWI: 188722 176097 4012386 194392 IRQ work interrupts
RTR: 6 0 0 0 APIC ICR read retries
- RES: 5411746 5256538 5121031 5309110 Rescheduling interrupts
- CAL: 5095633 4864599 4783138 4801338 Function call interrupts
- TLB: 3285768 3215589 3242406 3283532 TLB shootdowns
+ RES: 3032348 3054913 3073066 3067333 Rescheduling interrupts
+ CAL: 2007225 1886614 1842936 1822803 Function call interrupts
+ TLB: 834910 821519 882578 886401 TLB shootdowns
TRM: 0 0 0 0 Thermal event interrupts
THR: 0 0 0 0 Threshold APIC interrupts
DFR: 0 0 0 0 Deferred Error APIC interrupts
MCE: 0 0 0 0 Machine check exceptions
- MCP: 154 155 155 155 Machine check polls
+ MCP: 126 127 127 127 Machine check polls
ERR: 0
MIS: 0
PIN: 0 0 0 0 Posted-interrupt notification event
NPI: 0 0 0 0 Nested posted-interrupt event
PIW: 0 0 0 0 Posted-interrupt wakeup event
-MemTotal: 16240472 kB
-MemFree: 5742444 kB
-MemAvailable: 11577140 kB
-Buffers: 1120740 kB
-Cached: 5417168 kB
-SwapCached: 196 kB
-Active: 4165252 kB
-Inactive: 5218624 kB
-Active(anon): 324236 kB
-Inactive(anon): 3375812 kB
-Active(file): 3841016 kB
-Inactive(file): 1842812 kB
-Unevictable: 180200 kB
-Mlocked: 80 kB
+MemTotal: 16241860 kB
+MemFree: 5392752 kB
+MemAvailable: 11160932 kB
+Buffers: 644344 kB
+Cached: 6137464 kB
+SwapCached: 88 kB
+Active: 3310168 kB
+Inactive: 6401308 kB
+Active(anon): 234828 kB
+Inactive(anon): 3721332 kB
+Active(file): 3075340 kB
+Inactive(file): 2679976 kB
+Unevictable: 404632 kB
+Mlocked: 184 kB
SwapTotal: 16601080 kB
-SwapFree: 16598008 kB
+SwapFree: 16599032 kB
Zswap: 0 kB
Zswapped: 0 kB
-Dirty: 764 kB
-Writeback: 64 kB
-AnonPages: 3026048 kB
-Mapped: 803352 kB
-Shmem: 854072 kB
-KReclaimable: 488452 kB
-Slab: 677308 kB
-SReclaimable: 488452 kB
-SUnreclaim: 188856 kB
-KernelStack: 19736 kB
-PageTables: 47144 kB
+Dirty: 512 kB
+Writeback: 88 kB
+AnonPages: 3334300 kB
+Mapped: 858532 kB
+Shmem: 1026268 kB
+KReclaimable: 350456 kB
+Slab: 508500 kB
+SReclaimable: 350456 kB
+SUnreclaim: 158044 kB
+KernelStack: 19840 kB
+PageTables: 47464 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 24721316 kB
-Committed_AS: 10892992 kB
+CommitLimit: 24722008 kB
+Committed_AS: 11273556 kB
VmallocTotal: 34359738367 kB
-VmallocUsed: 85796 kB
+VmallocUsed: 82872 kB
VmallocChunk: 0 kB
-Percpu: 7712 kB
+Percpu: 7616 kB
HardwareCorrupted: 0 kB
AnonHugePages: 0 kB
ShmemHugePages: 0 kB
@@ -199,13 +199,13 @@ HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
Hugetlb: 0 kB
-DirectMap4k: 316904 kB
-DirectMap2M: 13176832 kB
-DirectMap1G: 4194304 kB
+DirectMap4k: 380392 kB
+DirectMap2M: 11016192 kB
+DirectMap1G: 6291456 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
- lo: 203398319 414266 0 0 0 0 0 0 203398319 414266 0 0 0 0 0 0
-enp0s31f6: 5122054096 4199224 4 121766 0 2 0 0 1451863592 3008081 0 0 0 0 0 0
+ lo: 307129 2471 0 0 0 0 0 0 307129 2471 0 0 0 0 0 0
+enp0s31f6: 672645123 686121 0 0 0 0 0 0 60881506 523376 0 0 0 0 0 0
wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
virbr0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-virbr2: 177806558086 17365569 0 0 0 0 0 57 943922498 11257216 0 0 0 0 0 0
+virbr2: 131939979990 12949352 0 0 0 0 0 82 724135061 8643862 0 0 0 0 0 0
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 25703d07d..8ae2b8508 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
@@ -4,22 +4,22 @@ subject=O = example.com, CN = clica Signing Cert rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.com, CN = clica CA rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.db
index e5ffc244d..c69040480 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.db
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 f6ff6f5f8..c66c29c60 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,46 +1,46 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 1E 7D 93 E7 45 B9 35 B3 D6 01 92 0D 96 04 AC 58 E4 DF 3D 86
+ localKeyID: 55 28 F8 94 CD 10 2F 29 62 37 95 1F CF 7C A4 21 C9 A5 CD 72
subject=CN = expired1.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM0NDdaFw0xOTEyMDExMjM0NDdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3YEJrsry
-T0KCVm5o/TavHUffYLRB6+aIOvXS4+Hb6DziAjTUaReV1WWArtrmOvWxvfcXngCs
-t56C4B/KrZkoq0LutMT1gPuJN6nfD/YdDlg58JcHYBp4suA1uI5jc2m7R+7AIFJw
-GiZ6HkKUYQKDERs8vGAegaCZH8Qte9auoterdmU7UNHQR350dFLIALMGN997LHht
-QI26BTPRpKYOGjFLerOxW4Nokb2bnLprTfbWcbs5s/AJ4nZ+47lj2TZropAJKmg+
-oM2/corav94U/rGH3sTRkwDxqJINqNNcE08aFHuc2jHVLj/Fp9I44niivijlRWL9
-m+WBjStVU2JeNwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM1NDJaFw0xOTEyMDExMjM1NDJaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvPLGhDlL
+6DxKpNuilIYuW5ZpvV4DwX/0bl5xQ10fsOl9L1TLKFQNjo+ugXmKaqGDb1Q8IJ1E
+oipjJP1cSXiT9aKRh0eZfnu5F1WFG9DQzf1jAFCk5CjeZiEu2/dlaeCXYlBP/edT
+NV8bUIBA6y8/7sdkdJ9qbBEumsCZqzxJYXjM+jEvrADQ0LZ/K2GpJHPTEnixtwQr
+seDOkfwwn7h5x1nSmj547vMgxFjM9r4NAmM2wBUTJiWHgjZsWonl221NoHLZ07+D
+33DFvJgD6QB7lZVmBldxx2DhVtiGdYS+QTVlYO7RMnWDr7Hl5EZLL93I/qsCvyGi
+i/wYydh+EkXbVQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCj8h11Ym+Wp45V
-yHxjBNCY5rN3za3fnNChULlRWRc+X9Kw2guz8zgCgBAsvo7ZYNuRr2m6kB2k0V7U
-T8qCiEnjEBT9sTZUtO880IXuSzZci+ciUmQFXmuVxvSeQt8n68NrKCycSBjsEr/H
-jfHK7puRdTy/m8RKm49zn5Yk8w+TE3DwDGlkQFIbqBhZyokwE9L6EvqWIgUCpy0p
-R3Mso8Lh+NQDSKkO4siN3FDpgMeKpUbNUQMkYYLLCJXxnTC+LL8tk9Yf2S80pbwt
-EeStAYi8VwKVWV2bkpu8u0Rv80eLDccTuwbWUOwrsTNYH2UuCaS7NzIe0cdEOqOu
-Rb2McZ7a
+cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBNUlRqXZq/NMtx
+jjizZJZnvLHMRg+lB3azYwlnHut6U/rWQkT0zb0CVUO2U50oY8lSpXqZRojhztZq
+yWlGmJZMG8mvv7HXg5lGP6NtYPjfOG2Im+w1H1b6gwdVW60Gcjy3mYhYA3pqYkeo
+2glfUZiNUM8rJh10GyXzX8bF7x1g5oeK2Ar1peW8EUvdLPvZkMxwp5rhrTv+AmMi
+xKj9KJZ4NOMsDRyAGGzUjDzANMxldx0Uq0QgUYfacH0U4HM/WHaUmmh6lfJkYe+e
+R1M0kPc12maC0W4/A5j4owTR9ZO2W380IO4xQH1ZV5Kny6Xu4nWxfvXK7ZQWoAsf
+F3qpUfxx
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----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 4bfbc8de3..4f66ee1ad 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,34 +1,34 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 1E 7D 93 E7 45 B9 35 B3 D6 01 92 0D 96 04 AC 58 E4 DF 3D 86
+ localKeyID: 55 28 F8 94 CD 10 2F 29 62 37 95 1F CF 7C A4 21 C9 A5 CD 72
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----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 b0fe5a68c..8546e8c41 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 d026c9bb9..4cb269090 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 98e75600b..154d8feb5 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 eef32e293..e7bc920d1 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 6c0d099eb..628a4e481 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 484d69fe6..ef65fa79c 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 a8b4ec28a..5ad5db6b5 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 ad5e0a286..fcf54e44a 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 873f8f081..eb5f05ddd 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 f464a20a3..0f1c8650f 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 9451cb9f8..5e5d8f321 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 7aec44ed2..9a488a778 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,27 +1,27 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 1E 7D 93 E7 45 B9 35 B3 D6 01 92 0D 96 04 AC 58 E4 DF 3D 86
+ localKeyID: 55 28 F8 94 CD 10 2F 29 62 37 95 1F CF 7C A4 21 C9 A5 CD 72
subject=CN = expired1.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM0NDdaFw0xOTEyMDExMjM0NDdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3YEJrsry
-T0KCVm5o/TavHUffYLRB6+aIOvXS4+Hb6DziAjTUaReV1WWArtrmOvWxvfcXngCs
-t56C4B/KrZkoq0LutMT1gPuJN6nfD/YdDlg58JcHYBp4suA1uI5jc2m7R+7AIFJw
-GiZ6HkKUYQKDERs8vGAegaCZH8Qte9auoterdmU7UNHQR350dFLIALMGN997LHht
-QI26BTPRpKYOGjFLerOxW4Nokb2bnLprTfbWcbs5s/AJ4nZ+47lj2TZropAJKmg+
-oM2/corav94U/rGH3sTRkwDxqJINqNNcE08aFHuc2jHVLj/Fp9I44niivijlRWL9
-m+WBjStVU2JeNwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM1NDJaFw0xOTEyMDExMjM1NDJaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvPLGhDlL
+6DxKpNuilIYuW5ZpvV4DwX/0bl5xQ10fsOl9L1TLKFQNjo+ugXmKaqGDb1Q8IJ1E
+oipjJP1cSXiT9aKRh0eZfnu5F1WFG9DQzf1jAFCk5CjeZiEu2/dlaeCXYlBP/edT
+NV8bUIBA6y8/7sdkdJ9qbBEumsCZqzxJYXjM+jEvrADQ0LZ/K2GpJHPTEnixtwQr
+seDOkfwwn7h5x1nSmj547vMgxFjM9r4NAmM2wBUTJiWHgjZsWonl221NoHLZ07+D
+33DFvJgD6QB7lZVmBldxx2DhVtiGdYS+QTVlYO7RMnWDr7Hl5EZLL93I/qsCvyGi
+i/wYydh+EkXbVQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCj8h11Ym+Wp45V
-yHxjBNCY5rN3za3fnNChULlRWRc+X9Kw2guz8zgCgBAsvo7ZYNuRr2m6kB2k0V7U
-T8qCiEnjEBT9sTZUtO880IXuSzZci+ciUmQFXmuVxvSeQt8n68NrKCycSBjsEr/H
-jfHK7puRdTy/m8RKm49zn5Yk8w+TE3DwDGlkQFIbqBhZyokwE9L6EvqWIgUCpy0p
-R3Mso8Lh+NQDSKkO4siN3FDpgMeKpUbNUQMkYYLLCJXxnTC+LL8tk9Yf2S80pbwt
-EeStAYi8VwKVWV2bkpu8u0Rv80eLDccTuwbWUOwrsTNYH2UuCaS7NzIe0cdEOqOu
-Rb2McZ7a
+cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBNUlRqXZq/NMtx
+jjizZJZnvLHMRg+lB3azYwlnHut6U/rWQkT0zb0CVUO2U50oY8lSpXqZRojhztZq
+yWlGmJZMG8mvv7HXg5lGP6NtYPjfOG2Im+w1H1b6gwdVW60Gcjy3mYhYA3pqYkeo
+2glfUZiNUM8rJh10GyXzX8bF7x1g5oeK2Ar1peW8EUvdLPvZkMxwp5rhrTv+AmMi
+xKj9KJZ4NOMsDRyAGGzUjDzANMxldx0Uq0QgUYfacH0U4HM/WHaUmmh6lfJkYe+e
+R1M0kPc12maC0W4/A5j4owTR9ZO2W380IO4xQH1ZV5Kny6Xu4nWxfvXK7ZQWoAsf
+F3qpUfxx
-----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 b33ebd4d2..a55005fe0 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDdgQmuyvJPQoJW
-bmj9Nq8dR99gtEHr5og69dLj4dvoPOICNNRpF5XVZYCu2uY69bG99xeeAKy3noLg
-H8qtmSirQu60xPWA+4k3qd8P9h0OWDnwlwdgGniy4DW4jmNzabtH7sAgUnAaJnoe
-QpRhAoMRGzy8YB6BoJkfxC171q6i16t2ZTtQ0dBHfnR0UsgAswY333sseG1AjboF
-M9Gkpg4aMUt6s7Fbg2iRvZucumtN9tZxuzmz8Anidn7juWPZNmuikAkqaD6gzb9y
-itq/3hT+sYfexNGTAPGokg2o01wTTxoUe5zaMdUuP8Wn0jjieKK+KOVFYv2b5YGN
-K1VTYl43AgMBAAECggEADaHu+CCKeEFWJz6lXIw8i9dMErYVZpDqKoLNp3PTpn/0
-wwEAX7VxZdBY8qoLSG6tsUzfWbyd5LEvSd77COMnwx6b9Wk32OfiQphEX8WcdTEN
-49ZPwGTwr8Wn2MN+sHA99AfoMDUSrDFZC7q6Shwu9+MOwmNCDWVWd0OKLxh/6Aqz
-q8jbEXwc6Ri1XUcg0wBZaxUlaAicqMt+P1Y5LCq8ftJiR9nsw34XZxIhHJwD9jog
-V3SQTorvTzaUtrlPMVdh1fgmHNriUIRARxtZA8agM3IZkkCBdELqZc3lGCbT+tNo
-BU9iDkSDDorzQokglytbuyQTxT8fNXo92DM0yx205QKBgQD6kDcIThFvzHARH2I9
-ev+7qnNfHm/qpLMwKKZ18iUdjhNHt4Rdr8W1rJ6Z/nkQZqr+0HGq5HcS6jKUqxd3
-mQfMwaZS2ecgPPcooG4pPP02saik7y/C2yXBEHXjB2tu7DUrEuVV74pUOgbVngE0
-DOUvtrqpyv92+oddshfu5zeR8wKBgQDiT2jSW8ElJ/fsM88+0/IpbRzes36MnGpK
-uKGCQuZydqwtcj/igwkCwn8+oMEUsSbuWLeYc22MvvXSVnYSSl0x+eOEzw+H+d+d
-XfT0Ve8OFo9Ho1HtMJz7C2nj3DbjfurJSs3SB6e0jOU0G/GiN5sy5Op6OlL+xRJm
-2bU+u/qPrQKBgQC4FMOZomFFFZkvuzLdoEPJiAyC0UW/yYir1PGWrXN/JyYbBkSE
-3+IM+uj6ke43knYGBvW7a2Xfy5eliZ0QDKmiUJL1Q4l+McwTWOoV+ey+Bf+0TNV1
-/rLaCFHTnVvcfkUBhDxgyj+Caa8juZWAvAiU6VZx7+WHb7+Loo/awJwe6QKBgQDP
-94trLDhs7bLOE7pSkTCLUyLhoG8dxiuDaPG6o8Hj1BxbUw9UF3hzWcrXAaENY9JT
-26Ez7nbwjReXaC7ulfnYkDu9cw5htYUBtzMASev5tU+L1JDX+AF6Tb3MUDT8kEgw
-HJbReIlryMJkRX2ixZjQhz7WfbyBNRa4/z2oXdRerQKBgExfHCNdskCtmk8Wg61/
-iZvw1bQAiSiempy6D4Ld5dwpV+T4ogymRwplue9IsEb2cLnG4Sj+B3W/B3kl/KDe
-Ou9ZPIDPJH2XBGOvBDx0hdrIL/aZmfGDGoxMsp0cKf6WIchDib3dvp26IHo/Z762
-hoS4U6wn5HNFkKATs1n9eE/Y
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC88saEOUvoPEqk
+26KUhi5blmm9XgPBf/RuXnFDXR+w6X0vVMsoVA2Oj66BeYpqoYNvVDwgnUSiKmMk
+/VxJeJP1opGHR5l+e7kXVYUb0NDN/WMAUKTkKN5mIS7b92Vp4JdiUE/951M1XxtQ
+gEDrLz/ux2R0n2psES6awJmrPElheMz6MS+sANDQtn8rYakkc9MSeLG3BCux4M6R
+/DCfuHnHWdKaPnju8yDEWMz2vg0CYzbAFRMmJYeCNmxaieXbbU2gctnTv4PfcMW8
+mAPpAHuVlWYGV3HHYOFW2IZ1hL5BNWVg7tEydYOvseXkRksv3cj+qwK/IaKL/BjJ
+2H4SRdtVAgMBAAECggEAA20xrW8ukbkaL3AuPBxM1etd4onEbqtn3uKGkk6rhvVN
+CGE0x/fyQP4ZD48JNBLWw9uWtY60km5LWv3fQRPXNxKqKfZh8bnDqwkpf04jo0Cv
+nW9Y9ixJkDeU1ndflvJ0PFuxf6zExQiDAcw5oSo7shRanYTQlMIhArxwbPsMZ6CV
+r+L8behY+5KT4SxWnkwB4WhSxJIt86c1sOs6t+HK4kgrr0bzu8s9BJxBjfKxxHYG
+QbdLsfAcEIdA3N3t587J8E7F8uEUKADpYNF7bpln/TLKc0YxMY9TP5eUV6q0sDm/
+LaDe5xPdiHCjD6+RuBGhNElJzLcdcKybEzTwNtIG0QKBgQDxnfq5pLVuf6XxNRYI
+Ze9gzeatOnspp3zMKJz4OVyik6EbNpi9eoGlLozNGTUKeiJwzDfPKskE5j6QFf14
+CCR9AEzeTCr+j7MkyHxEl+mlwJQ4egol0K9ZJZ3ZwAblhLOiSUwd67HSg40TVAb4
+hl/V+dPXgt5xIftQVoUxsyrqHQKBgQDIMixE8NVerA6gUxW3OV/l9GYJ5OgZ4Mi9
+x6AiFQs5g9Zyy97PbxB8lka9li9brGB/W6y2alVLOOyu5pKCWEAlXR00JXXtORv/
+kj2CxcMGz/178FLL2wLHNsJIELO6KiiAIWzzsQFhMbUje8GorwRn/3UJas6Fknzn
+8Fxcr5ywmQKBgQCuVodrHGWtbX2XJe7X8HVhLDCeHexwieGKjmN02C73P/6nXCWp
+0pNpVMVT2DRlcusW6MP8P6r8VgYegT97NKTfbTAJ1nvPYnCoweCovdRhPSu19JkN
+4B4l/PaBAAX55l6XYrwBeue8Nh+9Kow9FvhftPweLNfEWfi0ZzmEOvtkIQKBgEHk
+mcObTW+azDmi/zvOi60Bs3BAQtD5trkYcrGlIYutxDEGv3ChStjnEaOnQjE3XI+u
+2fs0ppxawTSUOdbjO0HREyKtzdHmATwuo0Ze12FvpixcHrRwgsqVUH8t2CpHZAtA
+dT8EnMKj/M4QFt7xtE6Su6/80rsOS0SATbZIKxfJAoGAVHrl3MgrJg7YUqmnqjNe
+XZE/D1/B4zrMxCm1hNnvzwCrfswMKf3lmWjtmzEwGFtGM0I6s4pxLpNZqDSUd4/+
+tOCCq1BEVc8Iz8ZjSvfzyrVCGtk8+xp762HZQZuFFbk41Na387UWoOuNgEe9H9+x
+KOszjOPQ2eoP3bcuRSKoaYM=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.db
index de5f1d0e1..2643a67f2 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.db
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 25703d07d..8ae2b8508 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
@@ -4,22 +4,22 @@ subject=O = example.com, CN = clica Signing Cert rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.com, CN = clica CA rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert9.db
index 540753efd..298d7e8da 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert9.db
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert9.db
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 be81e757b..0dd51219f 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,46 +1,46 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 41 0D 26 12 20 0C 54 92 DC 59 F6 6E 06 F1 9D E4 99 A7 78 40
+ localKeyID: E5 71 FC 50 4B 47 FE DD B7 6A 56 81 B1 58 C5 28 4F 05 43 EC
subject=CN = expired2.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNTIzWhcNMTkxMjAxMTIzNTIzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALztCX0B
-eLseVLBvP5eoMkDJJTXsgY6yF6Kjil/rIwvzxyCga3VSvxIDFIlHXBeoG9Az6b/6
-ZEB3dlCvh9HuhMHJZ8yMgQk0vdf91ccOSKOAZKVl54qMqNFOwVth9hXmADcRZYlE
-ORhrJH01YJie5p3bZIB5RuiwdDqXRQm7lkWTUAOCDwrqtzvjCzVaU9f2/ILPWpBz
-WNbxh0ZoWS0zBaLYfbC2XSmGm9xiFbagyvo+YE0pV7ylavBj24x4cn8qI0m2LUYz
-cOLKECnPy59RR/uI3U0ZF46QY0IRVVc1HIKbDSwGpXbMI9prlNufz0YSG2TqnYLE
-1q7/H4fPi4iW+nkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNjE5WhcNMTkxMjAxMTIzNjE5WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMge/cgI
+2m671Lan01CG5i9Hi+reyiQ1Mt+hnwgmRhygu2HiUb5wNPys4kfAa3Y43hZW52wR
+b15Hbi/qeUkPFA8+ezCEmtae1AobW8XCp8vn/Qc/2fdgR1Nq+Zxl2KxOse34A9q7
+SNVlv9WBbb7ZJwHvl0gb29pj+gzlpC+Hxa+Q7138V2rxWwRSzYKIYr8EIpRb5ZN6
+ooBmitWel0zKLRoQ/rtzoyzTg0an7EKGfxvejvvV8Hb/TkI5MWPV2PP5wwk0fapR
+5Qeaa97GkaIujEQ0f2H3d/04WiM2jC3cmiRwKj6JLDCynK6ALVluXk/9bm0pJySH
+kMCSop6ZdZWP1VMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAqTes6KMTvPiJ
-d5U5uaX+iTH1zzRaegTVuSIuqSR6goUbyIHxmJatHLcJ2n7DXK8Tt5Ycf8mgjYb5
-s+ojADgWrdUGkLS35vAJcgKoeziiV0X+CfocGoRAy1at/TqdjIZCwF4qSD/t3Kdl
-dH/XB6Xl3IE8jYaKLyoJWtNMShkPN/Ge6XIAz2YV0CtWFJZbPLK42xQ36dvsipzw
-Bq3jtGOBYoOnGzUOH7fWebRaA/Wh+cpRDLnVVilz1RsFLvwPkzHcYMj30tFZ9MQr
-F8bwGxtLsYPaSZM8LRbMfH1eqtWuPF4ThC6V7WktESlDYBVolanv9LneUadXwTLF
-wJDqbV+9Ig==
+eHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAjnDDe43A54Xr
+yIn0WDcTkNFvYyo0IoMHqMP+sxOsD/QAoHt/ilBe0yIghaAjkDa6EA7M9x43C88c
+dt7LM2sxwGanFcX6/Rtj0H0SZIJ1PtHrg5i8SHTiXGOk47TCCSOtOtaVxz7nqHpt
+6+UoXaGWKATZ8j7a7tUs4FUoyhHMXwD7mQRccu0JqmSf+XB9/4jSDr9NGdYHXQg7
+HTJLwWLSNwiYah0e2XSC3mmHi3IJVdNjdDJIHskaAgLrZ+tUIIAo6lDytof6zNxR
+IMpCzh61Ey0nx55wjv6sGBQ2aQ1qFTXJ0cLshoERTWPZuUyap+fHdxE1BVjuzK2v
+WYCDqCUFgw==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzQxOFoX
-DTM4MDEwMTEyMzQxOFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+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
-ggEKAoIBAQDH4/22rWiPmzi+0YENH2hU5H488P2jxPcKMrCTD8SVvBS3G+G1auz1
-FoH//iFMU/Q09ket3Z5cJs/GaCztU5ZxC3BQ89OOWyyQ0NXWFjMM4YrRwSJu3Tij
-bxz5E8zlc/Z+AJn/VT+3+WQ9MD+9u2+GHxfEHk+p9pI0ELrZWj2mH+lhH9QjcP5z
-SmeeiViO7fy+y35CtIbKP2uOXrjgYKHemkbTfa96psdkh4UGkEOsmvZhi1fOaqUj
-hu8eIsCWLPWBEjV/E/Od2RKfADNcyAKZKYdD4oa6hv7+XA8q6x8WOA389mEsXov4
-RUbqLBPzDZoMWYuB9Syl3kqKNP/zMjaHAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+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
-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
+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
-----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 928954123..b2190d08e 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,34 +1,34 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 41 0D 26 12 20 0C 54 92 DC 59 F6 6E 06 F1 9D E4 99 A7 78 40
+ localKeyID: E5 71 FC 50 4B 47 FE DD B7 6A 56 81 B1 58 C5 28 4F 05 43 EC
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----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 e23cceb40..c0fbefcb2 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 5077effd9..8bc77e218 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 6dcb1afb4..b5ebf4643 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 5077effd9..8bc77e218 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 115ca79ef..b38246b2d 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 57533354a..01a85c872 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 57533354a..01a85c872 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 2f1753f74..82083d06b 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 dd0809467..bb16e2af3 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 dd0809467..bb16e2af3 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 a8cd93017..0e358b15d 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 37724909a..a31ccfa7d 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,27 +1,27 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 41 0D 26 12 20 0C 54 92 DC 59 F6 6E 06 F1 9D E4 99 A7 78 40
+ localKeyID: E5 71 FC 50 4B 47 FE DD B7 6A 56 81 B1 58 C5 28 4F 05 43 EC
subject=CN = expired2.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNTIzWhcNMTkxMjAxMTIzNTIzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALztCX0B
-eLseVLBvP5eoMkDJJTXsgY6yF6Kjil/rIwvzxyCga3VSvxIDFIlHXBeoG9Az6b/6
-ZEB3dlCvh9HuhMHJZ8yMgQk0vdf91ccOSKOAZKVl54qMqNFOwVth9hXmADcRZYlE
-ORhrJH01YJie5p3bZIB5RuiwdDqXRQm7lkWTUAOCDwrqtzvjCzVaU9f2/ILPWpBz
-WNbxh0ZoWS0zBaLYfbC2XSmGm9xiFbagyvo+YE0pV7ylavBj24x4cn8qI0m2LUYz
-cOLKECnPy59RR/uI3U0ZF46QY0IRVVc1HIKbDSwGpXbMI9prlNufz0YSG2TqnYLE
-1q7/H4fPi4iW+nkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNjE5WhcNMTkxMjAxMTIzNjE5WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMge/cgI
+2m671Lan01CG5i9Hi+reyiQ1Mt+hnwgmRhygu2HiUb5wNPys4kfAa3Y43hZW52wR
+b15Hbi/qeUkPFA8+ezCEmtae1AobW8XCp8vn/Qc/2fdgR1Nq+Zxl2KxOse34A9q7
+SNVlv9WBbb7ZJwHvl0gb29pj+gzlpC+Hxa+Q7138V2rxWwRSzYKIYr8EIpRb5ZN6
+ooBmitWel0zKLRoQ/rtzoyzTg0an7EKGfxvejvvV8Hb/TkI5MWPV2PP5wwk0fapR
+5Qeaa97GkaIujEQ0f2H3d/04WiM2jC3cmiRwKj6JLDCynK6ALVluXk/9bm0pJySH
+kMCSop6ZdZWP1VMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAqTes6KMTvPiJ
-d5U5uaX+iTH1zzRaegTVuSIuqSR6goUbyIHxmJatHLcJ2n7DXK8Tt5Ycf8mgjYb5
-s+ojADgWrdUGkLS35vAJcgKoeziiV0X+CfocGoRAy1at/TqdjIZCwF4qSD/t3Kdl
-dH/XB6Xl3IE8jYaKLyoJWtNMShkPN/Ge6XIAz2YV0CtWFJZbPLK42xQ36dvsipzw
-Bq3jtGOBYoOnGzUOH7fWebRaA/Wh+cpRDLnVVilz1RsFLvwPkzHcYMj30tFZ9MQr
-F8bwGxtLsYPaSZM8LRbMfH1eqtWuPF4ThC6V7WktESlDYBVolanv9LneUadXwTLF
-wJDqbV+9Ig==
+eHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAjnDDe43A54Xr
+yIn0WDcTkNFvYyo0IoMHqMP+sxOsD/QAoHt/ilBe0yIghaAjkDa6EA7M9x43C88c
+dt7LM2sxwGanFcX6/Rtj0H0SZIJ1PtHrg5i8SHTiXGOk47TCCSOtOtaVxz7nqHpt
+6+UoXaGWKATZ8j7a7tUs4FUoyhHMXwD7mQRccu0JqmSf+XB9/4jSDr9NGdYHXQg7
+HTJLwWLSNwiYah0e2XSC3mmHi3IJVdNjdDJIHskaAgLrZ+tUIIAo6lDytof6zNxR
+IMpCzh61Ey0nx55wjv6sGBQ2aQ1qFTXJ0cLshoERTWPZuUyap+fHdxE1BVjuzK2v
+WYCDqCUFgw==
-----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 4ca340145..a5e0954cc 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC87Ql9AXi7HlSw
-bz+XqDJAySU17IGOsheio4pf6yML88cgoGt1Ur8SAxSJR1wXqBvQM+m/+mRAd3ZQ
-r4fR7oTByWfMjIEJNL3X/dXHDkijgGSlZeeKjKjRTsFbYfYV5gA3EWWJRDkYayR9
-NWCYnuad22SAeUbosHQ6l0UJu5ZFk1ADgg8K6rc74ws1WlPX9vyCz1qQc1jW8YdG
-aFktMwWi2H2wtl0phpvcYhW2oMr6PmBNKVe8pWrwY9uMeHJ/KiNJti1GM3DiyhAp
-z8ufUUf7iN1NGReOkGNCEVVXNRyCmw0sBqV2zCPaa5Tbn89GEhtk6p2CxNau/x+H
-z4uIlvp5AgMBAAECggEABlQFcGIH8chE7jGAbpjS0RkjutFgmr+OpjMb6mqsA9AZ
-4bcEjnDJJ2YXbkySfOozv0w5MSXmwoLgjCNAYDOWT7mVNV9DSbmHaThujG0R2WSD
-39yWA5iCpZssQ8k4MYOAyuzACyJlbAgtDVgdaOimq8+Kh46jEEjWeylwEFtvv8YO
-Em7QhNS6PX13roTl4nWsYwA7BWXdia2bxzzj5IywHreanredkAQGkwT9/DI9hljq
-Zkkf9UH8+2H5NGBWzz6SNQNlUoGeFHeT5wVBxBbYUCgeosHQodJoJOg0klBFPo1K
-iQW6KNfK5ngoJPxcTwSCt88Bpf9q52li9gUXxB1msQKBgQDibr57kbyI2tvwwNG/
-N5QT9U9Eb8LOJvwpar27NvDBOZtglk6Hv2gHPMZ09NWsWtj1/GimOT8VgAZ/uzQ4
-rtdOgjT9zl1KSgCGD69aVSrAufNVCnv/clI6Q+M+GRJHJ+ey0+eKphsNwxaRU//R
-29VoYhgiXHHasbG7dL1Vvkf9kQKBgQDVmIJLlf6+VmknZEBO7NoDKjsAo/c5cYlQ
-1ZFxCYQBVn2ZEbCsJo206B3tnX6D0msgBClGn2OukH5BDAMs3UR385kwX6P5xtF5
-ltXnsGbJTOngOUVCkAelNR/e7IWreasMXkMM5AHb/+Ue1y6QeWxfjaYUO/G1IVFe
-6lTPJbtaaQKBgFzIEBlGIEDbnR/LgqaduXlsHSzntqUOaGj4KgJagtBKMJalQExz
-a8b7aj5mTF+xYhF5edASyPygVwljxgQr8GFlDR2qv6M/K3PDXZDgMQKDr2d7Qk/r
-ojHpu2WolEq/2Tr3hXrUkWVUOR0XlE2DjLCW8VizFJwOD8vGDAbkT09hAoGAQnel
-BDR3A3AMZO+ze1wFM7ruhXKAumV0X602B0D4zRnHF90DZ27P5h3dQlYiSo8uOtZQ
-qeNrt6TLRR6h1lI8vj8VypHYix+ti/K+Oc0RD09Z8CaiQOZlGqn/cvWTWxsPeVfT
-8az6TyXAfOplWRwP92Qy7FUDEGR/19N/9L4/IRECgYBgESIfbeYNEMLEYtRANYgC
-5F0MqpjoXVty/5gyk1ZzzAJ5asbz3FZCQdbaDGxF4GidOmL4FKu/KoKHK78SNgKO
-6QIG3Clhdo8EuDUB06sQsSYVOU8Uz1gK/PFepT2Tvv+GqH84+ceaziBtC0S5EFx2
-LbjNas4LvAHknncXd2k4sw==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDIHv3ICNpuu9S2
+p9NQhuYvR4vq3sokNTLfoZ8IJkYcoLth4lG+cDT8rOJHwGt2ON4WVudsEW9eR24v
+6nlJDxQPPnswhJrWntQKG1vFwqfL5/0HP9n3YEdTavmcZdisTrHt+APau0jVZb/V
+gW2+2ScB75dIG9vaY/oM5aQvh8WvkO9d/Fdq8VsEUs2CiGK/BCKUW+WTeqKAZorV
+npdMyi0aEP67c6Ms04NGp+xChn8b3o771fB2/05COTFj1djz+cMJNH2qUeUHmmve
+xpGiLoxENH9h93f9OFojNowt3JokcCo+iSwwspyugC1Zbl5P/W5tKSckh5DAkqKe
+mXWVj9VTAgMBAAECggEAWL+lvHhwpnsWMorq4+NvYbhRDLAQ5U3Saeq7JFoU7c06
+TIaZyeLpHMVu9HMZNSyzESUpLHvu79itvQI3F3dgZgJHj5S/Nj7pujG32VQiJgOT
+6wseFt7TwuLGH93q4T9lGSvMScyU2E5vbLghe2nCKtGePZRdQ9Tip6WP0qRbvye2
+iZrpNB6Dj+nPrhiJxNhKDuRTBgxo5IINOsytKNOj0R00qnw9mHYD+PHx3ccdzGE5
+Ra6m7kM8eZ9ikOUi9zHbXTlQBAr/1lQ9enL6uTOy8dbktJmN/ihiIBTnsS9ExFQO
+5UEAtMcWWBG3m+7j36q+0ihetuVz3UkcHFTqEfHPQQKBgQDszCqv382IDr46Fmcv
+8g5tyqPbE2+I72pOZX/iPeDj76g6CTKvGgDxyAR/YVjaZkHMFyN0xOBiLS+s9hGw
+7PqT4l+yOi9DkkSUxczbW4y8lJoWkkqpQJTqV3Z1CGXlQGOoeGcd5RCNLgA4AgS5
+U+UdCo1PtMSCw1G4As6+3N6yDQKBgQDYWW8ekVfmj/4i4+snIF9X2gK3nLpJH0yN
+E+9I2IFPCvkHth8PFzrjYmZyuwxIKGijQ51NkXnwaIEhWi32B4SfaSsRgPMsZ2ry
+PPqnKNbVxIPflbKQGIoRFiuNQ0eVXHdx1ldGZ8AfJxQ4Tde2eQq7QEyhiYP2yDhO
+sRA03Tqs3wKBgGL/bG1A7MWQHFleml9CHGQsTtq9QmkGZvRFnPRyGD5TKIqy47yu
+62wpyi+S/Dm6fJGdrtYXpROGfqMZ8QV93bjL8GQrzSy7zu4/z8h5etowakc7e/lM
+pbVfQYfmLettQvzg8YNfC89qRu8jcOQmPegpTDDhizJ8BAMhMVw8LOJVAoGAZoV6
+8rFNRiTV+RKoTFI63BajUv8iB6SdUf0wVwTBwgMhH1ZeQXhwn2/xvEyG9Wqwqy1P
+TYKylgnvpy5kuUG2xxO/JPxGP7SCKWhcHvprU8Fb/IejpkT6qD4pRTespEq9D2TS
+1rozgI+0NTouDnota658oc/YiQk4JZIia+qp82ECgYBmtKqJt31JMf6iv3ZnbmG8
+KqhDoApnZ1cDECdORWVCO+KJTlIaYDZJsT3ee1E8ONRxI58o2QQBiOihlL3S+3F5
+WgSl/TUftf4ATNHPYSPx4jEUCkiz4FK9K2PFScsj9XdnMeoEh3Nvq5SdDwjfuvL/
+KAuC7tCuC0crcRzK2/ucRQ==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key4.db
index 350faf0d8..db78b6612 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key4.db
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key4.db
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 25703d07d..8ae2b8508 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
@@ -4,22 +4,22 @@ subject=O = example.com, CN = clica Signing Cert rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.com, CN = clica CA rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzQxNloX
-DTM4MDEwMTEyMzQxNlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALF/
-mibgvCGYwqApXnN7sD53QfZ0luIozEan/FsNmTXGyrH6HIJaPSlon1m2+njtEasT
-LKeFiL/hFTyVOVIscAEG8znPcFlVP1UJwPVQfH5OkFbyMp17Yiz/RHQQjEdjQuco
-Fxc6PPBbrdrh4iLP2YLfRGY4+Uvnop7nHHkCVhxptRZweZtCEyOaaOv5W5P3By+6
-qs1j6EiQdSbB/3MS0KJBckNqMeu4L93Ugak3EA2QIcX6FQKrEjTcTrHRwZfd0K9W
-/yjtkOKj6kzTApN7y/AynopqfWoHXRlRmVXG811aBe4FpRsLrpjcbIggiMSQHjU1
-nDZ6DnfBcbsPXqA9MFUCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAKZAhPL7t82UQzrWA/0hF5Is
-PricbvYbGepVy8eJHHymDZrO1fCOAR7Hco31+03SfFDDRid7yeu0utXSVvs6YHs9
-sG6ArM//zP4mUN14uOlSUXBbF1N0fi9/E64q9FXjC1vykocz94Lp7q+pb90sMr++
-UCjWyHgAH/skdMvYUs+N6spIOb2wzm6VXcPSQZ8rFC7WP2bIKpxR2xbMXRb9qcs2
-TrHJizB8J5rw7L1IIAjyiYiDVLPX98TKipyWgi5fUKWAHv0wnswHk+E6DyvRxEGh
-OLBE1Ob/0a+yuEm+Jf61exuX/u/yjl8EeZo58Zt8JU3amBynTigGYmrNWT9/N3g=
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert9.db
index 8142b9a13..2675f2b29 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert9.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key4.db
index 3fa7da512..47936e7cb 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key4.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key4.db
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 2a734dff1..5dd23c95b 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,46 +1,46 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 29 F0 DE DB DE C6 9E 5D 9A FA 0D 89 2E 29 E2 96 18 98 54 E8
+ localKeyID: 7B A3 C6 F1 02 AB BE DD CE 75 E7 3F D4 20 97 41 8E B3 EC B0
subject=CN = revoked1.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM0MzRaFw00NDEyMDExMjM0MzRaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA48Fa4vGN
-I/dbVdFAuqQ6GVmZsFGLwtZ/GQoFrdQNyjXzMFuimhaGYlW4PS69ss0doglUcXKT
-miuVxpySkqfMKz/q57985iEgrI1K4TGjrWs3LjR3PL11MCtfyrrAbSD9kfvUvkWi
-kvrXHL5FMppRh0FlbY1xccheeD03cV+Bj9/EQj7QN22DniGkwS+0YwJnepQh8VPn
-PB7vPlitGkYulS7kw/w+PI9sZ+5Ojy3HNZtnvB8Bk+HnQNBkgHFjbAk2O/Y/8lzo
-WlwFHKUvp12hq3QfKEMcuPtMyO2ov1LdE4eAsFhXJ2sDUwOQ5SMJx8QkELT0a+tF
-+KMByCXGQ4BnbQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM1MzBaFw00NDEyMDExMjM1MzBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2oJKYPMs
+ZNB12C2btVboyItZixasaBit8OcROu33Bpu8XYz10q78ufb4IjHAWTDc9cb31tAh
+yfVXH5AnRU33YChbuuCPUsmvFI/SW21b4C56bSDp/tKiR8zq4eZtOsbg+EupWGEZ
+mBgZnM29RvQOMorYQLMSaAl9vMbZgNWTtk3zjKyW+CHqSNRD5SK2WqrJMjsXan9Q
+1xpItBa7FuvmTHUSxSlxJF34ol0MQwgWdqK6yr+jl8XUXzvwcrqzPA5BvsWslYuo
+CV5P2Oec8knQCeyE6rHuYSZUTBVzGSBKhE6knrnRsJuHnq8VfD2vFEP486LrKNhG
+CfM6YcymYZGIhwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAkpd43dYWL3OMO
-kZ7LfozZfPe3bbs62rIonnOHMltRWaQo3TI8WuA35Oz91JCc/3n2ywrLTRuzoxE5
-GbvHXv6OQTwSS5iR/K2pqG4P+sJj/DGJ+O7uWVQwf6yZMamPCyP1TIf0EyNvnOei
-LVNifxEvNRHcyyvuNxXyfuACAsRNp8l8E9NvZg2v7R7l4hLkyJWYATITBdQZGnM7
-1XMH46YHOtaM1CXtM8XVs/ZarlX5q37g5+NxDStipsKtXie7sbsSSQY8elL04maX
-7ixxOwQat7UZapHvAameNPURG+LPStyLeCRBBi+0qutP7Ma0bBOs277EgzxjBlZz
-ltLDWe78
+dm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQB44daxlvnH4PCz
+Op6V+Ofm0Choi145lXXfUAmbRaieVO8REPsz9JpwyAT+vwcvlvG/cz1MHOMzefu0
+T7NAKG1k/chek9HJelKR9IsnmePaCO0Sdygqi6OJyHXh4Tw6zaDeshsjISDSdVyn
+FPFTI4TkDzzxgMmjeSS7fjv8slNNMnB2kPYPjWAXZSWuYgzc5C13nT8Krh6E27lH
++czpGzbr1tQ7SWALBEKlRjeOINW59mOrNrLsc0Qvf/9cJIeHSJL4keX5m0FF0CAV
+dCkv7+5wK5SXysZIpIZYaHZpGQfDFKnkb6c2Hv/KwNyCwkLj7G876CTdo0qVH7UP
+GLtXWC8m
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----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 e55f47428..6f059f8e5 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,34 +1,34 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 29 F0 DE DB DE C6 9E 5D 9A FA 0D 89 2E 29 E2 96 18 98 54 E8
+ localKeyID: 7B A3 C6 F1 02 AB BE DD CE 75 E7 3F D4 20 97 41 8E B3 EC B0
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----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 1a11c46f1..422d1b2e6 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 286eb2242..cfe2a05bb 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 ad116f2db..ecfe69347 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 d32370a64..8dcf6e914 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 d4ad4bbf4..9345214ee 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 b1d1d297b..8b1270aa0 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 5959b77b1..a945ca495 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 7b457befe..fe498fbab 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 fdde28b2f..bfb60a720 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 52472f6f3..7ee01a07f 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 449588c9d..bb4173c16 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 bcc2dc2b7..b13521275 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,27 +1,27 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 29 F0 DE DB DE C6 9E 5D 9A FA 0D 89 2E 29 E2 96 18 98 54 E8
+ localKeyID: 7B A3 C6 F1 02 AB BE DD CE 75 E7 3F D4 20 97 41 8E B3 EC B0
subject=CN = revoked1.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM0MzRaFw00NDEyMDExMjM0MzRaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA48Fa4vGN
-I/dbVdFAuqQ6GVmZsFGLwtZ/GQoFrdQNyjXzMFuimhaGYlW4PS69ss0doglUcXKT
-miuVxpySkqfMKz/q57985iEgrI1K4TGjrWs3LjR3PL11MCtfyrrAbSD9kfvUvkWi
-kvrXHL5FMppRh0FlbY1xccheeD03cV+Bj9/EQj7QN22DniGkwS+0YwJnepQh8VPn
-PB7vPlitGkYulS7kw/w+PI9sZ+5Ojy3HNZtnvB8Bk+HnQNBkgHFjbAk2O/Y/8lzo
-WlwFHKUvp12hq3QfKEMcuPtMyO2ov1LdE4eAsFhXJ2sDUwOQ5SMJx8QkELT0a+tF
-+KMByCXGQ4BnbQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM1MzBaFw00NDEyMDExMjM1MzBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2oJKYPMs
+ZNB12C2btVboyItZixasaBit8OcROu33Bpu8XYz10q78ufb4IjHAWTDc9cb31tAh
+yfVXH5AnRU33YChbuuCPUsmvFI/SW21b4C56bSDp/tKiR8zq4eZtOsbg+EupWGEZ
+mBgZnM29RvQOMorYQLMSaAl9vMbZgNWTtk3zjKyW+CHqSNRD5SK2WqrJMjsXan9Q
+1xpItBa7FuvmTHUSxSlxJF34ol0MQwgWdqK6yr+jl8XUXzvwcrqzPA5BvsWslYuo
+CV5P2Oec8knQCeyE6rHuYSZUTBVzGSBKhE6knrnRsJuHnq8VfD2vFEP486LrKNhG
+CfM6YcymYZGIhwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAkpd43dYWL3OMO
-kZ7LfozZfPe3bbs62rIonnOHMltRWaQo3TI8WuA35Oz91JCc/3n2ywrLTRuzoxE5
-GbvHXv6OQTwSS5iR/K2pqG4P+sJj/DGJ+O7uWVQwf6yZMamPCyP1TIf0EyNvnOei
-LVNifxEvNRHcyyvuNxXyfuACAsRNp8l8E9NvZg2v7R7l4hLkyJWYATITBdQZGnM7
-1XMH46YHOtaM1CXtM8XVs/ZarlX5q37g5+NxDStipsKtXie7sbsSSQY8elL04maX
-7ixxOwQat7UZapHvAameNPURG+LPStyLeCRBBi+0qutP7Ma0bBOs277EgzxjBlZz
-ltLDWe78
+dm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQB44daxlvnH4PCz
+Op6V+Ofm0Choi145lXXfUAmbRaieVO8REPsz9JpwyAT+vwcvlvG/cz1MHOMzefu0
+T7NAKG1k/chek9HJelKR9IsnmePaCO0Sdygqi6OJyHXh4Tw6zaDeshsjISDSdVyn
+FPFTI4TkDzzxgMmjeSS7fjv8slNNMnB2kPYPjWAXZSWuYgzc5C13nT8Krh6E27lH
++czpGzbr1tQ7SWALBEKlRjeOINW59mOrNrLsc0Qvf/9cJIeHSJL4keX5m0FF0CAV
+dCkv7+5wK5SXysZIpIZYaHZpGQfDFKnkb6c2Hv/KwNyCwkLj7G876CTdo0qVH7UP
+GLtXWC8m
-----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 3cdc6db54..d12b487f1 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDjwVri8Y0j91tV
-0UC6pDoZWZmwUYvC1n8ZCgWt1A3KNfMwW6KaFoZiVbg9Lr2yzR2iCVRxcpOaK5XG
-nJKSp8wrP+rnv3zmISCsjUrhMaOtazcuNHc8vXUwK1/KusBtIP2R+9S+RaKS+tcc
-vkUymlGHQWVtjXFxyF54PTdxX4GP38RCPtA3bYOeIaTBL7RjAmd6lCHxU+c8Hu8+
-WK0aRi6VLuTD/D48j2xn7k6PLcc1m2e8HwGT4edA0GSAcWNsCTY79j/yXOhaXAUc
-pS+nXaGrdB8oQxy4+0zI7ai/Ut0Th4CwWFcnawNTA5DlIwnHxCQQtPRr60X4owHI
-JcZDgGdtAgMBAAECggEANEBqdRF804kO08fvpUJDMAit6VU0Ds2+GAUEG4bAaSlq
-cyg6zEYpq4rF+4drLwe+6itgy6xBL8gbExddyzai8TM3VdbJNVTZVa0Oxk5ookMs
-RDX2OyGuLpBs6CpjNkYw1pqjismYDEdvLaF7Z6oe1TyMJA+kvLl+7vAAdcq3A0Yg
-yPFKmwDsq8LLgIeWNonFS2S/4oOsmB+AdXBOYEpWp6MkhuYPLHIYEtDuKQrwtwx5
-JxXDl1Q9lV8kYoqlFVVP92UUFeihQOiKH+aUJU1J9xoHoA41QWpslBbb3sxi5qDm
-E2Xp/pm/AYus+AvTcgWXVhkNKerXGeMPp6T2lMRfswKBgQDy8rIr368p/bICZ5wi
-H4m9A+pXFKvJXrlMBYUTbyFNaHgC6AM/IT4d/LXQSuxz4V9E7uVqZWM6eiyip+ld
-AbXpUC4RI8PeP1EUiGnotllHUahNbLUZWUTe8ie3ZaTrh8eC/0W7ewFIz7K3p2sO
-i2IxH64irRswZYfb17eFe++f9wKBgQDv/bX5AFjAMuxL+mXEKm0DoLnlBugZk+Ah
-5jFtX27CCKocFIqSHMB0Qu+r/cxgH+JV3wti8XDtdzmPMqA51dlEcmZzqXFOQMbV
-bnaua9iqz4z2ahynojkbRyGdCqOAw1Gl6mrs+5CDSG9+7e/EuFNRNptYK0mrVbBt
-Gx0ghxZiuwKBgGsJdmpSENCFT4ozr9xw3LSEJxjaqJz9uNG/lNPtIFUEc+uD4PpN
-YRrBHjF48RhU8S5junvX05IOBeBb7jrl6Am1I7a1dTRT3RsYxuCahlcfqPEDtf5H
-EErRkaIBjFmg5svWQBjLptM3ftvfTRGJY2eVN5lbfyEhemvnbJnI8tgdAoGAZTrj
-k1CuHwRb4ACTBJfQvAMD5rNvG7rgg+wRVU037uiwuH+Bo/g0xdWmOyonFzTbx9T5
-fJbTR5dO1DRKmZq2tsR6qrcCcDuqo0ShExmynvpFP3uq8pre876hUxi1tw6sVgv3
-ZlcGshnPzf6XcKc/nbYm+J3pyTev35XcR2gz7RkCgYAv6z8wAnaP5IyrtGfF251y
-oNesbK2NKOP52UIbaWRSzpx9Dan1Nb5e+1of2EWvm7Z3JCGroHRRJj3ByYRvfVWK
-2sEmgAQMMUTTFUM3qJxLTAIwHs7QKXBK3skky5GrkzLooYZR5K6qTZX6/9qXRQil
-RyTKae7Jv48swltu+doyqw==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDagkpg8yxk0HXY
+LZu1VujIi1mLFqxoGK3w5xE67fcGm7xdjPXSrvy59vgiMcBZMNz1xvfW0CHJ9Vcf
+kCdFTfdgKFu64I9Sya8Uj9JbbVvgLnptIOn+0qJHzOrh5m06xuD4S6lYYRmYGBmc
+zb1G9A4yithAsxJoCX28xtmA1ZO2TfOMrJb4IepI1EPlIrZaqskyOxdqf1DXGki0
+FrsW6+ZMdRLFKXEkXfiiXQxDCBZ2orrKv6OXxdRfO/ByurM8DkG+xayVi6gJXk/Y
+55zySdAJ7ITqse5hJlRMFXMZIEqETqSeudGwm4eerxV8Pa8UQ/jzouso2EYJ8zph
+zKZhkYiHAgMBAAECggEAF8/3FxWpEtt83DAsNdjgyWoWOggghb+axRQJVqi0MO4r
+2u4PpAQZ2pJFfER7t7yRd99VBv3rkLzB39ivzueuO7ZqOLVcKSN9hvodbIVAa+/k
+u5vIpFKECNsWBcQ8xxkBT02/iLgcN+z4bZQmOmNCYNOsuXBKYzgVkcsBzP55eHZW
+o10xUeR3Tv7Ad2NXnhMO57+BvNp9cJktu+eDqeeTaT3pdpmW0Lf45HUg+K268T3B
+JlbtblTJUGzlSNZEHTtquKDNU02EHCgs2HbxmKvCioAjWu+1PMFW8cvncBOajcam
+QKINx2ZONV21J9jyZgtisJ6GWd/kp6SLEXRAEMVeIQKBgQD5SqRn5Rvn15t9kx1l
+KyBE2XbvTDgvKzSuLhCC3cZNvQgREFGxv/UBtyY3tBAA9zU63VRV38hAML8EDvE1
+Pb3gOJ8MgyxhWe9IKY4UERNp2KWCCTf5xQshciSLmjk0efwdK7Ui7Wv0LiJyEOK6
+CLzzMc0YNOE+qYbxuuyW9Uy2aQKBgQDgY5aayIvz1kzwQNKGiv3ULc9byvewpraQ
+YGorRLdKrVgeuNHRhLaeAnDGcVYnK4bvZlrlJtA2cO+QWekARQQIxZzFDzAN621G
+B/bjlGKoyChVbXI0+DSWUHvK5IUQr5fZ2F//yketZxboL0bNy7t4446aO6UR3B1U
+Q/gqMqbJbwKBgDGDst3z8rP87iRmCQukIjeqneXv1KUBxuflvF/R3uZn6mdBP4i3
+oNljYFLmD9uxPkBf37Viymp9hCMxOJWjmsgjVuvsTe9UJqPFpTO1JI78efs3C4gv
+rANLoZic3EnhBMNigArc73lDhJH1aqMawzTmql7peeexUl1HDGD7fe4pAoGBAJYx
+ss46LItzRx6NlR0fjdVnMGPV0MM6Y/rxvj7mCPYAX3p45WCjv4S2R3xcwnkHhpNZ
+5L97omS+ZWwu8moOyCuC8nNovhajHgqBLD2axgsJpw2/a3GPLcvrZWEiYvsPPcpA
+LcnOQPoNheS2OGNp2juJvZr5D32L40nTERpVuxQbAoGBAMQoQHUgweVR1O95aXhh
+0kD/bv5w3RQs5fXpNBemNQiTk5uL94wVVgAFt5MazzX2Uk6rJ915PaL7lCjTnFHX
+YfjU2X9LtAmY7+aEqUZfW1ZN9ZK9/wl3a9wAk2udgG6ycUZ9xKnsJa/ZZSebW+Lo
+33oLizlyceeMcMBtI0BCYH1x
-----END PRIVATE KEY-----
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 25703d07d..8ae2b8508 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
@@ -4,22 +4,22 @@ subject=O = example.com, CN = clica Signing Cert rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.com, CN = clica CA rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert9.db
index 2b52f73a6..4a7697f1f 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert9.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key4.db
index f290a5280..66be2f704 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key4.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key4.db
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 abf7bbfe0..96322727d 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,46 +1,46 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 7D 6A EF 0D EA EB 90 48 9E 10 63 E5 76 6C 9E 05 83 34 89 A2
+ localKeyID: D6 7D BB 23 F6 3E 99 CA 5D 7A 5B 44 9E F9 AC 4A 7E 74 43 3A
subject=CN = revoked2.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNTExWhcNNDQxMjAxMTIzNTExWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM5c6EP2
-RbvB+t4Z32f5I+65muRKg692W3vs4WaPHyIoGQd+2Dppfz5JxrdvjhLmLSAEYQIQ
-wANM60efd2Amj5hKtJDgn86qqg9KYeEZhrzRKeBUGPVRTF8w6Kyf92396ekcka3D
-/whxUsCLuQBUH37QUIwQBbrSN0Im5EihUsjM+DD56Rcz5O1y/+raj2UFuoK4rqvu
-tGef/MRjxlUvM8T8R33lpGHlsXbYiY6/MpZmKFa8pN4ao1Sc9vj97LXD0/JbU1im
-3xab02sHUnXWV83uRcVc5WfwtUAZjoQxNt1odc/SCxuFAGOCa4txwGbWNPrlLuo3
-S5303/iY29xpsbkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNjA3WhcNNDQxMjAxMTIzNjA3WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6fTEdd
+q6A5TtG99JYarnrgGmrjIzSBXfQylIO+R3iVA0dsVLXYKyt8RSKGQMyzw9IAfu8r
+dnEILOzhN+//1+LBpAlQOP7oq4GF2Khqb3EYwQN6vmMNcno5sjIOVLhsULB7u46V
+mnX20QPRxlDTN0oEzpTXlaDgkFsQSSlhHahlmOSxOE/lZFrEk5AqP/6Z8hFmNSbh
+UsNrge+DrKenzy0geCxaoAjRXrp2I1c6n7cEJ0jtPRoPIKAR2y8Wfgb4Lgdl90g8
+lLnm5+2C1TjMdukGntY0CKXvD0UcOD67VJCH2G/uooHV9wGYQj+7dFdL/H/Mj50U
+z7cuyQCSTJwbqp8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAOogebbUbEZri
-g2weAbz1+B49N5g4ytzHSEXlShU6my/kXbzhJAIMIiFH1iY+nylOjmRQFLkwDRWv
-hs19HMYZHKYVXUjSYdBb2WhgNsvbgSrQDT8XS2YRXBohXp2AmmPNe1/3EoAI0KMf
-L45H5x7vAKJoiu9jkh9yR2RwwGJA9msNzVM7v5yyy/M77pcNEIWlvagQBnHjYOUV
-y7b9aXm5YE7VCB2O1bC44BtRcfjYITsaMrBlCu99ZThhnWF99TVyCdQwd430e9T9
-66IgoAERzB+8/ky+9PiKchO4qAnwRhIXER4z46Vd/ORSqYTr6TDpRkk1Udf7LE7a
-oNarJ7c4dA==
+ZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAsVESxd+99vne
++yZRbvvkDwJ0hGAsbuMLr1SicCvCspIqC+JAzSPKn3ayw+iQHLpqLd9hn1SfXacZ
+2GkWLwofOXu6O6sFjgv1p4eavcH1seF6cQSB7FOdbXap7M9f4ZXYAw1Y+X5Oww3R
+NslZd7uLSKlek1r9H55E2GjPSw6L+Z5uIH0QyPHfDv8i+qLyxbuNni4tH/7w1c62
+/Gk5Q59UUIZ2BKVK8bMBZvudfG4+LOGq3OivDzakADq9MGXL50FWjIzeyrDG47Jl
+909HHYHBzntbfyMmszMn+Jbuq9si6Oqxy6bfSgZGNYFrLTQDAdulCQJwtWvZg+6S
+DEE8h2KzLQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-ggEKAoIBAQDH4/22rWiPmzi+0YENH2hU5H488P2jxPcKMrCTD8SVvBS3G+G1auz1
-FoH//iFMU/Q09ket3Z5cJs/GaCztU5ZxC3BQ89OOWyyQ0NXWFjMM4YrRwSJu3Tij
-bxz5E8zlc/Z+AJn/VT+3+WQ9MD+9u2+GHxfEHk+p9pI0ELrZWj2mH+lhH9QjcP5z
-SmeeiViO7fy+y35CtIbKP2uOXrjgYKHemkbTfa96psdkh4UGkEOsmvZhi1fOaqUj
-hu8eIsCWLPWBEjV/E/Od2RKfADNcyAKZKYdD4oa6hv7+XA8q6x8WOA389mEsXov4
-RUbqLBPzDZoMWYuB9Syl3kqKNP/zMjaHAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+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
-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
+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
-----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 f7787b693..76eeb4038 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,34 +1,34 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 7D 6A EF 0D EA EB 90 48 9E 10 63 E5 76 6C 9E 05 83 34 89 A2
+ localKeyID: D6 7D BB 23 F6 3E 99 CA 5D 7A 5B 44 9E F9 AC 4A 7E 74 43 3A
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----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 0924d0645..69777d34d 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 67b349a69..173ddb15f 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 df4b24ad0..e3243da43 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 67b349a69..173ddb15f 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 434b92c8d..df110965d 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 9305538f4..464b10f0e 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 9305538f4..e434ae4f3 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 100b27c6e..b321cfad6 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 98fcb1597..598215372 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 98fcb1597..598215372 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 321b79e42..a0f5434c7 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 e7d29cedd..a0c0babe0 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,27 +1,27 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 7D 6A EF 0D EA EB 90 48 9E 10 63 E5 76 6C 9E 05 83 34 89 A2
+ localKeyID: D6 7D BB 23 F6 3E 99 CA 5D 7A 5B 44 9E F9 AC 4A 7E 74 43 3A
subject=CN = revoked2.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNTExWhcNNDQxMjAxMTIzNTExWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM5c6EP2
-RbvB+t4Z32f5I+65muRKg692W3vs4WaPHyIoGQd+2Dppfz5JxrdvjhLmLSAEYQIQ
-wANM60efd2Amj5hKtJDgn86qqg9KYeEZhrzRKeBUGPVRTF8w6Kyf92396ekcka3D
-/whxUsCLuQBUH37QUIwQBbrSN0Im5EihUsjM+DD56Rcz5O1y/+raj2UFuoK4rqvu
-tGef/MRjxlUvM8T8R33lpGHlsXbYiY6/MpZmKFa8pN4ao1Sc9vj97LXD0/JbU1im
-3xab02sHUnXWV83uRcVc5WfwtUAZjoQxNt1odc/SCxuFAGOCa4txwGbWNPrlLuo3
-S5303/iY29xpsbkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNjA3WhcNNDQxMjAxMTIzNjA3WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6fTEdd
+q6A5TtG99JYarnrgGmrjIzSBXfQylIO+R3iVA0dsVLXYKyt8RSKGQMyzw9IAfu8r
+dnEILOzhN+//1+LBpAlQOP7oq4GF2Khqb3EYwQN6vmMNcno5sjIOVLhsULB7u46V
+mnX20QPRxlDTN0oEzpTXlaDgkFsQSSlhHahlmOSxOE/lZFrEk5AqP/6Z8hFmNSbh
+UsNrge+DrKenzy0geCxaoAjRXrp2I1c6n7cEJ0jtPRoPIKAR2y8Wfgb4Lgdl90g8
+lLnm5+2C1TjMdukGntY0CKXvD0UcOD67VJCH2G/uooHV9wGYQj+7dFdL/H/Mj50U
+z7cuyQCSTJwbqp8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAOogebbUbEZri
-g2weAbz1+B49N5g4ytzHSEXlShU6my/kXbzhJAIMIiFH1iY+nylOjmRQFLkwDRWv
-hs19HMYZHKYVXUjSYdBb2WhgNsvbgSrQDT8XS2YRXBohXp2AmmPNe1/3EoAI0KMf
-L45H5x7vAKJoiu9jkh9yR2RwwGJA9msNzVM7v5yyy/M77pcNEIWlvagQBnHjYOUV
-y7b9aXm5YE7VCB2O1bC44BtRcfjYITsaMrBlCu99ZThhnWF99TVyCdQwd430e9T9
-66IgoAERzB+8/ky+9PiKchO4qAnwRhIXER4z46Vd/ORSqYTr6TDpRkk1Udf7LE7a
-oNarJ7c4dA==
+ZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAsVESxd+99vne
++yZRbvvkDwJ0hGAsbuMLr1SicCvCspIqC+JAzSPKn3ayw+iQHLpqLd9hn1SfXacZ
+2GkWLwofOXu6O6sFjgv1p4eavcH1seF6cQSB7FOdbXap7M9f4ZXYAw1Y+X5Oww3R
+NslZd7uLSKlek1r9H55E2GjPSw6L+Z5uIH0QyPHfDv8i+qLyxbuNni4tH/7w1c62
+/Gk5Q59UUIZ2BKVK8bMBZvudfG4+LOGq3OivDzakADq9MGXL50FWjIzeyrDG47Jl
+909HHYHBzntbfyMmszMn+Jbuq9si6Oqxy6bfSgZGNYFrLTQDAdulCQJwtWvZg+6S
+DEE8h2KzLQ==
-----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 696d8200a..ba8cd9685 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDOXOhD9kW7wfre
-Gd9n+SPuuZrkSoOvdlt77OFmjx8iKBkHftg6aX8+Sca3b44S5i0gBGECEMADTOtH
-n3dgJo+YSrSQ4J/OqqoPSmHhGYa80SngVBj1UUxfMOisn/dt/enpHJGtw/8IcVLA
-i7kAVB9+0FCMEAW60jdCJuRIoVLIzPgw+ekXM+Ttcv/q2o9lBbqCuK6r7rRnn/zE
-Y8ZVLzPE/Ed95aRh5bF22ImOvzKWZihWvKTeGqNUnPb4/ey1w9PyW1NYpt8Wm9Nr
-B1J11lfN7kXFXOVn8LVAGY6EMTbdaHXP0gsbhQBjgmuLccBm1jT65S7qN0ud9N/4
-mNvcabG5AgMBAAECggEAJIkYaifo8rQGSVpFTnAyp2pe/PogVGldCxTGV1URiweU
-XtpbSAQzjgCb2RA8FCaCaL+9uRLkG/F7WmPmS7SoCat4SooqYPmgQDLIH4VYcIeL
-pXbeMFijb9sF5sIvmV6yEh6HwD8KISGHKCXUrDU4mkghaprPmOLs+55NHnrJYFlw
-RiXocN3J4MPQu/vLKhTpQXvyhZDp/F8d9BoxosmxxILFV21OnAq6S7r2ysJUKPzr
-zX00AhYzQp+mPrS4CI4tY/2GYzWmwZFVO4LNOYQkopk+DHsRXA0qhoGxjt1yOnLO
-yCfdlNO7ou3giobczcWIFEppwXTZgFC5BzdTNmPN8QKBgQDvs1AZmvaRsUJGvFbO
-8ssgjyQwqH/6mRDUDqF14PPzqQWK7tMU7u/V8U9UslP+KNKX85Yl6YunIpe7FLw8
-nGG54seoMsoDUhJ7FMWPqK6ytcMnWg/YPFRKd1xt8wQ1SYi2TXmSHY7148elwd0c
-+RRWQZ2BnljAVMvVDrtiRLBanQKBgQDcZUHhKbfIKH6eIvbDpevk749fmVIY+0HR
-89HaQvT3ePLVqZmsyRaA8RxVuCTkFrYp8ERQgXjTcszX2VYJNOQ1xMMeR6QGNmzS
-Wadj4NPBze2i5J/Qcxs+/uvbE9s814Tol31vM+YZ4m3k0k8LJ/xik+TaxYjq4dru
-XXJe1hMKzQKBgGUi/3UOUWL/q7s01FvVTaebPeXZ8sXFt7gBxFZ8Z/IzKseIJT/7
-4O4gNxzBcXcXumOqv3uXovkOO38QLKxWP1WzPhLV+y6TfoC4LvOCdNOqpYEBGxZd
-viL9Yd5yXyAsuqZQ4i6okh1l0mM5/RWwcshCPzblnQTpwmdPI/k+ijpxAoGAF74A
-vtTTq4hRO4/grWruYpc8Brxpj69hg9CURsL3yMEKx+GhYG+5MOLIfqN7teaMcTAk
-69dGwOCZGJedIRjFjNVJf7WQAetTBcYKtkO+DB62/tlKLhZ4VOz5U3xsHb3J35SS
-OqyImTk/RWsygK0qDySHftnQyhzSjOMcMwM0wfECgYBFaX9NaxdHjYc8mt+jkh1z
-NjO+JFyO0WRAgm6koTV/ztl8gsgNYEaQIBxzDfYAQ/LY7Q2m79tPzoBXgg9+3yqq
-tQxXB9zdy6PNWN/Hf7a6lex39PJBdya3DctJkwtDVSxDe7M18rCERZEPttlA7hi4
-A9DrQr+HTk4KYBWumHGB7w==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC+n0xHXaugOU7R
+vfSWGq564Bpq4yM0gV30MpSDvkd4lQNHbFS12CsrfEUihkDMs8PSAH7vK3ZxCCzs
+4Tfv/9fiwaQJUDj+6KuBhdioam9xGMEDer5jDXJ6ObIyDlS4bFCwe7uOlZp19tED
+0cZQ0zdKBM6U15Wg4JBbEEkpYR2oZZjksThP5WRaxJOQKj/+mfIRZjUm4VLDa4Hv
+g6ynp88tIHgsWqAI0V66diNXOp+3BCdI7T0aDyCgEdsvFn4G+C4HZfdIPJS55uft
+gtU4zHbpBp7WNAil7w9FHDg+u1SQh9hv7qKB1fcBmEI/u3RXS/x/zI+dFM+3LskA
+kkycG6qfAgMBAAECggEAPbEcZLRiCRbC9Yp+j93OviGtKw6bpDCCEbgU7JY2V0YS
+q5jZyYhOYGJ1lXjRm+5J37sdWZY9XNOChp9VFS091ztINWNrLsRqTR7eQZNAwd97
+B/8/gpslg30MuLp+nLkhXByPVNQCC0930b6gaiQRbrkjinRDDq/eyDn7E5NEn+zB
+ucwWT0E04B2OwbPo2R/7mHpMiem+WqJGMVUXGbVcMpQ56N3+7SBWqGGbi0Pk1ymt
+e9t5fwgGnAa9E62vXtyoUQZoXGAx49aZAC9fSoXSKS3apQMioMoEYS6KAJM8f7gy
+WQr1TLbKXof1sUrm56yxEy1q/6dkqh319HhWAdFgUQKBgQD2YAUF0Y2m8oJowds/
+q/2BRCq8zxst7EjZ3HzRp5gWXXGJFnVW1caWyaFpncM+jCMFnPs6EGaYe+HAMFK4
+v5LmM77XQTgWcyGtDv+EZdBP3fWAs0HHmDgAs8X9FSyZ93fua/nQWqFjozwNImPG
+q6X7WemEdsxQN7b2S7vn7DZ3EwKBgQDGEbK83pGf/URH7VgSMpeORUFlajaVLmqb
+SPzCiYfXa8O8f/157HFaRBv2VBAVyoIP6Rp6QcOxcYn2tVjeNVzwLgv2pIur7Ifn
+xXnJc2ct1qjinz5Yqbii0YNJDaMjU/E1MfmGJEJe0zERQJQ9/nO2djemjA0Dqvvw
+IJfLLonzxQKBgBbRseVmEU6jK3z0Z5AwJ9yvKZ4vOH86YUz8ZPsuIKIBqaBe2iNe
+zXPt3OthV1IVvLCqZ4JrPnVlE/WvBBpkdACqTkS1n7JEm5vhxbzHiVG8Zx6ye6c2
+7Aj0naPhMC5ag1sr2Ql5O3V1CvzUcJVYFJmBLGW+cxIC9wk83nyOnkTNAoGAJIk1
+OEOyBxoX01DDsy+j5zl9M7Dg+qnCPny7K0NlTGZzh7zwS+JCko0Hv2uIQAzH6xlr
+qeuhpoS0F08iYnLjfuZvjIKTxRXvh+BUc8WW3czAAHWxcXd1OIt/NSWP1z9vuglK
+5uSfXZCFd5I7Bih+vcSWxWEGMYwDxyqr9W3TQqUCgYEAvs80BC9gPDCov+ylKLcx
+nSwoFCq42XGYHivJv0bC59dRJrvz6cdK1VlXpqtkvs1bc3VzQW9YigygutDIBtZT
+KbsXbKzd4zwOnSxeJGbyV+z0CiCj5tIw4Fo/kBOI2KltzZ5QADljcBNC+LqSsFAO
+De8GqbzbMOHVlH8bVef06Vw=
-----END PRIVATE KEY-----
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 25703d07d..8ae2b8508 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
@@ -4,22 +4,22 @@ subject=O = example.com, CN = clica Signing Cert rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.com, CN = clica CA rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert9.db
index 81edaa288..3416063ff 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert9.db
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.req b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.req
index 8807c73ab..f614d47a1 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp
index 10c49ef69..03ef26188 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem
index c68bdc062..0e4810b03 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.ocsp.resp.pem
@@ -3,50 +3,50 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.com
- Produced At: Fri Nov 01 12:35:51 UTC 2019
+ Produced At: Fri Nov 01 12:36:47 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 5af082e51d62fe01fd706baebeb878db64e68f76e74a36f36d914297ddee24b8
- Issuer Key Hash: 97790fb63575c6e69377256c8ad350b2a4066f4660f1460182f1e51484242a7f
+ Issuer Key Hash: 7cabdd19ba7a5f7685110c5356d2da5a4a5093357dd2b3508d3accbd49cae3e4
Serial Number: 65
Certificate Status: good
- This Update: Fri Nov 01 12:35:51 UTC 2019
- Next Update: Wed Oct 31 12:35:51 UTC 2029
+ This Update: Fri Nov 01 12:36:47 UTC 2019
+ Next Update: Wed Oct 31 12:36:47 UTC 2029
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109
- Issuer Key Hash: f0d8f45a4e6b3ab4652ef19a6bc57797fd8faa4f45e33403487a0172f6b6dd49
+ Issuer Key Hash: e5fd33f7390a423c4b8a39439ac0a7b7f407384572faadc482219bd0853e4c97
Serial Number: 42
Certificate Status: good
- This Update: Fri Nov 01 12:35:51 UTC 2019
- Next Update: Wed Oct 31 12:35:51 UTC 2029
+ This Update: Fri Nov 01 12:36:47 UTC 2019
+ Next Update: Wed Oct 31 12:36:47 UTC 2029
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: bfa7275a566efd4be2df82dbd9d1290d470186f6ff2acd8c16659f342ab56109
- Issuer Key Hash: f0d8f45a4e6b3ab4652ef19a6bc57797fd8faa4f45e33403487a0172f6b6dd49
+ Issuer Key Hash: e5fd33f7390a423c4b8a39439ac0a7b7f407384572faadc482219bd0853e4c97
Serial Number: 41
Certificate Status: good
- This Update: Fri Nov 01 12:35:51 UTC 2019
- Next Update: Wed Oct 31 12:35:51 UTC 2029
+ This Update: Fri Nov 01 12:36:47 UTC 2019
+ Next Update: Wed Oct 31 12:36:47 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIIC/AoBAKCCAvUwggLxBgkrBgEFBQcwAQEEggLiMIIC3jCCAcahLzAtMRQwEgYD
VQQKEwtleGFtcGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhGA8yMDE5MTEw
-MTEyMzU1MVowggGAMH4wVjANBglghkgBZQMEAgEFAAQgWvCC5R1i/gH9cGuuvrh4
-22Tmj3bnSjbzbZFCl93uJLgEIJd5D7Y1dcbmk3clbIrTULKkBm9GYPFGAYLx5RSE
-JCp/AgFlgAAYDzIwMTkxMTAxMTIzNTUxWqARGA8yMDI5MTAzMTEyMzU1MVowfjBW
+MTEyMzY0N1owggGAMH4wVjANBglghkgBZQMEAgEFAAQgWvCC5R1i/gH9cGuuvrh4
+22Tmj3bnSjbzbZFCl93uJLgEIHyr3Rm6el92hREMU1bS2lpKUJM1fdKzUI06zL1J
+yuPkAgFlgAAYDzIwMTkxMTAxMTIzNjQ3WqARGA8yMDI5MTAzMTEyMzY0N1owfjBW
MA0GCWCGSAFlAwQCAQUABCC/pydaVm79S+LfgtvZ0SkNRwGG9v8qzYwWZZ80KrVh
-CQQg8Nj0Wk5rOrRlLvGaa8V3l/2Pqk9F4zQDSHoBcva23UkCAUKAABgPMjAxOTEx
-MDExMjM1NTFaoBEYDzIwMjkxMDMxMTIzNTUxWjB+MFYwDQYJYIZIAWUDBAIBBQAE
-IL+nJ1pWbv1L4t+C29nRKQ1HAYb2/yrNjBZlnzQqtWEJBCDw2PRaTms6tGUu8Zpr
-xXeX/Y+qT0XjNANIegFy9rbdSQIBQYAAGA8yMDE5MTEwMTEyMzU1MVqgERgPMjAy
-OTEwMzExMjM1NTFaMA0GCSqGSIb3DQEBCwUAA4IBAQBS2onVfLE0BntxRqWabRmr
-kSTKtsMMTz4L3AfLvGSK/+t/zKBMls3urOzlCNMRFm2QyGVzgNrFcdoko6mi1STc
-MHPJgJ3w9DqbIzUXTzIDiRqSlxUvqUHW97UQLLQsx8VZ2eFa8oSrKU3K9JW7kprh
-4qUGdXUij2Tf5udowsIiVLE93Us3iHJkt+2HEt8I39/02tga8uulWSsKhEa6X9Rg
-YdnVo6MhARMzk6jSNq+pLBhhcCynIhdyMKuv853wZxh1mgHtKIoObGP7xXCXErgy
-2vjK0lD6cUQxciXUcmJSK2Nv/bKiMFmTkQ01jC6ePUD+E3n68NFIYM+B6OQmHJW6
+CQQg5f0z9zkKQjxLijlDmsCnt/QHOEVy+q3EgiGb0IU+TJcCAUKAABgPMjAxOTEx
+MDExMjM2NDdaoBEYDzIwMjkxMDMxMTIzNjQ3WjB+MFYwDQYJYIZIAWUDBAIBBQAE
+IL+nJ1pWbv1L4t+C29nRKQ1HAYb2/yrNjBZlnzQqtWEJBCDl/TP3OQpCPEuKOUOa
+wKe39Ac4RXL6rcSCIZvQhT5MlwIBQYAAGA8yMDE5MTEwMTEyMzY0N1qgERgPMjAy
+OTEwMzExMjM2NDdaMA0GCSqGSIb3DQEBCwUAA4IBAQCqHFWk54S7bHl3nfcHqpEX
+SZUEafxX7yQVUnqidHdF91TOSk6DGPwqpq2V1oW/tt2CAig+6uawOeMimebFsbkJ
+e58LV0BlNoB44yA07HBNiceTq5si4JmvdUxA/StyQUISTa8Dqz159UkbcCI+ICMm
++XzNkngM0IxAj92HklRcQoSd5Fu3wh4QhBnyXAWtu5R1oxjSNABQU540d6bUqdQg
+rQTBMVhClnYypw03FlMh0DMgxeNw1honcYq4jdOl8EskIi61+DJKwKP8RVI+5vuZ
+EhtcFaWM1JsdV4t2auP22NXGF4HEiw6y5S45T+x+sPS5oqASBEVyTALCZc/CxgEx
-----END OCSP RESPONSE-----
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 c404ee029..0ba4a4569 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,30 +1,30 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 20 FB 49 62 FE 8C 69 06 3F EF 62 B7 0D 83 1D 51 AC 41 3C 71
+ localKeyID: 93 E8 01 57 EB BA 1D 7C 46 73 A6 E1 B4 BB CC A9 CC B5 E0 BE
subject=CN = server1.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM0MjJaFw00NDEyMDExMjM0MjJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRd59UgzUc
-Uefy1vLKOqewCn0TJ8LGIiyK+d8adYtEWsl25ktLq/PR0Xo0EV91hfmH/qnVXbdL
-IxEw6wq+TlksJigXvXhb/EiYAFi2UDkUvlugT8Qod7djgDH/fOCZNazBGcGQsBca
-VGCooMGuggP43NO/h1SWl2XgMkuhWgrqhibO4pZf2tnr3V4D2YPfU6oWEWogZQZp
-bfc5YKC8Zwp1EWFA7H1SRhXeYPcACBVvOrQ6O5ASJYupgY5OQfpTvN1L/NxIWbtt
-AurTM4a6HNtyP3JyfcfzOVJ4DzI+lvvurH6YWkO0oVyNXS7eUGRWlVZ0Q1Ysc3iS
-fGbxS5Up6Tn7AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM1MThaFw00NDEyMDExMjM1MThaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0tC+GZbYH
+APMvfFmeL4VgXx/MqbROdsmVXENEVDIKsftXza/RoBgIwwWQiYGpZrE8i/Td0HwO
+843VWQBJ3jnomOgFRgRDiknWM2AqEshp5gSJRmGW4Qj7OSXYWsL/873aXGd3FjBU
+RpCuyX7dcccRob3Lk0E28MuevDA0e8lEPI9G0X76AgjePjYKlueRMfImXf1Vq3Uk
+Aksx/g5v6CF9Fm5UDflilEU+Fnjpep0O2nO62y5/Nv6P2zsksrFhMrM7kdfeTYDs
+GhY1Jfg9siUEJF1GdRB1HX50Fqs5Tx/ejjKPocyX/h6RMeV8Ztj6eHAeGMIGcz6A
+jiNjjF8lXycPAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBnggkq
-LnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CImFsdGVybmF0ZW5hbWUyLnNl
-cnZlcjEuZXhhbXBsZS5jb22CIWFsdGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxl
-LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAa7Nnbxs3g42Wb3agcUZu8xNGdyQBppFH
-fo9wKhLhv8Jwa7owVJSInc+g2rSu+IDZTVi1PyN43FWOycp6OLKo6E1E2bJvgEGl
-E50DyayINkbVsFR5SC2KU+x6dfnkz4hmKc3K6AEiVoy1BWLtWptet6+lOtVXcqtH
-ZQ6zgW/cFiiSX2Ohg/HqOyrE9/roFzLLtnj4fbyk1iZOb7QN0WMnr/iJz3seadJb
-PdMACk5At+p/lCNAiuDoAZPz3DUojtqSxD3/GLWTFH7CxHJZyqm5y8EXisa0U2ig
-CC9L/qmI2xWU89IEmaihjX30BccZ29DvoOhwoVsR29UCiKiPszI7FA==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2Vy
+dmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxl
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAGG/c1HxcsU2ZUohHpLsdEn1wzC3EPNOt
+XReDBokB3QpJNF3k/bntF+gSkNXT1RhSbtUEsxrQtghWa2WsDHoXcO2Wf5tD/s95
+kLrEwGYx+jvT1e/qZoyhxVeNaCL4gBeOrSGYccDKCcO77jnxEum5udxMsj0PpUum
+eSGXaJXU5XkAf90e5wb4vNiL2mIkWBrbo90/oVtve4RsdzQanJ2VGVAKg0EGvoag
+ux02IxuHjY17oKiV1Y27253hyfX/oYpW8Oh00/X0/HBZ9svmx5q3M1KhaD6ncfxU
++5J+5Dgnzk53sNtq5lWi0kNeW35ROFdgu2fzW+UmuRsW9T9BIDhnbw==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -32,22 +32,22 @@ subject=O = example.com, CN = clica Signing Cert rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -55,19 +55,19 @@ subject=O = example.com, CN = clica CA rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzQxNloX
-DTM4MDEwMTEyMzQxNlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALF/
-mibgvCGYwqApXnN7sD53QfZ0luIozEan/FsNmTXGyrH6HIJaPSlon1m2+njtEasT
-LKeFiL/hFTyVOVIscAEG8znPcFlVP1UJwPVQfH5OkFbyMp17Yiz/RHQQjEdjQuco
-Fxc6PPBbrdrh4iLP2YLfRGY4+Uvnop7nHHkCVhxptRZweZtCEyOaaOv5W5P3By+6
-qs1j6EiQdSbB/3MS0KJBckNqMeu4L93Ugak3EA2QIcX6FQKrEjTcTrHRwZfd0K9W
-/yjtkOKj6kzTApN7y/AynopqfWoHXRlRmVXG811aBe4FpRsLrpjcbIggiMSQHjU1
-nDZ6DnfBcbsPXqA9MFUCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAKZAhPL7t82UQzrWA/0hF5Is
-PricbvYbGepVy8eJHHymDZrO1fCOAR7Hco31+03SfFDDRid7yeu0utXSVvs6YHs9
-sG6ArM//zP4mUN14uOlSUXBbF1N0fi9/E64q9FXjC1vykocz94Lp7q+pb90sMr++
-UCjWyHgAH/skdMvYUs+N6spIOb2wzm6VXcPSQZ8rFC7WP2bIKpxR2xbMXRb9qcs2
-TrHJizB8J5rw7L1IIAjyiYiDVLPX98TKipyWgi5fUKWAHv0wnswHk+E6DyvRxEGh
-OLBE1Ob/0a+yuEm+Jf61exuX/u/yjl8EeZo58Zt8JU3amBynTigGYmrNWT9/N3g=
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/key4.db
index 946245e9f..c14c74d87 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/key4.db
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/key4.db
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 ff9ee49ba..d676270d9 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,47 +1,47 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 20 FB 49 62 FE 8C 69 06 3F EF 62 B7 0D 83 1D 51 AC 41 3C 71
+ localKeyID: 93 E8 01 57 EB BA 1D 7C 46 73 A6 E1 B4 BB CC A9 CC B5 E0 BE
subject=CN = server1.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM0MjJaFw00NDEyMDExMjM0MjJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRd59UgzUc
-Uefy1vLKOqewCn0TJ8LGIiyK+d8adYtEWsl25ktLq/PR0Xo0EV91hfmH/qnVXbdL
-IxEw6wq+TlksJigXvXhb/EiYAFi2UDkUvlugT8Qod7djgDH/fOCZNazBGcGQsBca
-VGCooMGuggP43NO/h1SWl2XgMkuhWgrqhibO4pZf2tnr3V4D2YPfU6oWEWogZQZp
-bfc5YKC8Zwp1EWFA7H1SRhXeYPcACBVvOrQ6O5ASJYupgY5OQfpTvN1L/NxIWbtt
-AurTM4a6HNtyP3JyfcfzOVJ4DzI+lvvurH6YWkO0oVyNXS7eUGRWlVZ0Q1Ysc3iS
-fGbxS5Up6Tn7AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM1MThaFw00NDEyMDExMjM1MThaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0tC+GZbYH
+APMvfFmeL4VgXx/MqbROdsmVXENEVDIKsftXza/RoBgIwwWQiYGpZrE8i/Td0HwO
+843VWQBJ3jnomOgFRgRDiknWM2AqEshp5gSJRmGW4Qj7OSXYWsL/873aXGd3FjBU
+RpCuyX7dcccRob3Lk0E28MuevDA0e8lEPI9G0X76AgjePjYKlueRMfImXf1Vq3Uk
+Aksx/g5v6CF9Fm5UDflilEU+Fnjpep0O2nO62y5/Nv6P2zsksrFhMrM7kdfeTYDs
+GhY1Jfg9siUEJF1GdRB1HX50Fqs5Tx/ejjKPocyX/h6RMeV8Ztj6eHAeGMIGcz6A
+jiNjjF8lXycPAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBnggkq
-LnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CImFsdGVybmF0ZW5hbWUyLnNl
-cnZlcjEuZXhhbXBsZS5jb22CIWFsdGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxl
-LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAa7Nnbxs3g42Wb3agcUZu8xNGdyQBppFH
-fo9wKhLhv8Jwa7owVJSInc+g2rSu+IDZTVi1PyN43FWOycp6OLKo6E1E2bJvgEGl
-E50DyayINkbVsFR5SC2KU+x6dfnkz4hmKc3K6AEiVoy1BWLtWptet6+lOtVXcqtH
-ZQ6zgW/cFiiSX2Ohg/HqOyrE9/roFzLLtnj4fbyk1iZOb7QN0WMnr/iJz3seadJb
-PdMACk5At+p/lCNAiuDoAZPz3DUojtqSxD3/GLWTFH7CxHJZyqm5y8EXisa0U2ig
-CC9L/qmI2xWU89IEmaihjX30BccZ29DvoOhwoVsR29UCiKiPszI7FA==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2Vy
+dmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxl
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAGG/c1HxcsU2ZUohHpLsdEn1wzC3EPNOt
+XReDBokB3QpJNF3k/bntF+gSkNXT1RhSbtUEsxrQtghWa2WsDHoXcO2Wf5tD/s95
+kLrEwGYx+jvT1e/qZoyhxVeNaCL4gBeOrSGYccDKCcO77jnxEum5udxMsj0PpUum
+eSGXaJXU5XkAf90e5wb4vNiL2mIkWBrbo90/oVtve4RsdzQanJ2VGVAKg0EGvoag
+ux02IxuHjY17oKiV1Y27253hyfX/oYpW8Oh00/X0/HBZ9svmx5q3M1KhaD6ncfxU
++5J+5Dgnzk53sNtq5lWi0kNeW35ROFdgu2fzW+UmuRsW9T9BIDhnbw==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-ggEKAoIBAQDH4/22rWiPmzi+0YENH2hU5H488P2jxPcKMrCTD8SVvBS3G+G1auz1
-FoH//iFMU/Q09ket3Z5cJs/GaCztU5ZxC3BQ89OOWyyQ0NXWFjMM4YrRwSJu3Tij
-bxz5E8zlc/Z+AJn/VT+3+WQ9MD+9u2+GHxfEHk+p9pI0ELrZWj2mH+lhH9QjcP5z
-SmeeiViO7fy+y35CtIbKP2uOXrjgYKHemkbTfa96psdkh4UGkEOsmvZhi1fOaqUj
-hu8eIsCWLPWBEjV/E/Od2RKfADNcyAKZKYdD4oa6hv7+XA8q6x8WOA389mEsXov4
-RUbqLBPzDZoMWYuB9Syl3kqKNP/zMjaHAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+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
-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
+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
-----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 2788337c9..01051487a 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,34 +1,34 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 20 FB 49 62 FE 8C 69 06 3F EF 62 B7 0D 83 1D 51 AC 41 3C 71
+ localKeyID: 93 E8 01 57 EB BA 1D 7C 46 73 A6 E1 B4 BB CC A9 CC B5 E0 BE
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQI3xVALI51v1sCAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDY34GxDHyLgbZ045LnlbJsBIIE
-wLGUeUGb3PxxaOYPphOdeP4xQdlUkiKeyN0eStb9aP1o2ZDFdUoehRB6nnhGQtmv
-7sfe6oLICIwxCZkE4RkWz2Wta+YGDr0avJJnroK5NW02J83iPYL2YfZ95bwnRzDD
-CbSfyiG1jFwklasOe75CIdsmsePmkWm2hzCTemcaK7nI2quXJj57ALSwOwhOFyWS
-ZHmw6BmeGMHUARgJ0aT+//CWlPN2WHBNMqXn8SVG31+RMTXftfw8XH6tYd5KWeZ1
-DUWCSj+osJjr0ISPsAuXMizd96WYT1/Z1mzkUSyMLZo3WXSdDicGXfn7Ja1jmGK0
-/rwvxWb7VSK/NMkmvDMa2utcNYz3j/HSV7/OdJBOtZBZwcG9KGx+iK8NaeHfTqgB
-xSHcPbZ811pMcRVUYVtkH71u+QVzkG/X++YvwWDZcrl8qFmTmE9dlpD9Z56vy3bE
-ja/O/9k5lR5kF3bUIVuqZmybb3xWGb2e43HwhZ3d8EtTW/s4P0wzjNG06oO12tqu
-l4Qc6uyo2VZnsmqKsWrEe8M8JFcDbcm3O3Dbm19egtb0xga1ZtTHrD+2JUEke244
-eKlB6eWrHCfZSTBcCtouE9TWNoQUYPcGNYVoYpjDUkcc9H/GV/p272yY6BsYZE+g
-gEVTiPseKVq8iI94cfIlzmHFLm1p8LEJ/medhooxx1yWGw3vqjEFUBBbyWyWvu2W
-mz866Xn7t/na9gjp8+UWedeH2CVTd2gyd77dW8o4t7+tW/OTgczEPWVYoXiMZeTS
-89wQ++nO9oBE8K1HltA6H/YVI936kThiV2g9PsnNDaRq4bXmyJWnzukLB7xWat15
-bcg9DXyvrdrSMBT2UBsUUP7vN4yMOf2CeyuQWP+5OclPDOwwdXdPOr3NmWOve3b4
-34qOh5QtYFG8cQLutst2BM02C97jqCFWuqhq3hZyQUASDnPF1X1wQBv6Kw4tFdGp
-ciffgmIxIuF4hbL4jQZ+GvKU+leCvmRxKXYwrlncjm1z133PwkA1Btvv8YzAaBkE
-GP3yQkxTIU8waod3LgEKxu9+OWOSKVq77qwT73QQTXwH9F7wVO8mgN1Q0uiikEOm
-kjFFgA1zVrqsbMJTc+13M2XEPmgozQjTeUxBkpC4OeGG/e/4I33riLww1Ilc8g0G
-dEgAb4lQQ5ybtD2RNxuMZPKGXNPNl8giL+cFvoE8do58Wmg2WmpOlOU6HJ9NRyly
-fOh1UEf0L1d9EO8JavUhyUfyVRk60lJVGGYrlVshNt+xACkL+38fBlT5ztoMuwqI
-kG2vKnREGu/nUeW0QIX8ztmcktYfUL36Kze/XbpIl8D8YaMkZIYpw4zrEARrIBEN
-NJlhw3xLHXR2Qvry3xr14dXwQLMbk2JRAb7aM6zLRwF+xYWA16PbgMPf0fcBAVX2
-MbfXx2SR5HXFFkVkrwFTLPqrYZWIpeZqMTgc0YgM+3M2bRSEiTMiFSmQwhwUETIK
-qAvqtcgE5LJgAvIYMwmjCkmQeeh5NgSmgyAzipnvEVYRL3ABuRyXeU23r9N7DFy3
-UM5bfxePMzWElAqKJfrtvXotYIXfcjXiL6IQPQqxjaH2FVHLcZ7wUTwUU8pGykDT
-tEPqC+v54YdVfqNPhtKO3hQ=
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIJnqQEUQOyw8CAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBBrRP6lxcSaQMQ3xbfnsyF/BIIE
+0AOQL2Tw5CWz2tN6tw03ywrGcqtTu4QC2ADH+7ol7yZGDFuRDgPEirnA5KFBZrAl
+t1SYYEKptTw5d9N1WxnkOP/p5W3Oo56XR++gnvcA0xLegVttKgsImYGjoPOBkjmE
+od+1Ww4rtYwN7HpGlKmTypPLNYFHBgkRDIDojtitKSBWs9Ha33I+MfFCoyX7cuRC
+EOSMvwk7nBVY7OCBeEPyUsLdn0ys22zf0w47FXYNcWtGQhk/ebXkuG1EgpRNCJ68
+ngQQuAHfg2BYzo9OvZecm+FUpYbGEhipnrWi7AUPt/tIPD16yDFy9IOZXsQQ5BF7
+HEAAu/AU/A7yAv+CmhONLrIdTQhwaNRinilVyMYnRDv4tqRhy7s6EVgyIfL69uSk
+0LJB5LL+QMRjdIkXdoMK36VG0eGtoqAyqlWIuM0taOUQozctexAdYsU5689fdpTw
+3NvjzE8y9YW3SKgLRtWZMq/0Np/o02yzn04/Z4P31TNxhGOq9hyr5/AULB7X5sUP
+xJKMaLNuRteSLY383UIUNA+rX5YKCsxpyzFLytIZxbgVsN7qhGsyy92xD4MJr3JP
+zLeMjsuKc43/ZyUg0MiTQIAjzXGn0VOUQO4BKVi0BGWobXlB6PGibFCPKLkKe0BW
+WdJFAhbGmDdjuVqJpaeuqsWofOx7c9E0Z8fHbbat9LBaQ/zG3NhKlOtfNlGGebhw
+yaETJ6PeirVP6eUoISciCQp0oGQhN6YMrLBQx4f1JgZ6CeNbREAk7zUESzVJbcgU
+aKPdkYU6BhETv4d3WPlMDOy0oCJ1/rkAe1WdEujmPaHc8Vy5dw4YBHLmibGMKhSN
+lV+bYdRGTZzNnddrnhvjYBly2aX1DIgB5aPJ2aK8gbWob3/eemFe5x73Qn8SwsDx
+xk3FktBGP25+7/Qxqti1SuLbV8mcSF6o3BihQNPRljCg9Cs3RODQMtsxEnsAW1yo
+rjQH8IIVvC3ksaqArhmxqozrSgMdk/nTu/u9Z30T+YwVjO6Ig4zvqwN5i5CT9h3b
+cY5PwgxPBkQKze33JaOJ+FoCC/9ZyRCC6HYB+wGSLrzYI76IE43UfvHiNmXFkQhY
+/u/NCclAf6NgeRVw7RkLw0CnLSFJ++Eet+1a56yxOTcuMB0/qeMq90uGpW/IuiNe
+rnX63kshkwxzWUblAS0BcNmrX5MXu4pojIM2uSwkYbTcU0osiiwmrvMI1oPcDPk1
+w69Noj91GBLR/bP0tRNQjHFUMYwFMFPNUbqwu5AVVsLcGhVWY+jP4t7K9oR8+LYe
+k183IpA3lC11EsRpvC3hLrqC5p8wn6ibjQWMrTzSDapCiZWzJ08tIOWq/FBwapuV
+lK20JkftaXiDy+FpYUtOs7p5pfm3pSjclkhO8I/aWjhxg1hbiieQs6YsXdLuPyz7
+3N+JcK1eZNt5dzNORJ0ritQjy6yjnODkmipqlHpzFmsVJu9L4pr/ASsZmgL/Y20y
+gOUG9lBPVkVF1IW0YNTfTnaGM3AyeKJorx3BvmAn6kmBH+uSvSLEZUnE+V7kyArA
+GKbEGuFreKbNKWImkPjeiVv3Wb6kNiW4zPqP3lvJpazJT2eiJw8P/cpeHl/KjUOG
+PEXRmy148ss+0r/0LOq1H1KxmpYn5ACewLciC16a494a
-----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 a9a011042..23137dbfe 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 765c5f05f..5f5786d16 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 df875208d..b10a7cbca 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 c95437990..f3928404a 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 b52e6590d..aaf1d1687 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 e05e5bbb4..c103fe55c 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 3bac1661b..da545e347 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 295ccac4d..399f6154d 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 0891b70e4..a96c2a200 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.good.resp.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp.pem
index 7119493e7..c80b300ea 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp.pem
@@ -3,29 +3,29 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica Signing Cert rsa,O=example.com
- Produced At: Fri Nov 01 12:35:50 UTC 2019
+ Produced At: Fri Nov 01 12:36:46 UTC 2019
Responses:
Certificate ID:
- Hash Algorithm: SHA256
- Issuer Name Hash: 5af082e51d62fe01fd706baebeb878db64e68f76e74a36f36d914297ddee24b8
- Issuer Key Hash: 97790fb63575c6e69377256c8ad350b2a4066f4660f1460182f1e51484242a7f
+ Hash Algorithm: SHA1
+ Issuer Name Hash: acc6dec2b3847811a95ff3a3b52d87156784085c
+ Issuer Key Hash: 9b5bead2c467a52b4834bb3b04a9655c4a6536da
Serial Number: 65
Certificate Status: good
- This Update: Fri Nov 01 12:35:50 UTC 2019
- Next Update: Wed Oct 31 12:35:50 UTC 2029
+ This Update: Fri Nov 01 12:36:46 UTC 2019
+ Next Update: Wed Oct 31 12:36:46 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
-MIICBAoBAKCCAf0wggH5BgkrBgEFBQcwAQEEggHqMIIB5jCBz6E5MDcxFDASBgNV
+MIIB5woBAKCCAeAwggHcBgkrBgEFBQcwAQEEggHNMIIByTCBsqE5MDcxFDASBgNV
BAoTC2V4YW1wbGUuY29tMR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNh
-GA8yMDE5MTEwMTEyMzU1MFowgYAwfjBWMA0GCWCGSAFlAwQCAQUABCBa8ILlHWL+
-Af1wa66+uHjbZOaPdudKNvNtkUKX3e4kuAQgl3kPtjV1xuaTdyVsitNQsqQGb0Zg
-8UYBgvHlFIQkKn8CAWWAABgPMjAxOTExMDExMjM1NTBaoBEYDzIwMjkxMDMxMTIz
-NTUwWjANBgkqhkiG9w0BAQsFAAOCAQEAhXtOnQCXKw4dXBT4423/mE37qO3x2SiZ
-unnUrJ/Abre6ZkK+qyEJOwAU7xs5hd24XUTWd+j5kUZX0GjtQlAhERbXc/Ap21Tc
-+XzkcrExtyOgxpU+3k/guw8wak3mCC0zDHIQ7VGSGeIbrU7YBd3phDLDYv03BrIv
-BtX7R1RO8V8Mi5NOGVU2R6H4E6nx3ql1ihHKY4xnoVJ26Y+4KsFJo6p9oIXOXPly
-WGzyiZbgVEeLt9mTJ4Qg9TJbzbHdlXQpPCmHx1G5QeSUx4DTJfhRmSkaiGVKJRBN
-GHbhqxqoxfMxT8eIuxVk4RughcXiHcDLG+qfWtx477Ruwa0E2yPIBw==
+GA8yMDE5MTEwMTEyMzY0NlowZDBiMDowCQYFKw4DAhoFAAQUrMbewrOEeBGpX/Oj
+tS2HFWeECFwEFJtb6tLEZ6UrSDS7OwSpZVxKZTbaAgFlgAAYDzIwMTkxMTAxMTIz
+NjQ2WqARGA8yMDI5MTAzMTEyMzY0NlowDQYJKoZIhvcNAQELBQADggEBAMokvzDq
+2T0hX38pxqtf3ZBwz6DHus0F9BLp/jxJXygP5OE/pWKFPHfUrkvIcetISzU7XAEc
+F3SEj+Y5knjdCEZJ2/cVhel3Pmm4bgA91EAkcN4PMO5uYEdA/xpB5NDgd5wjz8X4
+wkgEyC8quxt6cPUXLb6NA/DDm1Dy3D/8ojJkOmUH4SqKVRnTaww/v5XnRC8T3PqW
+BEAmBFUDs4Mrg6ZN+Cnrdh0Co8RG3gt4E6+94Eu39TIBMFhY1GGFxk54x1HVbYv4
++bOoJh/WeASi6JBnHNR5uvROZi8pwOSio6i6KmYLmRBsDjPUvZcdoZ78ZX+c75EZ
+hXWOALJ02L4n5vc=
-----END OCSP RESPONSE-----
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 5ebed9856..d14e04517 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 d66bb8480..235052ecb 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 565ad62bc..2e58a1514 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,28 +1,28 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 20 FB 49 62 FE 8C 69 06 3F EF 62 B7 0D 83 1D 51 AC 41 3C 71
+ localKeyID: 93 E8 01 57 EB BA 1D 7C 46 73 A6 E1 B4 BB CC A9 CC B5 E0 BE
subject=CN = server1.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM0MjJaFw00NDEyMDExMjM0MjJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRd59UgzUc
-Uefy1vLKOqewCn0TJ8LGIiyK+d8adYtEWsl25ktLq/PR0Xo0EV91hfmH/qnVXbdL
-IxEw6wq+TlksJigXvXhb/EiYAFi2UDkUvlugT8Qod7djgDH/fOCZNazBGcGQsBca
-VGCooMGuggP43NO/h1SWl2XgMkuhWgrqhibO4pZf2tnr3V4D2YPfU6oWEWogZQZp
-bfc5YKC8Zwp1EWFA7H1SRhXeYPcACBVvOrQ6O5ASJYupgY5OQfpTvN1L/NxIWbtt
-AurTM4a6HNtyP3JyfcfzOVJ4DzI+lvvurH6YWkO0oVyNXS7eUGRWlVZ0Q1Ysc3iS
-fGbxS5Up6Tn7AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM1MThaFw00NDEyMDExMjM1MThaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0tC+GZbYH
+APMvfFmeL4VgXx/MqbROdsmVXENEVDIKsftXza/RoBgIwwWQiYGpZrE8i/Td0HwO
+843VWQBJ3jnomOgFRgRDiknWM2AqEshp5gSJRmGW4Qj7OSXYWsL/873aXGd3FjBU
+RpCuyX7dcccRob3Lk0E28MuevDA0e8lEPI9G0X76AgjePjYKlueRMfImXf1Vq3Uk
+Aksx/g5v6CF9Fm5UDflilEU+Fnjpep0O2nO62y5/Nv6P2zsksrFhMrM7kdfeTYDs
+GhY1Jfg9siUEJF1GdRB1HX50Fqs5Tx/ejjKPocyX/h6RMeV8Ztj6eHAeGMIGcz6A
+jiNjjF8lXycPAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBnggkq
-LnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CImFsdGVybmF0ZW5hbWUyLnNl
-cnZlcjEuZXhhbXBsZS5jb22CIWFsdGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxl
-LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAa7Nnbxs3g42Wb3agcUZu8xNGdyQBppFH
-fo9wKhLhv8Jwa7owVJSInc+g2rSu+IDZTVi1PyN43FWOycp6OLKo6E1E2bJvgEGl
-E50DyayINkbVsFR5SC2KU+x6dfnkz4hmKc3K6AEiVoy1BWLtWptet6+lOtVXcqtH
-ZQ6zgW/cFiiSX2Ohg/HqOyrE9/roFzLLtnj4fbyk1iZOb7QN0WMnr/iJz3seadJb
-PdMACk5At+p/lCNAiuDoAZPz3DUojtqSxD3/GLWTFH7CxHJZyqm5y8EXisa0U2ig
-CC9L/qmI2xWU89IEmaihjX30BccZ29DvoOhwoVsR29UCiKiPszI7FA==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2Vy
+dmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxl
+LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAGG/c1HxcsU2ZUohHpLsdEn1wzC3EPNOt
+XReDBokB3QpJNF3k/bntF+gSkNXT1RhSbtUEsxrQtghWa2WsDHoXcO2Wf5tD/s95
+kLrEwGYx+jvT1e/qZoyhxVeNaCL4gBeOrSGYccDKCcO77jnxEum5udxMsj0PpUum
+eSGXaJXU5XkAf90e5wb4vNiL2mIkWBrbo90/oVtve4RsdzQanJ2VGVAKg0EGvoag
+ux02IxuHjY17oKiV1Y27253hyfX/oYpW8Oh00/X0/HBZ9svmx5q3M1KhaD6ncfxU
++5J+5Dgnzk53sNtq5lWi0kNeW35ROFdgu2fzW+UmuRsW9T9BIDhnbw==
-----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 1ae8f13bd..0bb13c0d9 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDRd59UgzUcUefy
-1vLKOqewCn0TJ8LGIiyK+d8adYtEWsl25ktLq/PR0Xo0EV91hfmH/qnVXbdLIxEw
-6wq+TlksJigXvXhb/EiYAFi2UDkUvlugT8Qod7djgDH/fOCZNazBGcGQsBcaVGCo
-oMGuggP43NO/h1SWl2XgMkuhWgrqhibO4pZf2tnr3V4D2YPfU6oWEWogZQZpbfc5
-YKC8Zwp1EWFA7H1SRhXeYPcACBVvOrQ6O5ASJYupgY5OQfpTvN1L/NxIWbttAurT
-M4a6HNtyP3JyfcfzOVJ4DzI+lvvurH6YWkO0oVyNXS7eUGRWlVZ0Q1Ysc3iSfGbx
-S5Up6Tn7AgMBAAECggEAYNTDuvXMn4Ldjsz+/62NxzuSBkDjMWSq4rQQBtM/xiGR
-8H0VYa3j0KLdsyQ01MdSSyPWruPbz8guMkb1eHQPlPEup4rXEO7XQC0o1V7QhF5b
-TQiSzYJKLJ0ef9TinvDJI5sceB5vD6Th6hImdt1zqJ+s42VUHSlv1uxpOfW+BhuX
-yrpMHGLHfQMqJa9RTEYYS10adKxCs9ys5FeOM9ss+uW1AXj9FpJDfS1QhRIlba2g
-z0oiqbvXzarhauluv90dM6MNQGpWlUeS9U67h+r/5LIx6Nh9Pxwmb4mqCAz/i6B1
-Ecnx9rBwjyrRFmbQ7lAIjyVBkOEwHZfqycg5bIfkQQKBgQDpGSKPF1OkZ37m31u8
-mtzSN0JUYqzpiLeSCRous+mHBfhEKURDkWAfhYPg66pXVdlQWfXu/IcHE5MYkAgI
-widNRv71/2rFuuulVaifhQl8GVeTU1xYynCphc/UWmi1wTHfefRB3AbbInkSsY+V
-6LZtphQEMOgKNPh3jFOGvJmCVQKBgQDmDB/2U7EFQK3m8ftjHzjQ0+E4Vk1yHrTm
-1g9DObDzH/vYAzD97ndIwYBKlZggqTTsHY9dLoIuP4QzckmuKS173lKYLY8couWE
-HTLhm6MF+6sLK8Bgj6ijcIXcJy4kcKxNK0Av8ZhZRENbGY4/WExc4Ylss0Hfzs/p
-+NoD1107DwKBgFBsz7O3RLCw1OQrpKdKd25Aiq467ZYWCeBlK5d5k9V2hdZetqLp
-gdTeaEYuibNgd351y5kNoDkc09/hsiPzeUP8fvO5kMlwWOXOzENdz4v14nV+iZpJ
-Ht4ewTpvhzlO0zpcBZ7Dn8nz9vowMW5zwJ3Mc5OOnEEJTcFRtXADmqORAn9cjoRN
-l16hvmQ5hyKdvvIdEyKKiC6gu7oNJhL9+Tg4maW6Q45ynH9hxnjXiViry2h/l2UX
-GJ9H/EY0bMc4S1kBfXG9yJbL7r5paVYPb48n2Rn4ZKICN8qh96Pj79+gybSJV917
-bLjfMZfoD2AsHFqdBCFGmtjmM09z06vj38KjAoGBAJSQZ+XQyZK0EueIWH3qappw
-DOq86synsoWko27FW5M2T3Q0MrB3Bd5m7DuUYS7kxs5gvQ4/YU/zqvQbgU4D4r/M
-rXwce2QCkiJdxW764EuoiI6lMhOs61sXbIy5ZtHqOQkMOn04NiwPRROXM7ND1Vgj
-6YrdCAH1QHYjJCf6vUXK
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD0tC+GZbYHAPMv
+fFmeL4VgXx/MqbROdsmVXENEVDIKsftXza/RoBgIwwWQiYGpZrE8i/Td0HwO843V
+WQBJ3jnomOgFRgRDiknWM2AqEshp5gSJRmGW4Qj7OSXYWsL/873aXGd3FjBURpCu
+yX7dcccRob3Lk0E28MuevDA0e8lEPI9G0X76AgjePjYKlueRMfImXf1Vq3UkAksx
+/g5v6CF9Fm5UDflilEU+Fnjpep0O2nO62y5/Nv6P2zsksrFhMrM7kdfeTYDsGhY1
+Jfg9siUEJF1GdRB1HX50Fqs5Tx/ejjKPocyX/h6RMeV8Ztj6eHAeGMIGcz6AjiNj
+jF8lXycPAgMBAAECggEAQRlqh0upyGU1TQ283btwtTm5QP5ozHMHn+eisZvgkD3X
+Sv2aZ586paIUaeZbC1EZl6z4IMalKmka84Yw8HXhXALJvxVobvtsN0MFs0u564pY
+7Jg/wB7v/72tVsiWlfcnK99nWyQZCWKYfRd327u4JPWtg2oScGZRFVKlVGEWI0Of
+/bF4WQsuhow6yKFJaLeR5kqnrE/3y9ekzJPTxi727st62Bfr5CSkqpcT6E7yIpeX
+DvMtrsXeNLqSiEe5OrsXP29wWFkk9JCzLMLFIa9RVxYSYm131DulNAuvCiCWgaq3
+1jYYSAYstH5ihlqN0yBHUuXpPVOS3Vp7dO5FwogDCQKBgQD+cIqRmuWMuTROM+DJ
+WxGK/uXWsFUDzLxyGJmC6VY1y8X9m+rEgmJO78iix+EzuAdzdvYIp8mrlhr4YABs
+UpC7gZIgPsLfC122p/1y+UygpK0goCAsjLCLWt1ZyB0vQ2FGEMWTl5L3lQbrdPBY
+jYcmUH/pWv+h98E5Spvcwdy4PQKBgQD2NFwR/5M/jSzF7Dxdd1lojRU+/a0wXvXY
+VRmJ3cbdwwucd2641PgsFjBf9LcUXDAGDp8OWWiU8CMHvpHbTYBFL9mh7Lkz5Bax
+X6Q2cQqRzVGY4bZWmiDXNIV+K3DrzRC9UduGe48hP7G1Z3W8SxTuqZczKIKoqefg
+G1n7jn2FOwKBgA+faWK3WBDj7ko+9TZn2RPnwsUD3rR1Bb0btZFMMnbrJCUGRcv7
+FX4zSuZzz2gVjJ+SVlkBtGhMtys4+c2s5CYfNpG0SNLZJ8/nULCWjhXvBpJSQqd5
+m/1yftTcbK5SPM7IiNkfHW8GP36Fl5xYVEwN9Uymwbt4Mu0Jn7hWTu8hAoGBAJlf
+QMPNjHMYhP2/DlPDV6UzzjpxWQQ7A7eCO+iQiaP4LzGHjSgDM55zLCt6jNpYG2qK
+jTcpJ2cwuQHIC6CsBO4UwuSGTVEwE5rnU6q+fLEbUGuGoEoOtcqaY1aXxT5/fqAR
+cEm0ixNRVGkHTGbB9wY+C3zJDav4PAR1xXZZ64OlAoGAfSHqNfjQztnqYKV5xVF0
+vaDz7tzhoFBK1xCzcYe7PN/CqS33eUubIFfvNCvopJa78QjTNfFz+b7MXU482FG0
+BDSUdfSOccvWDFCvDyzq73I8GgTRMu1V2Q9bEEahvKcVyrR4neZPXzCIZGORwc4K
+3bM58TsbcGdEd/JC4a//J+c=
-----END 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 25703d07d..8ae2b8508 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
@@ -4,22 +4,22 @@ subject=O = example.com, CN = clica Signing Cert rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-CSqGSIb3DQEBCwUAA4IBAQBkat2W/o27LourC6zTj9LSavxpPrY2JQ0szQQiJFVN
-G7NKu6hg3fAnwKls25aG8u0aa8wi5iqj4fOmg/XzrtFA+u3k93vkiLm/K8uGX94R
-v7SNu3sppeLaM/JGr3ov8X92D1zV7sasQhMhpLJMzlhZTpx5dHfM/clke2KxOO7P
-MATCFI9vAWhr937k/UzEhUnRgEDcxUep/edoKnXzNrBHf4q7dFpy9X30gxUXH56A
-GWfKye/9qhw8/OvwH0lX8Jc+89N4uHmRudCmsjBYcnDlBOR0rUoPj0cG75kj3rH0
-jIgRIHHcWR6sd/TQGXlfUnTjnVlW3HC020Dej3YmuYzs
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.com, CN = clica CA rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzQxNloX
-DTM4MDEwMTEyMzQxNlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALF/
-mibgvCGYwqApXnN7sD53QfZ0luIozEan/FsNmTXGyrH6HIJaPSlon1m2+njtEasT
-LKeFiL/hFTyVOVIscAEG8znPcFlVP1UJwPVQfH5OkFbyMp17Yiz/RHQQjEdjQuco
-Fxc6PPBbrdrh4iLP2YLfRGY4+Uvnop7nHHkCVhxptRZweZtCEyOaaOv5W5P3By+6
-qs1j6EiQdSbB/3MS0KJBckNqMeu4L93Ugak3EA2QIcX6FQKrEjTcTrHRwZfd0K9W
-/yjtkOKj6kzTApN7y/AynopqfWoHXRlRmVXG811aBe4FpRsLrpjcbIggiMSQHjU1
-nDZ6DnfBcbsPXqA9MFUCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAKZAhPL7t82UQzrWA/0hF5Is
-PricbvYbGepVy8eJHHymDZrO1fCOAR7Hco31+03SfFDDRid7yeu0utXSVvs6YHs9
-sG6ArM//zP4mUN14uOlSUXBbF1N0fi9/E64q9FXjC1vykocz94Lp7q+pb90sMr++
-UCjWyHgAH/skdMvYUs+N6spIOb2wzm6VXcPSQZ8rFC7WP2bIKpxR2xbMXRb9qcs2
-TrHJizB8J5rw7L1IIAjyiYiDVLPX98TKipyWgi5fUKWAHv0wnswHk+E6DyvRxEGh
-OLBE1Ob/0a+yuEm+Jf61exuX/u/yjl8EeZo58Zt8JU3amBynTigGYmrNWT9/N3g=
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert9.db
index aa0491393..41a1febc8 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert9.db
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key4.db
index 0c566e486..35152ac18 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key4.db
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key4.db
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 2bc35bdf8..7c1f97c1c 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,44 +1,44 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: 18 4A 88 86 B0 75 BC 95 0D 94 96 BB F3 D4 AD 90 AD F5 0D 86
+ localKeyID: C6 FA 99 64 B9 2F AE 17 A2 74 E3 8B 4F 24 93 1F 60 54 ED 28
subject=CN = server1_ec.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDLzCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzODUyWhcNNDQxMjAxMTIzODUyWjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBBfBNd67rlpKl
-jmWa5ufBFu2AOCbAG+T06kIniKoT7w2csA9Z086hwqqQSM8e41z4ILzYGXn1w4tJ
-kraSM0lEjGMBgtm1HbiGiFTEtoTliBG03ubEzNWLO+i0JHZSbb3ndB+hS36ZtCwG
-8G2a/LAiVxmCYDymLwM9VaG/GbyX7e+LL2OjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
+MTAxMTI0MDAyWhcNNDQxMjAxMTI0MDAyWjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
+LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAjT6lwvKeMJXg
+QmiceJ1/8F0qdj59CnboIFjqshneuiH45D8d+y7kvYN7omjs1yCVpaP0ra+p1LdF
+locQDkqaZ5IAv2bQDeMcYLG4T+d17o7b1ljUZPPLbgbvb4zbKZMeekrFQ2uQKLoD
+dwowyTWbjYe+nt2hjX4EkkqsWKBXA5j96q2jgeIwgd8wDgYDVR0PAQH/BAQDAgTw
MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYIJKi50ZXN0LmV4ghNzZXJ2
-ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCkPLyYpaWxAoyeovwS
-TnzZ1tccBV+EyE1VFE9lw68DxuvJgbyDudrSHwq2puVHoXbQKPM0KEPD8GTO18rQ
-HWrDRvxFpcQgBgm+9Vo+Nyt+Bb+eVacjqeoXjrCnUe2MXGRiZNPwXelNvEshe022
-/BiKvqiIvg0jTyAf4hlSHr2PuDiiqboeFLMQuqyIFQjBZovHh0XWZ8BRnr1/ccDt
-ceGdEteFAT8/2Y05KaTbH1UuY5CpqY50B+fN2Tum0R73HhHO3OKSyoIqSaIbYRGY
-g+vazyMTCjfKr7RCrxNWkmyTRwBoFHdXbCmOnGnl7FZb04uzL2/Tevfye1vDFiij
-rjEj
+ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQDOewDEMI8gQejTMLk1
+y6KytupJJM18NqrxvnX8NXGEgHYEh9rsgnroNFTvO2Z8Jv9n1QvsxbbaIxS9ROaz
+EqNw31iLWROqftF5/Gz3d5pgCOe+YhL6a01ulsJP22lfkO7Sdw0kTLdwAqJIuX6H
+YAwBL1SUY9Xp33+gnSRRkb0eHj3irSOtyTXC1wsBr76rqggZlJamGqPOHMfkdOX5
++gswQLP6jRmFbeKOjt6Q3s+FAVJVUDo5RaVCs26EeLnxp1OE73tMSE08EBNHhgeJ
+HxicnRUGQlLyoNlvyWertUWa232Cfi0vglxZee0un7W2isGBGCsKgLbuY9jE8JTH
+b3+E
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzQxOFoX
-DTM4MDEwMTEyMzQxOFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+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
-ggEKAoIBAQDH4/22rWiPmzi+0YENH2hU5H488P2jxPcKMrCTD8SVvBS3G+G1auz1
-FoH//iFMU/Q09ket3Z5cJs/GaCztU5ZxC3BQ89OOWyyQ0NXWFjMM4YrRwSJu3Tij
-bxz5E8zlc/Z+AJn/VT+3+WQ9MD+9u2+GHxfEHk+p9pI0ELrZWj2mH+lhH9QjcP5z
-SmeeiViO7fy+y35CtIbKP2uOXrjgYKHemkbTfa96psdkh4UGkEOsmvZhi1fOaqUj
-hu8eIsCWLPWBEjV/E/Od2RKfADNcyAKZKYdD4oa6hv7+XA8q6x8WOA389mEsXov4
-RUbqLBPzDZoMWYuB9Syl3kqKNP/zMjaHAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+ggEKAoIBAQDPKciMVG4YnWPq4UAupPHOTXh8rWhYeOSHxJWLIvw0ZchJl5S/3YqX
+kD4WqFugpHj6JC9HirffLhPfdfFRM83U8O+RHTdTfAX6avCLijWzvXoWzqUe93j5
+fOM4M3Iyy9Dvyc2tEsg6qiI54HaoIRgEcPA3DsXFtvAX+LiSMbpxjxWNWt6OxvLy
+7mYYZJn4tWq9wuWq1l9kShSGAMvsSU1PNv/NK0SUPhDgh2PVCzUzc+I1ETZ5yaBu
+XiBRIDobsaDx62TB9uuRof6mnqTgOV6PuXb5Pma0Y95CuDNwZRBONzDqrwOpsU1Y
+ruQTVmfLLo3RP5CbgDQpKvG7x/MMukGFAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-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
+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
-----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 d0e0d827f..b5e1f7912 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,14 +1,14 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: 18 4A 88 86 B0 75 BC 95 0D 94 96 BB F3 D4 AD 90 AD F5 0D 86
+ localKeyID: C6 FA 99 64 B9 2F AE 17 A2 74 E3 8B 4F 24 93 1F 60 54 ED 28
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBXTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQItyEBrgNU4HACAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBAaAAglWZ/+R7sGTPA3PIxpBIIB
-APgx567M6LvSrQkv45ea6VhT8ldtcUHXrutxjY/Pdf9E0GXE0GSXgAV5VXyehtfT
-+bJjgQHSUMBQ+c9Tp1QdHOjr/DFTmBRo5p8A8djw7CbVA8l0HpDmRoeiLZyx2ozV
-rSuXVTBIzeWxwxlGa/bJL9gFLzIsaCvfgAAUi5WyX9HaXlZXNiwhchi8YpvENnfh
-mVj3krD0JOqiw+boH2TFRf+WRsm75EVHQdfBEQR/ag1/MR1vpvm4jklf6jXvCL1K
-a2P2g3TTD7cY9bVBykFZkTQO7prhz/OS7XYK6n0aLXnWbJYKGs4ZUOknIJQhZFnp
-HDeuBlC4MS+5wdkwm0tB+0M=
+MIIBXTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIJi9ZNhR2wgYCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBBOZEz8jaovcxy4t3Jh2eCWBIIB
+ALiNmine39sJmIf5rL4dQTwKXA3cxhBA6RJ7IRyjet0Ezd/C73DEVFLRMW1iYFFm
+KWq5H1UQiYCRA/lhV7mgJcX+Ygf+294/GoBcWVEyWFm+1Ntw++LzsU8yEcLuVB71
+ISGAAV91N6vPXovYJVUomCY9c+3maFViHcjykAbBsvWbo9/vSO/1IQXcAgcrCkNm
+ZhDe3ryIFYuHh55qZjpsm4a0R15J7fgokkpV+pKsyh3D9JlhusDm0gVOGvAR9dcE
+1nv0n5ntWsuuMAPbZ5cI5MHvgwvurxJZa0Fwm/es6Q2678JlJDHZ8Nzo9Q5wMwdT
+ZPh5HhMYQJ0qzEwkZty+Xi0=
-----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 6fd9333a5..847fdcbd9 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 b698fb166..ba45228ec 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,25 +1,25 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: 18 4A 88 86 B0 75 BC 95 0D 94 96 BB F3 D4 AD 90 AD F5 0D 86
+ localKeyID: C6 FA 99 64 B9 2F AE 17 A2 74 E3 8B 4F 24 93 1F 60 54 ED 28
subject=CN = server1_ec.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDLzCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzODUyWhcNNDQxMjAxMTIzODUyWjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBBfBNd67rlpKl
-jmWa5ufBFu2AOCbAG+T06kIniKoT7w2csA9Z086hwqqQSM8e41z4ILzYGXn1w4tJ
-kraSM0lEjGMBgtm1HbiGiFTEtoTliBG03ubEzNWLO+i0JHZSbb3ndB+hS36ZtCwG
-8G2a/LAiVxmCYDymLwM9VaG/GbyX7e+LL2OjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
+MTAxMTI0MDAyWhcNNDQxMjAxMTI0MDAyWjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
+LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAjT6lwvKeMJXg
+QmiceJ1/8F0qdj59CnboIFjqshneuiH45D8d+y7kvYN7omjs1yCVpaP0ra+p1LdF
+locQDkqaZ5IAv2bQDeMcYLG4T+d17o7b1ljUZPPLbgbvb4zbKZMeekrFQ2uQKLoD
+dwowyTWbjYe+nt2hjX4EkkqsWKBXA5j96q2jgeIwgd8wDgYDVR0PAQH/BAQDAgTw
MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYIJKi50ZXN0LmV4ghNzZXJ2
-ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCkPLyYpaWxAoyeovwS
-TnzZ1tccBV+EyE1VFE9lw68DxuvJgbyDudrSHwq2puVHoXbQKPM0KEPD8GTO18rQ
-HWrDRvxFpcQgBgm+9Vo+Nyt+Bb+eVacjqeoXjrCnUe2MXGRiZNPwXelNvEshe022
-/BiKvqiIvg0jTyAf4hlSHr2PuDiiqboeFLMQuqyIFQjBZovHh0XWZ8BRnr1/ccDt
-ceGdEteFAT8/2Y05KaTbH1UuY5CpqY50B+fN2Tum0R73HhHO3OKSyoIqSaIbYRGY
-g+vazyMTCjfKr7RCrxNWkmyTRwBoFHdXbCmOnGnl7FZb04uzL2/Tevfye1vDFiij
-rjEj
+ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQDOewDEMI8gQejTMLk1
+y6KytupJJM18NqrxvnX8NXGEgHYEh9rsgnroNFTvO2Z8Jv9n1QvsxbbaIxS9ROaz
+EqNw31iLWROqftF5/Gz3d5pgCOe+YhL6a01ulsJP22lfkO7Sdw0kTLdwAqJIuX6H
+YAwBL1SUY9Xp33+gnSRRkb0eHj3irSOtyTXC1wsBr76rqggZlJamGqPOHMfkdOX5
++gswQLP6jRmFbeKOjt6Q3s+FAVJVUDo5RaVCs26EeLnxp1OE73tMSE08EBNHhgeJ
+HxicnRUGQlLyoNlvyWertUWa232Cfi0vglxZee0un7W2isGBGCsKgLbuY9jE8JTH
+b3+E
-----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 6fd8b8a94..b25e75579 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-----
-MIHcAgEBBEIABCBaRnmPEwfHfb1/0o5/w0+WqNONAI3cvemvVa8UfjSe0lqJKF68
-etRDpnpK7SoQDQ7LO7io1ghxNNu2zkm7r1OgBwYFK4EEACOhgYkDgYYABAEF8E13
-ruuWkqWOZZrm58EW7YA4JsAb5PTqQieIqhPvDZywD1nTzqHCqpBIzx7jXPggvNgZ
-efXDi0mStpIzSUSMYwGC2bUduIaIVMS2hOWIEbTe5sTM1Ys76LQkdlJtved0H6FL
-fpm0LAbwbZr8sCJXGYJgPKYvAz1Vob8ZvJft74svYw==
+MIHcAgEBBEIAXXCtHtlfrpaObHVelWY7+4ZwEkhZCEV5tp56gxvhZk0fwSpQN8JT
+cd5/Qg0AnyfcD82wwFsv32PAv0ZlYsZ+kG2gBwYFK4EEACOhgYkDgYYABACNPqXC
+8p4wleBCaJx4nX/wXSp2Pn0KduggWOqyGd66IfjkPx37LuS9g3uiaOzXIJWlo/St
+r6nUt0WWhxAOSppnkgC/ZtAN4xxgsbhP53XujtvWWNRk88tuBu9vjNspkx56SsVD
+a5AougN3CjDJNZuNh76e3aGNfgSSSqxYoFcDmP3qrQ==
-----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 25703d07d..8ae2b8508 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
@@ -4,22 +4,22 @@ subject=O = example.com, CN = clica Signing Cert rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.com, CN = clica CA rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert9.db
index 437e25cae..dcb404c2e 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert9.db
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert9.db
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 60f135e4b..cfc247f6d 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,29 +1,29 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 8E 08 ED 63 E3 10 E0 F6 87 08 96 48 63 19 A0 31 2B 36 E1 1F
+ localKeyID: BD CC 08 EA C1 9E 08 69 39 30 87 61 CA B3 FD C1 1E C7 9D EB
subject=CN = server2.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNDU5WhcNNDQxMjAxMTIzNDU5WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3AYwvYO
-EPfSwR4ggAFZcQboIXsYwoAT+OdOiIjIh/t0ICB9rVS5yvOrg+q6AXYVZpxCrs/M
-SwjsgLvfEcQY+0UPE/Jx2USSfVvRF1Ff2fXdbPmiJzrRS+LyAvnj8TyZmEpnkRrT
-BGWLlSDB6P1VdPG8INYdQTUZdxZaCPVAeo3PISHNEUXK7uLIjABS4VtAdX/AHa6P
-WkJw+1QAr6IhY7fx8vaD2dRrPC+HG5xmZMosEl8BxEYh0uEAhSfqoW00QwQmTqep
-1TUy6kWKFkY1AYslbTw7XcJxbb1YSInJ4ZCNKaiAkj9MSfFLvN03QtDUe4rqJKDO
-TnphxOPBK3iBmQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNTU1WhcNNDQxMjAxMTIzNTU1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx22vcLBk
+HoQNPVIhVKOedgZcPGZS5d92LZjHN9IE1C6rmWPm1UVkfg040gs4NsQpgtV7UiZk
+MREvYtVsTN3pFfBNrr3WSba0hP6qXV9pllnbQoswa4AUZt3CWbZCGDgbZby9Lj1t
+YuKic/Bp9MtA0IVRPDquNP7lhKlW+ZUARRNLQ+TIbmgwOBb8LZXOL+JRZ83Iqpy4
++ZfJbp8SISF3K0s7qaDaD246eKgHijROuKOA0WOMr3w+DXSMYsLlRhqh4kQMzG1d
+E4UhP4uYCb4/21cloh6FdsvKRo4uE4mY8pSudv06BeL4vgyctVfYJ34gLOwX4i1N
+QV/j5NCT0VnQ9QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
LmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBACLFveOiRGS7A0tlpoB16hv5KyNu
-1pqHHosapjqsDs12e+7LpNXBOBB7Ykcg5e4Z7Xv+5VPoht7O+CsxhEACeAz5ix9q
-J0lTibUWup45h1WiBb/pMMX6S8GQ2igIYX+1JQkeF//shqRC/vvGmlzJdblhalH8
-3nLAD/5MSeAkewv8/Uzz+ktuFR66D1Bt0G/RUYK+PvaXfOw768W74YbY1W+KSBBn
-TdrZr3xhhJxIpKBtmY+3/8kaKovTQ9icR0LagN8R5MTaJ9kmSOGZtJfwFGZlMGxc
-khllzOrtucTxOJ7Ibuhp71pV5qCzL3ygpNenILQBxQlzCtXVT77U8J3Dvdg=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAIqN+tTH/XssL89UYrzKnEmOtgHJ
+Re7fr1Jtg+uoQM26Y//jj0YbYOPVJTZ/UOTYB5L1LWMgaH4u3IM6OpFvLbKmwtFh
+7whw5gzz5SQD0RB/d+CJSgcpTmfQvLlraUxE0xA+x9S3ceDWuvYjO/y6i+Qmi2Nu
+WfXYc+JVv0th6mLKXd6JIDvBkuNOTXvdWpiiqfsvsbUknTcwfuK1uLgD+U+eXO+6
+EzT5D+UZVxR5bkiJDmAv+5qQygQDp2xq3/0jjl/EWkbjXooV0EDrEW1kmaGVsmO2
+BcX001t8FXtGFybjx7pygcx9m+3Ht40J8UxD6VyjdenASwYaGM6mplbItys=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -31,22 +31,22 @@ subject=O = example.com, CN = clica Signing Cert rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -54,19 +54,19 @@ subject=O = example.com, CN = clica CA rsa
issuer=O = example.com, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/key4.db
index 8cecbf771..e13f7bc78 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/key4.db
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/key4.db
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 d2bccde5d..5d4d02d2b 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,46 +1,46 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 8E 08 ED 63 E3 10 E0 F6 87 08 96 48 63 19 A0 31 2B 36 E1 1F
+ localKeyID: BD CC 08 EA C1 9E 08 69 39 30 87 61 CA B3 FD C1 1E C7 9D EB
subject=CN = server2.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNDU5WhcNNDQxMjAxMTIzNDU5WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3AYwvYO
-EPfSwR4ggAFZcQboIXsYwoAT+OdOiIjIh/t0ICB9rVS5yvOrg+q6AXYVZpxCrs/M
-SwjsgLvfEcQY+0UPE/Jx2USSfVvRF1Ff2fXdbPmiJzrRS+LyAvnj8TyZmEpnkRrT
-BGWLlSDB6P1VdPG8INYdQTUZdxZaCPVAeo3PISHNEUXK7uLIjABS4VtAdX/AHa6P
-WkJw+1QAr6IhY7fx8vaD2dRrPC+HG5xmZMosEl8BxEYh0uEAhSfqoW00QwQmTqep
-1TUy6kWKFkY1AYslbTw7XcJxbb1YSInJ4ZCNKaiAkj9MSfFLvN03QtDUe4rqJKDO
-TnphxOPBK3iBmQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNTU1WhcNNDQxMjAxMTIzNTU1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx22vcLBk
+HoQNPVIhVKOedgZcPGZS5d92LZjHN9IE1C6rmWPm1UVkfg040gs4NsQpgtV7UiZk
+MREvYtVsTN3pFfBNrr3WSba0hP6qXV9pllnbQoswa4AUZt3CWbZCGDgbZby9Lj1t
+YuKic/Bp9MtA0IVRPDquNP7lhKlW+ZUARRNLQ+TIbmgwOBb8LZXOL+JRZ83Iqpy4
++ZfJbp8SISF3K0s7qaDaD246eKgHijROuKOA0WOMr3w+DXSMYsLlRhqh4kQMzG1d
+E4UhP4uYCb4/21cloh6FdsvKRo4uE4mY8pSudv06BeL4vgyctVfYJ34gLOwX4i1N
+QV/j5NCT0VnQ9QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
LmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBACLFveOiRGS7A0tlpoB16hv5KyNu
-1pqHHosapjqsDs12e+7LpNXBOBB7Ykcg5e4Z7Xv+5VPoht7O+CsxhEACeAz5ix9q
-J0lTibUWup45h1WiBb/pMMX6S8GQ2igIYX+1JQkeF//shqRC/vvGmlzJdblhalH8
-3nLAD/5MSeAkewv8/Uzz+ktuFR66D1Bt0G/RUYK+PvaXfOw768W74YbY1W+KSBBn
-TdrZr3xhhJxIpKBtmY+3/8kaKovTQ9icR0LagN8R5MTaJ9kmSOGZtJfwFGZlMGxc
-khllzOrtucTxOJ7Ibuhp71pV5qCzL3ygpNenILQBxQlzCtXVT77U8J3Dvdg=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAIqN+tTH/XssL89UYrzKnEmOtgHJ
+Re7fr1Jtg+uoQM26Y//jj0YbYOPVJTZ/UOTYB5L1LWMgaH4u3IM6OpFvLbKmwtFh
+7whw5gzz5SQD0RB/d+CJSgcpTmfQvLlraUxE0xA+x9S3ceDWuvYjO/y6i+Qmi2Nu
+WfXYc+JVv0th6mLKXd6JIDvBkuNOTXvdWpiiqfsvsbUknTcwfuK1uLgD+U+eXO+6
+EzT5D+UZVxR5bkiJDmAv+5qQygQDp2xq3/0jjl/EWkbjXooV0EDrEW1kmaGVsmO2
+BcX001t8FXtGFybjx7pygcx9m+3Ht40J8UxD6VyjdenASwYaGM6mplbItys=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----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 1337071ea..aaf7cebcf 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,34 +1,34 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 8E 08 ED 63 E3 10 E0 F6 87 08 96 48 63 19 A0 31 2B 36 E1 1F
+ localKeyID: BD CC 08 EA C1 9E 08 69 39 30 87 61 CA B3 FD C1 1E C7 9D EB
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIKpqZZPvQQGwCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBAEquffA3EXrWwVlApre+zHBIIE
+0M9NPm6T+A4Stj5fF26z0iuGhwz5enB8mYUM2qygx6ci/is2wdFEItGp6AuoK8NC
+ocnUCIQXZAhvU/pLQlJ/+7Nl6STUYJ2lmG3hk/Q/1PJfSnD7qwrEHviyrTFDo+XG
+fAcS0KDriR7quOSVDYBJl0DohAsCP8bk6ge0A/nLB9cJ7QraRcFuhYbeRQCU+rka
+qoVm9yjgFwKKCiILrJ/JAD0pC23iZuJQ8aiv2PpY6hwsCRhMEDaiMtHvYHU0kmbB
+6+YLM//N6eAMn4sG3RgGO+0u+dA1lCC15uahJJfZkTQsgzECcs2Eid6RRs4m9XkB
+Vg7AV9cePGyHKz3L6Y30aSjYOLLTNK4Qw4uEGaZ+PO4yRPH03K0LKS2/Ke4ROgZU
+7Lu0J6gra6NX4CEK3vzRIouDHi9f0maVWVtyC5TBIn0YsSzcJKMlC/VVYvV2XoCH
+zxilQgbpaB5L9qXPfOXrWhEnOmTbRqDXEEVgvcRXVOqKoLiJFQ0s7Mi4FwouMXts
+3hwX/qJPyZMGS7fL1EprSYCkDj97DU7hEUD7GeDbz78bzs5uAxjkHLRWw1+wVJhI
+yDPp/ADsDV9H6wb2T1ooy9Fg1OW18NEvB1fW9p+lL8S7HjBLxkB515mWMXw274e+
+Vrp0Wi37eHed2/QRU7qAoS3apDx7DmPXCgIgob5J8DyY5eDKk/k9LeYu61tX6OS3
+SrDUCvoQhzAmvIfP6hUkbH8i1JH8N4LSZIxPy/w3z5qLJZSV+LCgNbzoi6kDdYtN
+qJ8xh9z7gNqJFpc2xSCGf3Gu8dh/HcKl2jDgXamWSjP2OnoewxgdtqYGrIriDayp
+nGhYFgTIYQkUsO5yfpZHELHu5o7JZpBbAQzUB/dcs1IDi9mau8lNw5K/kJP6wFpb
+2l9RMY3J+0VoBBjCTwH7xLY1/dWJSF84HanpkXkhuE6qMYQ3l461lQTa3LbMWJD3
+V8Ja9xzYcAXmSLUUCUXX2dwdw9o2gQeEzq/EPziyHqXs3g7LlqCpynuB+MjigeAX
+LPG2S8xu9RdLFGOmHkMzBSdg69gIvo5oIiVutaQ/Vbh9uBvWxKQV7U4zXIXGQeG/
+m1LNtCAXOXbC3XaYAwVGLWWEhcBIoDC6qjEpNiCxpZvvt96qOApdAoDyz3YWQ6Sw
+RL3eT0GmASgRX0HMqzXZ5XHFX/AK5chELkx0uuZPWibhq6CMqBdTctDsLCQ2DOVO
+eXlRaK0/Ju0mCaFzZ5rdWoXu1owus7OMsHEA5Ga9KXtKoalbN6s4MPAX3U+OEAmV
+CdYJOImeg/GE4H0wVhQ6CtMCJI1Y3tV2vxxAy3bSBNu8SZnedcOLXb4uNuGgtv8q
+61bNeQjoQhH2R53Wp0S3sW5Xfx20ojcgIctuMmOgslYwDtwPWA/pw7mGSVromZHP
+fAGGjr7VTBXbfprRe3TRconDVqiD9sCittw7tMUYyH/IL/1Aig06RLANeIGF5LRa
+B7jdueH8oOP889lU+TBjnpNQIqqKhK557l+Sh0seL9baMD4v0yMvuByXkE7XfI7T
+dIKQlettMP187ALBp0pUkA1M3sp/NTX0qU9PaNq7G91o2qm39E/nNRgZeL35ztJf
+4cyM9+XJIcvftOyMUzA6KdxnVrcZiVxtGiqa1nycqjWI
-----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 1d57c9c66..19b960609 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 57aed3d9d..34748cefa 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 3faaa393c..0fa4d72b7 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 57aed3d9d..34748cefa 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 b2bbb46e4..93382044f 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 397f789e2..2adb66a14 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 397f789e2..2adb66a14 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 30a7b9776..c460fa3ef 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 16e824e9d..843ad4a8c 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 16e824e9d..843ad4a8c 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 406123967..4f9ba6963 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 cacc97f08..8d5510e0c 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,27 +1,27 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 8E 08 ED 63 E3 10 E0 F6 87 08 96 48 63 19 A0 31 2B 36 E1 1F
+ localKeyID: BD CC 08 EA C1 9E 08 69 39 30 87 61 CA B3 FD C1 1E C7 9D EB
subject=CN = server2.example.com
issuer=O = example.com, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNDU5WhcNNDQxMjAxMTIzNDU5WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3AYwvYO
-EPfSwR4ggAFZcQboIXsYwoAT+OdOiIjIh/t0ICB9rVS5yvOrg+q6AXYVZpxCrs/M
-SwjsgLvfEcQY+0UPE/Jx2USSfVvRF1Ff2fXdbPmiJzrRS+LyAvnj8TyZmEpnkRrT
-BGWLlSDB6P1VdPG8INYdQTUZdxZaCPVAeo3PISHNEUXK7uLIjABS4VtAdX/AHa6P
-WkJw+1QAr6IhY7fx8vaD2dRrPC+HG5xmZMosEl8BxEYh0uEAhSfqoW00QwQmTqep
-1TUy6kWKFkY1AYslbTw7XcJxbb1YSInJ4ZCNKaiAkj9MSfFLvN03QtDUe4rqJKDO
-TnphxOPBK3iBmQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNTU1WhcNNDQxMjAxMTIzNTU1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx22vcLBk
+HoQNPVIhVKOedgZcPGZS5d92LZjHN9IE1C6rmWPm1UVkfg040gs4NsQpgtV7UiZk
+MREvYtVsTN3pFfBNrr3WSba0hP6qXV9pllnbQoswa4AUZt3CWbZCGDgbZby9Lj1t
+YuKic/Bp9MtA0IVRPDquNP7lhKlW+ZUARRNLQ+TIbmgwOBb8LZXOL+JRZ83Iqpy4
++ZfJbp8SISF3K0s7qaDaD246eKgHijROuKOA0WOMr3w+DXSMYsLlRhqh4kQMzG1d
+E4UhP4uYCb4/21cloh6FdsvKRo4uE4mY8pSudv06BeL4vgyctVfYJ34gLOwX4i1N
+QV/j5NCT0VnQ9QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
LmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBACLFveOiRGS7A0tlpoB16hv5KyNu
-1pqHHosapjqsDs12e+7LpNXBOBB7Ykcg5e4Z7Xv+5VPoht7O+CsxhEACeAz5ix9q
-J0lTibUWup45h1WiBb/pMMX6S8GQ2igIYX+1JQkeF//shqRC/vvGmlzJdblhalH8
-3nLAD/5MSeAkewv8/Uzz+ktuFR66D1Bt0G/RUYK+PvaXfOw768W74YbY1W+KSBBn
-TdrZr3xhhJxIpKBtmY+3/8kaKovTQ9icR0LagN8R5MTaJ9kmSOGZtJfwFGZlMGxc
-khllzOrtucTxOJ7Ibuhp71pV5qCzL3ygpNenILQBxQlzCtXVT77U8J3Dvdg=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAIqN+tTH/XssL89UYrzKnEmOtgHJ
+Re7fr1Jtg+uoQM26Y//jj0YbYOPVJTZ/UOTYB5L1LWMgaH4u3IM6OpFvLbKmwtFh
+7whw5gzz5SQD0RB/d+CJSgcpTmfQvLlraUxE0xA+x9S3ceDWuvYjO/y6i+Qmi2Nu
+WfXYc+JVv0th6mLKXd6JIDvBkuNOTXvdWpiiqfsvsbUknTcwfuK1uLgD+U+eXO+6
+EzT5D+UZVxR5bkiJDmAv+5qQygQDp2xq3/0jjl/EWkbjXooV0EDrEW1kmaGVsmO2
+BcX001t8FXtGFybjx7pygcx9m+3Ht40J8UxD6VyjdenASwYaGM6mplbItys=
-----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 de9ee0b69..cfe546243 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCvcBjC9g4Q99LB
-HiCAAVlxBughexjCgBP4506IiMiH+3QgIH2tVLnK86uD6roBdhVmnEKuz8xLCOyA
-u98RxBj7RQ8T8nHZRJJ9W9EXUV/Z9d1s+aInOtFL4vIC+ePxPJmYSmeRGtMEZYuV
-IMHo/VV08bwg1h1BNRl3FloI9UB6jc8hIc0RRcru4siMAFLhW0B1f8Adro9aQnD7
-VACvoiFjt/Hy9oPZ1Gs8L4cbnGZkyiwSXwHERiHS4QCFJ+qhbTRDBCZOp6nVNTLq
-RYoWRjUBiyVtPDtdwnFtvVhIicnhkI0pqICSP0xJ8Uu83TdC0NR7iuokoM5OemHE
-48EreIGZAgMBAAECggEAAeNn/Z+eX4phuouZ3loLxDUTbI2hossahYeGOqv8oV7d
-TVDSnK0yLsALeY9rBYPOD5B6m0N7UT3Wv2/5b6+3p4S2K9XK0FB2CMljNigKRKzq
-Mp3hPYdBiqdcfLG2q8Y/zpOgCvMwXQ/zit0szFaY6ka4ndxDUyXAkQQsxenpEfVn
-1A0FZMNsXRt3dq1MLSf7U88DukGPo+tQbdys+aDS0Yyg9Ore78vRfuPF8d1xY/XC
-FbUX+R+I7VPqMuB2Hnq7BwLKFwdyHunPjwsAvflGWRihNM2d1Azbz4lOI4wNeaYe
-hkwHDfsF7LbZScRFVGBvO0QhOPu0pUfwCr4cADQ3jQKBgQDZYxVr79xvegLRfceC
-7DFHrbuDwpxAyYGTbm96RURzRqKRQQZqS2TfLz9Ogyi0vtrlP5mVBpgDhQKUsLXa
-hZgBP0J3tNbWMSwwbDRQygWazwpRYllm77KdjrJN0VenoIQH3SpwOM2lHjMG8lTC
-zsFl3AJqGaOUEmxFFJizzO3KIwKBgQDOmYVufc2xfhT2D1Mj/TxgpmZDlqFCofjY
-emsnJiNznyKMoJSgLGR7LA0rTIjeNoncruxMzGAS0DZrG2jrQhDlcdvZDh3tkVVp
-1L7GaFX4WQ2HhzZcf6r84eeFQccjc37+XHphNC5CA1L9glPxR1y63w6sfsj1EWHm
-ldFsfAELEwKBgDnx5FriE9MPJcMrkMvAI56km5AShs3qKITg8gwYfJdxo5GuUIRy
-1k97a5eE9IvBN93Vpx2HJWwCv15dAAxggdULRK9d38o2Tz4VCZjjUL0kJO7ulUAP
-8n928uY1P/Upnyftdwt0yLQTqaxXWeqXbAu3qlkXvneQtZVwWQfMPzIbAoGALCy9
-UBPMMIByAO7j6xURnOTXhuolTvcNG1SJptRLzkQfggwv21PCpGeV5UU3GrR0o+Av
-HHiyrjMg/6PbujnlHPpMdMvE8HAb4EYiCJB0mWaJMwphQEP4DpxLAb4/0z+1zrN9
-Y11h6rGFRDlis3t7w2VAYPe3BleSJFiyb8zP+EsCgYEAtWnB/52rf+rTuDM1yfgo
-IJyrRXfTXtkQOtIY5FTWkWlo2EPauen0qA/vgrEULa+k/R50WmDEXN911iQFnaaz
-vKF7j68K84dAh9VUvxGDKP5rQCjJSws6guutpOrybdRMuq0TmrX4qVBzGs3WQ+IL
-N79FbFTsxJC3+ypFCTnIpQI=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDHba9wsGQehA09
+UiFUo552Blw8ZlLl33YtmMc30gTULquZY+bVRWR+DTjSCzg2xCmC1XtSJmQxES9i
+1WxM3ekV8E2uvdZJtrSE/qpdX2mWWdtCizBrgBRm3cJZtkIYOBtlvL0uPW1i4qJz
+8Gn0y0DQhVE8Oq40/uWEqVb5lQBFE0tD5MhuaDA4Fvwtlc4v4lFnzciqnLj5l8lu
+nxIhIXcrSzupoNoPbjp4qAeKNE64o4DRY4yvfD4NdIxiwuVGGqHiRAzMbV0ThSE/
+i5gJvj/bVyWiHoV2y8pGji4TiZjylK52/ToF4vi+DJy1V9gnfiAs7BfiLU1BX+Pk
+0JPRWdD1AgMBAAECggEAHps806SemPhXN9QE/YJm7WIogbSKgHD9KB5MZMq8pvvK
+pi3o3U5bD+VjlQjXxb/xRv0QghkWQ1mJ1jc++cUM4qsQoQLNgl6h8c9LwizEfaio
+t9u4wKbVerwJ+c648hKaUdDXj+MpiIWTvQtml4UiG156iy3OUp/UBbofeQpfEjqP
+8Uuzxi/jEV/HnnkmxXyxgLPWRCmZNIjibRtvPZ+9euTHzy8YK+0MB4aOuwDWu9e4
+dumXPLPLmtBdkaerIE8ofYpkRUXbqU6OmQY3yGV5dELNxX75Nk6FAmXdOWi+fkgq
+Efi5FldT/8xnupgFSxNrU9PQ80v04h3HTZXAyVgJ+QKBgQD/SeNigYVEJI1fFe/N
+GLnLR6aNu+JD2e25skbOwiFpnVE95JvoComw2TKJ2b5qAX4G+WuwPMaugDQSXSMk
+UDpX1Y4MAivGBs6Anyth2Adfo+6DMbQt+ZDcfsa01fbvdzeB86ZC5IJCvlE3qkel
+kYLfPBHnjr+frwjBHDVoWObW5wKBgQDH+/Lp+Z8IwSbvWReklIziBihgWPhSqGRm
+OR2ptq8jH0CHAn0/7aYuLvHLOnlpnEHSc+NXu1/7Z0cVoySLW7qzgarpIL136s4l
+2tg5fMRRiYLzktvkaW9gzUEyTDv5RkDpq/EG70bkwHJ10PzBPnVDGRa+4bwrJt0U
+wAb6A5oJwwKBgQDaWGMAHJFUAANeQU/x1mUKhYThksHqkJlwCxfevVGAmIok6sOi
+CmlL9ejw2GixGAenhWriuIiiNYrT7g8hfvD3sPKmOLEh1S6H+htLu05LMdXNJhTa
+gaqxvEjN4Hcsx4WVQ0R/0BvNZCPo/V38MWGC90jFCWXB+R3+tNbFIcyGHwKBgEGV
+ClBYoCLK1O3hFbPPU3Q7+Lm/84+H0YUEbgnd8wldkle0JUb1tG2oz3qKLo7Hw340
+qvV2aT+U2ubpnW5mIpADkfzp07ijs/8OCaKwm+Dxa5RdMOdy/CeOqDbKcVCKDXeT
+/3L6vRD/W4nvgzQMO4BJlf/7Hy43jIDliGQtEjLpAoGAKd9kroyk4uUX+mEKxNS7
+UivEgSg467UA25VDJw7JN/DGIucbUnYZg6RxPMy4cZGUJ2vXIXZWbB4hZysILIpD
+ciAtAF4+agB3j+PGZ6TbhgxKUU1TbXpYdWmzNDpFmuaxAdfbgwb7CCtu26tyXcIj
+ekGrv9pyFY+JizGNSftLBu4=
-----END 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 2a2f85d2b..17454092c 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
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
-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
+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
-----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 21f51716c..d2fdf9653 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db b/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db
index e410410ce..c35c4c5fc 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/key4.db b/test/aux-fixed/exim-ca/example.net/BLANK/key4.db
index 574163560..da40ee72c 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.key b/test/aux-fixed/exim-ca/example.net/CA/CA.key
index 35d4461c9..8cc35c173 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: Certificate Authority rsa
- localKeyID: 23 AA 74 A0 98 D6 6C C3 6F 46 56 42 25 29 F9 6F 8C CF 34 15
+ localKeyID: 3B 13 82 D1 F7 80 5D 36 EF 95 6E 38 81 11 52 06 FF 0F 04 48
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDc083B8p4yLQEK
-7bA3MYAyPtELNkniV1JK7MmGZdczVImpxtI/CZ8TIa5IQI8AIWEOpjTXDiidXLII
-eX8hLsbAjpVGkgmpI5vfi3zwRB5v/0DQqi9dRiYIDb2AOsPNgFuS8lD7XSy0KiIB
-iEHLCl/cfzgCOwWKhvAHykPCZP3SAN/kxdb9s2O52ApMmh8uZRSz0H5E6U7jpDNM
-hYsoCc9sYM4Av2QxQeP3E2JjiBv6i5Ut1xnkvs/f3HuD5sKdkYUZxoO2OO82p9gA
-nae14n11ARFl3Aoqmh+zP/X0JpjJLZtn4BO1oLm7IlMhAg1WidfTpjw/iDdm17rY
-i4T9d9FpAgMBAAECggEAAh21dwpQIcL0o5orehvrUo/viN/4TUbw7u7d73/CVCeX
-Oh1BnoEFGTXVabPUqvem6nEFSJpGIVvmCNbBNRwxo166Z3a2yPwiXj4D8Hl2oTQc
-9uLqmUY2zxTyn+vwPGPifMH9rKrz5rYQpVsc5kkvKfm+G6ddIjqwyiJSC+bT19NN
-w129WXdpPKmx38NIcxC1+curE92DmesEOUkrsFYTAbTmyKyDlSDPN4VV/aaMf207
-/271vlGZ11T8TCJP7Rk6xU6c39EG/1MkvGYlZf7hMsWRR0tgA3XQoDDY153iClSq
-JG+/5BvrqUdbDup4jMJSSbmsyiSh8SeEfkYbBlbwAQKBgQDvtUL3cYo+nZZ+oBqO
-XkVIsnmEpqMFvMNI62gqD9eL/8oAYiYNeiWtonHP+FjMaqVb5c5EtB2TlOO5RxP7
-1SF8PfQ9uzdhTvgvTSlDFvtzWHjpNgytkBW133d5niblWPgzoHwOOZ4tSYW2QnoE
-XiRjGpIBo2GHgSIndgGZoqhTgQKBgQDr1ghJ27+vrdAAexwDoF1VlQ0+St/G8ACn
-ZxGRZb7Csr28q+4GJdRTi9hlLQDHa1ITgYeJqY876Z2ZBFHvyZjaKyfN9VbT4EqJ
-6Ba3uODYhWRDjh3pTsP4gAYGvuALZvP9V72RxXZptn8gBQqy3SL9rAyudHAHOEYG
-bOSzu9hR6QKBgQCgBvq2Bu6r7rjRwED6WqUWa1AE5tpesi4NOFtJ+VmE9Tb+Gogc
-5zbQPGqO1NUzYt8SAtE5vKUiKXv97R3COf8o2pN7wsiuBfJaYcDyMR2dW6scxiCg
-nlhgGtfAMXz2D/djP/iR5pVa1oKVsruSvua74rkmrtQlimgqv/VBg/2sAQKBgFgT
-y2yqIWDfLTvAvqmsDq+TxypolEKcB+J9X9ZJhYD5eFsqau7o2e+J3vuKXywbLMAU
-NCZ5qQDbMvye3GsNg4SXcXo+Ent23N+8Sh+7cF3tE5EXVpx3ykDYr2d9ifc4MA+B
-4U67zImWmsu+lkxOwm6y/tl4qw5HOf/UU2W81gFhAoGAIA3cI28H8zj7n4XKsIUG
-+ayTF/12Ikg3PD6p+cIRI5pnGr+mHp7407jHuOghG/HtoXL9/RudoP3Ka4lwwA67
-1kfI0RFAOEMd2cmIW4MPMYSlPIXZ/joKxrsUZlBZqT6HOMQSkPq5QReN4+aZ54zl
-m3w+WV0WXC1Erm3JUAkQtvY=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD6DnWH7nqx53FQ
+M3XWMRc6SQwt5LfCB56HOy9+AwOxWAgt7vSfaELBJYuLr3HOplsaBvEhco5kss6Y
+3zkEyNwTTtCmHV7TOFLETH5VA9/y9ivxiaAtmw1NXV9JoIXPgC3OKG7dy3NeYS3H
+05S/RtamlTxvF+M51wYBRK33ThoSuYPMTYJVctvhw+w5NN/dWi5jzioa3beaPOUy
+zNGPlUxNG5pdklbFYD+bTtZ16or3Q+7tGi5EVqJY79UBaQixPLo+rFiuBwuquQRo
+h2YOqVo5N+ZpIkNBT0FHb7kAFcytWwoDYLfbmbW4yx6g4J1pBymEQ+rtwGBjPAPb
+erP6TiAPAgMBAAECggEAAjSScMp3po4F/9EUXvk73TW7t8Pmov1yNnsdJh1csPm3
+yL/sxGMlA5MTMf4wIMRy1T3ubn8WJmk1TT/avuIOntT5Hh3wMiizAiwyiQlptjjZ
+ll3CXeSaL259YqbZx0S4IrNUlvwuXky5HKQPEcjMJ9f1Gn25cU8mLGiwqBe2PygD
+PQ1FMF1zJOObCL9dTSEKIHVtf5+hzJDpqvRUclHkiFtbVTXZ/Asa2Od4SZt9zfpp
+qdtyCN3x8otbSWW9UKCCyvM3+ZEpWr64veLP9G42EgXEMszfTuzoXVSUAXd2Kold
+7w7x+LugfJdoGsVZ3bJCPkJM2sNvZkjD4N6yTVu0IQKBgQD+A/mhRauSqxaGYFt1
+u9BO9raIgqhJzHIfxvo6Xu/0IesFgw+ebTaBgh+Gmeq6fLrMakpZwgZaTMfle3mQ
+BfEe0njKciNP0rdOQ/IFgUqDRsMFMXpUKEBdHVHB6stomupJ9CSlyjs0BIPWPFbV
+IecOTBRo3ICN1wJZahiHkAEg2QKBgQD8ApDkxDOSlgNbD5fXwNV/GEBlx4q5AqAm
+CJzSQHC0LsgxZCxEWXPBozsvfjNztARr6fX3zZ3fTgOxLqvVhGWNfQba86KpSHij
+RY5cdWFGdL5N6+M8QNL4bsr+JltiTRxjvx9Es6aaaQgU79ob91jTPUKAteHapPSA
+FePecH+3JwKBgQCjLv6RYmakpJCl5wUaj3t1Hv2ImRdvwY2XaIacNR1F4vxO4DGK
+f3LCpEuIdxzajQKcC7SUERdvr1/Dxx0DLy4FtQSwWb7hqubjuraiXrr1tuHWVkDW
+C729k/ZP83yVSOA2fkeE0nRSKIxhdwX5ifwbrTh3XSCg/n2d35C+lf6DkQKBgQCX
+57QPMXUk1ugO68dLdiE7CxNGRpGIE90VD/v3gIBvHAPwQcGtMX5lKk9ywU+iXtCL
+e+uYA4k2IYB4PPm3KqdMMiD/ufxCrjyJrlOxx89q+NP9hELk/u4schxKNjS/fFuw
+hHQEpYW3bbhBZpLCaMZSDosXqosJkIUQ8CD65DUX4QKBgAF+JVPtAiXquE4rQqLS
+4H0oclryS6490RelJwCI/mdd8eOXmJn+HtdJ98guw+yngHswS3CLJJtUV5j3khuY
+RltbPTnZDwzhRV2NWeQnNyt2Efnvy4LiOWK9s3a3Qdvjaih2YuW4m3AsCFLQt5po
+me7MV5BI6pVp16WUQCvv7NQh
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.p12 b/test/aux-fixed/exim-ca/example.net/CA/CA.p12
index b20aab86e..6d2d11791 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.p12
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 2a2f85d2b..17454092c 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
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
-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
+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
-----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 c5096ead7..3de4b8a27 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: 1C 56 DF E0 DE B6 9B 61 14 29 F1 24 16 75 C0 C2 64 EF 21 E6
+ localKeyID: AE 50 8E 2E 85 66 34 C9 C5 F6 99 E3 D7 9C 5F BA A5 92 9D E8
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDEq+p2hE6rIfbl
-/pfvCibWNHUdGk49rnC+YoUrAI8h5e6LbWooRfQqV+IaHGc1PKAbbRkydv6R6wfk
-jQbluY05737vMswrEWVLoEglsw/gPMJa9DYEcQwUqB9sZrddm54+NqgRuc4IVjcM
-FD4iqILyimCcHi0grS+eUrfhsi1PcWn0UgtwS7EzGf/NdupdXR2+v4bC3xIkrFiK
-/YBhpcE3KbGoNdURP9hM3JnU/IIfpaPmQaFaF09/PtvjP41bbIyURI3aQXgam+aW
-cJXlc7wxqHnR8BXfhQFgF9CAvGOLqrxra1x3BW7y49vRorIki7+BUNCVlDp8/oJj
-qCAOYNfLAgMBAAECggEACcEnG2K7jiRcnRKwEXSU8YnfhyZ/W/LTd7XmOfhIoRtI
-5hRyr/WsQw9h0P64pbzQihuypLyfKriYBx9xiKJX3VhCGPYRh09REVutSGVls67/
-ysgTB8xdl4axLEy56oQl6JsIYfyvud0g1NIKNOjbudDgMs4SWe0NEBK1ORX/xlFY
-55kQ2HtrUhjPX5nmVAGDDiadxGLlUalabhlxNHXzovSfuYhjTMXdfpM2x2cC5EGz
-g7NduCXMQFEX3G+EzU7umivFyM8PRu6Tk6h4spWqlmi8kOBrxDcEIw7lGIA5QWq0
-n8UJwY3X1yxJwh3aoLz2GyIq1UpueJc6LBE+mqocuQKBgQDyRhGfzVbTzNX4tEC9
-pLpq2dgvatLCen4U2O37LO5wkLuE1id/SXgAFwWiQ18YlVowJabxDKsu6f0Tq3pJ
-B4xDpOEymfCdvd5iLLIbfoCAgI8M8GgwpVTx6a/1jUWMS3fio7WwUFCug08yua0z
-LR3toZquH3iDTuQSiVY5jJIFwwKBgQDP0G8++jznXGkp/rA242nKvqdRb9v6P4ev
-mLX9KSBejtyJ+lTV+/vNn0dxmAK/4FRepzbo42n4K+57gZNQ8UD3X7633Pnb5hCa
-9WBqBCj4qd4Vc6BWlmPa2M9opK6Upovr+ZbqcNkbPdXgd6PYTyhKIOacvC5mVYuC
-7Z859RddWQKBgQCzR/ioyXn0N8MrTLAP5kNw6I3a4PDfq2d7o9/PnDtCH0g0j4kg
-30wmvOKVZceMWJEpyeMUw6w1hj+Z+639NtGsCOoA2Pu+rw9OlQaj4+PRs9Cn4Yso
-XGBUt/pW+li57erkUwMTWwupaFAGGHK7ySo5e/oL2gwDFzEdKnYdFhHEowKBgQDK
-ICJDr+KS6WgEB4tfJ5vbLcrRw6nC4g3YNgE0hc7NCcjpjwj6xEcqvPQhQUfTVp7Z
-HWyj4aVNU3V2vRYLEUwuDvsSHCUNw9x8y5MGKpurGJVAaiEWdtoSnvRFBIAlZ0QK
-tc0ao74W5/Lhi5xaJMu8JfoHkmTS9ftm0jYfigo6qQKBgQDAoe2K1drdSI5KzxMh
-wtjHQ1OV4UqnY++RLbOX2PItIoAlOASjIfxcJzUy1kn4E3/ngDxnSptta8bnjBbB
-v3dEKCzfRieEwPNeFNxbBy8jnJVQM/p8nZk5qoo33WeibgMScO3GC2P+CtW0GfNh
-iKyKxbU/32GLLQyJp/xqyA1FsA==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDT2+lHIgrKkcDB
+OzKaaOfOpby/fXc0nvMkYTOTGpuUV2cqdwlCcPznXMv+dynrCYIpSXA5Rcu6YbzT
+WfRe7yrE8xgki6U/8ylAoWS6OKvBGMcS/jVaOxYbKTI2PpXeQompXq2/BSY/lNnc
+rcV00y3fIXPFiAKKQmjo+N68ylNS/5euk4T6v+V9NJQLHW0wSNSOtdrU66YaMqFd
+sQeu6xSZJb9IyP/hKkCoMIqs8kI3pTVwegJyvZSDhXmcgG8J/IyS0z5FGQ+bUk9H
+hRl40Of0ozU0VTMwmsAsOMiJWnIJWSp1yDE52sfDzatFC2LOUkfsQN4BWhL8CKjr
+rP9jY5cjAgMBAAECggEAZTR5ZMSrWQd1iBlKXB7fFYVw/BzodBe2WNuiMpSUW7HB
+E7UXlEi7V56pyF6OhLvfFPADDyj7YIbOGDyxkyQ3Tyw9jT+0ai8ztq8imh72VWEL
+wFP1kqwFLGZqmSUenLU2Y9VZtJW2Jstpo5TTbbJwCFZHosYNSJTe3uP8Kz2PvmaC
+L31GR277MncnsvNNlJULV2bTyDKw4i0xPaJlQeTTfe2ArSxsBnyGZn7cIGuDqIqh
+k01tKOhxTL0UZVX0xIk4ouomleEi1JC6OGrQRzaume608mEMNMy7zWvvuL0vV2qz
+tgRVOCREY8Cgq8knjgNwiKpQNIRQc3lz1IF3HXZ7YQKBgQDvIybwgrjYIw7TP7Vh
+VKhOpAxhX8U1f3rX2S40GN68d7Yjdb8eWmhj671VbA1RJ8nvXbYEHnskqgLS+tIg
+PeUKZaJ/lkyf5OncWJY7ToL44VF6UwiwnnFoih+8TSwXJyzuIRmeG+nnfBfjznPL
+32+zjBMFMPyx9Y2M0C5uXNK7kQKBgQDizFaX+q3LS0Ml/DDfBh5FXPOltCBObvQb
+Ks+3bhgkAPLOGYhOJLOLi7I1FnEau15X4BeZsv6Kdu632V9Eap7+Qz7pYh/UI0PV
+bu3ABCA96fUAumBAvyTlsUKioXR9PRoEHZnJXjeN8eQ0hpzLrIlIBoCTV8G2TDUr
+L7B7h1eFcwKBgHyEtEj1+GPq1VRgTwTQPRc9yoiFgr2ZlJCCMNHFxW0jdH7AV/Tp
+JIQrAxpQuhpw+nAePqGkcYCk2fWbzwAk2ndwdo2y6FE1tCQdKJTXC9GmGXP1eofk
+6K6DhYTaNkQUDQwtxhYS+NelQRdIr/kPbi1ymZDRcjMD5mHVIOgsgzpRAoGBANLA
+V2d7Bqz3DzrpEvDsWozSR4cfzzWTXTsxmTw3Di/GwdpLV6Jl8IIoGj3C0O+qVY0L
+LGMjNe2tfz9Qu3p0KbLVAk0VZcZXzt0y67OXIe7mzUkT6AXCmaLoCafeqMUIVnik
+mRfKeY1pzkoRHPsXJarMgAZrchLY1j9/XVws9GOJAoGBAJ4dNAFmPf7EErg9889Z
+bRQttSe/GlrPT4nzcXqQs3lGDBW1tqCmYjh8MGc1QQNxfh7aMoXsRzYMi617rzSB
+v+uLzL9wojGLSTUVw1ma5Ew6Z/M5KeyPEtfViP0bihwL1knNtXjUidXLfT/Fu2IL
+QBU/O5kTGKwbbZgwTs0sA2NN
-----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 5fadbfa85..1e9d5415d 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 c504ef234..e50e70f72 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDEjCCAfqgAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM3MjlaFw0zODAxMDExMjM3MjlaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
+MDExMjM4MjhaFw0zODAxMDExMjM4MjhaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDEq+p2hE6rIfbl/pfvCibWNHUdGk49rnC+YoUrAI8h
-5e6LbWooRfQqV+IaHGc1PKAbbRkydv6R6wfkjQbluY05737vMswrEWVLoEglsw/g
-PMJa9DYEcQwUqB9sZrddm54+NqgRuc4IVjcMFD4iqILyimCcHi0grS+eUrfhsi1P
-cWn0UgtwS7EzGf/NdupdXR2+v4bC3xIkrFiK/YBhpcE3KbGoNdURP9hM3JnU/IIf
-paPmQaFaF09/PtvjP41bbIyURI3aQXgam+aWcJXlc7wxqHnR8BXfhQFgF9CAvGOL
-qrxra1x3BW7y49vRorIki7+BUNCVlDp8/oJjqCAOYNfLAgMBAAGjKjAoMA4GA1Ud
+AQUAA4IBDwAwggEKAoIBAQDT2+lHIgrKkcDBOzKaaOfOpby/fXc0nvMkYTOTGpuU
+V2cqdwlCcPznXMv+dynrCYIpSXA5Rcu6YbzTWfRe7yrE8xgki6U/8ylAoWS6OKvB
+GMcS/jVaOxYbKTI2PpXeQompXq2/BSY/lNncrcV00y3fIXPFiAKKQmjo+N68ylNS
+/5euk4T6v+V9NJQLHW0wSNSOtdrU66YaMqFdsQeu6xSZJb9IyP/hKkCoMIqs8kI3
+pTVwegJyvZSDhXmcgG8J/IyS0z5FGQ+bUk9HhRl40Of0ozU0VTMwmsAsOMiJWnIJ
+WSp1yDE52sfDzatFC2LOUkfsQN4BWhL8CKjrrP9jY5cjAgMBAAGjKjAoMA4GA1Ud
DwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsF
-AAOCAQEAGKTpRvVyjvgEfMisSGqg9OMvEdIsyVzDKOY8RbIWcAwmYSwCdgyG7Noz
-sGHOqY6Wfw0hhpB7W4c1YimVqALXiAMC/299PuJcH7FyO4S3GKYygPuh8V/6QpM5
-k6o0A5+kW693cHDBjhM2XfSgdgfUdHYuX6NhFOTQ82Tv2ElBjua6KIixtsfHwN8L
-RcDf3WApvmwL8Swbyi/6k0SWpQnxCIflKngzSJEjrJYreYjNf+cPTJPwgPnJRMQ7
-iDEMM84Fkgc4mqhcSI/6luJrgjwoh56EmjZeelbMi7aPzll4nB35dVJ1v7tX5Y3t
-+a5v03loWdurloPMjEf8HKx/JA77+w==
+AAOCAQEAMJcf1de50VnQQdXOb8rUkWSdkFM8c3vz34FE+HrDq0z3tIMje2R8i4/5
+kkvKrdiaXuKfrOxF+DYZnit28VoRwPzD2gGWvq7OopV2/kb5I0LGWP7BcSP5nKfA
+u5B9YeHnzx0Cx+CeeQCFEnFY0hpCtuIPVjqNNvROLATxArgAuIgg196QrvXCCrqO
+X27qej7Dc8v/3PK8om9V+26MaCjClZG3/f3fzyolG3jhU63IFapEEfMPJ4kCEN/t
+j2s2LUR02Tk//uKBDDgI7uni5gPHnldZhNeeNbBgPCth72Vm4i7EHkq/qDcdXACi
+46HRN87z16TPXopPQR9qmViUz5o6iw==
-----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 573523233..d2699a9ab 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: 30 91 29 47 95 E4 C1 29 66 02 8D 6C FD CB 1D 82 A2 F8 46 D3
+ localKeyID: 8A 6A 51 3F 1C C9 C9 B9 A5 F5 29 29 B7 39 EB AF 7B 06 AB 43
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDV2QMhXroWfkj9
-YEPBRT121t9etcI9Vd1nNquiwiZQXaA5htcRAfDRtJH6m9a8IW1jq/PAfoJduMuq
-+wyWFQRTPXBwJQf64URZ+Mr0iBn0YmQo5WioEUuQx3s/UnmI3d9l3j6WAsBVIIB1
-QuyocUDdsQZDZ4L6qCFi1WwwL6kqOnVXviqPx2IfU3XR9sxqWuQa73moAvPH/JSO
-xUMyozlua7GFrjb1bthwOU/muJIVdrdwtuQb+reNpuuNWjxY56DAfS0F8IIc85C9
-52sARizsjGQhuzim2l1h4rZkKDRGBHgjDdIEZWxinQg6k8WseM9GdPFLjxUD73Su
-DTR5QGftAgMBAAECggEAK7/kzc4rLIBkDuBDpFX1y+sMUjxFs5YuQFg1N4xYWc85
-wSMmuz5GJiT2y4pX3W/KSR6r9Nj8808j7cREMC03EA+NAgh1cDxnZy/I18vDYZXC
-j4JVjbLSHpnNC2ikYB2iP10/OSHxdsj6NuM89v4KiwBVO3OBHqZIhEeNBXOuvGpO
-5pR27skjXLKaYnGcL4y+skxkeA0ZhYuTFEb6MUySa20MlqmW6N88v4DcHRVdDxui
-9uXSV5nMLWUzE5xDcZRFs74nlF+SoJohGVUvXVFEafSG33Su49Cc+w2yu8hBDDa8
-TYdffYaImHJizIKcJxCQc+Jx2T2b3UFKoa3JiHFikQKBgQD3U5DDCj28l54MBr3A
-Ln61OHlapyr6byUM9hczlpP6J57aYLZ07sHJCN5ety1CvWh6L/xvwA87NFNuHWTX
-dFHjhA+BwLDYRma5fzjKDZ7dftExntv0BtriNRq1UxUycXBDpHehrmcLwLvK22Nj
-uxwm8PE4tJwKB9VtGYNAmEKTHQKBgQDdWOIYSKvV2WQaMAlJsUpyowgEu1ecu0fz
-Dp09gAtgZ1msXcWrcHSjA+ev6T9TLDkQgH/ttrExZNssWeT2kvTUJKLMxjBCgX+S
-YV1eOJXkg/Y/PfooyqSiO21i0hhED7S036n0dfmGgmK1JtYiZYNBLY8His/BmNPA
-7PAxprq/EQKBgHD8MO6Y2Bk2nlHaJocL9oBtGyspoP2lFqT0Kyc7C8DEptIWSmPi
-yo4/Se60+a06f+cJ0uVuNMcUIWT1cqLmlZ49LyRUVbWHe9gT4WqUjFWdYI2th8fT
-9dxO7DOXj+BqaCHOmYQ3+wUod+G1FZNy3+p+OYRxJbODXqGnfQleRVOVAoGALaSI
-as2BcYV0WNoS8Dk4ys7HdoJTHKSZv4sB7Y6byfNF0H89pY543qyNd/626iWyVq7I
-snH7s93CPDEFP7sp9Rzg3Sz5Ap3Fep/NKwKsFgUIIB5dmU/ABxwOAFSmYFKExs9g
-MmKpY407YXNysIESQbxtQ/bhxGAJOj0hgnuJAqECgYEAwNoD36FX72dupJHNBGMM
-FE3xWnvfG8vywPzx7r7y0xS7wnjo+1qq3noQstChAmGyXq/rPlv2nGBEJqspS8cF
-FhJim0AiVtkgK2wFPyA8rvikzDU/bSBnvZ2DCfFYj7ZocIdLMRafD9MDrFCbFtdW
-L8UWHWveio7SAcA2YvZkg3k=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCkL0Gw+jw7XFj1
+EoIVMrNa519vJeAad+wYVplDS9vB/WgWfCIgLhN8sLy6DKa/bwPMliUXDjGLisXd
+5jh1d36uFeeCN9R2fvlNgHiZslZmkEuPngBfPvjEUDN3avu96Dyi3EIJlP2sxoGU
+utvG6gNlTnUCLUldJeZNzXoLhTZdpFMf7k03h+OunjNdmDIxMChMP474DqThP9sA
+2bUdhVzWGhR/fa8Sbb/Q7Zcr1tb1i+siwpxoYGt2LeGbMKsF9uZdGgoxJ8i1rpLv
+f+CrBnDFJZzpNC1+LjGWwKH08srpY0a2eCex7tfgHUCi6JSx08j04uWSpo0W1/BJ
++AvycNaNAgMBAAECggEAAvltL/rUiQHDBcuMSjyFJcYvwyh1Px2BjC5Tb/XpmQHR
+dyjQCHO1PCrKfHdatPiaocPtj5Wc/alprLutNamQxLAWZdRDl9L0irwjUyt5J7oA
++GzVFmSiZpIKYKUyQs44fP3O/3PwxYbCFbLt5NRb8+OgOIYgAF09pxasGZXT9o3K
+Wh/ANq5guMZwSMU/wQJ7lOMVmBdhvQ41CunFa5uYg4E2SFY/GhADfAsmdFuU+6gR
+mrWCettrh8uqcOBfnuXhvy43BfCPBYjTEhPghcKYM0MEjyBZxIJ+4jYrpcNpLbzc
+HPOwXdW+vnOH0sqzRn9K4ICYFPeYiNcLS3l0oDfuSQKBgQDTwmDX/5eammWxlSm2
+KbntKOzh5sNmgRJLth4nnQj3+lSmZfwpJ46HePildxNua6s6ylXR9JrM5CsOnO+U
+INjRmHrpeCDNwSXhl5u2TgM13/OujcGU3rE4sG4vRW1naurpYZIxM872z0Wza8l2
+7f0Egk6Of8+lw/DmUfag3BcchQKBgQDGfGsnm8DC365+nH2uRIpRe7Fybwqza1km
+CpIUuXYPjrDUdOyl0TARrjs89RC+d6Vxl71yj2S4c+OdkCoEq4uWSnqJGwLIsdTW
+4hBYzQEVFY5BxdLlMyJTQWljcck3CxpUo7KhJ3kvPb2QRbmYvHBtRZL5bO6fNhmF
+FhXF73jUaQKBgBIZ0XFlNa5PeFXfrDsYAf6VuvnsYdOHQOsb3CQCtluMGGRI328d
+JH/MBWUPcqfDqFVUKlXSFNFix5NuMsR0slPoNslyLUupMPXBodvJe1jFlezbzSpO
+htOTsTd1Nc7bQs1EO9zc0toiCZE2q3fxC+mwwcpIfpVq1FK7utsxNQCJAoGAUQof
+ng5jx60YS62NSwfFCbvdGYHo9pSP045hUoDeiT+TR0tuC827OJzQpvTQH1QugpCX
+0xxk3ULD3mMsJLf9yCEkorIakuK4qfum/PrGxFsGuCgTEW2tSBze8LFWnFi2KXSk
+zFOXkQg+S5eMTaYyqQrNFXW6f9rQ1JvNzAEYbnECgYByFBsRkrKuYnozXcMwLvlK
+5nIQnrwEPzwcl6gy22G1WESUwfHveAk3t6gC4okimodiu8rKfc/oXQ4y2ryj1ZOO
+ExqntOhbCOB/ilU3qhaEybqiSNF8s9QyBGWVeBJ/3oCNlp219i0/OC3o+V3QvBaS
+GC5wqBcuhLkpa5M17M6qHA==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req
index baacc66f5..c3e03ca37 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp
index ce9d73ade..cbb8f0ad9 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem
index 73d3e144a..f68ca99c6 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem
@@ -3,29 +3,29 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.net
- Produced At: Fri Nov 01 12:38:51 UTC 2019
+ Produced At: Fri Nov 01 12:40:02 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
- Issuer Key Hash: 95ebed771f13bb78170dd9520c1e594c85fc648d96625a47c576677b74989f6e
+ Issuer Key Hash: 01089fc170c578818ccc7b96390741ac0d020c89eb3e00f574c8f4d90d14dbf9
Serial Number: 42
Certificate Status: good
- This Update: Fri Nov 01 12:38:51 UTC 2019
- Next Update: Wed Oct 31 12:38:51 UTC 2029
+ This Update: Fri Nov 01 12:40:02 UTC 2019
+ Next Update: Wed Oct 31 12:40:02 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIIB+goBAKCCAfMwggHvBgkrBgEFBQcwAQEEggHgMIIB3DCBxaEvMC0xFDASBgNV
BAoTC2V4YW1wbGUubmV0MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAx
-MTIzODUxWjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIElG2m+vxvyC/H27ycn9keIR
-r2aAn9jdVIl8+kvdTNbnBCCV6+13HxO7eBcN2VIMHllMhfxkjZZiWkfFdmd7dJif
-bgIBQoAAGA8yMDE5MTEwMTEyMzg1MVqgERgPMjAyOTEwMzExMjM4NTFaMA0GCSqG
-SIb3DQEBCwUAA4IBAQAkvJysBuIpCpbxaUXHwkNPjcEoqzd3dnqGNMGjS0LNb00z
-wpexttbYNbqFuWirWcRJKmG9VMvp+4TkG8UBrTSET62EMeld2aCBeet7nIbh4rLL
-NrGcqqH+7At4QqjwKKaC/QlPMW0Ub2cYHAo308d3SAIHUyXEskvn1n4UBo079ySw
-uSpRhkzPf5S43wZKsxsgSxANVG+hGEBmLK0L+4f1c+q0+gBCzVRfefMOPgL/EiRN
-68cOvlupFnWRUda3sBmne+rsEls5vV3jnZQRSMQUTIAOrKZSf3VFtaK9jwwkL8zV
-Fo1+dGOqTOeUNSOjQK76Rk7fKtEgElG8nd1TRtHU
+MTI0MDAyWjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIElG2m+vxvyC/H27ycn9keIR
+r2aAn9jdVIl8+kvdTNbnBCABCJ/BcMV4gYzMe5Y5B0GsDQIMies+APV0yPTZDRTb
++QIBQoAAGA8yMDE5MTEwMTEyNDAwMlqgERgPMjAyOTEwMzExMjQwMDJaMA0GCSqG
+SIb3DQEBCwUAA4IBAQDFauXmEIyKwNzx1bn4zULuP8nspEB+T2ei8uoGkUgWB14A
+coWBD+lBbXWoRGZaZwwyevSmSxzzlnWSy93FjbYMUo+5aU/A7iZB6eFjp2AcSZE5
+1CaAGTB6RjAFEwVRUiqqX1vRws+TMqHXx68rv0Cf1JvHUSbypKB5MYxDSJcyYfEK
+ieLwScQ7Dg4FNhitlPIrfnzVmMQW7/5L3q/a6nSPGexR2GSIsEVhhLM+CqHtdosZ
+sPFX3aCyzhetYJH12mJrmDDXdP6CbzXCGnCSau2ZuvszR+7p6jvmo3llsRfHzDx6
+OFr+nwK0zK9T1LcOE2/897NoQDxD4OXPrIYKP5Op
-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp
index bf8f9ea80..38148ef58 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem
index d652fd8f4..975b0f148 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem
@@ -3,31 +3,31 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.net
- Produced At: Fri Nov 01 12:38:51 UTC 2019
+ Produced At: Fri Nov 01 12:40:02 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
- Issuer Key Hash: 95ebed771f13bb78170dd9520c1e594c85fc648d96625a47c576677b74989f6e
+ Issuer Key Hash: 01089fc170c578818ccc7b96390741ac0d020c89eb3e00f574c8f4d90d14dbf9
Serial Number: 42
Certificate Status: revoked
Revocation time: Mon Feb 01 14:27:09 UTC 2010
- This Update: Fri Nov 01 12:38:51 UTC 2019
- Next Update: Wed Oct 31 12:38:51 UTC 2029
+ This Update: Fri Nov 01 12:40:02 UTC 2019
+ Next Update: Wed Oct 31 12:40:02 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIICEQoBAKCCAgowggIGBgkrBgEFBQcwAQEEggH3MIIB8zCB3KEvMC0xFDASBgNV
BAoTC2V4YW1wbGUubmV0MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAx
-MTIzODUxWjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCBJRtpvr8b8gvx9u8nJ/ZHi
-Ea9mgJ/Y3VSJfPpL3UzW5wQglevtdx8Tu3gXDdlSDB5ZTIX8ZI2WYlpHxXZne3SY
-n24CAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTkxMTAxMTIzODUxWqAR
-GA8yMDI5MTAzMTEyMzg1MVowDQYJKoZIhvcNAQELBQADggEBAIjtLDJ+1QecZWj8
-HOVVv5Exr/pbfS6Oy54aVAiWZ4OEpiwfdZBZARq+R22pPLvJyDsWvF8SGqpv8LYA
-pJV8MqlRAoUYtuRGGzrumwHnDnkD130REpEu+TzKRaHTijho2EO7TUOuq2s6R40Z
-dntasZqsJ3EWhtLQw2j9NSialex1gaLTt8/FycJ3AjkrNwpE6RtgH8IFVWClkXk6
-DfyCo+NBtSWpZRKWhatDb1E9WBsx2NU3cQ9eja2qLzSWjHwSIGhwr0i7yujDbWvi
-BfO5SZG3CvERW3FkW66FMzZnXk8ZTTZd1x+VQ9A6ZbSOl4dLSG/fXhNm7N3nXQ0P
-bKZdKvI=
+MTI0MDAyWjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCBJRtpvr8b8gvx9u8nJ/ZHi
+Ea9mgJ/Y3VSJfPpL3UzW5wQgAQifwXDFeIGMzHuWOQdBrA0CDInrPgD1dMj02Q0U
+2/kCAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTkxMTAxMTI0MDAyWqAR
+GA8yMDI5MTAzMTEyNDAwMlowDQYJKoZIhvcNAQELBQADggEBAOmNUgeAB6Qrlu/j
+HhfNF3X3VfrwK5hoX8dzvMDcPs5ug34OpqZeFHBFfc8H8qBLcHFEYzlRZ56lwkeN
+gLNyKgyFWVJmUnPS3XCLSJ6GLM/ZU1a3JuaS2Cr2NLQaw57v4tR6RPd+9KEmmL8e
+bFCk7qvHGagt66fn+CnGNQ1pBfRb93hwWJtjz18vjKngaeAf4G1ddk4UIhwxG2Io
+rTGm7dVJWK8DVaLTLY2N6cCquHTmcxMwQnbbOi0YCRNssGJeNVHO0zDIGS+ot7eX
+sQIu6YUL56Crq9MciiT4scsf4UTZYeUu4/Ye+Odecoxi7c9QGhhQqxiVpMZ1JmQB
+cWCOc2g=
-----END OCSP RESPONSE-----
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 5ab282b9f..2e245da88 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 21f51716c..d2fdf9653 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----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 8ae606c7d..17d47403e 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,19 @@
; Config::Simple 4.59
-; Fri Nov 1 12:37:25 2019
-
-[CA]
-name=Certificate Authority rsa
-subject=clica CA
-org=example.net
-bits=2048
+; Fri Nov 1 12:38:23 2019
[CLICA]
level=1
sighash=SHA256
crl_url=http://crl.example.net/latest.crl
signer=Signing Cert rsa
+ocsp_url=http://oscp.example.net/
ocsp_signer=OCSP Signer rsa
ocsp_url=http://oscp.example.net/
+[CA]
+name=Certificate Authority rsa
+bits=2048
+subject=clica CA
+org=example.net
+
diff --git a/test/aux-fixed/exim-ca/example.net/CA/cert9.db b/test/aux-fixed/exim-ca/example.net/CA/cert9.db
index b1c1d03d6..0e6e18ca8 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/CA/cert9.db
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 d87b6e3ef..f6505cb5f 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 643115630..4e32a860d 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=20221103224953Z
+update=20191101124302Z
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 7b473df9f..2cd9846d4 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,10 +1,10 @@
-----BEGIN X509 CRL-----
MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUubmV0
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjIxMTAzMjI0OTUzWjANBgkqhkiG
-9w0BAQsFAAOCAQEA1rtA3ePMfYuQkWZOBrF8sj26qkwey3R0cltpTvznYZjj4duH
-LsNKz+YScdBLGxI8Vu8g/KiOxM47yariQf7zg4ytN3wZYrcyuIBZ40pynQGfOW7O
-UQP5LEeK159Net+YoGqvD7saEJpiwy+NupFwWtUWQhfYSQBbtBm4P4++Wnei8jgZ
-i1c1CndHxdbN2o8cUgEUvgn8mASZ0Bj6i26up1pak3lutoJnYF/7LHReHMV6NEjO
-oKPr+yYs8eEu6Z8tWGXmK4jaw87xlwfXtUBGZVrB+jiKH90yuoeoxJQ5eTR3Tz0N
-DnHttMtlr/MbV64IyxO2nmlKUZwVYrm1W8NI5Q==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAxMTI0MzAyWjANBgkqhkiG
+9w0BAQsFAAOCAQEASWQ5FCPuO8IevQSU//+4Y0NVJseiD2V2PZUJusZueEEsEbFR
+Ve8TLhEvocDDIzpppRRgKslzTbJvpB1PMD/0vb+uTM65ZzeFzdg8/4fGXyyJoKqu
+miSQCEOn6YJGXRNVp5e+gyAYi7nITI+hsJmyB7p/Axi2Ue6ROzFOdoXFRx9PJ+2d
+cc+7raY5gvmwCthVXsodfocZFcZbux+TITIwDGIVOcWDbApV7ZwPtKtxkcsK29kq
+3kfPhKyQDC3Z4tfCIUPnDJrr7RAahZaM7p1DsYN9F9NmydXyMMyTg6gjSTld8Wo8
+DB0uBKZbwnU0L6mnE7y8eODWSDiarfwqHfew3A==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem
index d4ade0674..a85c79f72 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem
@@ -1,21 +1,21 @@
-----BEGIN X509 CRL-----
MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUubmV0
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjIxMTAzMjI0OTUzWjANBgkqhkiG
-9w0BAQsFAAOCAQEA1rtA3ePMfYuQkWZOBrF8sj26qkwey3R0cltpTvznYZjj4duH
-LsNKz+YScdBLGxI8Vu8g/KiOxM47yariQf7zg4ytN3wZYrcyuIBZ40pynQGfOW7O
-UQP5LEeK159Net+YoGqvD7saEJpiwy+NupFwWtUWQhfYSQBbtBm4P4++Wnei8jgZ
-i1c1CndHxdbN2o8cUgEUvgn8mASZ0Bj6i26up1pak3lutoJnYF/7LHReHMV6NEjO
-oKPr+yYs8eEu6Z8tWGXmK4jaw87xlwfXtUBGZVrB+jiKH90yuoeoxJQ5eTR3Tz0N
-DnHttMtlr/MbV64IyxO2nmlKUZwVYrm1W8NI5Q==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAxMTI0MzAyWjANBgkqhkiG
+9w0BAQsFAAOCAQEASWQ5FCPuO8IevQSU//+4Y0NVJseiD2V2PZUJusZueEEsEbFR
+Ve8TLhEvocDDIzpppRRgKslzTbJvpB1PMD/0vb+uTM65ZzeFzdg8/4fGXyyJoKqu
+miSQCEOn6YJGXRNVp5e+gyAYi7nITI+hsJmyB7p/Axi2Ue6ROzFOdoXFRx9PJ+2d
+cc+7raY5gvmwCthVXsodfocZFcZbux+TITIwDGIVOcWDbApV7ZwPtKtxkcsK29kq
+3kfPhKyQDC3Z4tfCIUPnDJrr7RAahZaM7p1DsYN9F9NmydXyMMyTg6gjSTld8Wo8
+DB0uBKZbwnU0L6mnE7y8eODWSDiarfwqHfew3A==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
-dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMjExMDMyMjQ5
-NTNaMC0wFAIBZhgPMjAyMjExMDMyMjQ5NTNaMBUCAgDKGA8yMDIyMTEwMzIyNDk1
-M1owDQYJKoZIhvcNAQELBQADggEBAHVKHALfB/OeDMeIvaSeZPDcxzJk5sR5zXBb
-hnjYXyl2ROxVF5Nl3d0mWGlZN1oabGp4QHxrkviylSWAPhS5NbaVfTP/eWqiHtQA
-yY9mEdZSNkA9nghDBOjqMneFQZRMUBhApQgl83mKNf3HI0geSOPSg2VNBX40JLi+
-w90NxZjbVAParCjp0dq8AiZpY4j9x6r3oTGbm+D+nfxfLq/KIMdCYHGsdmiR1spm
-/TxBVu4tH5d/q4MM25M8K1j6vx28Qc8VSGMyovPs444p5WLRxdpXSEM83546Zxk/
-m6lmY6FzoWdqlMK44473jIB4K7+ZcJ9I9Omf3P9c07WTpReP+QM=
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxOTExMDExMjQz
+MDJaMC0wFAIBZhgPMjAxOTExMDExMjQzMDJaMBUCAgDKGA8yMDE5MTEwMTEyNDMw
+MlowDQYJKoZIhvcNAQELBQADggEBAARzrjOHNj3kd5SSLk384QNWISzL7guRd3g/
+x9hCAmqGnUPVC3fRDsgHmtKKTLON+TAhQbpBqachoMyU0HpnVl2pMiirsxEHAae6
+wNNOPiCYb8SPVuzQb/mjRpli4Q89AxJfQ4V3kydYLQlHH/9b3snCK9s7mIRWPrzb
+aMlYhZrzubl7ghewUbp18nEZT5TU1f+pXTlmqMV6GB25OEsyhPSh0Lml40q6dwU+
+RD6FNEI3t21rG0NNrWWGcjCO3zxcMAFbQR3Km5AyTtldgzsa5Uxzp92tQmWexqHG
+bb3VNyF9OjLZMa2x/TyzYCaKKj3yUWe98jI2t2inkQk9zY1GACg=
-----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 3bc574dd5..ff02105f1 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 718d47f1e..f0012b670 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=20221103224949Z
+update=20191101124259Z
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 135e9b2ac..0c6da5cac 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,10 +1,10 @@
-----BEGIN X509 CRL-----
MIIBcjBcAgEBMA0GCSqGSIb3DQEBCwUAMDcxFDASBgNVBAoTC2V4YW1wbGUubmV0
-MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDIyMTEwMzIyNDk0
-OVowDQYJKoZIhvcNAQELBQADggEBAC/i+OArlTDYo6oN9H4o2QCsxgNmQYsTa+a2
-FZKJrBqlSiCaj/IVccnFZIEy/krtXYDEKBiUhYS/HQzAr9Qf96s+ZQN0Ho06xYb3
-Qu+k4tPSwfGBegddzAM+XDZnKLPsLsynJUK0XsPvE66Z8Bm3/a/LSoj7mliek04A
-sDGM+WaX+y0sSJYTlIFc57St5sXotxwwHHZyEZ7YLGFyLVKZLxeEo8yJNXpiVslU
-fLhZQNesST4zcpjr5iR+JjYS0OYuiDZ8ZauxzwJVWcoK4DFGnaxgVYwM480zAhT+
-VZIMUBp9sHhhAr+wHTVRryrVnBwsA1I0BPwysREUsAS/u9cIKkk=
+MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDE5MTEwMTEyNDI1
+OVowDQYJKoZIhvcNAQELBQADggEBABr5jxVJ3WQoVTI9fStZ/jI7mNbzoOBWPm5w
+3uMQt9hKShi2t5/RaaSt6hL9oRhAsPfdhImbFIhI2qfgrI8HeysTHulgrXBwgDQE
+/NebB5shGb287CT/11iBHaEeuCIqSp2FR2q/HIQzAGBYsgrud6B/6TgluiofiNlt
+pIC3vHGxGLQ2RD26WcHXvDGUwMrhU1vG392rF5r81PDfhNZEnGgmbG4x5lVYfWY1
+d+xAewFeSJoZ+7tT+vxLWSPe0LzI0K1Wg/OZtvu2hd5adoBWwv09mmJWRHjL3V5L
+EFS1tf0/lQALQsVUpbB4MmyO0u5SN7qESXe4Jj41FD22VrdpWpM=
-----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 db911b04d..d45c44e75 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 103579818..9f54f912c 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=20221103224953Z
-addcert 102 20221103224953Z
-addcert 202 20221103224953Z
+update=20191101124302Z
+addcert 102 20191101124302Z
+addcert 202 20191101124302Z
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 0f9c6bd88..2a2462561 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,11 +1,11 @@
-----BEGIN X509 CRL-----
MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
-dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMjExMDMyMjQ5
-NTNaMC0wFAIBZhgPMjAyMjExMDMyMjQ5NTNaMBUCAgDKGA8yMDIyMTEwMzIyNDk1
-M1owDQYJKoZIhvcNAQELBQADggEBAHVKHALfB/OeDMeIvaSeZPDcxzJk5sR5zXBb
-hnjYXyl2ROxVF5Nl3d0mWGlZN1oabGp4QHxrkviylSWAPhS5NbaVfTP/eWqiHtQA
-yY9mEdZSNkA9nghDBOjqMneFQZRMUBhApQgl83mKNf3HI0geSOPSg2VNBX40JLi+
-w90NxZjbVAParCjp0dq8AiZpY4j9x6r3oTGbm+D+nfxfLq/KIMdCYHGsdmiR1spm
-/TxBVu4tH5d/q4MM25M8K1j6vx28Qc8VSGMyovPs444p5WLRxdpXSEM83546Zxk/
-m6lmY6FzoWdqlMK44473jIB4K7+ZcJ9I9Omf3P9c07WTpReP+QM=
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxOTExMDExMjQz
+MDJaMC0wFAIBZhgPMjAxOTExMDExMjQzMDJaMBUCAgDKGA8yMDE5MTEwMTEyNDMw
+MlowDQYJKoZIhvcNAQELBQADggEBAARzrjOHNj3kd5SSLk384QNWISzL7guRd3g/
+x9hCAmqGnUPVC3fRDsgHmtKKTLON+TAhQbpBqachoMyU0HpnVl2pMiirsxEHAae6
+wNNOPiCYb8SPVuzQb/mjRpli4Q89AxJfQ4V3kydYLQlHH/9b3snCK9s7mIRWPrzb
+aMlYhZrzubl7ghewUbp18nEZT5TU1f+pXTlmqMV6GB25OEsyhPSh0Lml40q6dwU+
+RD6FNEI3t21rG0NNrWWGcjCO3zxcMAFbQR3Km5AyTtldgzsa5Uxzp92tQmWexqHG
+bb3VNyF9OjLZMa2x/TyzYCaKKj3yUWe98jI2t2inkQk9zY1GACg=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/key4.db b/test/aux-fixed/exim-ca/example.net/CA/key4.db
index 5d5aadb54..46bd98d96 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/CA/key4.db
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 9c8e0b6d3..f98cc0439 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.net/CA/noise.file
@@ -5,7 +5,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 2800.011
+cpu MHz : 3201.587
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -33,7 +33,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 2800.038
+cpu MHz : 3297.210
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -61,7 +61,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 2800.715
+cpu MHz : 3298.538
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -89,7 +89,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 2803.417
+cpu MHz : 3292.926
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -111,80 +111,80 @@ address sizes : 39 bits physical, 48 bits virtual
power management:
CPU0 CPU1 CPU2 CPU3
- 0: 39 0 0 0 IR-IO-APIC 2-edge timer
- 1: 0 0 0 28568 IR-IO-APIC 1-edge i8042
- 8: 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 0 169855 0 0 IR-IO-APIC 9-fasteoi acpi
- 12: 0 0 1882987 0 IR-IO-APIC 12-edge i8042
+ 0: 38 0 0 0 IR-IO-APIC 2-edge timer
+ 1: 0 0 0 973 IR-IO-APIC 1-edge i8042
+ 8: 1 0 0 0 IR-IO-APIC 8-edge rtc0
+ 9: 0 138991 0 0 IR-IO-APIC 9-fasteoi acpi
+ 12: 0 0 201523 0 IR-IO-APIC 12-edge i8042
16: 0 0 3 0 IR-IO-APIC 16-fasteoi i801_smbus
120: 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 DMAR-MSI 1-edge dmar1
- 126: 0 0 0 1963021 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 127: 0 1368 1116015 0 IR-PCI-MSI 327680-edge xhci_hcd
- 128: 0 556 0 0 IR-PCI-MSI 2097152-edge rtsx_pci
- 129: 0 0 17 5611123 IR-PCI-MSI 520192-edge enp0s31f6
- 130: 31 0 0 5 IR-PCI-MSI 1048576-edge nvkm
- 131: 626 0 13676971 0 IR-PCI-MSI 32768-edge i915
- 132: 0 63 0 0 IR-PCI-MSI 360448-edge mei_me
- 133: 0 0 0 46 IR-PCI-MSI 1572864-edge iwlwifi
- 134: 1333 0 0 0 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- NMI: 850 840 851 825 Non-maskable interrupts
- LOC: 30565583 29786411 30178317 28615590 Local timer interrupts
+ 126: 0 0 0 682090 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 127: 0 5232 629360 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 128: 0 506 0 0 IR-PCI-MSI 2097152-edge rtsx_pci
+ 129: 0 0 15 1152157 IR-PCI-MSI 520192-edge enp0s31f6
+ 130: 13 0 0 5 IR-PCI-MSI 1048576-edge nvkm
+ 131: 629 0 9194221 0 IR-PCI-MSI 32768-edge i915
+ 132: 0 65 0 0 IR-PCI-MSI 360448-edge mei_me
+ 133: 0 0 0 49 IR-PCI-MSI 1572864-edge iwlwifi
+ 134: 1151 0 0 0 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ NMI: 421 422 430 415 Non-maskable interrupts
+ LOC: 24553927 23675944 23065181 22449912 Local timer interrupts
SPU: 0 0 0 0 Spurious interrupts
- PMI: 850 840 851 825 Performance monitoring interrupts
- IWI: 304853 283991 5536222 309962 IRQ work interrupts
+ PMI: 421 422 430 415 Performance monitoring interrupts
+ IWI: 188144 175861 4004788 194234 IRQ work interrupts
RTR: 6 0 0 0 APIC ICR read retries
- RES: 5411739 5256528 5121030 5309099 Rescheduling interrupts
- CAL: 5095425 4864364 4783029 4801195 Function call interrupts
- TLB: 3285742 3215570 3242405 3283511 TLB shootdowns
+ RES: 3031047 3054389 3071151 3064710 Rescheduling interrupts
+ CAL: 2005440 1885713 1840937 1822035 Function call interrupts
+ TLB: 834647 821497 882555 886390 TLB shootdowns
TRM: 0 0 0 0 Thermal event interrupts
THR: 0 0 0 0 Threshold APIC interrupts
DFR: 0 0 0 0 Deferred Error APIC interrupts
MCE: 0 0 0 0 Machine check exceptions
- MCP: 154 155 155 155 Machine check polls
+ MCP: 126 127 127 127 Machine check polls
ERR: 0
MIS: 0
PIN: 0 0 0 0 Posted-interrupt notification event
NPI: 0 0 0 0 Nested posted-interrupt event
PIW: 0 0 0 0 Posted-interrupt wakeup event
-MemTotal: 16240472 kB
-MemFree: 5767108 kB
-MemAvailable: 11601180 kB
-Buffers: 1120564 kB
-Cached: 5412564 kB
-SwapCached: 196 kB
-Active: 4164912 kB
-Inactive: 5219392 kB
-Active(anon): 324236 kB
-Inactive(anon): 3376864 kB
-Active(file): 3840676 kB
-Inactive(file): 1842528 kB
-Unevictable: 176052 kB
-Mlocked: 80 kB
+MemTotal: 16241860 kB
+MemFree: 5579284 kB
+MemAvailable: 11233488 kB
+Buffers: 643836 kB
+Cached: 5956172 kB
+SwapCached: 88 kB
+Active: 3268604 kB
+Inactive: 6319564 kB
+Active(anon): 234808 kB
+Inactive(anon): 3711476 kB
+Active(file): 3033796 kB
+Inactive(file): 2608088 kB
+Unevictable: 336688 kB
+Mlocked: 184 kB
SwapTotal: 16601080 kB
-SwapFree: 16598008 kB
+SwapFree: 16599032 kB
Zswap: 0 kB
Zswapped: 0 kB
-Dirty: 72 kB
-Writeback: 32 kB
-AnonPages: 3027256 kB
-Mapped: 803168 kB
-Shmem: 849924 kB
-KReclaimable: 488452 kB
-Slab: 677372 kB
-SReclaimable: 488452 kB
-SUnreclaim: 188920 kB
-KernelStack: 19696 kB
-PageTables: 46776 kB
+Dirty: 640 kB
+Writeback: 0 kB
+AnonPages: 3324800 kB
+Mapped: 841156 kB
+Shmem: 958108 kB
+KReclaimable: 349912 kB
+Slab: 507748 kB
+SReclaimable: 349912 kB
+SUnreclaim: 157836 kB
+KernelStack: 19744 kB
+PageTables: 47124 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 24721316 kB
-Committed_AS: 10888852 kB
+CommitLimit: 24722008 kB
+Committed_AS: 11193284 kB
VmallocTotal: 34359738367 kB
-VmallocUsed: 85812 kB
+VmallocUsed: 82756 kB
VmallocChunk: 0 kB
-Percpu: 7712 kB
+Percpu: 7616 kB
HardwareCorrupted: 0 kB
AnonHugePages: 0 kB
ShmemHugePages: 0 kB
@@ -199,13 +199,13 @@ HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
Hugetlb: 0 kB
-DirectMap4k: 316904 kB
-DirectMap2M: 13176832 kB
-DirectMap1G: 4194304 kB
+DirectMap4k: 374248 kB
+DirectMap2M: 11022336 kB
+DirectMap1G: 6291456 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
- lo: 203398319 414266 0 0 0 0 0 0 203398319 414266 0 0 0 0 0 0
-enp0s31f6: 5122045061 4199174 4 121766 0 2 0 0 1451857470 3008007 0 0 0 0 0 0
+ lo: 307129 2471 0 0 0 0 0 0 307129 2471 0 0 0 0 0 0
+enp0s31f6: 672636085 686092 0 0 0 0 0 0 60877460 523339 0 0 0 0 0 0
wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
virbr0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-virbr2: 177806558086 17365569 0 0 0 0 0 57 943922498 11257216 0 0 0 0 0 0
+virbr2: 131939979990 12949352 0 0 0 0 0 82 724135061 8643862 0 0 0 0 0 0
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 6f79c2d4e..dcb99dc5d 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
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-ggEKAoIBAQDV2QMhXroWfkj9YEPBRT121t9etcI9Vd1nNquiwiZQXaA5htcRAfDR
-tJH6m9a8IW1jq/PAfoJduMuq+wyWFQRTPXBwJQf64URZ+Mr0iBn0YmQo5WioEUuQ
-x3s/UnmI3d9l3j6WAsBVIIB1QuyocUDdsQZDZ4L6qCFi1WwwL6kqOnVXviqPx2If
-U3XR9sxqWuQa73moAvPH/JSOxUMyozlua7GFrjb1bthwOU/muJIVdrdwtuQb+reN
-puuNWjxY56DAfS0F8IIc85C952sARizsjGQhuzim2l1h4rZkKDRGBHgjDdIEZWxi
-nQg6k8WseM9GdPFLjxUD73SuDTR5QGftAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+ggEKAoIBAQCkL0Gw+jw7XFj1EoIVMrNa519vJeAad+wYVplDS9vB/WgWfCIgLhN8
+sLy6DKa/bwPMliUXDjGLisXd5jh1d36uFeeCN9R2fvlNgHiZslZmkEuPngBfPvjE
+UDN3avu96Dyi3EIJlP2sxoGUutvG6gNlTnUCLUldJeZNzXoLhTZdpFMf7k03h+Ou
+njNdmDIxMChMP474DqThP9sA2bUdhVzWGhR/fa8Sbb/Q7Zcr1tb1i+siwpxoYGt2
+LeGbMKsF9uZdGgoxJ8i1rpLvf+CrBnDFJZzpNC1+LjGWwKH08srpY0a2eCex7tfg
+HUCi6JSx08j04uWSpo0W1/BJ+AvycNaNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzcyNloX
-DTM4MDEwMTEyMzcyNlowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANzT
-zcHynjItAQrtsDcxgDI+0Qs2SeJXUkrsyYZl1zNUianG0j8JnxMhrkhAjwAhYQ6m
-NNcOKJ1csgh5fyEuxsCOlUaSCakjm9+LfPBEHm//QNCqL11GJggNvYA6w82AW5Ly
-UPtdLLQqIgGIQcsKX9x/OAI7BYqG8AfKQ8Jk/dIA3+TF1v2zY7nYCkyaHy5lFLPQ
-fkTpTuOkM0yFiygJz2xgzgC/ZDFB4/cTYmOIG/qLlS3XGeS+z9/ce4Pmwp2RhRnG
-g7Y47zan2ACdp7XifXUBEWXcCiqaH7M/9fQmmMktm2fgE7WgubsiUyECDVaJ19Om
-PD+IN2bXutiLhP130WkCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAF2YN9oC6YtXrdXesgCF8ISG
-lmQrM4oDCCQc+bY6v1t9pEcIfzx5/Oe/5TEyYOBb/mfjVA0zm11nP3rReFqJHKae
-aYgV4HUTuWp48ErLGbR9+1SfjxqLxcMsnCnA4Q0OkQD22DbuUgDCMqEJFCFmM7XF
-ijh8WNXFlFLL1Nqyf+GYcbjdunova68igeTh8hMO6v/TeBe1DBqz6j2elt9JMRI3
-a+bYWZxRGCoqIBpedBKFSNl+L9KQ+FetBff5EAZtGxVLk1gBOtHHQDtBaAdKz9Ok
-W2CGAV5W51L4+ntwttnChVvcw3uqrhrjPNarvQ/JsibBgQdyO4BjQd4l7Qrdmx4=
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.db
index e98d0d1a3..eecd70439 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.db
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 4c4dd3844..49fab0aa6 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,46 +1,46 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: E7 67 5D 65 29 20 32 9E E3 25 6F ED 87 94 A5 FB 41 E0 90 EF
+ localKeyID: D1 34 52 F9 D5 F8 C2 2F 07 A0 84 D1 BB 3B 8D 6D A6 46 CF 3E
subject=CN = expired1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM3NTNaFw0xOTEyMDExMjM3NTNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3G4ZvbRE
-XMQEeYUywcXT6aGzHmT7mrLiw1yfFgTS4BPSBmk/LFYxhTnjuwonA/WWzql+InIW
-krTWO+EQYUlqtQYKicKtm9QR50SjWg22DOvCMqsW8G8OzD5aOTi8RJWwP9rAf8mh
-czmnqWOuKQeykdCh8MBhZU+3W6BcJTBEi/ANz7/yMoK4LpSyewb8267X/C/Fe1xC
-8lVoZMOkPHsTbyG+LKrLDejpAljgFtCSYbiLdg6RBu/lyWovmnIrl4RFp57ToskY
-PLeSWVyBvz5caaipjHqjAmjq6d6cfaGG+4KrlEecZj/+Ke3SObZcbrXfWH/Bnw2N
-6yTPpfrXZ6+ViwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM4NTVaFw0xOTEyMDExMjM4NTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAreN4DiWs
+3l3qn/x6aEoUqGnZTL51E1We5FBmeQp+7TndfjiOaOg0BlViy0PAWrGIbSufmoG7
+DOj2xzBthMYASYayRCyTfZp6OmzlanR31fCj8gfGsdEAttO9ym6SS9Iuh7CMRpsy
+yjPFce/MqBuGQWaA6ubxcWldd+XUk/tCcLc8tQroBoj56czmAtlnRs04AW3Z4Csk
+De3DS2yKEkWCu8ETQb1qrzuDZDNfsiJMG+Um1b820dzEghTLFp9OD4vGfwm10LpC
+790dBq3BDGQyHHcHrUOBAyoYb/PSe6iTIRpPf3BvOuBHIz+bFtwxiv+nLgGiR8QD
+J3RHcMdCB8HkPQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQBT4iC+IV/CvK30
-ZrRw5wPhZ9hMpkW5FaN2LEzXml5Cf7wIfC4gCf7vpEMYcf+2F5ytvqC4q/AFUKp3
-dk3VblF8o0yoYBy5tKveO5bi8GeC2SR7PDKoZFt59/Ijpq6jB5RiIT/ir1753v+r
-BUiEiLybVG/qtRE+cPjKVygyCwciMjvCFjdux17JfClvR+UWntwvtQ4aXI7CnWHA
-FKHb5A/VnMHuDbELrXk2edvq7X3oqcMPK1plsYyrR0zY//JtOMs2Z3oxUGRHxLhC
-FPfyVsWuzsr3vIoSe45cMWwfey3DlOT22w21wHVNgwmiiSUpKex4SBRpjgbOOwQy
-EmCOJIaE
+cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQCfvJNOEXcHDAuj
+w0W0L6ObZ66OjpwvbJ9rrNff9HR6T6KZn5kfz/YGVAXDD/uLouE13BBFZcwRRawC
+rYSm76gCecolMz2tKGLT72E010JcRfIz0LDCth3v+MNyCHmQnRQzeM0bYo2SMkHI
+UR8d9o2xCgA6r2LetRj+4X9Qb1aKshKiJjcuobGwKVcOSXtNYpmbjJZcf4oJ/8qF
+iyKE/qXUlZCGWuBP0/UGg7Io3H1C10ucG6CjGPPz4kiGEWx+cn08VUFg6r/7TPE6
+VoPp1OilhlqT7LZ0BUk10uSMWKIXiufGfIedSf7ZSsGoQpuz/4KhNhLgCg8kHMm0
+IdsqDGR7
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzgyNloX
+DTM4MDEwMTEyMzgyNlowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+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
-----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 607cca8d7..ee8bb01f1 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,34 +1,34 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: E7 67 5D 65 29 20 32 9E E3 25 6F ED 87 94 A5 FB 41 E0 90 EF
+ localKeyID: D1 34 52 F9 D5 F8 C2 2F 07 A0 84 D1 BB 3B 8D 6D A6 46 CF 3E
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIcsngkRyRf/sCAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBAmynZ9vNI5fpRrfzjICAuGBIIE
-0DFDRrfOKXN/Dn/dylgw6SKogUGKxlGT89fuoJL+VNCnIggxdN3GmE8ot4971T4m
-dxOE8D2JH2tfa54sbnEgvNrQ17LHAR1aYzwiXcodetSY1nIR3Q3ledeCOIFhXORj
-G8/QXRarEJXg/tYUV16fK1hZPMgLQhzsOdNy4wvq9b4hjUT0+/dTVGredR8Sl2PJ
-TDeky90K2QonTCPheGCaUQrll9bJYozpFDeKQZDlYphWZYF0a8fVPZNeBVrkI1QH
-dCc1e6or2alViwKYFxWTlOp8XXAqWjTq9fSW+jpNZWxmojaKjdOwhOs/uSVGAPPq
-Bc1btHu3JbLbWuXSioYOyOyAPcjuKFJo50JacEr0EiOzt3dchSQmoHjPB8F56ZWB
-rOp4/MkUdACjh1XLDz5Far7/foSkW0hvcw/CHWyHrJD6KMbYAW+cRSvK9AHzBvYc
-C3lSDho0xtnfsmrSzGAa2KQuuaODgSdFwtdZhLHaPmCdvbNwYO12O/iAGyXgBUFD
-C6Kz3pKbTtw4EzgPA9BZWQIuf8HXRBU7Zhw4jpJMENDabZuYuwoIku+/LiBr6Z2A
-ulhEfuqPZWGv4NVifLmFThQMzVe4XQPZ3Ht3xV915kEZKGBD5UyTpMOEbsgmY73L
-qJjeWXQwJHR4sA36TK38mWD3JPuDudW9VflvZB4i/vriO7GeoJXkVT6AuzuPGQK8
-Bq7uFzOGr1hEHiAdDwS9TAsam2JAa+TyMXdtTWwUK6iRf/TI6X0Y37bD5Tl/32K2
-HoctMBrJQM5236NGEUZHXfWSsfQ4EYD5nJb9TOyNpFt1kDTV1A8sSBq7404AD+tl
-KYJOMGScgwTAq9fj26ydeFnXD1xkA8bxpUdqvCA7MiwB9NbGRAjwMXkWPAavmq4t
-H82hyTR0XdeVq+X8RVZEbQjNbHEJzWla5JZ1/m9bHzq9iWoBaUCM6JQhwf0Psg9h
-al4Ay8n8tkIHsXIrv3IsafYrxyX+r5KBpkNGKF4wLBQ42TJJBF8CnUSHfRuAk+ly
-XWMcSc7u4YN1OUkkzI11aBMcYo6rN1VRUy+qSZpSIP+UQJB40o7PN5vB+wHsVMzO
-Gtcdi3X9ONd22St0ZUhIYosHqyUQuljC1JrrP3IguiYXx2QPSCViy0f7gLboq58G
-ds6IJpf0RpH/4xQ/+106POzVLJJYxNOBwd5gKAtaUYVyiJIVBUNT0Go4gk3KhsM4
-WVVwjL1b9zr/K5t5jwdbR/xSIvXWi9Hz/sM0Y47FglO5rPiv5ZsPOO+CYTj9VepT
-bH/3HIOrLXlaWJqIKQnxgUG6Pdxjw0FM18royyku85RAWvvLJ0suvg9K/cclSJLG
-Bul93vQW9BjPhtjGLL/HmynMIxUMsCM9wlLM6G9IgDk3pw3ku+OJ3PpSSyLriRIA
-NBz5SPORu/EW/N7Ny9FmaZBUzMwHGbQKnU25p9sGJw7RxUKKDJ1syq/TNx2qbQ7m
-WD+zqV8MiMs6cnPnRpQhnKDGcF2PdKKbvUZ6YnmjaGYRmWsWznnabpIuHMv2otgG
-vnJf0NHM5sEuQ7BFClKzor692hCrhuyIFJIJSZu69uVOrCV/3RZaLb7ovPlWWGWu
-xaaJq1F8q/+AXKd+KcL77gsxZdYrH4sh7y29t4G35rFW
+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
-----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 ead58003c..cf61710c4 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 7d86bb842..18bca86a7 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 3fdbc80f5..d9f6d07bd 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 4fdafa309..468831abc 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 3f8193061..066989a36 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 3fbee3e1d..a8e509f9e 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 c93834f82..9f1fdfb43 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 7839010f2..8a33cae19 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 39487c182..581e259fb 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 c269e4438..33d22574e 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 c1f252f92..38a898c3c 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 26504d128..5451a0187 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,27 +1,27 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: E7 67 5D 65 29 20 32 9E E3 25 6F ED 87 94 A5 FB 41 E0 90 EF
+ localKeyID: D1 34 52 F9 D5 F8 C2 2F 07 A0 84 D1 BB 3B 8D 6D A6 46 CF 3E
subject=CN = expired1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM3NTNaFw0xOTEyMDExMjM3NTNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3G4ZvbRE
-XMQEeYUywcXT6aGzHmT7mrLiw1yfFgTS4BPSBmk/LFYxhTnjuwonA/WWzql+InIW
-krTWO+EQYUlqtQYKicKtm9QR50SjWg22DOvCMqsW8G8OzD5aOTi8RJWwP9rAf8mh
-czmnqWOuKQeykdCh8MBhZU+3W6BcJTBEi/ANz7/yMoK4LpSyewb8267X/C/Fe1xC
-8lVoZMOkPHsTbyG+LKrLDejpAljgFtCSYbiLdg6RBu/lyWovmnIrl4RFp57ToskY
-PLeSWVyBvz5caaipjHqjAmjq6d6cfaGG+4KrlEecZj/+Ke3SObZcbrXfWH/Bnw2N
-6yTPpfrXZ6+ViwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM4NTVaFw0xOTEyMDExMjM4NTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAreN4DiWs
+3l3qn/x6aEoUqGnZTL51E1We5FBmeQp+7TndfjiOaOg0BlViy0PAWrGIbSufmoG7
+DOj2xzBthMYASYayRCyTfZp6OmzlanR31fCj8gfGsdEAttO9ym6SS9Iuh7CMRpsy
+yjPFce/MqBuGQWaA6ubxcWldd+XUk/tCcLc8tQroBoj56czmAtlnRs04AW3Z4Csk
+De3DS2yKEkWCu8ETQb1qrzuDZDNfsiJMG+Um1b820dzEghTLFp9OD4vGfwm10LpC
+790dBq3BDGQyHHcHrUOBAyoYb/PSe6iTIRpPf3BvOuBHIz+bFtwxiv+nLgGiR8QD
+J3RHcMdCB8HkPQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQBT4iC+IV/CvK30
-ZrRw5wPhZ9hMpkW5FaN2LEzXml5Cf7wIfC4gCf7vpEMYcf+2F5ytvqC4q/AFUKp3
-dk3VblF8o0yoYBy5tKveO5bi8GeC2SR7PDKoZFt59/Ijpq6jB5RiIT/ir1753v+r
-BUiEiLybVG/qtRE+cPjKVygyCwciMjvCFjdux17JfClvR+UWntwvtQ4aXI7CnWHA
-FKHb5A/VnMHuDbELrXk2edvq7X3oqcMPK1plsYyrR0zY//JtOMs2Z3oxUGRHxLhC
-FPfyVsWuzsr3vIoSe45cMWwfey3DlOT22w21wHVNgwmiiSUpKex4SBRpjgbOOwQy
-EmCOJIaE
+cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQCfvJNOEXcHDAuj
+w0W0L6ObZ66OjpwvbJ9rrNff9HR6T6KZn5kfz/YGVAXDD/uLouE13BBFZcwRRawC
+rYSm76gCecolMz2tKGLT72E010JcRfIz0LDCth3v+MNyCHmQnRQzeM0bYo2SMkHI
+UR8d9o2xCgA6r2LetRj+4X9Qb1aKshKiJjcuobGwKVcOSXtNYpmbjJZcf4oJ/8qF
+iyKE/qXUlZCGWuBP0/UGg7Io3H1C10ucG6CjGPPz4kiGEWx+cn08VUFg6r/7TPE6
+VoPp1OilhlqT7LZ0BUk10uSMWKIXiufGfIedSf7ZSsGoQpuz/4KhNhLgCg8kHMm0
+IdsqDGR7
-----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 cfb8e83f7..68e3f8925 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDcbhm9tERcxAR5
-hTLBxdPpobMeZPuasuLDXJ8WBNLgE9IGaT8sVjGFOeO7CicD9ZbOqX4ichaStNY7
-4RBhSWq1BgqJwq2b1BHnRKNaDbYM68Iyqxbwbw7MPlo5OLxElbA/2sB/yaFzOaep
-Y64pB7KR0KHwwGFlT7dboFwlMESL8A3Pv/IygrgulLJ7Bvzbrtf8L8V7XELyVWhk
-w6Q8exNvIb4sqssN6OkCWOAW0JJhuIt2DpEG7+XJai+aciuXhEWnntOiyRg8t5JZ
-XIG/PlxpqKmMeqMCaOrp3px9oYb7gquUR5xmP/4p7dI5tlxutd9Yf8GfDY3rJM+l
-+tdnr5WLAgMBAAECggEAEfZk4ZkZgwe0J6TrjG/PA3haTM1E1YfjQ7E+A4DUIE9t
-K3mTHM1PTsB3Zsv+fuuZ5PBZ53utjDnxRULjX1IowGSkIjK7i/m9lb95okKAxc/G
-bPOVNHWQWqNwHb6aVOpvyNxOGHu5TNbzazHExPIsIobCU4iRxzw2QGCycZNb2p1H
-+ZnQVk6S0Z7qRysdOetcDKXWlFjvUbvw7wVA/86AF/WJDDpaCccb2sm6xnYuYDzN
-VhaOcGyipfJo+UNg9a9sOGMPhu9X/18TWaSJc6wTLqjOjq7+tUFFa8bxfnWysnfF
-LF6ky1uJIKT+JdlJYWHwQ7gjKBB2d77CecUOQuXFmQKBgQD4eWoTfHv9J/VSQ4Mu
-4/mkP7doeffJfR3cIddBfDxDkVp8ytVe/nB9H+2G0kUEVsBS5UDXWC8+2uJnfbDm
-zQxjErsNd9TWBPB/IgGMVWCURnOV9wTv4XbGBXPFBsD7b+3ZXa1DzyvzzvddsftJ
-esdYOqCJ4d/+5iO3pPQ4BOzQgwKBgQDjGz2wfs8MH6I7nTEAOfmDBXUd46v2XrLg
-zDOwYTaMQU92yzNvXJ2c85OEBGKscBrsO8ViGvCJR5eIRxz1dFVshn7fsZZhSzZG
-ZqYwY2TModqKLUsQ81wxcvXXhFZ7q6z/dTEMNGk5AxEqTz3nOjzrXcx7Gk+jq3lB
-+F865B0IWQKBgQCvT/soBIz28VqF0FyemPtqiApADM5nu3918eqOqblbcxMFOZeS
-jrOPlRdiKLnJdev8kQRO7Elpb8aOfoByV/qFbJHNzt68on+NM9Ej0plyBMNI7CDv
-n4TN8srcGQfQYAjRdObrESFRxJWD5jAGiDpeZf8fSd9hWb+Zsykc3Vy5QQKBgEts
-L5ee9ZocI1/S+4QMvO2jcVrE0sZWeuenSX9JOblos0BLicBxLLMEPbh5UF/eN0K/
-MvU65ylgSlXq8BYgVYJeRGJ78upK9TJ6QrUNPVusYQzEsApoF/UgLb8uZx5ZTHHm
-dKyN92gEub2oZXGWaMbt9svnWA2OFA4xs0a2nWG5AoGAcOq6KpOpV91W/j2IThED
-Z8I0sa6hpZB/yvHHBRRUUrIds94iRsVUzn7mQ/sXtnb2VxAbyxV+4p2GjBdR/vXC
-Ay/slzUKgXUDLOCgaTgfKFviGFbQkmfLUxX9aDWqmhxj1o9UGdR5+8uykvb4K8+w
-YwUzBsDFmn0Cm8409jmPX6o=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCt43gOJazeXeqf
+/HpoShSoadlMvnUTVZ7kUGZ5Cn7tOd1+OI5o6DQGVWLLQ8BasYhtK5+agbsM6PbH
+MG2ExgBJhrJELJN9mno6bOVqdHfV8KPyB8ax0QC2073KbpJL0i6HsIxGmzLKM8Vx
+78yoG4ZBZoDq5vFxaV135dST+0Jwtzy1CugGiPnpzOYC2WdGzTgBbdngKyQN7cNL
+bIoSRYK7wRNBvWqvO4NkM1+yIkwb5SbVvzbR3MSCFMsWn04Pi8Z/CbXQukLv3R0G
+rcEMZDIcdwetQ4EDKhhv89J7qJMhGk9/cG864EcjP5sW3DGK/6cuAaJHxAMndEdw
+x0IHweQ9AgMBAAECggEAIokC1wx0gNV2O8ARL5VG9QvQtIU/C0/99qphL7j97G+J
+pf/liMBVVMywil4yXdDUn5oCYNVTKQU7vePIXI5WkEPIM/IGePOtQt1N0w6+nibk
+6LTSqY4w7h6vmvzK4XQk+Z3+vicktzQBCtftdZXB3EtXX0/us++ROLbUuW81it0F
+yi7/2ZnDxGvc4busaPGAfL7r+6rUIkAynjgFX6Z5MMDJCTIsTWWwSSbX+YtRe6HT
+Y8OUoA8KFnhrLco6Y/9i6nrq5z0MCEV71TKKjTw6ZpuB2LnlGpSQHK+SPNOyC1pt
+WqMwK7Vi8OTYhGV693oAQHVp4olaYyC1us2JpT3RoQKBgQDUoVK8IkCKhmdkqlNl
+qzVE6Ka5ZG6/FcNfwAsdfvaJQpvxCiWUg5cWwLSfGJoAaPa7aKGho4n5i1wkZ2L+
+SiryPa132G6paQoD2AfKkBVlF/l/szTewqPTd5nB9SO3XxcAshLHUyLfp/o5FPdB
+As8KCEMP2vYV9nkmg5nf88CiqwKBgQDRWzeUq+v314Y1FLJp/nJ5MGQkhfyYUj0s
+qYnyzAjIPVCu2C3V3T7TQBIBQsVJM7tNQ3B+7HswL3k1bnXlcNlgaa7mSVQweRsU
+4ZTRMwJWo3MjMV5zRniHB8cgLGaroQo3kqpiibIaGgk/1tI6YvV1IivhacBMS/u9
+uuuGhwjUtwKBgEyMj6afhjDY1lxNXZzamGDoiS1xVNWCVkYgc1/5F3SvAEk05/ah
+sUFFu0ETsE25fCpYLuhsYf3vCAsrFV6LAQ8Y2VyuFJj08eAUZCmu2aT9jptEvyH7
+XNOC2V4UjPk1SKi9czlDWui+Jr1qKOHEyxjHhK0unS2nAFK3SixwKsflAoGAPgE4
+Gu44OvU4KGxy0vWrTb1JS4/rWemxeJLV6nUHfNa8GKyqFpcqTkLBkmIGMEIEDUQW
+A2Fissi8q1iFzmh32Rgz1ryNFLYpkSumebcT0Dkklp2+jYGnnMZu8VZ1KgvODNuB
+XyHM//IKH0Auj2BTtldii6ZYb8BpVK4Rp4xCz00CgYAuSS9hvEizRjEg7yVXsq7M
+QV4kYW0d3ik2I++Evx6uqbgXiPVPYY5nN7XLI2QAo8GuUu+5ZdXvcIt6Lm9SaAVs
+RrCjBC9WlMEZt8g02pIxCzcC7vuVezmd6/tUIqfUz8BeN/4u92+rWJxVYlBibvbi
+NJI3+wCT7FsDOpYh/lwEVw==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.db
index 4aacf8ede..8cd577d52 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.db
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 6f79c2d4e..dcb99dc5d 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
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.db
index d362cdca7..8d990f1ab 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.db
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 21d837d47..d3988504b 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,46 +1,46 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: E9 00 D4 E7 F4 C7 77 84 F9 95 A9 E4 4E 3F CE 61 11 A2 FF 22
+ localKeyID: A0 22 8D 08 49 A4 EE D1 D8 48 4B F9 86 A2 93 BB 25 D1 3C 5D
subject=CN = expired2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzODI3WhcNMTkxMjAxMTIzODI3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMl/nggF
-tIc7Gsuh4Hsa05QKhUjWCcjHzNvAcwV0Mc7zkg7/z3vYn4drkuCB5AYDie7A+Vjc
-Dn6QYEZDDcjAN3BJOMH0KH63S+fO5sgfG44TsXKb2o6BSjNIdNs8ZKEKkLTBYpnL
-SvmOHb0Rqa1xR4WltMm78sgtdIWbe9pVUvyfK81RDR5r4lHXcQvLDLgX3ioBsSMp
-IJaJnm7zGh8Jrr8ILxYqPo8RXSi/R5WTxGhGqZp8wpeW9/5jMd+2XviRFvM4gtaZ
-2Y+Qq1u73PmFQ8WUf+cXAk0Zi2nqRAYEMC4tl7GtRN1jk7W9N/xV14SVyehaDMji
-PLsgedjpyQvcjWkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzOTMzWhcNMTkxMjAxMTIzOTMzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsZVe6V
+CRBgQuuMIMA0cS33P0z1gc11+fBX7sBjvIndHHj8Vx+Sombl/4WL7WPHE7JlYPZB
+b+6pbStJv8q5Y+nq1F/U0O7Y38HJ+LGoGBSvq/FLJDosrFOJwxvU4U5P5JB2Vm5m
+Ok0XNSq4C8GxuorRwNDFlY+ADnJdMwo1zBjqd3xSnCav006Yf+O00GEsPaNRF34I
+i/aPWmiw+FizLYPX02XNpPJVD+XwFUFB6hWRYiTmAoLaWEfRFebvmj0DhjVUueN/
+MXqddGbAJrvMJFj0Bb+uNd65fqmZPpauP1Hvn8z8ayGjlSWqLyh5dh+8smpICpFF
+mjwqa+zg1pTtyOcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAOxvwB0mgjrou
-2iJq0xpHf8+9SGQSXItkkDg4WQQZpfd/+Rxe+9TiBefjKXPKChUrHbJfpY8ky0UW
-N53W4pilBZP+Hj7Wz8UMzpL1fsDSi+YQ6NGKwf35bchVG7LI/H3r5z20+o7XIO9K
-zslicsdghTR63DzYw50WAuwxirrUDlDg+XN493LbEXo/oc4FoxIiwscZ9IQED2TI
-lfS9FAWEB41UVEjF8HjF+edFtgfsq2miqLosq/E0UOg8bU5p7iHEpiwUPZinw6bq
-jXhCwbKJP+mKQ6/3cF5iCYtVnpHYX0KFX4i4MVfgjTReRMF+v3ScR+jJZsB3mD3n
-3UaR/47xZQ==
+eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAJ8LWFwlP5gE+
+AHDcAHSjFy/R/BxN3KBQ9knr7EfSiKfvpzNxCsePIohpmi9pZK+dTEvk4x13DjBH
+TxN4MwmFvSmYFRA6lmeZwcm7NlUDNBR94K/5Mp2LvCXSsso0iYfvzRkwwpaadjxg
+mt4XgCdVBxfxyDcPMDchiIdd6nrWi9ms9Sa85P0WYwoad5XbNUdOKJCbN01pjKpA
+lSbYgJ6hFraa2uNOnVw4JdygqON+w1k7LHk0JsHUz1RrIpUGOZqcE+aiDzhTcc3h
+ISBcR451z4FB9HbPZw8EL7dgsSGHbim7bRI+U3vk78Rhf6UK91IhqoLGjmZYmApb
+oUAgc1ucZQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----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 15241bb4d..15995ee75 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,34 +1,34 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: E9 00 D4 E7 F4 C7 77 84 F9 95 A9 E4 4E 3F CE 61 11 A2 FF 22
+ localKeyID: A0 22 8D 08 49 A4 EE D1 D8 48 4B F9 86 A2 93 BB 25 D1 3C 5D
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----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 d7c23459b..62e71557c 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 4c5433b24..95903bdc3 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 7921c3f16..1ec9429c8 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 4c5433b24..95903bdc3 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 1abdf48a8..29ece6470 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 35b2d709a..6b2e2e547 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 35b2d709a..6b2e2e547 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 37fa2aba5..de515f0fb 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 67d57776a..d24ebd0b5 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 67d57776a..d24ebd0b5 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 1e4c89d5f..41d5224a5 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 dd5ce1932..de854f4c5 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,27 +1,27 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: E9 00 D4 E7 F4 C7 77 84 F9 95 A9 E4 4E 3F CE 61 11 A2 FF 22
+ localKeyID: A0 22 8D 08 49 A4 EE D1 D8 48 4B F9 86 A2 93 BB 25 D1 3C 5D
subject=CN = expired2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzODI3WhcNMTkxMjAxMTIzODI3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMl/nggF
-tIc7Gsuh4Hsa05QKhUjWCcjHzNvAcwV0Mc7zkg7/z3vYn4drkuCB5AYDie7A+Vjc
-Dn6QYEZDDcjAN3BJOMH0KH63S+fO5sgfG44TsXKb2o6BSjNIdNs8ZKEKkLTBYpnL
-SvmOHb0Rqa1xR4WltMm78sgtdIWbe9pVUvyfK81RDR5r4lHXcQvLDLgX3ioBsSMp
-IJaJnm7zGh8Jrr8ILxYqPo8RXSi/R5WTxGhGqZp8wpeW9/5jMd+2XviRFvM4gtaZ
-2Y+Qq1u73PmFQ8WUf+cXAk0Zi2nqRAYEMC4tl7GtRN1jk7W9N/xV14SVyehaDMji
-PLsgedjpyQvcjWkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzOTMzWhcNMTkxMjAxMTIzOTMzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsZVe6V
+CRBgQuuMIMA0cS33P0z1gc11+fBX7sBjvIndHHj8Vx+Sombl/4WL7WPHE7JlYPZB
+b+6pbStJv8q5Y+nq1F/U0O7Y38HJ+LGoGBSvq/FLJDosrFOJwxvU4U5P5JB2Vm5m
+Ok0XNSq4C8GxuorRwNDFlY+ADnJdMwo1zBjqd3xSnCav006Yf+O00GEsPaNRF34I
+i/aPWmiw+FizLYPX02XNpPJVD+XwFUFB6hWRYiTmAoLaWEfRFebvmj0DhjVUueN/
+MXqddGbAJrvMJFj0Bb+uNd65fqmZPpauP1Hvn8z8ayGjlSWqLyh5dh+8smpICpFF
+mjwqa+zg1pTtyOcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAOxvwB0mgjrou
-2iJq0xpHf8+9SGQSXItkkDg4WQQZpfd/+Rxe+9TiBefjKXPKChUrHbJfpY8ky0UW
-N53W4pilBZP+Hj7Wz8UMzpL1fsDSi+YQ6NGKwf35bchVG7LI/H3r5z20+o7XIO9K
-zslicsdghTR63DzYw50WAuwxirrUDlDg+XN493LbEXo/oc4FoxIiwscZ9IQED2TI
-lfS9FAWEB41UVEjF8HjF+edFtgfsq2miqLosq/E0UOg8bU5p7iHEpiwUPZinw6bq
-jXhCwbKJP+mKQ6/3cF5iCYtVnpHYX0KFX4i4MVfgjTReRMF+v3ScR+jJZsB3mD3n
-3UaR/47xZQ==
+eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAJ8LWFwlP5gE+
+AHDcAHSjFy/R/BxN3KBQ9knr7EfSiKfvpzNxCsePIohpmi9pZK+dTEvk4x13DjBH
+TxN4MwmFvSmYFRA6lmeZwcm7NlUDNBR94K/5Mp2LvCXSsso0iYfvzRkwwpaadjxg
+mt4XgCdVBxfxyDcPMDchiIdd6nrWi9ms9Sa85P0WYwoad5XbNUdOKJCbN01pjKpA
+lSbYgJ6hFraa2uNOnVw4JdygqON+w1k7LHk0JsHUz1RrIpUGOZqcE+aiDzhTcc3h
+ISBcR451z4FB9HbPZw8EL7dgsSGHbim7bRI+U3vk78Rhf6UK91IhqoLGjmZYmApb
+oUAgc1ucZQ==
-----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 58954a0e6..17fe7f420 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDJf54IBbSHOxrL
-oeB7GtOUCoVI1gnIx8zbwHMFdDHO85IO/8972J+Ha5LggeQGA4nuwPlY3A5+kGBG
-Qw3IwDdwSTjB9Ch+t0vnzubIHxuOE7Fym9qOgUozSHTbPGShCpC0wWKZy0r5jh29
-EamtcUeFpbTJu/LILXSFm3vaVVL8nyvNUQ0ea+JR13ELywy4F94qAbEjKSCWiZ5u
-8xofCa6/CC8WKj6PEV0ov0eVk8RoRqmafMKXlvf+YzHftl74kRbzOILWmdmPkKtb
-u9z5hUPFlH/nFwJNGYtp6kQGBDAuLZexrUTdY5O1vTf8VdeElcnoWgzI4jy7IHnY
-6ckL3I1pAgMBAAECggEAPo1giMsEnQqLKfYJ0w2j6wxNDixsAymLfhjDXEkTAVT5
-3bAqQB8ifw61HP8Vw4wrsLO1dJFz6nR1frpoOA775t7EQOnD/Hp4lPDVEgEeM8AH
-UTXy5lRarYrrw/d+ocO+4m46ZtYGY2xr7PrjutU0x9eGRS4Uk3IQ/z0ieMgOKB/Q
-gfZhu70mc4kuCoXhDgzGp9G63CsP5+nILp01CAVPn9/59P4zYAy7Y7JsbfG5u894
-sIb00pyABM9PDj1dRSWV/7W8zX5EqHq51Jv1wmmPX+IIxnDSFr4C2yiPck2yHaC2
-77OO81hV0SYsRVY5tLxcjGbu+3Irp2hdaFXiFpIHtQKBgQDsAVlvJXZO7rO/q4e1
-WeQfm1N0tYrOv+2ppMoZ9CTpVt6ib5Gt2yguEnHAT3Ty2QQV6pGNdex7RUgR3cGC
-c56yt6uFDVCk1LYc0SAM8QyNuSU+FDRVKiLAIHtvTgXrq4GLjjx2Ugcdc6RCSsXB
-+wQRR5F798angTj6zR8LKJlXTwKBgQDakdxQ4BJZvHUyq2WVtGwuvUhxrjUpv9aH
-U19M7ugMEgMMN4/kFjhWdClQJ+6UYx3UEvnmZ8yard2CD0OS6k3kky6DHLwzGOgK
-tKnZvhCG63zAFm+PlbGuWAyQJ+3njmBXYRQJgl+Umicvjl/qhEvOibZ94yZXDyWu
-+m+5Vu+hxwKBgQDEp/MwLJVC/KEHbBVvRnJS7AlEzSnXUhLmM4y8x7YiQeLOlA1e
-Q6pdib0DtLIM0k0XPhj/OW5O4dJGIPTokROCdI4WFpxGXYFKze/ZGNuPFOI1snxR
-IwVF90sj2m4QjR8rfOBg78VCA2SyYMAc/d/LzkkqdbMxTPp/8oCVucTc/QKBgQCT
-bSErGAioqJpwo/VwRfNWj2wG6deIIpKkUtMMRHUWdyvBGNUgpvA3OEEJhPXC9xwO
-iQIwrEDw8Gdhq8QLm6kQjUopO7+hw6H4XqXWbgIdz0clFb0IH5Nqoo9OyPAKaRmI
-tr1aMKshw9y8kg8WU0gCtxb10LpyrI/hd6DWZdJazwKBgQCLIQ5mkrd7rHGDmAhC
-rfRffz+D0Ay9F+7/yH0GzFycUzW+Ca0vZ5Hc6xJiKKZydGdhQtCTV1iCgvXGqujq
-ZYnWw6GwtbiWaW3EuD5tEKBfUH3VQ/m0+75OuKC3caLegW8uIU+TqO8KZqXekS6V
-NJ6eIxjxUcgv8MXt/C+xf4llBA==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDLGVXulQkQYELr
+jCDANHEt9z9M9YHNdfnwV+7AY7yJ3Rx4/FcfkqJm5f+Fi+1jxxOyZWD2QW/uqW0r
+Sb/KuWPp6tRf1NDu2N/ByfixqBgUr6vxSyQ6LKxTicMb1OFOT+SQdlZuZjpNFzUq
+uAvBsbqK0cDQxZWPgA5yXTMKNcwY6nd8Upwmr9NOmH/jtNBhLD2jURd+CIv2j1po
+sPhYsy2D19NlzaTyVQ/l8BVBQeoVkWIk5gKC2lhH0RXm75o9A4Y1VLnjfzF6nXRm
+wCa7zCRY9AW/rjXeuX6pmT6Wrj9R75/M/Gsho5Ulqi8oeXYfvLJqSAqRRZo8Kmvs
+4NaU7cjnAgMBAAECggEAOsL6T1yUckX/pqn04ddqdZunF2ui4iDDr0upusVAi/zK
+26Bazro8vZvG+csZ5Hf5VXCqhKU7LuibOt6MHKnV5Bx61L08tBZQav+2MiSJzxZi
+n54XfbNmKoddyYQmqeNIpJlweWGfdaWEzvbQA/sZl0eHy3+XPZ0V0PXxKf+VrRFJ
+JSYSPuHRcKZoO7NYLPM8mXQ5Xnvn5xm7L2xeRzp89VFOkoVnTfEpczgFL18QSN4k
+10zSuhLAYlKuNH9YPiZh62FtuQxYYQi3hQ4MV007pZQxZ7moZ7wQRS2JqPvUiAua
+mSn3ztD2Yr8r/k8gIAMkAKL77ZYx/hhcZ0HzEBzYsQKBgQD2rDjymrTIKrS3QEb8
+iVeB/k6HwFD6MaIt3o0rtPWxJ2Y1QSk1oacfJMqwxbdafZ10TQv4X1QdUlIn/xsw
+iR61tm47MMnhja7XXllerolJcIk4EewPy+XuHvq5xYtx3QFV5HMq2/TLh2sVqvdE
+J13GoH9C4GAM6KtoS1CXOWxRFwKBgQDSx1JXUb/x8ps14XAxHii6otvlmtqJ5Cw9
+gGelaTkbBW7Kb4T5Fq+pzSYduZ9X+hmBo8vWDZsOZdSSotosssWC5tOh76Tvubip
+mvmBY64pfkR178OeWxPiLdRDC9veLfJ/xGLeNBuFsQvAemiSNCnOyMPg161Aa5j0
+2kUTfCcIsQKBgCUpItchiVSSYnEs5MTMp/s0ZX478bcPXSBN47SO6WiLx/ED5QJo
+XPXrJAHnd0zRmbPYm5IKQnC8YxYVb3IrZg338rlGC1PIdWuKkioaXyJKKtHgmVBz
+5iquThVIdk5r/fSDmvn88u7qcq5r+B4zVARFT4ayqKWpM5Fdr0Fo7DF3AoGAPSBs
+8sHUhpgzBvcwEC6M5UNhvj6gbijr45IffMr9MqbqsG6TA6Heo8HI8gno+hyf1Qbp
+kFQ1yYEimrv7xca6nPHQIkBbduJHeXhmL233DjV+KS21b3E+XPOpgSApTU/J6d/M
+RGCcMrNbkyBsvym9jiiPFd+2cN5DZ479RV9V+qECgYAJhzqZodQVYgsFMWswB9+j
+ZAcFpNR7XPJMnpk1XnKvxyoxQaQz4S15mfKj9QULsh5s8WPX5HrzIJ/72VM5+6IP
+HV5EGarVXC9NIxd1ZjMKikKZLDTPhdaLOxB5k/6lMkEB8LiRbohB9fmRK/c0qvQ5
+8Wz8zaVaxfnxuaZzcPsDPg==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.db
index 0272af9ba..b1676e421 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.db
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 6f79c2d4e..dcb99dc5d 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
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.db
index 6ede837f8..cd02cfb07 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db
index d12e9a7c2..dc2106cd2 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db
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 c0e78ed32..4f9204948 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,46 +1,46 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 2B 2F 96 77 1A 43 21 95 4D E6 2A 9F 3B A2 3D C2 A0 0A A7 77
+ localKeyID: 45 DC F8 48 9A D5 9A 7E 05 05 8D 02 E7 B2 39 6B AE 97 EC 1D
subject=CN = revoked1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM3NDJaFw00NDEyMDExMjM3NDJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA230qU4Eb
-2efkpJqx2SblMvBQDNN9SCuF5F9X+Dni13esPiImiJ9SLrjnj/RnajSk1ba43Lb1
-ZVkigH3NwY8pzoQkJOJZf3cejBqvbMR/8m8yLTteBgwG3F0r/NzJdQHolKrBKWRK
-7qXyXaH9yRrOcowxv48gWwSolcnQExyvfCDTEPSur1CGliSPEbXiJR+y+KDIVBJS
-pXRnStWS7OLlbx10JDkvimJdA6vPeN9Pe6EDlY5Lz+yuH/Ax90gvr5HLu/dWzZYy
-wq9mflPUVz9x8YRw0fDmhrvHLBtDgUHTZYRSkZuGGYBi31xEW+a6WW8lb69qyLxy
-IJcARUxhvnpGzQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM4NDNaFw00NDEyMDExMjM4NDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzPKVc14I
+tKfr2eVRRclnGURtl9xObM4JWKwLOA29NuWQ5U5U0ARQO5vveZQ/wnj2Q87fKbZB
+3YwEeuqh0Vjf263H5BBrksbzJiR+yUTLxSCAcRug4QGquQt9r/Ph5w8xqj0t201A
+rdIrocKutZZ6EB+IpwfD72BNgphNlDQs8rcfJ9Hjd/kz+fwUiOHYNHoAc4DNpGGL
+I/SaBPFwmwYOKBt6V4vsvOiLdTGfJhW3KFUk+JIFsUzRz9E5t6+3ih1YZFvXF+if
+wgsMNGjJgVKCiMYxbZOXWTxbFUC9c9+CZGqP8V/ORJkVwuRmMEAuoGeuZKaCEA7S
+5DNPg0+mp3M0qwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQDNIMeMjCgl2b6r
-ob2wbkBm8bAbxJ1tlx0geMil7Q2AU25QeXhJdE4eQXT+ggiSkQ1Ojw0OAj6mutw9
-OY43Po7h6PBrdmMkGAdEKlB+ORVWjWX0He5R4N6ur51o8/NBIlE3zJuUdPgwNZUY
-5GCW3aPEIJDMuL+EdhbdZQFD9YwLCETP8xK50AtNFvX86S2PcIgZ3d7WwW5vqjdp
-Xo+e6OPZgnAQAU7R2Yqvbseb/DdMHX9d6M3CvyzRJSF+Angw7nM0E0UuSZT2IgUs
-Yy3Ywln4mfT0pfCui2jr7YX29MKsjzX1/DPwmhcxSUdREl5Go8jXJMaKWWbLe/36
-pIiY0FxE
+dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQBRUgzkfh3O9YbG
+zBomba0Uoxr3uQ8K3ZCQ4pc09yHNVJ+k2x8BEmHbwF9qwqEtK29syEv6NhSZfFyF
+LMNp4AyzvaZJcsfW1np3hK5aT3IpeAruX3NEKHIme6dZ+r5+DL5h+5PCz4Yz/EFX
+PqtuFofRDDCGZ54qhmRZFSN+OM5eIMtK+Ry6lwN6BEyT7zLlEAN9ydP3oBuZo4Dk
+exrQYb0TSM1EU3/REcKs8Wbs1kvstG5C7JfwWpfmF+BjhSw+oglCbDD8497fCHpT
+AvRIfJdS3XRhwhm1/nqc548uxiAKq8mdZSYvjJtrjCNmi10n2q8CwZ6TehLN5Aaa
+lBCgEQn/
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzgyNloX
+DTM4MDEwMTEyMzgyNlowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+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
-----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 91031452d..2c34e3607 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,34 +1,34 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 2B 2F 96 77 1A 43 21 95 4D E6 2A 9F 3B A2 3D C2 A0 0A A7 77
+ localKeyID: 45 DC F8 48 9A D5 9A 7E 05 05 8D 02 E7 B2 39 6B AE 97 EC 1D
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----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 3b37ed821..532dbf510 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 754f40c83..e2849c304 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 3e58df8a8..5c5011117 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 b385aa2ff..f5b9a45a0 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 d7fdf53b4..f0c5ffba7 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 54933d80d..177509670 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 dbf4b45d3..b4e879b96 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 070188645..35ab2047d 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 01bf710f7..8b05c2b55 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 bcea5c0d1..209dd80e3 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 b674e80ce..e95308479 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 71b81cc74..4e49bdb4b 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,27 +1,27 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 2B 2F 96 77 1A 43 21 95 4D E6 2A 9F 3B A2 3D C2 A0 0A A7 77
+ localKeyID: 45 DC F8 48 9A D5 9A 7E 05 05 8D 02 E7 B2 39 6B AE 97 EC 1D
subject=CN = revoked1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM3NDJaFw00NDEyMDExMjM3NDJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA230qU4Eb
-2efkpJqx2SblMvBQDNN9SCuF5F9X+Dni13esPiImiJ9SLrjnj/RnajSk1ba43Lb1
-ZVkigH3NwY8pzoQkJOJZf3cejBqvbMR/8m8yLTteBgwG3F0r/NzJdQHolKrBKWRK
-7qXyXaH9yRrOcowxv48gWwSolcnQExyvfCDTEPSur1CGliSPEbXiJR+y+KDIVBJS
-pXRnStWS7OLlbx10JDkvimJdA6vPeN9Pe6EDlY5Lz+yuH/Ax90gvr5HLu/dWzZYy
-wq9mflPUVz9x8YRw0fDmhrvHLBtDgUHTZYRSkZuGGYBi31xEW+a6WW8lb69qyLxy
-IJcARUxhvnpGzQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM4NDNaFw00NDEyMDExMjM4NDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzPKVc14I
+tKfr2eVRRclnGURtl9xObM4JWKwLOA29NuWQ5U5U0ARQO5vveZQ/wnj2Q87fKbZB
+3YwEeuqh0Vjf263H5BBrksbzJiR+yUTLxSCAcRug4QGquQt9r/Ph5w8xqj0t201A
+rdIrocKutZZ6EB+IpwfD72BNgphNlDQs8rcfJ9Hjd/kz+fwUiOHYNHoAc4DNpGGL
+I/SaBPFwmwYOKBt6V4vsvOiLdTGfJhW3KFUk+JIFsUzRz9E5t6+3ih1YZFvXF+if
+wgsMNGjJgVKCiMYxbZOXWTxbFUC9c9+CZGqP8V/ORJkVwuRmMEAuoGeuZKaCEA7S
+5DNPg0+mp3M0qwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQDNIMeMjCgl2b6r
-ob2wbkBm8bAbxJ1tlx0geMil7Q2AU25QeXhJdE4eQXT+ggiSkQ1Ojw0OAj6mutw9
-OY43Po7h6PBrdmMkGAdEKlB+ORVWjWX0He5R4N6ur51o8/NBIlE3zJuUdPgwNZUY
-5GCW3aPEIJDMuL+EdhbdZQFD9YwLCETP8xK50AtNFvX86S2PcIgZ3d7WwW5vqjdp
-Xo+e6OPZgnAQAU7R2Yqvbseb/DdMHX9d6M3CvyzRJSF+Angw7nM0E0UuSZT2IgUs
-Yy3Ywln4mfT0pfCui2jr7YX29MKsjzX1/DPwmhcxSUdREl5Go8jXJMaKWWbLe/36
-pIiY0FxE
+dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQBRUgzkfh3O9YbG
+zBomba0Uoxr3uQ8K3ZCQ4pc09yHNVJ+k2x8BEmHbwF9qwqEtK29syEv6NhSZfFyF
+LMNp4AyzvaZJcsfW1np3hK5aT3IpeAruX3NEKHIme6dZ+r5+DL5h+5PCz4Yz/EFX
+PqtuFofRDDCGZ54qhmRZFSN+OM5eIMtK+Ry6lwN6BEyT7zLlEAN9ydP3oBuZo4Dk
+exrQYb0TSM1EU3/REcKs8Wbs1kvstG5C7JfwWpfmF+BjhSw+oglCbDD8497fCHpT
+AvRIfJdS3XRhwhm1/nqc548uxiAKq8mdZSYvjJtrjCNmi10n2q8CwZ6TehLN5Aaa
+lBCgEQn/
-----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 497256b60..a01a07674 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDbfSpTgRvZ5+Sk
-mrHZJuUy8FAM031IK4XkX1f4OeLXd6w+IiaIn1IuuOeP9GdqNKTVtrjctvVlWSKA
-fc3BjynOhCQk4ll/dx6MGq9sxH/ybzItO14GDAbcXSv83Ml1AeiUqsEpZErupfJd
-of3JGs5yjDG/jyBbBKiVydATHK98INMQ9K6vUIaWJI8RteIlH7L4oMhUElKldGdK
-1ZLs4uVvHXQkOS+KYl0Dq8943097oQOVjkvP7K4f8DH3SC+vkcu791bNljLCr2Z+
-U9RXP3HxhHDR8OaGu8csG0OBQdNlhFKRm4YZgGLfXERb5rpZbyVvr2rIvHIglwBF
-TGG+ekbNAgMBAAECggEAK9kO7hyyWC9r7XhcBEIxcqIwk8diVVsghfWIKPZDe4EU
-X1tKMGwHqn7U/9y3FjALKAi3WJySXJtYeavoQX1cwD2EzPuNHppI93tTRVriJqgR
-MZkVGQcpDbftVDg1ZNMrSBvut9qp35A2YX89qIHa8WZRf+/Tamt9VGM7Vr4ZzqWP
-PdxfdUFRSMWE0ORw5eX57qlk0BsdqFSVCJDWh9oAQgRhjItHtW1Mo+nyp/FLEIzd
-ISgfujwcA9rjT8b+maflfspE1NhexBf3PoOBKkLGucIsYfclJ585Mpu61vA7cdUn
-y50DTz2pSghB+Te1FivNCccC1mf/rBUuMZtXHjUGfwKBgQD5wpCMjtVFde5vg0U9
-gEWHgYMGEXMJBtOWNAELHXzR2+imDrinO0jZnT/JQqOOpEJTjD2M7HdwLiyJYG5r
-wbd8HPwVyYrETRgDgTzwHfCP2iHtcFN/SHxl9t56FHCSf5he9Vn8MdSc2KEpV0wA
-qnyymt1EK2ZQJrtSKwcDGWoaEwKBgQDg+P2Kk9R+jObQWSSOWMDzEjwqHfEcy4cC
-XDyZtRbdSQdQMTtZLoifdunReqQlxyHiLhwK1fgvSjwLUd7uBi/Qaga6s+lqoyzQ
-s7ETGPBiBvFMK5G/S7FZVNE3TQXED0FRetzo5iz9ea7f+kbbFSTaQZ+kiedfSI2C
-xuVC7V43nwKBgE6IZik8NEVOCrYXoarv7WzpRUigLfq1ocxF99oF4JygOCwWzusO
-kh6S+l6PTJxqe8yHeUcZh4jHjAt6Pd42IDqvZnh3UeHdl+JqPb4GvACPh0GAo1CP
-e0YYdOYQDUGTS1b4cN4C0SasWyiDoYtIEEOcvFxWBSrIsvfoPaE02Y7vAoGANurR
-CYj4sEO4/FcmY1ErGKr04NsaRoswU9UsPeFEyZPQIzVBZY3EcBjZDve/JjGsBch3
-s/VzdifK7IB5yOTduySGrADLE+rtP6z9psnJtEQ5lvxzwZy6mDHqOHOm2qtWqIsz
-be7yQJX5qFcyALzymAy46bN4NXxCfxAKWwISo8UCgYEA70KKBoUwqh4k6wr5TxUX
-lSzgVU114r50OEmOyKB3dQAfuHbKdi+ek2VVHqimjPwUjr4LiqWVHiTksdJhrpfW
-Wlzlc6Y7UKOtTzylQHVT0MS9v7YKL7NPQDwA7xgpGGKddbuKrrUEzF4F4QACNuGo
-nmFwQLE2qEerBZdup00h0t0=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDM8pVzXgi0p+vZ
+5VFFyWcZRG2X3E5szglYrAs4Db025ZDlTlTQBFA7m+95lD/CePZDzt8ptkHdjAR6
+6qHRWN/brcfkEGuSxvMmJH7JRMvFIIBxG6DhAaq5C32v8+HnDzGqPS3bTUCt0iuh
+wq61lnoQH4inB8PvYE2CmE2UNCzytx8n0eN3+TP5/BSI4dg0egBzgM2kYYsj9JoE
+8XCbBg4oG3pXi+y86It1MZ8mFbcoVST4kgWxTNHP0Tm3r7eKHVhkW9cX6J/CCww0
+aMmBUoKIxjFtk5dZPFsVQL1z34Jkao/xX85EmRXC5GYwQC6gZ65kpoIQDtLkM0+D
+T6anczSrAgMBAAECggEAG04gmj/HgiYzNpMmWllkeonS3h40dquWtDErx3qRIIzC
+WsKuaw6AEAkNBVI6knLiQJOByQFm0hkTCbtT9tvT62VCUgDcDDCkeYr4N2GKkodr
+hWZMb130/HVq9/PSv6GXGNrQzryCpwXu2TziYQAc4CQLZVGUCcL3YLRg9aNj76w3
+xXd1Ffe7RsY3Ma+n2bqt0zSdZ9FtJa8Hm2ryfnlu8R65tGLW94EtE3OT/qsygkAS
+2iGfUKZk5nLusCWEk3sfJ2R28lSxOp6bVfkLZtMTYhkMosYeBtafX75NpF74dSEr
+2vJLvKVHQB5zRfUL0Y3/6b0s4eM2fmwargNgluaOVQKBgQD+I7OYawz2u5F1RuQ1
+GhdE+EDjV/lFWsZcimm5bRmqTo4MR2wdw6rSJ95Nikd/bucSwuVZfKx7tEIu8jzN
+ygTmYPbYZHsZC2YmZU50OyfP/6INqsSrlJ41wq5Gv7YXUmyBO0CZfI2mWQV5NQDY
+ILpLBxHICR/w1reSlLu/eC729QKBgQDOcrBQyNlhP16d6XdPeT8yKy5OSxfHJz7x
+iyrKiEW+F7CAMY+5U3Ou7xqaPVGqMBFCJ7RmXAKr12WNLjM5tCRjkrt2Ni/lSa80
+ZYc2n/FQU4D4zIjpqIpR4Hx2iZKMCWXrwnI3ydFqauufwe8N1Axl0kS9kqaSI7CR
+bv5uXfP5HwKBgHGXqZWt+6xo6DpARo6Jq+7y+6XiU5OxYEpKv7jW0Ar0c79/SQ8A
+v2CR22ZTMWP/QR98p6DY/guI5bAwLAdbjdcfbhYIy5DFLJJq46dGLaRlwZxUQPXk
+RtcGvnj3Bb/k4oTc5CH2ryW0UqL7kvYHot0YOtVrZrByeLj26/hIEs3lAoGBAKTB
+prBx+fnAJvSDM7J7ItIY3/WfvDQ1v+folpfXtUEFithjtT3Dudjr/SEGurvFbKCN
+K01dNMyLNAI90qfEeh31JiIrEII+EdMRC52ue1kNqynjoYhH90tsiifXltqnTW2f
+WqPnLndtKOnwTaWNiu9fpXhdJw4N6YXHPMo7tM8lAoGAG0MwVD1P40wvLgexPSYt
+2/gWSbCoBv6dvN5HwPAWuei82GoaecBLcGsEalhKX2TwTfSW8U3KPr9HUZgGB0I+
+GnV+KfPPQuRv28cg7L26xlyKP9B/cKtbILhMZMYFuPMe4qzEndrPjgvTrk5/f21I
+jKt3jYoXthUyPE/5+3JmRWE=
-----END PRIVATE KEY-----
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 6f79c2d4e..dcb99dc5d 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
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.db
index a3c9cf15b..a51932b9b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db
index fb34864df..f3c6bd78b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db
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 fd843481c..2c1b0f0ee 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,46 +1,46 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: D6 A2 1A 7A 18 A4 FD 92 CD 5E 28 A7 32 D4 CC 4C 9A 30 AE 1B
+ localKeyID: 9C D6 7F 1F B7 43 4E 33 E4 60 54 AA 64 C4 B5 D9 47 5A 25 AB
subject=CN = revoked2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzODE2WhcNNDQxMjAxMTIzODE2WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnPPNiM
-EdxsuJUwYaEbvw+obOwk4GF0CJ4UUQNhZYCr9XgJ0eqhEQMi46N6S/uBc5rvrWF9
-qBZe//QmLPIpr0ESh82fsSGVaNpSrrxe6ltK/n3y9yq0X3TJO3RDQjRUoSHhGJAX
-Rnug8hrn4GEMMmwF5EWhIczyRHfCQbOg8EM7nzrJXic1tZYjKaTqHXYJbXnOyPXD
-n4B2KJPPvI1kEiTLQ1nVe5QSmMKGyaSGdFXmMfcnMDi63dfhFm/jaz4+X+wUOyr7
-FQAo72pBDrxW2dXnbManpRuUT++F4S4ToWJM7UKH0CI0pL7QIbqn8xIeGTynNgC8
-C1+SobVSe1EUyBECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzOTIxWhcNNDQxMjAxMTIzOTIxWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3iQ2As
+pBzGEQS3F/gJQ66+eQrCuLneZiNVgBTEm9xoSixZQ+T7Li8AuYIQOTkFdCPCNCY0
+y0F7/IOvqlqb1C9Akwo9kRtHtkiagIQdwgzT1+bQQ8xf1a5EUPMsOcnq0N5y7pVz
+yhGYAkGJf5VBlCQz0keAZuh/oJZfJWHPK7x8OQLRNdLfLVhJqTzi08M4zMwzlmZo
+DVMT5sWq9uir6UMJvzTIpWHhY2qESk+e8ibJy4JkF7LknOMxu2un/HVBljFxjJI6
+wuNCVbv0Tg12jXWp1aL1jXx1AN6ODk4IwmWPof0VsSdHnaK2lPobkZg4g45ARoiB
+le7AkTn9pnpKkvkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAZrNmjMLPjLpT
-LZ1JPGDo3w6Q6n7vsoI6MDPbH31GM9Iw3aszvzN9iPlHFOiV9UFkUnuPqUN1lfxA
-fmqS8hjqIFBi4dvm5uGCb//2dXi2kBGBr0zD99atC/QsAG+hzc1v7UINEV6oa6x3
-uUOn2RBPYUqWlw8Na6CQ/PLs+x6dR0pdTDiV/RF2TXfx1WD6GFU7+tczNtGmpMPT
-6jhF9k7ILap54g2sLVBi/0KnPOV3ggvtpIACl8EYtx9fZnjqfTMvNG36jS0fgMrm
-1q6abm77FYddpUilZkhjL3nqFEYZhQpCg3TIAmiMsV6SBmGj1iV5nwse3jgCZTBy
-SOz5thOJqQ==
+ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAhN22N3FGZw5+
+g2P7JO1sCF3sOATTQ5+dMXroMiUpRfkZrBlf1HO7MK2MGL4qvWANpyGtkAuq7gxi
+7lA3I2+mXbUNq94ygl3dsFaQhmVb7pxfSXy5ePgH+GC8q7vOgP0dtfRwWCqHHtwW
+EHL4UvRTkZR49cdPnCShncKJkhNLWvEC/eWL64R3LyzHnt75BXXROUG5EynzD34m
+AS+qUyNmlP5iv7a3k59OY5GIY5kC9QBbtK7H71XAU+HFQz9bdkIe86/YEMlSutID
+pIuICtrCrFJx+lpgF+2V3QkciSUtsr2QfwwLCywjxd/d7ylfI0/+yYVIq6/Jvz1B
+loqC9PJq2g==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-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
+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
-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
+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
-----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 55f9164ac..5cf39c065 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,34 +1,34 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: D6 A2 1A 7A 18 A4 FD 92 CD 5E 28 A7 32 D4 CC 4C 9A 30 AE 1B
+ localKeyID: 9C D6 7F 1F B7 43 4E 33 E4 60 54 AA 64 C4 B5 D9 47 5A 25 AB
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIUL2xNdwMwr0CAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBC9TKdtu9NP5PhkohGzDs+pBIIE
-0IzFf9SnDGICb0ppRHgNMKCCzjSpf7Fm47ckd2++dDMpwpRNLWJVn0PHqrZgigWb
-VrNYHRAuXxT6Fluw+taeup1Lp8UIF8hbryGrbrzjiXUf5T84Wp/kdjQO2/kbZJdz
-EGgkW8x5frspCrbrBOl0so9kbhjvTjQDqRlb4ghqCaQDq0dDGHQWJSl0FBsPeL8D
-MXpWd7lEFFlMIYVuZjF1v3zTQwW6zdG9gbNcAR/zwCOYGaNdMSL0eN5s3bXJ+Il7
-sw6AnVnRWyYnYsiRjrbOAM/BNNlTFER2p3YFCZMACBT44HnNMWj9XwmzdZrLGfo7
-g9fbRgZe+45fPPVoZ+6s33aw6XUUe052c1XpyzHXbEdWjPe0FkSyfviEYBdqXpsi
-G+95vydTHaH6aZFS7sJgvvMpKgpZVCWmPxQCqKzmFUw76NChSRGWdlX/zRRt5Hxc
-GreWiTR2DGu6ISVx2fp+P0/jBsTZtfG2D5RjrKp6KW4Ug+BRxEyJSLlvtmfDmE22
-fZ3GwBDQk/jBc5f2rLJ1rS9rFhSivWsw6OBFQZ+x22c11/VmDnBB+FD1QuemXezE
-+DNcvpr+Lo8AhDPX0X7EBo/VInvWeNCTUBRrPdiCstadvTmYQItckaHQuN08GW/b
-Fsj/g8aMVT0v2oHpx3cQ6fqAt7rVSRv2ROFVGXRFALmk0fbjh/sxjUiWqb3qrRJ1
-LJPs3t6GU6MNZjkSzeafjUw1L5bCV6daiJZG/cTLRxWVvY+slYCFtuG5SjZUtHaK
-L5bnD8B7PhG+NFgbe0RTA/NDUCaWbuTJzkMZPHbuntnqF6eGgRBYg5htp4GE0LCy
-BOqqkScsqeimFGrHrwLCoF9nmwISAp6lHZ21nMb1V5e/0UqIC4UFX4wWYjS2TVbl
-xeNb0ZcuRQy3WiOMTUJSbW3y6o7YjwDh/wpiNqrJSGd+TZr90TymXYtRRO0/qiOq
-FO3pgAX29J4E21fcLAoq8XTWvubXzZjzYQkVYGIEkLflkA6bPZ7O/ssWqCv37DVl
-cmajFPR96hcX/1bBhvx4PXObuIyalkkNkK29pEXGloCaLmoxoh8j6LeEuuPT0y1i
-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
+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
-----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 fbf885428..dc933e07d 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 9bbab4785..b2a5724d8 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 608d8cf00..528c0636d 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 9bbab4785..b2a5724d8 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 d38cefe02..4f0db530a 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 fe1ad9932..d96a8540a 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 fe1ad9932..d96a8540a 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 40fc6a8d8..558392855 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 d667aaa47..763f273f0 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 d667aaa47..763f273f0 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 4b4f300d0..3b94f1a33 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 9af3cf6d4..032e72938 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,27 +1,27 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: D6 A2 1A 7A 18 A4 FD 92 CD 5E 28 A7 32 D4 CC 4C 9A 30 AE 1B
+ localKeyID: 9C D6 7F 1F B7 43 4E 33 E4 60 54 AA 64 C4 B5 D9 47 5A 25 AB
subject=CN = revoked2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzODE2WhcNNDQxMjAxMTIzODE2WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnPPNiM
-EdxsuJUwYaEbvw+obOwk4GF0CJ4UUQNhZYCr9XgJ0eqhEQMi46N6S/uBc5rvrWF9
-qBZe//QmLPIpr0ESh82fsSGVaNpSrrxe6ltK/n3y9yq0X3TJO3RDQjRUoSHhGJAX
-Rnug8hrn4GEMMmwF5EWhIczyRHfCQbOg8EM7nzrJXic1tZYjKaTqHXYJbXnOyPXD
-n4B2KJPPvI1kEiTLQ1nVe5QSmMKGyaSGdFXmMfcnMDi63dfhFm/jaz4+X+wUOyr7
-FQAo72pBDrxW2dXnbManpRuUT++F4S4ToWJM7UKH0CI0pL7QIbqn8xIeGTynNgC8
-C1+SobVSe1EUyBECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzOTIxWhcNNDQxMjAxMTIzOTIxWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3iQ2As
+pBzGEQS3F/gJQ66+eQrCuLneZiNVgBTEm9xoSixZQ+T7Li8AuYIQOTkFdCPCNCY0
+y0F7/IOvqlqb1C9Akwo9kRtHtkiagIQdwgzT1+bQQ8xf1a5EUPMsOcnq0N5y7pVz
+yhGYAkGJf5VBlCQz0keAZuh/oJZfJWHPK7x8OQLRNdLfLVhJqTzi08M4zMwzlmZo
+DVMT5sWq9uir6UMJvzTIpWHhY2qESk+e8ibJy4JkF7LknOMxu2un/HVBljFxjJI6
+wuNCVbv0Tg12jXWp1aL1jXx1AN6ODk4IwmWPof0VsSdHnaK2lPobkZg4g45ARoiB
+le7AkTn9pnpKkvkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAZrNmjMLPjLpT
-LZ1JPGDo3w6Q6n7vsoI6MDPbH31GM9Iw3aszvzN9iPlHFOiV9UFkUnuPqUN1lfxA
-fmqS8hjqIFBi4dvm5uGCb//2dXi2kBGBr0zD99atC/QsAG+hzc1v7UINEV6oa6x3
-uUOn2RBPYUqWlw8Na6CQ/PLs+x6dR0pdTDiV/RF2TXfx1WD6GFU7+tczNtGmpMPT
-6jhF9k7ILap54g2sLVBi/0KnPOV3ggvtpIACl8EYtx9fZnjqfTMvNG36jS0fgMrm
-1q6abm77FYddpUilZkhjL3nqFEYZhQpCg3TIAmiMsV6SBmGj1iV5nwse3jgCZTBy
-SOz5thOJqQ==
+ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAhN22N3FGZw5+
+g2P7JO1sCF3sOATTQ5+dMXroMiUpRfkZrBlf1HO7MK2MGL4qvWANpyGtkAuq7gxi
+7lA3I2+mXbUNq94ygl3dsFaQhmVb7pxfSXy5ePgH+GC8q7vOgP0dtfRwWCqHHtwW
+EHL4UvRTkZR49cdPnCShncKJkhNLWvEC/eWL64R3LyzHnt75BXXROUG5EynzD34m
+AS+qUyNmlP5iv7a3k59OY5GIY5kC9QBbtK7H71XAU+HFQz9bdkIe86/YEMlSutID
+pIuICtrCrFJx+lpgF+2V3QkciSUtsr2QfwwLCywjxd/d7ylfI0/+yYVIq6/Jvz1B
+loqC9PJq2g==
-----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 08ab7de1b..926f121f1 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCpzzzYjBHcbLiV
-MGGhG78PqGzsJOBhdAieFFEDYWWAq/V4CdHqoREDIuOjekv7gXOa761hfagWXv/0
-JizyKa9BEofNn7EhlWjaUq68XupbSv598vcqtF90yTt0Q0I0VKEh4RiQF0Z7oPIa
-5+BhDDJsBeRFoSHM8kR3wkGzoPBDO586yV4nNbWWIymk6h12CW15zsj1w5+AdiiT
-z7yNZBIky0NZ1XuUEpjChsmkhnRV5jH3JzA4ut3X4RZv42s+Pl/sFDsq+xUAKO9q
-QQ68VtnV52zGp6UblE/vheEuE6FiTO1Ch9AiNKS+0CG6p/MSHhk8pzYAvAtfkqG1
-UntRFMgRAgMBAAECggEALu3XIwGS7hgd6x0z3hKM+wbRE3IdkNFAkG+M9CI2qxja
-/hG4sd9RlExQHR3vYdKk4GzcvdS8X3JhylfClCpxBMraPTmk+mMQV0YChIy2uARB
-0Q0UwfiXaO80Py1XXp8E6RgMccX89K3GOylaGXgFd1UpgRTHApzxzycggUQ5Ilsk
-h8V4O9TVHPOaMpS5uN6IGSV36ppksis9ufSMQXGXsZ2GxdxtMu1TViiDg+v3LDI4
-LzJzdyWcXtHaNXTdEd+LLwirQE6hYLe5QBFX9a8jPX/E2LI4TKdWNfLjD+RBLtic
-bGJtaIYMrNLJt6eJNBpQ6bMJqWb3V1s47+qhsGbzAQKBgQDadxwFnnivx/p2WCOH
-BsJ8faIn8phj8paYbMBiqrW225qjeg48bvlPsattgExrv3tjNUJebP+5ICzskt9I
-tPYO15GkokZV7zDMkv4vPmvRCpHHLSXII46QRIpneGRrEVQ/7veGL0na1GzFkOQw
-unSDE0azzHSY92jKR9BXUKXBfwKBgQDG/BKpBkrN6+Mr+ctjldTy6XA7eIHbfV2H
-fEkoRjd/4GjRIGlaENKjedkwF8u+EcLxkHFyObytP6TiTBFxJAQPvksJSmAknbsp
-Sf6wWonj+sh/QsrlIEgyIyopKV52RcBu1r72kk2Kx5Ggw8EIgpS1xAG0daCJ8zVe
-9ZlpRfcebwKBgQCGj90LvPubUjL8l/dyIQDES2II9w1UasTFqB6r53g75HIQhYql
-QLmBk+8CaIcpyuzGQ7TYkozEy4PASAsOLqBsre0Amg92uPi22UeFdA5W2QrHwxBF
-gVk7lWwmpWo85JSfOKLv3MrB5hwFaOSU+xPu9H2VG7cpzSKXjbpPPdaLIwKBgQCr
-gcL3qrO5D1MLqU8T86XLBUe2CqUqsMB3sblAnFzjvGG7tor3lT5opvJ7EFeM6LQ1
-D4GoqXklfpC4eEYkVZ2mkCcOx+tcRBN4gA2kpTTqqlI71i8ZFB0GEecZ+U0w9efp
-4PBRiEKLln2/qlnr4tkYXev2RdhsbpMW2Os0oJhhwwKBgE5CTjheSff8fTH9y0bv
-4J8HNYL6A6t6yPsKjlnyEKw3Hj4JwsHV+xF69iLePVepXkMDP5Jzmr7okZE6WJYY
-El4UZ32VoH/dEa8GTtpxPmerMrEQSjPx5UaIiFA7wEsESziLPpNU271MY3dnYihv
-SNk+0DOR+lMv5pRQC7qDkuWq
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC94kNgLKQcxhEE
+txf4CUOuvnkKwri53mYjVYAUxJvcaEosWUPk+y4vALmCEDk5BXQjwjQmNMtBe/yD
+r6pam9QvQJMKPZEbR7ZImoCEHcIM09fm0EPMX9WuRFDzLDnJ6tDecu6Vc8oRmAJB
+iX+VQZQkM9JHgGbof6CWXyVhzyu8fDkC0TXS3y1YSak84tPDOMzMM5ZmaA1TE+bF
+qvboq+lDCb80yKVh4WNqhEpPnvImycuCZBey5JzjMbtrp/x1QZYxcYySOsLjQlW7
+9E4Ndo11qdWi9Y18dQDejg5OCMJlj6H9FbEnR52itpT6G5GYOIOOQEaIgZXuwJE5
+/aZ6SpL5AgMBAAECggEAAZv3CmEzzoWe3ngcb87zn/m/xgen7/VSpBvaTx1qcmf/
+hu2GaIdOGSULrW6XRDndBdzkZcApSn0ImGdxor0dg31WhwNGD/c1NDDRBC2fYnic
+z2Pg9eIIX3wh5n8FCgZ02N8cUVpu8jlkUtYIOtrYgfpeyW8tEBfdeSDFzOon+qaG
+yEduw1QlZsR/jf7FBoovc/cZr7Yyi87+180Ln744OcvX2fqpyyDvsdEMuKYISwBu
+IMnaaR5KgFk96MwUvhCpUkGjjz+cUJqZndwwtfyZ7foNAzQHuU5JhOWQyQH4trPM
+exOjwMom/jpVhAuFCmm6cMOpE0rWN3uv6M5pV9RX7QKBgQDtFpTtKF1jMeGizNFH
+QN0QwX+M1Yyr1GVEBcF8s2Fa1aT423M79wxzjSIOr4UMvUtzBCRcmKtu4tq7wG5r
+Zl9dy1x7NdZbOBBL5FRldVNDrmxYlpDE2v8q00IpfHKCk6xHnHUcuxG0YvI+4NaG
+MPgCjhjy7UDXak6jSWBtqsQjNQKBgQDNB8C9O+QM8hmst0i74Rgs5YlfCXpub6UU
+JtzgDX6AIbHo9gm8BF1B3jFll7AQ8+8iHp4gcKrRI64H/Fmye+ViQ8MvwaNn6mFL
+u6y0ZBBt4sAf3WYpYh4mnpi+kT9rGqsm90qBZ3P3SRCe5vmlOfVTuBbOuyKM0k6k
+Y3bvfapFNQKBgQDa5wSuS5yeH8ozJGT+Ivd5pw77m5h8dmjhe2cAmicDVUsysnwd
+G6cVcXPGl2yDLKvjECn6jMOMaEyJGc1ZwHXBBijnYff+1S7Gw5Tg8Ijmbr9+s9YK
+zCDZC6GE6HBZ+7sPi3feBSL9qHX+dF3eHIyA325NrZ02x+K/hNpRp1/dGQKBgQC+
+q64XjaHoVCGCWLTgXFXSMuiMpFDicRtQ4U9ZYdM5r5w3LNAitOBRSCQh+W34ZhIG
+Zfjh7EU+13KZ5Jk5/jR1LNVRDUA8fGBdQLw8yi3pMw0+1POUGrY1bhpYZtVWcmem
+hiUYsK/M0XsOe3jAqmS2paU4PhnEYjRWdlV+JRx63QKBgQCBLiWDXy+TNHU+Gkt9
+Q/MLNRnIP29tMpLUgZNN11jLTW5gQNWrcXb66HWs7qitwGLsQQ3foQohkQd4J/Fu
+Jhg/zuibiZo70WbjiAPxCEucM4x/11sniQUfv4r4VSb9vGeYZNVkoi0Qab3du5Wx
+uYItwcUOYP5VJboBMKLcs7so+g==
-----END PRIVATE KEY-----
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 6f79c2d4e..dcb99dc5d 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
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.db
index 8b6b84e41..389d85920 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req
index 6c4b6d226..e4bb66abd 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp
index b455ffaf1..8bf7a10f9 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem
index 4f0ee0325..f82606f71 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem
@@ -3,50 +3,50 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.net
- Produced At: Fri Nov 01 12:38:51 UTC 2019
+ Produced At: Fri Nov 01 12:40:02 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 43f5e376b0d5e4b6726b036ad3f86cdb598e6554030274971b10c13035d140a3
- Issuer Key Hash: 6c4e6d4cea3b947e13df8a80ca0dda28a6349c0052b715121823fe38fa9399b6
+ Issuer Key Hash: 6b211a64620ca16f9a76e153ed34f54ba9810aa03de274f6b27452c4f2d07cce
Serial Number: 65
Certificate Status: good
- This Update: Fri Nov 01 12:38:51 UTC 2019
- Next Update: Wed Oct 31 12:38:51 UTC 2029
+ This Update: Fri Nov 01 12:40:02 UTC 2019
+ Next Update: Wed Oct 31 12:40:02 UTC 2029
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
- Issuer Key Hash: 95ebed771f13bb78170dd9520c1e594c85fc648d96625a47c576677b74989f6e
+ Issuer Key Hash: 01089fc170c578818ccc7b96390741ac0d020c89eb3e00f574c8f4d90d14dbf9
Serial Number: 42
Certificate Status: good
- This Update: Fri Nov 01 12:38:51 UTC 2019
- Next Update: Wed Oct 31 12:38:51 UTC 2029
+ This Update: Fri Nov 01 12:40:02 UTC 2019
+ Next Update: Wed Oct 31 12:40:02 UTC 2029
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
- Issuer Key Hash: 95ebed771f13bb78170dd9520c1e594c85fc648d96625a47c576677b74989f6e
+ Issuer Key Hash: 01089fc170c578818ccc7b96390741ac0d020c89eb3e00f574c8f4d90d14dbf9
Serial Number: 41
Certificate Status: good
- This Update: Fri Nov 01 12:38:51 UTC 2019
- Next Update: Wed Oct 31 12:38:51 UTC 2029
+ This Update: Fri Nov 01 12:40:02 UTC 2019
+ Next Update: Wed Oct 31 12:40:02 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIIC/AoBAKCCAvUwggLxBgkrBgEFBQcwAQEEggLiMIIC3jCCAcahLzAtMRQwEgYD
VQQKEwtleGFtcGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhGA8yMDE5MTEw
-MTEyMzg1MVowggGAMH4wVjANBglghkgBZQMEAgEFAAQgQ/XjdrDV5LZyawNq0/hs
-21mOZVQDAnSXGxDBMDXRQKMEIGxObUzqO5R+E9+KgMoN2iimNJwAUrcVEhgj/jj6
-k5m2AgFlgAAYDzIwMTkxMTAxMTIzODUxWqARGA8yMDI5MTAzMTEyMzg1MVowfjBW
+MTEyNDAwMlowggGAMH4wVjANBglghkgBZQMEAgEFAAQgQ/XjdrDV5LZyawNq0/hs
+21mOZVQDAnSXGxDBMDXRQKMEIGshGmRiDKFvmnbhU+009UupgQqgPeJ09rJ0UsTy
+0HzOAgFlgAAYDzIwMTkxMTAxMTI0MDAyWqARGA8yMDI5MTAzMTEyNDAwMlowfjBW
MA0GCWCGSAFlAwQCAQUABCBJRtpvr8b8gvx9u8nJ/ZHiEa9mgJ/Y3VSJfPpL3UzW
-5wQglevtdx8Tu3gXDdlSDB5ZTIX8ZI2WYlpHxXZne3SYn24CAUKAABgPMjAxOTEx
-MDExMjM4NTFaoBEYDzIwMjkxMDMxMTIzODUxWjB+MFYwDQYJYIZIAWUDBAIBBQAE
-IElG2m+vxvyC/H27ycn9keIRr2aAn9jdVIl8+kvdTNbnBCCV6+13HxO7eBcN2VIM
-HllMhfxkjZZiWkfFdmd7dJifbgIBQYAAGA8yMDE5MTEwMTEyMzg1MVqgERgPMjAy
-OTEwMzExMjM4NTFaMA0GCSqGSIb3DQEBCwUAA4IBAQCD/VH0NnusINRa/A5N3slR
-0uW5rojbbfZh2EVSSaemzMQ8XOrl3dPFx8scMsE+QFuDJfT3rOsMD7+hoCE16JEE
-Rz+KqwlKre9F+v4WVjb+IiiHS1w78Yodz3B6o28AuT69BQGUB+MsgvagoK6Swyhn
-hEscLya7jlq7aqGZyZ/fXvb1wI4Bm07RZZKKoiD8ramCK2dNk6ZnNPtuToTSasaH
-OLeY0lZEz9fhzmlQ0fr82sKjYxvBD3bcLIeoahfWCXKZGgeUiOKiQYMM8Lok0q10
-WNUjJbln8uSGxslPxfoOyv8CPEjttFIJafx+FvQfTq4pTop03KjhDXCK2U81JZDZ
+5wQgAQifwXDFeIGMzHuWOQdBrA0CDInrPgD1dMj02Q0U2/kCAUKAABgPMjAxOTEx
+MDExMjQwMDJaoBEYDzIwMjkxMDMxMTI0MDAyWjB+MFYwDQYJYIZIAWUDBAIBBQAE
+IElG2m+vxvyC/H27ycn9keIRr2aAn9jdVIl8+kvdTNbnBCABCJ/BcMV4gYzMe5Y5
+B0GsDQIMies+APV0yPTZDRTb+QIBQYAAGA8yMDE5MTEwMTEyNDAwMlqgERgPMjAy
+OTEwMzExMjQwMDJaMA0GCSqGSIb3DQEBCwUAA4IBAQCtSAFwmbwSL9apNWFXDCVm
+N8/5uIEveeiAk6QVOXOWu3Prejb/5IBrRywRHWrXknY58Dm7Nyzeq5AWB//evKqJ
+k9nV7RNBqdwpF4U4MSTsEkRe0n0+DwrYQUII6UO0Br9q94Kmm4HU4/TcUwIsFib/
+B5vKNyyZ7PPYi85MvOW8s+k50Sc5fiDdCtDOFtN9uuCdMcw63f+VXsoKLE6buuBx
+OVVmAO01NrJxaK9lprGNNsjkIw994ecImw4WuKAaRSaNPtiT4JQ/WtEsieRg4T1o
+5QEaTWQ4t7+Y61sPZeGuxNWVGNBCqvnxYIA0SXzjWRJNN0M/39ca1HI4KmaKlu2H
-----END OCSP RESPONSE-----
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 a306da341..138cd6d8b 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,30 +1,30 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 5A 8C 4C E8 07 CC 36 6B A8 F5 2F 70 1F 55 05 70 9D 0A A7 19
+ localKeyID: 2A 22 8E 09 99 1C 1D 7E 7A F5 09 30 86 37 A2 33 AB 16 0E 14
subject=CN = server1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM3MzFaFw00NDEyMDExMjM3MzFaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDInoFU0rL0
-k98NeCRFBDQ3itLCMVo7OsfKs0iSG2X2ZqDFuFqnSbBPKM0MQPhYfDLvAbDPVhdM
-IAL4Xs3d2MA8qDZzY1oTsIJHjwaGOLXJGuZTuC4jfCtfKFmI778s9hEEOacEFoee
-dbHsQ6tG+Ebjha9Wp5CgIH5g1DWoPwQPLwewfGxaajXb/M/Vkm7keQbxRXC3B57b
-uBmm0o47XAGMx4b68bV9MjLTZFsaEf+Ie9PwQ0eqva996Z1YdMMWhYXv78A/sw6A
-QXz+9Q9WjkbnHnZEu+4GEiG7ArYqTkIHfeBuLnW6+wV6Kb+61HpcCHgEwQyFVgkR
-9baCO8QCzMzpAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM4MzBaFw00NDEyMDExMjM4MzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDblKcLgb03
+NrBQmR20Lt35rADNqLeuYLKPii9ygVC+TTOAk/wTCIg0phcfBezjDB4URFdOhxJB
+/PdJ7XsNpBGZSUD/gZPD9UvHxtlk1SBF6ETDSF5WcRGg3HTzyE4iJGiepoP8rOcX
+9r4FPB4YpfnhhXoerwcOhW6bcQPm0pY3gH+lliIA7P5tECv1eYM1OWkHPFuEjeUa
+6h81PrucFBTSixOv5nzVpKoYJaiTorP27rDWuWSnixJx+N6Es6Z5IWbbh9QkH0eS
+o4DCcHrD5zvoAgT6j1QocNpd9LaKjLjKcBkZpi1tfkb1NUS9/QmyDLr6px+S61kq
+AbtXCNAHclPfAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiJh
-bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUubmV0giFhbHRlcm5hdGVuYW1l
-LnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVz
-dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAJDiypNBZ2Zv5Y5zFyt1AxOkDlLeTJPjc
-keo5/KSbWowpg+MVETbeTM6kwl6EKPP2bVRsGmCE9/7jSkQy4TsbrJkRa6+lOs1a
-K1t4iPPAn/ZyI6KmPZxPPp4/x5D+NRxj+QGONz/yvzK9hof/XU0oF7pbTsmSTr/U
-pRB1mbx1HARH6rE0oeQ4QGjr0vGogZtOEQLJfXD79JoUUP18x+1ab8d4tj9gkYlB
-YfiERPARx4y+Jtmk8OsLzrL7m5M0oX5mZHuoKuOc23MfFmu4elvMa/BdCx4O56JW
-YtcUyP63wrCqUJyqLeqTj8gjG/CGXmFroCR5vCGZdXiXvMAhAJvk9A==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCImFsdGVybmF0ZW5hbWUy
+LnNlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAQcJmqY3/48kV0zZrfzerpWeq6q96xChu
+RjGHyPuYY1+Y8iTxWTCqpVIPukjqdTAiuGjpwYFsqg81oZbrvT2+VmB9BWMwC/Jn
+esU48zDaBqczi6ffvfa7rmIsJkoYPp2EbOI3/61xqbsAbyIreroN19oZC8SDaO6S
+PD9L4DBVV6+Br5fpI94x5F4/fogU/T9YOit4KV9iC9FMxyYpKttxWSKyrcTMcgzK
+7YdsaWZDpgspM91gK7CgfqsnkHafZipEZRdiWlc9IsXKoZgRRCy+NexVz2zf177a
+s0WGyDRAREVflXzz7C0VAegErfBYnseP8O3ycmQ0FhpZ6BGpQ/V2xg==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -32,22 +32,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-ggEKAoIBAQDV2QMhXroWfkj9YEPBRT121t9etcI9Vd1nNquiwiZQXaA5htcRAfDR
-tJH6m9a8IW1jq/PAfoJduMuq+wyWFQRTPXBwJQf64URZ+Mr0iBn0YmQo5WioEUuQ
-x3s/UnmI3d9l3j6WAsBVIIB1QuyocUDdsQZDZ4L6qCFi1WwwL6kqOnVXviqPx2If
-U3XR9sxqWuQa73moAvPH/JSOxUMyozlua7GFrjb1bthwOU/muJIVdrdwtuQb+reN
-puuNWjxY56DAfS0F8IIc85C952sARizsjGQhuzim2l1h4rZkKDRGBHgjDdIEZWxi
-nQg6k8WseM9GdPFLjxUD73SuDTR5QGftAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -55,19 +55,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db
index a45a519f4..ed4131e99 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db
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 9f35a79da..dfcc36ba1 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,47 +1,47 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 5A 8C 4C E8 07 CC 36 6B A8 F5 2F 70 1F 55 05 70 9D 0A A7 19
+ localKeyID: 2A 22 8E 09 99 1C 1D 7E 7A F5 09 30 86 37 A2 33 AB 16 0E 14
subject=CN = server1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM3MzFaFw00NDEyMDExMjM3MzFaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDInoFU0rL0
-k98NeCRFBDQ3itLCMVo7OsfKs0iSG2X2ZqDFuFqnSbBPKM0MQPhYfDLvAbDPVhdM
-IAL4Xs3d2MA8qDZzY1oTsIJHjwaGOLXJGuZTuC4jfCtfKFmI778s9hEEOacEFoee
-dbHsQ6tG+Ebjha9Wp5CgIH5g1DWoPwQPLwewfGxaajXb/M/Vkm7keQbxRXC3B57b
-uBmm0o47XAGMx4b68bV9MjLTZFsaEf+Ie9PwQ0eqva996Z1YdMMWhYXv78A/sw6A
-QXz+9Q9WjkbnHnZEu+4GEiG7ArYqTkIHfeBuLnW6+wV6Kb+61HpcCHgEwQyFVgkR
-9baCO8QCzMzpAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM4MzBaFw00NDEyMDExMjM4MzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDblKcLgb03
+NrBQmR20Lt35rADNqLeuYLKPii9ygVC+TTOAk/wTCIg0phcfBezjDB4URFdOhxJB
+/PdJ7XsNpBGZSUD/gZPD9UvHxtlk1SBF6ETDSF5WcRGg3HTzyE4iJGiepoP8rOcX
+9r4FPB4YpfnhhXoerwcOhW6bcQPm0pY3gH+lliIA7P5tECv1eYM1OWkHPFuEjeUa
+6h81PrucFBTSixOv5nzVpKoYJaiTorP27rDWuWSnixJx+N6Es6Z5IWbbh9QkH0eS
+o4DCcHrD5zvoAgT6j1QocNpd9LaKjLjKcBkZpi1tfkb1NUS9/QmyDLr6px+S61kq
+AbtXCNAHclPfAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiJh
-bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUubmV0giFhbHRlcm5hdGVuYW1l
-LnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVz
-dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAJDiypNBZ2Zv5Y5zFyt1AxOkDlLeTJPjc
-keo5/KSbWowpg+MVETbeTM6kwl6EKPP2bVRsGmCE9/7jSkQy4TsbrJkRa6+lOs1a
-K1t4iPPAn/ZyI6KmPZxPPp4/x5D+NRxj+QGONz/yvzK9hof/XU0oF7pbTsmSTr/U
-pRB1mbx1HARH6rE0oeQ4QGjr0vGogZtOEQLJfXD79JoUUP18x+1ab8d4tj9gkYlB
-YfiERPARx4y+Jtmk8OsLzrL7m5M0oX5mZHuoKuOc23MfFmu4elvMa/BdCx4O56JW
-YtcUyP63wrCqUJyqLeqTj8gjG/CGXmFroCR5vCGZdXiXvMAhAJvk9A==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCImFsdGVybmF0ZW5hbWUy
+LnNlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAQcJmqY3/48kV0zZrfzerpWeq6q96xChu
+RjGHyPuYY1+Y8iTxWTCqpVIPukjqdTAiuGjpwYFsqg81oZbrvT2+VmB9BWMwC/Jn
+esU48zDaBqczi6ffvfa7rmIsJkoYPp2EbOI3/61xqbsAbyIreroN19oZC8SDaO6S
+PD9L4DBVV6+Br5fpI94x5F4/fogU/T9YOit4KV9iC9FMxyYpKttxWSKyrcTMcgzK
+7YdsaWZDpgspM91gK7CgfqsnkHafZipEZRdiWlc9IsXKoZgRRCy+NexVz2zf177a
+s0WGyDRAREVflXzz7C0VAegErfBYnseP8O3ycmQ0FhpZ6BGpQ/V2xg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzgyNloX
+DTM4MDEwMTEyMzgyNlowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+CSqGSIb3DQEBCwUAA4IBAQAgqIO3hOfqgXt/9ejnwUcC36RVUwkU/bET4RQs3jED
+vh3PS67YYAv8oyAvLJg47alk2jqqm2TJfnpZ8viYGbd3V4//ZpLjyweoUPU0Y54m
+pZi5G+dmeK6/zL8ZQPQEHoiTfNXVM3UwUTnyYCO5XALNBTxOWINq2LAiaQLd36o5
+gDaeKdAGjlLkWYYEnnyz+L/VOU+RlPHenWn7QUp/1WQo9xq+zQZoVQ2MVLwcY+QI
+BHFDN0ZrodqU1l4ej2GwBax575rshxgIcZl13lHzLJKX5PYaJj8E4kOFsmMDwwQb
+G7Yu0Szw7PMdWgyggWdZMNMeQo9zkUiTLDJ3dfaUrcR1
-----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 05985a284..4ae7ebe49 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,34 +1,34 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 5A 8C 4C E8 07 CC 36 6B A8 F5 2F 70 1F 55 05 70 9D 0A A7 19
+ localKeyID: 2A 22 8E 09 99 1C 1D 7E 7A F5 09 30 86 37 A2 33 AB 16 0E 14
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----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 411a3d299..df178d528 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 bbc9bc7ec..4f15f85ab 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 8450f3a3d..6a0ff4b61 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 79bfdcc35..23e0ba36b 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 9c7c10ea6..3fc9dff44 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 a3c41639e..20e8d3854 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 9d9bc3b9b..d6f035f4d 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 4bf970f70..1c0edb14a 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 0cd3c1d0f..145803613 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.good.resp.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem
index 6f65db9da..b48d067eb 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem
@@ -3,29 +3,29 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica Signing Cert rsa,O=example.net
- Produced At: Fri Nov 01 12:38:51 UTC 2019
+ Produced At: Fri Nov 01 12:40:01 UTC 2019
Responses:
Certificate ID:
- Hash Algorithm: SHA256
- Issuer Name Hash: 43f5e376b0d5e4b6726b036ad3f86cdb598e6554030274971b10c13035d140a3
- Issuer Key Hash: 6c4e6d4cea3b947e13df8a80ca0dda28a6349c0052b715121823fe38fa9399b6
+ Hash Algorithm: SHA1
+ Issuer Name Hash: 72b2200a81655f043d43c56b3c0b4b4d664abb5b
+ Issuer Key Hash: dcfe0078faedf0c2d99caffc76a7e19e8f1b759f
Serial Number: 65
Certificate Status: good
- This Update: Fri Nov 01 12:38:51 UTC 2019
- Next Update: Wed Oct 31 12:38:51 UTC 2029
+ This Update: Fri Nov 01 12:40:01 UTC 2019
+ Next Update: Wed Oct 31 12:40:01 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
-MIICBAoBAKCCAf0wggH5BgkrBgEFBQcwAQEEggHqMIIB5jCBz6E5MDcxFDASBgNV
+MIIB5woBAKCCAeAwggHcBgkrBgEFBQcwAQEEggHNMIIByTCBsqE5MDcxFDASBgNV
BAoTC2V4YW1wbGUubmV0MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNh
-GA8yMDE5MTEwMTEyMzg1MVowgYAwfjBWMA0GCWCGSAFlAwQCAQUABCBD9eN2sNXk
-tnJrA2rT+GzbWY5lVAMCdJcbEMEwNdFAowQgbE5tTOo7lH4T34qAyg3aKKY0nABS
-txUSGCP+OPqTmbYCAWWAABgPMjAxOTExMDExMjM4NTFaoBEYDzIwMjkxMDMxMTIz
-ODUxWjANBgkqhkiG9w0BAQsFAAOCAQEAZKeVm8kgoYY2eEePnucN1/AKh0NG7+hR
-KQsgkrlQrBPmt92YJGhkzuf9oFfjC2rP3O/KlhvgaKwITzVWgAFAj2376xTahh5O
-YqKzJBOje5JygMRmgBMQq0xR04vYz/Ju222BJX2IIfGmQH6z5Da6AwhWdutZREpx
-ZaIA/XNwVV4kYb0aryp/6RZsaVE5sK8mAbqenXM1/TKm8cGO4fcfzL6DiDyVbavT
-ZnhJkHsNUwcksLFhMj2d4MHhN2VBYDLmh8YmuMKJ04t1is2l9FrYyudzZJzYxWeW
-ZLrlsvnn/Ph2dpkSNJJ/Pecuwa0HvMUM6jppxjjPO8uNXFhSJRwtMw==
+GA8yMDE5MTEwMTEyNDAwMVowZDBiMDowCQYFKw4DAhoFAAQUcrIgCoFlXwQ9Q8Vr
+PAtLTWZKu1sEFNz+AHj67fDC2Zyv/Han4Z6PG3WfAgFlgAAYDzIwMTkxMTAxMTI0
+MDAxWqARGA8yMDI5MTAzMTEyNDAwMVowDQYJKoZIhvcNAQELBQADggEBAIw398Fl
+kORUURZoaUoa567qTv2ZJcz0j5ROM9Z5LuZAlrsNuxIgHBgi/9CfGNE9OMupuBBS
+tDuEyhoGSIKzwjTm9P/PVNBsiZWikh0E/td6AZ9/WyvYzQ61ae85yo7pcpoVlsLI
+bpYP+qD4DbDQ5ck7C6fkqVZR3ZwWXeAih59jmw44L65PgJwgu2xgwKb/PgYv/Knm
+AibNl2pXLcIf3mXcyXHOwXDwGhTn2mVUMQ/S5PWLc2w0b9o+A5azsOXmjB64iutl
+wBc6MP2q7wZvVE0DCN9P8IZUoe3u70nbQZ9uic/L7WpB4LOnro6FwWqJGPElVQUt
+9y1ed9CUxl2BCow=
-----END OCSP RESPONSE-----
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 ed858fff2..4aba3ca33 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 f03588d62..4f878eebc 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 dbc9acc24..69121c4eb 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,28 +1,28 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 5A 8C 4C E8 07 CC 36 6B A8 F5 2F 70 1F 55 05 70 9D 0A A7 19
+ localKeyID: 2A 22 8E 09 99 1C 1D 7E 7A F5 09 30 86 37 A2 33 AB 16 0E 14
subject=CN = server1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM3MzFaFw00NDEyMDExMjM3MzFaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDInoFU0rL0
-k98NeCRFBDQ3itLCMVo7OsfKs0iSG2X2ZqDFuFqnSbBPKM0MQPhYfDLvAbDPVhdM
-IAL4Xs3d2MA8qDZzY1oTsIJHjwaGOLXJGuZTuC4jfCtfKFmI778s9hEEOacEFoee
-dbHsQ6tG+Ebjha9Wp5CgIH5g1DWoPwQPLwewfGxaajXb/M/Vkm7keQbxRXC3B57b
-uBmm0o47XAGMx4b68bV9MjLTZFsaEf+Ie9PwQ0eqva996Z1YdMMWhYXv78A/sw6A
-QXz+9Q9WjkbnHnZEu+4GEiG7ArYqTkIHfeBuLnW6+wV6Kb+61HpcCHgEwQyFVgkR
-9baCO8QCzMzpAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM4MzBaFw00NDEyMDExMjM4MzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDblKcLgb03
+NrBQmR20Lt35rADNqLeuYLKPii9ygVC+TTOAk/wTCIg0phcfBezjDB4URFdOhxJB
+/PdJ7XsNpBGZSUD/gZPD9UvHxtlk1SBF6ETDSF5WcRGg3HTzyE4iJGiepoP8rOcX
+9r4FPB4YpfnhhXoerwcOhW6bcQPm0pY3gH+lliIA7P5tECv1eYM1OWkHPFuEjeUa
+6h81PrucFBTSixOv5nzVpKoYJaiTorP27rDWuWSnixJx+N6Es6Z5IWbbh9QkH0eS
+o4DCcHrD5zvoAgT6j1QocNpd9LaKjLjKcBkZpi1tfkb1NUS9/QmyDLr6px+S61kq
+AbtXCNAHclPfAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiJh
-bHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUubmV0giFhbHRlcm5hdGVuYW1l
-LnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVz
-dC5leDANBgkqhkiG9w0BAQsFAAOCAQEAJDiypNBZ2Zv5Y5zFyt1AxOkDlLeTJPjc
-keo5/KSbWowpg+MVETbeTM6kwl6EKPP2bVRsGmCE9/7jSkQy4TsbrJkRa6+lOs1a
-K1t4iPPAn/ZyI6KmPZxPPp4/x5D+NRxj+QGONz/yvzK9hof/XU0oF7pbTsmSTr/U
-pRB1mbx1HARH6rE0oeQ4QGjr0vGogZtOEQLJfXD79JoUUP18x+1ab8d4tj9gkYlB
-YfiERPARx4y+Jtmk8OsLzrL7m5M0oX5mZHuoKuOc23MfFmu4elvMa/BdCx4O56JW
-YtcUyP63wrCqUJyqLeqTj8gjG/CGXmFroCR5vCGZdXiXvMAhAJvk9A==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCImFsdGVybmF0ZW5hbWUy
+LnNlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAQcJmqY3/48kV0zZrfzerpWeq6q96xChu
+RjGHyPuYY1+Y8iTxWTCqpVIPukjqdTAiuGjpwYFsqg81oZbrvT2+VmB9BWMwC/Jn
+esU48zDaBqczi6ffvfa7rmIsJkoYPp2EbOI3/61xqbsAbyIreroN19oZC8SDaO6S
+PD9L4DBVV6+Br5fpI94x5F4/fogU/T9YOit4KV9iC9FMxyYpKttxWSKyrcTMcgzK
+7YdsaWZDpgspM91gK7CgfqsnkHafZipEZRdiWlc9IsXKoZgRRCy+NexVz2zf177a
+s0WGyDRAREVflXzz7C0VAegErfBYnseP8O3ycmQ0FhpZ6BGpQ/V2xg==
-----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 b6cfdc6d2..f25e57d60 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDInoFU0rL0k98N
-eCRFBDQ3itLCMVo7OsfKs0iSG2X2ZqDFuFqnSbBPKM0MQPhYfDLvAbDPVhdMIAL4
-Xs3d2MA8qDZzY1oTsIJHjwaGOLXJGuZTuC4jfCtfKFmI778s9hEEOacEFoeedbHs
-Q6tG+Ebjha9Wp5CgIH5g1DWoPwQPLwewfGxaajXb/M/Vkm7keQbxRXC3B57buBmm
-0o47XAGMx4b68bV9MjLTZFsaEf+Ie9PwQ0eqva996Z1YdMMWhYXv78A/sw6AQXz+
-9Q9WjkbnHnZEu+4GEiG7ArYqTkIHfeBuLnW6+wV6Kb+61HpcCHgEwQyFVgkR9baC
-O8QCzMzpAgMBAAECggEALYbu8alpDCDcjwlzLahhEzOxVXlusR9LRMA/2UxXbL3o
-gUYvaGRMGwK22a+KzEXPJzcagUrXuaJQGj4leNFd+sXvqWrj/7DgN84I3H/VHSC6
-IUicS9g7XXpiKzXBDDqBLRTKRp64QykRaf0HSvE/4RUu77rSEsyc8WtnC9nVGX6b
-PLY5vZ681iizNtP77TA2tsyxjkQHqPfzob+mZmpxjYePtJVeXiiw87v71FmfB2li
-NhYpyWt0q6Zr43yg92Yd7y5ikZA9tAkOmaU5B6Z3KztreCFrtUvZV5NDMijD8nOA
-31k5KAdMpUxqndjWLx2tTlFt+Rv66i4MB948jQeJIwKBgQDvUcCvmNWEsMkI5YV9
-ZaZkRVMIM1DE8yoGVamMsjPJCSh/wk9V0E8WqsTCAUBovY8/9qZJ1ne8aUSgGsZj
-Zz/SNUrnIt3TtW/kNnZUNthMd9frS4eQ5d4whn4r9HaVZ0H38k1Vd9v6Py/T5ewI
-iABQfG4ah6zuqMZ4+F9tKBap2wKBgQDWmjajiIDCm3bz8vthuJZOPeW3V4++ngVX
-qpOlfP1/qhlOHnXuP/z84BkABCWSvz8jUQ6tQy5OUybee6Few2bDMJciN48xrozw
-xb53s+xbb1wvSaSGvAOHQIE4woZZizNbODR2atux8eoqCOr1CyinY/3xTTp1LkYW
-RMEtuCepiwKBgFb/URyEYpop6eriBPTgzuwEh3qjrOjrvIsw+MG8xjZ+rcpDyLNZ
-VmbXDU+5RMDOqBSIhUqyPDSxz9Cj6xqXngu8c84yTpF3k4VShxF2HostxcAzZMS3
-y124hoVUCQem0cRgwNwhBkaiUbCmFHfFeNfJY/0g9SyNDhlLsOTtfc+hAoGAfSzY
-oAzYJitueB8L+FUl/x9lpcrCQsqDjT4m/wloCBZcyk9ENKNIWuwQSQ0iKXW6S0xV
-hkTAdtlTu8RbPR43C7WFAmVr9eu9tBdz4Pim7jKHj+GhwSFb4YGDnmsA2Kw0WYnw
-N/5ehW35S2mGO0a2AOV3U0/bwEwsf4K9N4DKSb8CgYAN8aJaRcwhXjfsNbpXEbVK
-fSxJB4baL/JtGF0+kSIuWgD3Hhq7/ae+2P7W14AFUGGwhM7BYTpq8ZbFmTGvQ1J1
-83CrfNZG+zZlSOPb6T8hOlEci7USHkDOdVQP5qVpIgXsZ21gYQtIahpkyPtkkqUE
-PIzuj1xNyhp+qN8J4daeLQ==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDblKcLgb03NrBQ
+mR20Lt35rADNqLeuYLKPii9ygVC+TTOAk/wTCIg0phcfBezjDB4URFdOhxJB/PdJ
+7XsNpBGZSUD/gZPD9UvHxtlk1SBF6ETDSF5WcRGg3HTzyE4iJGiepoP8rOcX9r4F
+PB4YpfnhhXoerwcOhW6bcQPm0pY3gH+lliIA7P5tECv1eYM1OWkHPFuEjeUa6h81
+PrucFBTSixOv5nzVpKoYJaiTorP27rDWuWSnixJx+N6Es6Z5IWbbh9QkH0eSo4DC
+cHrD5zvoAgT6j1QocNpd9LaKjLjKcBkZpi1tfkb1NUS9/QmyDLr6px+S61kqAbtX
+CNAHclPfAgMBAAECggEAHUE3ZkGRT5diM0LLIdPysA56Bux5GGr6r0QWYTeYZdpM
+R8+vkGudFgKg5vm3n2JgaYvXY/d79723xqo0sFMRIy6O0dvWL4/xWjsEgLoidB3n
+d2sfYn3q/tcQX+BqhIL8S1LdF9+DZH5zv6fMTLVkTuclJ4xjMMyXOW97uReKevdN
+CzxSbFSESKyop3cuzf7In850Atn323YSSecITPEzB/TTNnYKZYsSLlKzNQZqyLtu
+jIUEOcRZSa26lxvg1wICBo572pTYVNgr5TNntQKLPD+RWz2u/zZZ3J8BIyZl4V5q
+PivnSrZ1MXNbapognSx7y8llUIxvM6CWKMzZy+kEuQKBgQD4iOEUvKbp/7dcwxEb
+LDD380t68tS5Q39U0RfzAem7sj2XwQtlq0s9oR2Uj/Ku3AcxsiS7T6bU7Q5BbzB8
+xT/8+rkMSdsukwlCyCRPRAsHu7wE3hZGFHUntuiuNZXPuvP9GdhGIAguwpum3UJ/
+19Kb64SfIFBMY3ag9GK4ue43mQKBgQDiLSE/2jarU70DNJUNL0q2z5ECTn7C7M67
+cHEDgU2EaUv/oE1ss5fWaapfk+8ezIclT3zCW+B033fWAwrPMqVwuOd0kdeIDcN4
+8TbmzqXiBt41J7cwnnoApGmGD/193KbD84tsaHT370RnkLrpzh2JOv2WA3bVXE/L
+9cHaePyyNwKBgGZVriAkwbGuKmkWpO+EVbFyy0yXukGCamaZJfxYeE5hyPy4byHw
+0y1QLubiErIvRQMQcBF0baRU677DsrpdWcin0BQgQRC/WFvYHyNISCZqBbQXYiJ+
+//JXXR2GUOZU+2vm/Wd6fwQJ+59MkbokOsMayePfoVCiz9Dcb93SKSVZAoGAbUpJ
+asVS7W7FQqtB6uETRUr/UxIDBsXPD5vBwGPWxUjsRFV9lC0kDaN5hD3DqipCk7DZ
+JEGpMFBbY7qMmppqfxGaJiXi9AdSkTpdwSHR3mpbLWxHhOLPKUhJBVLstsjMfJtO
+n8/J1ZR0hWbWKuxCMXGj371EysyUcoYKajtUP/kCgYACjSGVemvN37HHHpn0t001
+b9hB/LREZ/LvtbCaAVFERJ5idWREi9nKCAfIJ6IYq0Tc6DVHW/qDVo6WReGWIEYm
+8WSnmcD7MZGtjJ1IeNv1yj20duMURg+0swVuu5R4+F2qR1HOKB13ytnLQ7/Yytv1
+Tq46ebTltGgo0C/qcUF06w==
-----END 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 6f79c2d4e..dcb99dc5d 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
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzcyOFoX
-DTM4MDEwMTEyMzcyOFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db
index 335e4e674..2846d2c0e 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db
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 33b16ad8a..0f447f483 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,29 +1,29 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: DF 8E 8D 4A 1D 71 0D 4F AD 1A BE 7A EB 3F 04 D9 E2 24 ED FD
+ localKeyID: 43 70 54 6D 39 D9 D3 36 A6 3E AC 1A A7 DE F2 89 55 2D 19 7F
subject=CN = server2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzODA1WhcNNDQxMjAxMTIzODA1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1AfDiYOe
-CYMCscfy0DNzHPuGOSPw6/WzLUJrRmbJBvyHCGI2Qr08Z8t5kGKRY9Or4TdLVN9N
-+5sZKSyf47OH0ixT8olx3FOZ61FVcoBTG4oa1+sNJcCCqcrnanpp/6EapcAwGofj
-DyRVR7xZHmzCuViWmiLafx9qhEwk0wT5E3IoxYPvLeJNBfslgirwHOP2FLfSRp4p
-RxicWayNCnhhsW21LBaYHSKhwuOCOyK3QjjPyZ/FWwARXkXA0o1tra1dlsKQ+t6L
-Zv61rM26RrZiD2OxBwNhTuHpxA+LYT3KiUCFQCZc9qT+Am63jA7J9BC8nJCUW3Jg
-ZvOyjM5Gd3a9gQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzOTA4WhcNNDQxMjAxMTIzOTA4WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6ZfmDuVL
+2Ascbs0E7iEwaEa5c0utuotkKWbREWT35gxV6kKPCa76hI5M94iKi/B5PpHoe3pn
+3v+Gfi6Nb+mQI/gwGEUjHq4vzVVrEciQTV0NX9POXIFbPAAinH93blh4DG4pwfIq
+jYe9VbcifpXOEbA20UYcdwqIjs+Lqqhqs60UMRLPW/rPyKtD9MoMgGu5bsSpzouV
+O8pnoWMUWv+IbELCU9ayFKmtBiesvk4BgGUu7M583FvvFXMUpoYzIHlLuq+Mdox/
+QqMD1PMhPLNKcsZted4FXlvEVNxq9xXrZmodRAgczxaifpwIciTcwglMu8UHoOTk
+RA6NiAgTF/COcwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAEy7rEhYOPeZjXNOd9SdjeQNt29q
-CyTz/CkaT+We9cl89Wop+NOh1xPpN3KPM8q1l+EEkrF1RjCva9RwHbeGbcFpsow7
-lBNvrebw3I8PAGUqfVwR1m+DuRCtpTsA7vHxelH/v6j6WQSXwP4XR8Or+/bXdyzR
-BElKL00wmi3QNu8pfq33tpdlZLtYTuThL8v/pQaajlf2g+uzQnSIgtCLzbBynbRq
-v6aTU4LuQPu9fXqghiwo1U4iamWqjGDrsaqloxsLoNPhH0P/Mq+85C0cdpydnXqx
-GlkAygbdRlsBxN052aUxkB0Zq55Z3cacfGEXI5eet5FmxrC7gC7HsTFfKpc=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAFZjze2kLYk3ikCG1t+DruNDTWTN
+MpNh0wXZXsbR9hpIE0IVscuh7sOmltDh3Jeg6penWXZxcG4j1XZyjhuFe38htwOs
+w/4JR/iBsDSz4WyXzr9dTxUYP3OLIMqalpAFj26QPaNv9hLmDV4NX1dB1UdQhgxT
+ec2NI4QQQuudoZakeIW2Rjo1gPZ5+XwjZHVcHm66eoIdjOHqQKfumQaGC58hKctX
+sECunPnvFYVnLJRrReH2i0Xbdcc+r2WXlHWpqE/clM6vM/ymq98ZM7Lxg2FUlLoY
+JWgSeL7T/X59a3CK6C2yw5PVy1al72hJUyYu3Zq2Bv2nUB7wb8bNWW5DW1c=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -31,22 +31,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -54,19 +54,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db
index 85809fdfd..fe27adbc2 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db
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 014e03426..5ca72a712 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,46 +1,46 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: DF 8E 8D 4A 1D 71 0D 4F AD 1A BE 7A EB 3F 04 D9 E2 24 ED FD
+ localKeyID: 43 70 54 6D 39 D9 D3 36 A6 3E AC 1A A7 DE F2 89 55 2D 19 7F
subject=CN = server2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzODA1WhcNNDQxMjAxMTIzODA1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1AfDiYOe
-CYMCscfy0DNzHPuGOSPw6/WzLUJrRmbJBvyHCGI2Qr08Z8t5kGKRY9Or4TdLVN9N
-+5sZKSyf47OH0ixT8olx3FOZ61FVcoBTG4oa1+sNJcCCqcrnanpp/6EapcAwGofj
-DyRVR7xZHmzCuViWmiLafx9qhEwk0wT5E3IoxYPvLeJNBfslgirwHOP2FLfSRp4p
-RxicWayNCnhhsW21LBaYHSKhwuOCOyK3QjjPyZ/FWwARXkXA0o1tra1dlsKQ+t6L
-Zv61rM26RrZiD2OxBwNhTuHpxA+LYT3KiUCFQCZc9qT+Am63jA7J9BC8nJCUW3Jg
-ZvOyjM5Gd3a9gQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzOTA4WhcNNDQxMjAxMTIzOTA4WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6ZfmDuVL
+2Ascbs0E7iEwaEa5c0utuotkKWbREWT35gxV6kKPCa76hI5M94iKi/B5PpHoe3pn
+3v+Gfi6Nb+mQI/gwGEUjHq4vzVVrEciQTV0NX9POXIFbPAAinH93blh4DG4pwfIq
+jYe9VbcifpXOEbA20UYcdwqIjs+Lqqhqs60UMRLPW/rPyKtD9MoMgGu5bsSpzouV
+O8pnoWMUWv+IbELCU9ayFKmtBiesvk4BgGUu7M583FvvFXMUpoYzIHlLuq+Mdox/
+QqMD1PMhPLNKcsZted4FXlvEVNxq9xXrZmodRAgczxaifpwIciTcwglMu8UHoOTk
+RA6NiAgTF/COcwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAEy7rEhYOPeZjXNOd9SdjeQNt29q
-CyTz/CkaT+We9cl89Wop+NOh1xPpN3KPM8q1l+EEkrF1RjCva9RwHbeGbcFpsow7
-lBNvrebw3I8PAGUqfVwR1m+DuRCtpTsA7vHxelH/v6j6WQSXwP4XR8Or+/bXdyzR
-BElKL00wmi3QNu8pfq33tpdlZLtYTuThL8v/pQaajlf2g+uzQnSIgtCLzbBynbRq
-v6aTU4LuQPu9fXqghiwo1U4iamWqjGDrsaqloxsLoNPhH0P/Mq+85C0cdpydnXqx
-GlkAygbdRlsBxN052aUxkB0Zq55Z3cacfGEXI5eet5FmxrC7gC7HsTFfKpc=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAFZjze2kLYk3ikCG1t+DruNDTWTN
+MpNh0wXZXsbR9hpIE0IVscuh7sOmltDh3Jeg6penWXZxcG4j1XZyjhuFe38htwOs
+w/4JR/iBsDSz4WyXzr9dTxUYP3OLIMqalpAFj26QPaNv9hLmDV4NX1dB1UdQhgxT
+ec2NI4QQQuudoZakeIW2Rjo1gPZ5+XwjZHVcHm66eoIdjOHqQKfumQaGC58hKctX
+sECunPnvFYVnLJRrReH2i0Xbdcc+r2WXlHWpqE/clM6vM/ymq98ZM7Lxg2FUlLoY
+JWgSeL7T/X59a3CK6C2yw5PVy1al72hJUyYu3Zq2Bv2nUB7wb8bNWW5DW1c=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----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 61da4bdf2..c90baaf1a 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,34 +1,34 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: DF 8E 8D 4A 1D 71 0D 4F AD 1A BE 7A EB 3F 04 D9 E2 24 ED FD
+ localKeyID: 43 70 54 6D 39 D9 D3 36 A6 3E AC 1A A7 DE F2 89 55 2D 19 7F
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIIsIgVstZKzcCAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBBALYvsAcNH4kMpgmy0olilBIIE
-wH7xqmWhHKEIzw2dfBxddPy3AmktQ/3GRndbj4io6rygMibaKowsyaXQTKcYEUWQ
-LyIYnrEgFMZCEhy4vUt3apmQJ633OXotLkKU3RkW+oz3xyPAJFbkgH1LIN7VTqvE
-x2ZG0YE0z91dFPwd9/1y9vQli/UUAO6mAidKxkeM35dCz/AJp5FuLs1LUYi9huwg
-aVSb2qsJFaWrNHX8rAXwqGve26DM6vq2gqJww60Ty0imQBuIPMM0yGuPjBhFrlIH
-psxJ1CRzQJ7/t8w7TTTQIpws7GtMCB8/ATQFDlfaq7rWNCliVM7pm61wgM8ArbxD
-4OC+3SFGOKDx3FlsP3gjxkGrxopseDEnAAyZ2W73C1GGPGyWlb8//PQ5WiDVorvB
-7iDPMF0+fBMLM2Sc77TcN1ohGLFStG7DsWwoE9DaARMY/79ZT51+b1KUTjd0JNye
-3Y0DW++DiSaWph0xZqEatyiQiZ4T5H4YyOIsX1so45nj1w5n4aMZqPaERlQVONlw
-21Lcl3Di0E66FqPAfctcAHgpJgAYH4Cgh3c88ecgfW4uGUy54d2DG5DIN/36GczE
-4PZgzwzjnx51pyzduOE1AqeomA/T84ekxeucaGJYbXzMnCQle8qqm9PQwbZ8VZk5
-oteAk+mcgwMZsjbVt186i69z7MlpS0xpoVPNMoYCdk/qIn2lGZFHsZFl0ORkcUUK
-uizkKg/nFfxepXIzs6MhUdhXudLTvCtFN8d2XB58+MZtepc4PxcvC29Gd2O3Rqle
-j9MRH19RUq6OIZKoqi2Z0jdXDz2LOYVTE1LAohzLQSItVWcfD0lIQwx5nMm/32Tf
-q9d7cotYxHWr55ciPO4Lqg7C1eI6Ea9MEWWgwCeB9SQCc4RyUD49iuU4DPWHZ0j/
-+axq0FFSJuuNj06PV1xVDK2IsW2nXV9hN2UAV0i7v03XDY1Kc+j9kbF3YYMqwm16
-FaWrOIrrkXNJQmori7aXaoGwKmNj+CX7XvDJ2lzQ/CzhlH5W3MLYahuaaXWS1az9
-EJJrWUFxpc4ZQH4xLBg6oGBZodfkTD1qg46NIv2T4jLehqgPfIGh+KcN9RnnNgnj
-jjRSPs+Rt1gbxbXkF7Uayyigxnyz7/HAuUT75Sk+lt1jw09c48/nFZtZT3VsnU24
-BM92d02pYWjgI5IPFGuXdakaeKu9ZM2FPt4NFVLgMSnErN9sEp8mv8GPmOR8Mp/4
-e/FXmThyNO3K/q9aiN/1Zf/gkSjWkXoEV4eHDR3xl5XwpvdO0R0MOkcQRvfcxSfC
-v1pikZntHk49zjC8UsAAxtupWIiVetw6IP3OZ7ill9ecq5Min2bEzp6qDqmQFka1
-MoFJBN9C2oXK8yVaHvTG/dXiAzvtlQ1LeA60eCdfs1EwlqpAihclUNoVUzTPWkMl
-VpA47YaCBZB5fVG09HuYroOFXxHG/1+EIBYx6ECPnbZV1ECPD19fVFCF0DtPkau1
-p4/FMYI92E+Dekx7t0Gw3KH4R4OiZ2uw3W3RvVmX9/rJG24XbVqUXoZsyPB+XBbN
-hCn2YtEj+Aa2qV6jbrROdhyK+3+QwbZqfxB87CVaiuCiM+vsgJitXCeMfDMLjQpX
-uPwDff2ODoYDIgUJ+fdwGhE=
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQINXxd+0TIBggCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBChiQOns40A2YEjimx9hwgsBIIE
+0EG2/MnzGrGaeup+fJonHgODd7H7JySv9IzrhkRBC2ZMnLUPhwSBQZh0MBXfBIZZ
+I5YzwpW+7SzrwS8AZAdgETNawzaRI/kso73oKXymfb0KSJlL3hoJ/raT3GqvhRYZ
+2h8PIw0PF9uyXsMGCi8lQJEkz6soYmkbN1NwDmlhzY5AtgZpMU0FRKs7UkGq8RNh
+WjB6qjIRfPoDIWQk0iHswnXrurMThx79DMg8MLhu6XQ/PnZrIX1y30996rd/lx/k
+vvxtZjcdBZxSs3nrBFD/jTxO+bN/F4tm1xVpnkFkPXsAKHTSxgBKSDCsVJP+EHFj
+alnYulBrxuac1gQ4I3Em74v6jksQPdsMID7h4cuCilPEMMb/yzWArjcgTCoqF5+k
+SkSIvf5DiHQeIORxM78/S5q6/B2OG1nDEFbYfDiIbf1FbuFZn9N0mvbZ01Spl+gy
+eNksslmvMDmmAvQqOIBsdI3txYUEybuWBF+hxNbL/Ean4xYJUQMFNCe6s6eoznz/
+X1rtCssf/94isBSv6APp8nmEppXl6LMvxTJra20QYg4uG/7pNsbWLpqcblIAx5sB
+uEtW4Q2NiuoMn7RsafaUcErarJl00V83pjvuurlncOCEhu2pjR2UuWHyhYHlW7l7
+AgaULzB0bZa7TIABrxEkDxaiug74EYSdjZCqE+1efE+fAOs/+OVQkuGY74YSlYD4
+2RUGbxE5Q0kEz6ZgULEUdYTi8Qo5MJt0ZoYrKOYsmn4u1SRKKfui++7+Zr1/0vSX
+mSDVMNUfhupVPE8UeSMAVjkws6GD9pVM+x7x9w4QAEb1ajuKn7jtdBUJ/pgfUDm6
+2t64KR55hoxqdpeW5YJRKJlzk5YHjy5lACzhjGsz6mBXM8TG9vMIBGX4QdHJu5Ly
+u01M6rBTx6iEskc1W93Z7hxQPYlqHyDR1bcQ+Pef0HE5QjHz7YnWNtA3E4MQCACp
+fl7t4ycvwdusw3Uq/aAFaFng9cnPbCnF8a8l9V0QFxspGHv8d+uqAkQhsnP4W8DS
+csEDcRNVtmr5B9xW7AFN4RbUSRKPCx0G6cDaLXclH9z7lKpXb6kQ/pd+Ky3FuwBo
+BdB/AKM8S/BlVfg2OW+vG+AtpTYXdjoM1IX9tODw+0NiQyPWaHyqyU4mVyBy0nSY
+emSwalGBHqQx/2kR8VvHzJuArO0iZsCkPAl8GrKJT+KkafbTCls8R43EduePRh4o
+aJst0b83wUw7E8mMII9tH3fgeUTR0tpW6m7pRjwmYJ7/rC08xFew/44VmPOSJSYy
+JAbtZbOBZXe0gZdEVLL6mbVjeFFtOSBEXjnqhxiZy2hPiAdGB/KLpS+TxN5yW7zr
+40RnPOlTuVgbipwGqU0UdNs/eLZCJeX9ww4m91FehJDgQewb8g+CrqysH0O25tJ+
+hLxcXq91ACVCRlZrHGQE1ch3OQXmsX+gjEAiJbJkU0ihCAhCm5qYq904Y3SGSUis
+3stkmGhZwKlyyeqZ0iSo80VYCiP5aLJ/LMAvYhiNiaB+8053mCy/uh3WZd/BAf3Q
+P/oiVnFEW9uwXuQ16vKKHV/h7kPN81Bu1vKCrx0ut/Iyij01kem32S/py90V5OlW
+Q2NWUcat4regzzd0/KA6ZlEvJMHOqAYmu4zJTpK6JUgM
-----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 09c02f94e..6ee5e7696 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 4389f3ff7..adb3a83dc 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 95d853e37..5295976de 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 4389f3ff7..adb3a83dc 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 c7164ff20..f9da09a35 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 46ade7b1b..e4542c2c9 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 46ade7b1b..e4542c2c9 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 8d5265264..1d3c7640f 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 bfc680d6a..9250e9792 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 bfc680d6a..9250e9792 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 6303d402f..216a52ff9 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 7aaf545b1..4f18e05d0 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,27 +1,27 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: DF 8E 8D 4A 1D 71 0D 4F AD 1A BE 7A EB 3F 04 D9 E2 24 ED FD
+ localKeyID: 43 70 54 6D 39 D9 D3 36 A6 3E AC 1A A7 DE F2 89 55 2D 19 7F
subject=CN = server2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzODA1WhcNNDQxMjAxMTIzODA1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1AfDiYOe
-CYMCscfy0DNzHPuGOSPw6/WzLUJrRmbJBvyHCGI2Qr08Z8t5kGKRY9Or4TdLVN9N
-+5sZKSyf47OH0ixT8olx3FOZ61FVcoBTG4oa1+sNJcCCqcrnanpp/6EapcAwGofj
-DyRVR7xZHmzCuViWmiLafx9qhEwk0wT5E3IoxYPvLeJNBfslgirwHOP2FLfSRp4p
-RxicWayNCnhhsW21LBaYHSKhwuOCOyK3QjjPyZ/FWwARXkXA0o1tra1dlsKQ+t6L
-Zv61rM26RrZiD2OxBwNhTuHpxA+LYT3KiUCFQCZc9qT+Am63jA7J9BC8nJCUW3Jg
-ZvOyjM5Gd3a9gQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzOTA4WhcNNDQxMjAxMTIzOTA4WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6ZfmDuVL
+2Ascbs0E7iEwaEa5c0utuotkKWbREWT35gxV6kKPCa76hI5M94iKi/B5PpHoe3pn
+3v+Gfi6Nb+mQI/gwGEUjHq4vzVVrEciQTV0NX9POXIFbPAAinH93blh4DG4pwfIq
+jYe9VbcifpXOEbA20UYcdwqIjs+Lqqhqs60UMRLPW/rPyKtD9MoMgGu5bsSpzouV
+O8pnoWMUWv+IbELCU9ayFKmtBiesvk4BgGUu7M583FvvFXMUpoYzIHlLuq+Mdox/
+QqMD1PMhPLNKcsZted4FXlvEVNxq9xXrZmodRAgczxaifpwIciTcwglMu8UHoOTk
+RA6NiAgTF/COcwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAEy7rEhYOPeZjXNOd9SdjeQNt29q
-CyTz/CkaT+We9cl89Wop+NOh1xPpN3KPM8q1l+EEkrF1RjCva9RwHbeGbcFpsow7
-lBNvrebw3I8PAGUqfVwR1m+DuRCtpTsA7vHxelH/v6j6WQSXwP4XR8Or+/bXdyzR
-BElKL00wmi3QNu8pfq33tpdlZLtYTuThL8v/pQaajlf2g+uzQnSIgtCLzbBynbRq
-v6aTU4LuQPu9fXqghiwo1U4iamWqjGDrsaqloxsLoNPhH0P/Mq+85C0cdpydnXqx
-GlkAygbdRlsBxN052aUxkB0Zq55Z3cacfGEXI5eet5FmxrC7gC7HsTFfKpc=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAFZjze2kLYk3ikCG1t+DruNDTWTN
+MpNh0wXZXsbR9hpIE0IVscuh7sOmltDh3Jeg6penWXZxcG4j1XZyjhuFe38htwOs
+w/4JR/iBsDSz4WyXzr9dTxUYP3OLIMqalpAFj26QPaNv9hLmDV4NX1dB1UdQhgxT
+ec2NI4QQQuudoZakeIW2Rjo1gPZ5+XwjZHVcHm66eoIdjOHqQKfumQaGC58hKctX
+sECunPnvFYVnLJRrReH2i0Xbdcc+r2WXlHWpqE/clM6vM/ymq98ZM7Lxg2FUlLoY
+JWgSeL7T/X59a3CK6C2yw5PVy1al72hJUyYu3Zq2Bv2nUB7wb8bNWW5DW1c=
-----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 a8829623a..edbf0fb80 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDUB8OJg54JgwKx
-x/LQM3Mc+4Y5I/Dr9bMtQmtGZskG/IcIYjZCvTxny3mQYpFj06vhN0tU3037mxkp
-LJ/js4fSLFPyiXHcU5nrUVVygFMbihrX6w0lwIKpyudqemn/oRqlwDAah+MPJFVH
-vFkebMK5WJaaItp/H2qETCTTBPkTcijFg+8t4k0F+yWCKvAc4/YUt9JGnilHGJxZ
-rI0KeGGxbbUsFpgdIqHC44I7IrdCOM/Jn8VbABFeRcDSjW2trV2WwpD63otm/rWs
-zbpGtmIPY7EHA2FO4enED4thPcqJQIVAJlz2pP4CbreMDsn0ELyckJRbcmBm87KM
-zkZ3dr2BAgMBAAECggEADghzgxrwbz26BG0w32HAWSc2g3qi++L3mGPAeNjdrjYx
-c7cYU0N2B4KaiZlUeRBt3EqOFFBxN1lVCXoYHPhpYVootjEtlYD8+2uXJaxjk7uI
-ukimxpxeqYEx3sS6Vj5h5p15MZBT0VE8ybIoDdDx9FVuJkZvQqGgKaBmgYbfO0+g
-lkj70M6NRvQwi6mPbmRAilotTXc0aVXhGiQkMH14nJLGibq6XCrQiUpk/RAWutH4
-ew11nbCGCoUMpyaHtgUXQ2dhLp9VLznVG6u+AETdvKZ98LnuZ8y0ln+OLHoBFXw9
-SUO77foGrtKQdsLL2UUGFuNnrxBebDmSwYccy4CQfwKBgQDspK8cTjICCVI4bLTm
-7QRT5wd6gSgy+qSfmrWu4lAsLw00u0UOaqjo15bRjUuSlbvC/uuFYqS39hw7rALF
-sY/qKTA9tUyoxgvw6eRJIqTuiVcad39K7ABFAQoIZpMnHlEHy7b8I01mWDr/v+D7
-e5gsQx4QRrU4RSZj/cOFijj+cwKBgQDlX68D7pHN1ZcpO++cptjwUKU86KLpyLPw
-d/LdSxZojyHJRXPWjDDKeK+9MaC9KGO2ahdz7bmXQelp/U4joQ8A9W12TNQWeXZ7
-Xp2t7laQQ/ZrsvcUmh4lWtAeJC0/FYOk6Nnl7uCv17El/6ERAw7O22Fs405vinl4
-R7HC/FRDOwKBgQC4aoqws1uTbLIvmL/N6s3hmPyiAn9SYzPh0c5esK2sESroejyR
-xJtHgaNeQQ+w95Fwn/rpYvtdBaXw9tbeO8ccw+Z9YImSSWzK3Wtzd1UzM8K2tIN1
-3r9DB1FLRKzO4nhha+d5TQWniYDJCD6LnUD01YVbR884P+NwLzWtHw/VcwJ/OyJv
-/JOFA4wNbJQHMlvRkiM4dnuDhMI5ocVK18KEBHDiRQGi261I5uo2ZJBm4F2JV34C
-jeC7+EMF6k1j18uuEpEzp0wnYaPu5998x1qq9oaPATUifi09mGPRQ/QPtjPVvK5L
-fvwW8T6qbSF6ZOhk6O+mLmxrzFXm+xuAuMRU9QKBgAkgS2FKLrk+h75xfO/uQjhj
-dmhC1ezzKU2EFHHnVjrouMn2jXy3ruIqvUcfOSzZ9F30ZB1xoEHpcNjBGT8ZZj7T
-sVFCOjn8d3dEoudA3LSj1cnc5Bs21TiBJSNn5FO/MoRpyUsF/Nd8K77fPO+hIhlt
-YP5ora6k+7flDzrBbbCq
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDpl+YO5UvYCxxu
+zQTuITBoRrlzS626i2QpZtERZPfmDFXqQo8JrvqEjkz3iIqL8Hk+keh7emfe/4Z+
+Lo1v6ZAj+DAYRSMeri/NVWsRyJBNXQ1f085cgVs8ACKcf3duWHgMbinB8iqNh71V
+tyJ+lc4RsDbRRhx3CoiOz4uqqGqzrRQxEs9b+s/Iq0P0ygyAa7luxKnOi5U7ymeh
+YxRa/4hsQsJT1rIUqa0GJ6y+TgGAZS7sznzcW+8VcxSmhjMgeUu6r4x2jH9CowPU
+8yE8s0pyxm153gVeW8RU3Gr3Fetmah1ECBzPFqJ+nAhyJNzCCUy7xQeg5OREDo2I
+CBMX8I5zAgMBAAECggEAJZKyxROZ0vrajHH6yIjbHfK+Uq7KF3bjWgt5NniMrVqv
+mRoyosab8iVneOtkCaVZAzj58Z6bRZHJYtN/GZCyiC6cIdNBFmbDNp52NeqSV3dP
+tum9SEDgWXLWHmEcZ0ngqXMw0UrwEErUqAxohn73If47mwbRfk5Z78qvdvhXDWZL
+bWQZ0MLQWgLpxTn4i3uy2CuPm5H9sd2OqtI5g+aIPJPKW6sqlgHnK6KXI/XEdE9a
+fSYhTKb0y8xFU0eAfzsZEMq74F8Dq2Z28lrgrW8Au4xlt2kyztbHnhVmKXCjBNVl
+Qnkd6eJ3UtVMxfWLJzXsisIwmhc/6/FCiP82MgwlDQKBgQD1CY8tzXk6D37gjxcs
+bgW9elPKb/lnb/dj+YW4LzVxW1D5rj91mv7KKwRcuJKSYBYDmbaEsXvfHKn+FiIq
+z6KX/v0WslHY9k5k8lepOtr2wWgQ8dX40inO9K1IOHTIEWvrzzhPFkWZq3qyTOJj
+2Blh1uR1HfADODemR66FN8IgPQKBgQD0C0UkDigwbD6L7Ox4/tS3OCyKP1aQo7Ym
+mtBrjXNEnChK/1XUpAI16OB8XZK48EEEF5eyjDo71iEU7G9azmClSUulQNNmrHJ7
+lEfIMEkgZtjWFRGG6BNAT3Bxtgyyd+R8O5+mNdOK/CHkeTSBd9UWsx+0WIjJUK7V
+a4Km3uwkbwKBgCnNE6vQnZmWAyLzxhRCQKBuOdUS/Qz0QNPBQVqGUyufVFUDsLez
+VTvP0tKuefKWiarbkhNY47TQAv/hbrq26Rnc2fgBO40zl3QJE4M/ExN9Mu+REdt8
+nr07aEQlvWZT8oErvINhXUY1xpycGRLHTq0uJ5MDJGqoMHYhTFhVhrxRAoGBAN7b
+F9V4FB08C9XtknhfhVKXOp04f81vopwYTfGZZ0SlMWpjRzb6WoZuVelb7etygnzB
+KqdCxL71qJoZ2wpaYgkuKKUM0L/3BEhzvSVDatPq92JwNOQ0M7hLksxUSb4EHCOS
+sxSuHLLT0gN454i/LFkhU/d1zdvBERcVqWbHNW+DAoGAdtSkOAEhoZLTLENHFSwM
+hmxlShwWG3S4ayiEBESduxtAKp6ootu5RZC1f7ZrXsg7cQkOi/YwSeqigxtXASqE
+OCOxAn9BoB+l3Q3HLAFbJgMjFic7ghHtQuwr+vn1saV8IkTpgDNV7MI5QLn55Pco
+kuAbgMdvPg2yee2ElDEZBWo=
-----END 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 3f7768df2..f179fe39a 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
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
-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
+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
-----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 cc8204392..667dd3f9a 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+ggEKAoIBAQC03q9JccjRRcH6bj0DURJ4qyjEWR/rQveVfmuQaEQy3IEXCPzU0DWR
+k1rQ+vfmVFsr/z2JIW8z/l+j2QrGENhNmYbhUkrqYVmujjS5ugVpvzPAwhjTAlo6
+3gEB6NQ6ffP7XVDhriAaLXUd+JzxuhT+baIGE+3CA9YeBmveJHqIAH3GDR/uxLVc
+Cxg42FPoXWbluR6rqlQSY7dj1L+H4irq6vbcskib4F5psg3//iTnkFXguj7QwGrV
+JhqRy/zz3l9+1kwNoyjOD8Nz3ozWTCwGic9o0wACcikSlchiiO6jlaWq/LzHBy6d
+PuQKONhvBvtjlMRgXD0q0x1ycOdpzc5jAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/cert9.db b/test/aux-fixed/exim-ca/example.org/BLANK/cert9.db
index 5f13b7696..063530884 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/cert9.db
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/key4.db b/test/aux-fixed/exim-ca/example.org/BLANK/key4.db
index cae51d52b..9050a250b 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/key4.db
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/CA.key b/test/aux-fixed/exim-ca/example.org/CA/CA.key
index 3db867e02..f112a852d 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/CA.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/CA.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: Certificate Authority rsa
- localKeyID: 55 CF 93 A4 79 A2 FA B3 2B 07 B1 2B 52 D8 30 01 FF B8 70 12
+ localKeyID: FA 6C BC B2 A2 C0 9A A7 7F F8 40 EA 8C F6 86 92 7D 64 96 6E
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDh+7irBdso3h/L
-l9tGM0XLRjabY/aX7FqW3hZBP/LFgFW51KbbK5OOV90L8a1QY/bknS5aRh4PJx+S
-1kaFS7kOLg92oXrbtefsLrfIf2mrOT2VlKn7pcjU9DowuzGdSy6HzTCzHgdMUPt6
-KxcNND9uR9QRBZMyNAs2IcQSnF3UMNEozskFCTJRNwt2mgsW0rBJtTzVsx60PeVE
-QHrK/fWUr1cNagOyqnRJPimywpRxIPHdgVmxGAyTurwMS+mrPng/1Y7C1KpAidYv
-ImCo0WCqi/25RernthkB9llzYS8DD7EdVyiZ12jzfBqS6r9p/90WtUQCUA8srq0r
-/nCxQTW9AgMBAAECggEABN9Ngvp0WDQ50UTr6F6QoapY4Q7NsUbaSShuqGd9j36N
-2pzYIB+XZdlFHc3PI82T9CfjaPTcDw2T47GVAai5S7H4iWE/6d7JKlFzivIcUCHC
-zyfOZmuToevGGWjfz/lf/nORGjuKgr24PlERhSpcN796tgc9vjZbC4a82H3glAOT
-DWEZ4bSDE5Flf8xW6Y1GjncjFmeZHKclJ8Kg9QPU5uArdkkl2c6CeARzrWYqclku
-OKg94gwcbUsI2QDDrf9tYJo1/9DDPaAjiNLi0kRAJCWwFdMVnK1XMkTiCXc+aMng
-NdKeRgCHsV3Ruk22bpwVGIEh7UVqtnElLTIHpP0NbQKBgQD62/357DCgo962Q0vZ
-q7Hq0QV+6h8cqoN1CsAmb0HHqvI4JP8hzobMx2nfS4Er3RPadxCgzqiaj2F4AFlF
-p3wmarBAdfpQzstj6ysmV8r/AWvdACoOw7EtTKIO0sCdA3fS17vV3pVLbpF3CXne
-Z+ZVT/9CrVceG+NO3SPwwTWgwwKBgQDmnTq/u3g5P9Rs5id5XVMeS0Ri31Cy0bLd
-ILguvRBw0c+KFLHgz/asTapQOlpB5RqTiMeWlxFUaYqzdl4ihI4Sx0UVaBKA3r4O
-FSV93fdFJOYcGdNPl54JT36hhzY+Si+DA7CvMwznuqH4fFEKQfYSz+jWUgLowdPz
-5Y217KhnfwKBgHTNyBT9f6rcgk+VSBUDF+WBC7ELbA8Z6fmuVsfOl+9TTlMMDut7
-0VI6K7a33l5BIwRe2hQ2BVVqG3UXnHmNQYZVuNla1YGYuCU/E6lXyYIw9DtD31Fe
-lvnDq9WBFgRF4B4BK0mqyRMFWZ/2fpMrB5mDlRRDx8OSMqW+3AQ2wjSnAoGAS63/
-cJpSCt+Sk6Y4ABELTN7Ac337mqNMglrRdq0e7xc7d4HxGejFd6gJI0jzA7rurMnv
-TdEHo9764IgQvl0nzqvMVQkRQW9XiYGRCyxDkFJanZAwE2ebOkz3LoUT3P81dlZI
-rkYfjxBlRQlvAuHAok3OiD7jq4SoTNrhVXlzjnsCgYAlUnWBTxAXrudDwcWNhTog
-soPhLFUYEdcy/2CXe9gizkTnWMSwTxtdVq8GXed+mNi0pYUipY/iJgK7N2C/I7KF
-tuX+dTrtbvsLzznpfvKYD6nQfdtAPZMzUH/kWD5Mix7Zcq57IHrMZCVhblyAng/d
-V9krGaX5vovsN22xT0ffiA==
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDg/JqwQc8i4bua
+s/IGhN7Yh4vzwNmbNHSo4qTN/j+hFTDX/XhMENi/LogHCjSQFl0AfmzgxIaPs0PM
+iNGlpWWxNZID2mkeNyjxhLuBf4wCuwSpCjqd7vxHJT1hFVUj0njBE3F8GmFfPeCh
+NYnF3w1NsUmxyMD7E2bMqafBK5vJe/9fh3u20Za8rsRHrwFFNZZM1z3LNvuVe1Rb
+MLRZVK9K8SgCSELpzGSJ8tj7U+JzlEXZQkP8GL1O20dOZuFwhDMX3/mlTdBlPkNf
+Ar2RMv/83Q2n4vfX7+LctcI5jI7dGFC0oQfrnW/WFXF8Cwjr8M+taDOCEPXT+xp6
+d0RD/Ii7AgMBAAECggEAG34yxvQbxEbyXmq72hkVhD84Fm7MCJ/F27dqbTOzAdOt
+ls9GCoGKgv5EKBwSpULeVYeddW/+g4Pj9pQHjmbiQN/remYPr14NNkpCgYYdDV5e
+KOvzksYX9PezgvAQ6eI32FwwY3pzyKgukXSR4+ioXwSZnUyLbIMH7l2S/tN944Z1
+R2rY5B/SxipMN43uRA/GykbmminYwLq/B9WDaCgJ89HM6eMnLeAAhgrK3jDXs2vT
+J9ZtmAOT7utN0xptasbFBlS7auozERmJEyS1vV+JjPfTXMtdqOpQcx24Y+YA3YXB
+xogZHN3Vf2suUOtOnU7unE4bxtzMT41yKc9tqeueLQKBgQD9CDbZM1ceeMtlI0y4
+tae+YJu1CF6+T7hWh6MDXqN2buUVbiaR1RXtIyWK72yFn6y7YVj9qnhJpqD+Z1H5
+/qPrGBRSwG9uwCi8Fa6Tpww52oy4GcMPdbXXeUJ7kZ5VhzaYkW3zJnIRC3YLyfzi
+KVixV1nDefP8jEbgGiruGYaw9QKBgQDjoC1yQwMUc5x1cXMF/eIsseuffKYeiOPw
+r47uKCZTgf2h6Ikp5UkMxwaPFPmy1wUz8ndhw3fjeXQq36Ahqhkv6NoHWMot8jsZ
+VWMIG6BDaKSeOeMHp0pJnNLrDbKllm7nW6vskvPVaM0FcU3bz+P+EykUJXCLHSo9
+X26jEKOE7wKBgQDihesMccDpf7yfE4YIyl+cuMJMxGyFNbtSg+U1DBGM4mRl1hHj
+dn9Fp7RheEyQJ82shs7zcRx02x7AAmFKTGQVAJ6ZIrvfy1nsYADFIMR6OqTF4BJX
+kcq0V1Nkao30BbOjzHZBOsbdaYRJs4+YLOnBAfFTZac/DZoZ4HNUazfAzQKBgQCr
+hNwZ2ELu2zrPCECbCDawZRTeJYfrRE015KO380sF69KZeOY6Sopj9WiM0kphJ0LF
+ZPPuF+Mz5iXR1JYOJ+U4w6XemVonivpbWYr45hA6GxTIIWhgMP96PpB0C+tMePFy
+phIDfqv7aC/s5Pa9JoZuwjNW+es2+DAG9O0iNHxywwKBgQDCIfWD3lpv4+6iTDyf
+vuJta2IGLtCIBXAW7Kru57rekQQN0LgeB0/XDWZKH2BUckNhGo3Nq5wKYs4Wtjvk
+Nb55A7AwVUqpU5rEon1o6wW+ykKDSHIdVGYSf6c9uxgMvYljo7SqHkt7/EzioSjw
+xCVGIaUmti/E9p8nSRSFw6DVjQ==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/CA.p12 b/test/aux-fixed/exim-ca/example.org/CA/CA.p12
index 47f65df18..ac7063c8a 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/CA.p12
+++ b/test/aux-fixed/exim-ca/example.org/CA/CA.p12
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 3f7768df2..f179fe39a 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/CA.pem
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
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
-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
+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
-----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 c0e977ee3..b07155dc0 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: B3 AB 46 24 98 23 58 B2 DA 48 7C 8A BD D8 21 EB F8 14 68 3E
+ localKeyID: 3D 53 E1 53 DC D0 E9 0E 95 36 46 71 44 47 72 E8 86 F6 0E 3D
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCwy3LG2RJcjlha
-OCTzXaWJfXkvM66wLJSqGTwgDLJeGqgjSzFXcLumDd2ZlCDtZMehTVYK3G2Iauu4
-qm6zQkoZKDZWuhwLf4Sl5+UGdwdcrS2eMXFLqV0wC193X7hGcypk8JaXY/jyb0uG
-I6GKXVgmJyufoSbyQAL2t4DIUHLS9y4AjwNgj0I721LS9kMFRvriwMuAd8dm+ELX
-kZXt6DsSqnacSaxld69kXnitpnqwLVb1VXtg9ZibqI5rFJI86OuMphDkw2ZYYp+K
-5ujCXpcQYJ8XhQuveSbG80zWxCR+J5Rlx8yKyt5g3vN8jww6+l2nWS8ira9MFklc
-6odIPxRJAgMBAAECggEAByA0IJqoOE3OdthzeNGp9eg2RbZGELjDRzXcLAiG+e8G
-HuINe5JCJffCGkoTp63bs/8rfCWVTp3MoXVRH+2IkgoCYq1+quH5ZTx7CS8r/0rF
-n24rvFp3tJOIxgV4JnLG3ympUDHJ22+r8hymiq6nemYyxmzW5oW4+Nu9l5VSg3k8
-3ZhwQ7U2jHBG5OQa3RY6cb8PXDokwP5HPce/BFlNIYvX2KJAbM7stegoPA+uKqqp
-QKfFBhwPh11fRRjpsnRr1uequUFnyHQ2KxK79/SXE6LS2DDIyQF1eQ+RToQKkAR4
-PtOG4KZL9T7IXOeUWHaFT3SlTts231dken9/mdj4HwKBgQDVboW1mcjgOs15E05r
-AiWje6e58cR+/sILwiB+zNNb1ceMVLO2u3CAYbIDW9fMK6MqEh9m4TmQQHI6rzza
-vIKBEgNjY6lPHjSGejPGiKJGsSQ88s/Md7giJl5ZDDZzZR8aHrGlJFu6U/+dvtcz
-4PZ6FxOeZJKq+thVAHg/N319vwKBgQDUDkzFHNZZUMiGPYw/NS2ATZvknBL85baO
-TR7UWIjIq+eT1YH9UIq+UKeAffXQKXTpEKl876mnZoMq1rf/R5i8DK9o2QoYmQL1
-hLdMBpuBVyc1nBgmksgYTI2NGiKX8VfsE0JgLM0voKTWIoPTgHRtxCAVFE8WGIVy
-T/JYN3d/9wKBgEY+LrFa4Jqzn6ZGbVuYhEyuyL/QywvEypZWGJ3CyZkC3b7YraDp
-RZhrDsw+MOKYRgX1mvIgE/Le0vlvbQbMXeMey5CtXy6T0VOk6l9f3pCHglawzyUL
-DcXnfMuv0kfeMwNEsNCaC7piJNGE2ozPcC80YxeRIBg3oHUxR2H+4EU/AoGADTBG
-fgvpGOz5S8AQNO4twkkRZQp/89Klo/wP6s0G1NQ8NumUiBi2SFfj0w4Cd8vcRZKP
-uAF/37V0evmXv/zH9woi7rZw9k6t7G8wpz3R9h1hhugKaHvAjiJUu23gsOqFuV0J
-R8oBiPDIz7id0k2u8BS+mhEFSi6EPjPSssHgYMkCgYAQDUkal/XHxyMjQl5YhEQq
-7hAtOGvldTR9N+UZiABSTksD/Q6ahTWWOkz+SQqLRWnroHLgxjLH7ZOo8M73HIbZ
-gBP+YQxYzvTEAnINbsuvhe+2feJKvZQggA08SW1FBTazg0WgohzSPNbL35W3kPBn
-OY3xLaxJflH3HsaoR9y9+A==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCV2l7/qZq2Ma7d
+PCmAb67GuwtDqLlRsesHh5Z5b/RNmZ4TA32W9tZMTDTdt5vH/Zx7vCtfh6DQaFv9
+XVkqHubGGX/MikNP2VRjOJyQhZxhjwGLvBM9XUMywwus13c6kPDVbvyLUI4np8jg
+izHAdW681SFZoRb9J6ggMIsyDw8JRFbYp2iXmIyLqXF14OAH2esD2Q9kxR8Za1aR
+3i1yjoOqhK/EHVUOZ3pz1KC25ftp21hVe3D2hPeKQzSNTXk2SbbVdTE4Y9/R7NJA
+8g7ELN5mY3DMFX3+9J9+qWuXolY+oNEsMpzqvxV29TmDRiX/zI+ZVoGayOr1Tcnz
+cJNWpRy1AgMBAAECggEARbhVZbbn6+e+t2ED4CVWGFEzAvYvzrIsKxMq7/ImJKqZ
+0LfZiVDr0JDOMe/4szosQaeBOI+WQxCi6AUz9HRvI3D+tFAJ1E9Fw2o18cmwQfWy
+nuxQuUa4epgjyPVwnBeObYcXScwfb5TRUaOBcM1SSdoRi6120C7QurVLNe2qrcDf
+LzPqhoKFeGgSVUCLapboDpXBcqJOLPJ/2XZyzHQodEDLpF8bN7kJePvARDNGv3+m
+eBdmTpuwO8eNBOs1qlEdYr5HG3+XNpni7G/juWPTsW4A0tFUsMqC7sZCFrkoXhu3
+ofYeTHgyjCYPwTzCJwFDczvcy1cjoDHgmfRek7xY2wKBgQDGlswOJZTY7yuIoaQ/
+MrYXq1nZAVWYufkwob1qK61UU3xuETfa0LA+sHKw04+Yw+msLkcwKQ1HQAALB/xD
+WC/orRK7qLr3nF5Fz0Z3WztgGSX0L2RViLC9zYNNwdVVqNwRpHwtWpv+lHsgMqm5
+KDocSPANCrwl+3biPHUcMpnFnwKBgQDBLLYS+QKFrKQJc8y5QTl7M+BHr0XKgslV
+/dgcpYej9ltfHtSa/YHCUn7FMRLZoHIWE5WS3ftpUQ1Z4orFbUWP+tLSPFagak6D
+hmWXGveSOyzNXlBzf42rllB6hlY7B7CxXFm7SKsCMc7KynNVOx4MKMg3MBUbUuGD
+0afrL7k1KwKBgHuWyXNcbB/96KflgORb2PsuBoKI1A5yXuSnI8x5ViuOsXeGe65Q
+Bf9drGLjpxA5jKk9O8x7H+phqCU1WQdIULiLTYdAYOtMg1cKwh3xxyftPrOS8uxQ
+Xz4gMkEoCm5+4kaQiT9ojoCHQ4EsRngW0uNbeRmEvscckkYFvhRIYW6dAoGAAXuN
+XjHpEguUKrpnzNgyT77DLumqeHZugylymi2vD9QZOW6sJRBjCZHGhU7uHRt9JKw7
+zqfDgThtCM6TUBaZnRRIv/JUm+CU/69tYi6DzeyEWIMrzOciuDlsHrSfPs69TW8v
+BR/2qAqn0qihH/tXLLK3bq0AzHfjYTafuk9gdYcCgYEAhycQGLIC8w+wLhT0hf7n
+ehyVfUP60qEckBcysPF7X+8t6ZZNIRcO8Iuut9zybfoshVmSh9+ASawYH9ySIh1A
+P8r62YIw3xjMnsb1vKyEo2QV+pTI+AzFGyyyuH69dN6vvfUfbEwv2sI+/K9KBDGX
+j6iBkr27HpkjGW7SAandC9o=
-----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 81dc6bdde..aff6912f5 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 dfc33dc61..669961b4c 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDEjCCAfqgAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM1NTZaFw0zODAxMDExMjM1NTZaMDYxFDASBgNVBAoTC2V4YW1wbGUub3Jn
+MDExMjM2NTJaFw0zODAxMDExMjM2NTJaMDYxFDASBgNVBAoTC2V4YW1wbGUub3Jn
MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCwy3LG2RJcjlhaOCTzXaWJfXkvM66wLJSqGTwgDLJe
-GqgjSzFXcLumDd2ZlCDtZMehTVYK3G2Iauu4qm6zQkoZKDZWuhwLf4Sl5+UGdwdc
-rS2eMXFLqV0wC193X7hGcypk8JaXY/jyb0uGI6GKXVgmJyufoSbyQAL2t4DIUHLS
-9y4AjwNgj0I721LS9kMFRvriwMuAd8dm+ELXkZXt6DsSqnacSaxld69kXnitpnqw
-LVb1VXtg9ZibqI5rFJI86OuMphDkw2ZYYp+K5ujCXpcQYJ8XhQuveSbG80zWxCR+
-J5Rlx8yKyt5g3vN8jww6+l2nWS8ira9MFklc6odIPxRJAgMBAAGjKjAoMA4GA1Ud
+AQUAA4IBDwAwggEKAoIBAQCV2l7/qZq2Ma7dPCmAb67GuwtDqLlRsesHh5Z5b/RN
+mZ4TA32W9tZMTDTdt5vH/Zx7vCtfh6DQaFv9XVkqHubGGX/MikNP2VRjOJyQhZxh
+jwGLvBM9XUMywwus13c6kPDVbvyLUI4np8jgizHAdW681SFZoRb9J6ggMIsyDw8J
+RFbYp2iXmIyLqXF14OAH2esD2Q9kxR8Za1aR3i1yjoOqhK/EHVUOZ3pz1KC25ftp
+21hVe3D2hPeKQzSNTXk2SbbVdTE4Y9/R7NJA8g7ELN5mY3DMFX3+9J9+qWuXolY+
+oNEsMpzqvxV29TmDRiX/zI+ZVoGayOr1TcnzcJNWpRy1AgMBAAGjKjAoMA4GA1Ud
DwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsF
-AAOCAQEATBjVRrfNh+5q0wBIcPcJZ50dZuWxs3WVYEgSrj9A7DXdL7XokiVWA+Dl
-GBp3h+50VXCV7lLuNj/idXjV45UtoR1v747VYmkxF36PfIl9uVodvkOk5UZJZywo
-TRLYqyub48wE7VRrtINBZJdxWT3FoFqb9gz6Wf04KsFDce81X6Ef0lOU/bu+ih6i
-LB0msnwbZu9x8cz0ZfsuVdaXd4xZiWTS/G5oBpOTeZ/htqd9y9g2fxqixI1qFUzz
-J3bqy3RQvqkpQlfkEweiFHQdh2DjyuUEATiG/Pnhc9LJlgJxoqqkRPovNnblJnCT
-xomIXvZbaLPTzzcYlFgRmyJKsgmBCQ==
+AAOCAQEAsqLnkcXj4h+kQqGKFcoNCNVKvEo5tVVs5lF8TXC2cN6deocYe7zCzA7O
+FF43mrscRxvzKoWvk8QfJOxNGkdTZJ6wbTpePOewwca08cIuV/qlD6T7GXw2XhGi
+6OTDiyuZjIWzRXdpQ1qulcc9L2ANCnkree60pAXdkApBy3OScP/pTr/+Y2DA9FOD
+D2i3ujI//33tEpSLL9azthGubDwWIs8VDsOtrmB9HOj98zCwW20M2TuuIy//n2YO
+6Sn+40ZQIRf+XYqNm1SaXToxChGVVvuBmSgBUorQeU0zJEP4dIZ4FEfRgLamUU7d
+OG7CbxzJXWyqABvCwrtFdMsNhErOew==
-----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 19f528522..f63fe939f 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: 84 07 7A 40 2C 44 62 43 9B 50 E0 1E 69 75 1D B4 12 E7 49 63
+ localKeyID: FD 03 34 4B 77 99 9B E8 FC 30 B8 D8 90 9A 5A 05 C6 F9 AF 11
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCz3PscJ1OyIh4n
-k8O57PcZUPmXyzho/Lmp6x+hYp2ride53caP9K13oqO/ePewy8eoFp9CrI2bJgQs
-iAyjnwE81XKfchgNcx2VPWpU8L1QOpVsfnMY9ZleITANrpy/jRFtFd8n6tx+Z52V
-ei5zKGeO+mxy/xGATiwtnFBcMfQaQEEJSCVZx5/BCccRXzq07ocQ15igChsDdLx9
-7d0WqI3q8cprZUnax0lsdokg8ayNNKWILo7vPzdS/xvGGufA6TbUYaxkypUtJjyY
-2WAZTuc2GmI7Fi1I93z3L4lvnpYtSTavcO9/HrFIBp5viKbO/AFb6wliv7k7oMy4
-cZ/UcCOPAgMBAAECggEAFk+foJbqRWsBBZTJTytrXWsTgvZU+YT7/O1rH4hNmaVA
-KtCtXFcUG4aDvHEjfH1St3GS8ODZsfitxN5dfwBu1V5+2PN8s1JnxYb4RTAVs7mI
-powq99ojW69POCtES2iS1E7FvzxdfJqazBt7XpKRAgXjZQJp59oKld/RghY6OvUv
-J5rEZR1pXbtgbNMHh1OWFwkKE17tdGK8E0DSoswz5QFrWuXUF0g74aevS65TUMrM
-0/JvD+7RbvcrLavEwniRA5C0FUa6j/l5jSpVARnVXzAIv8mBUTk+ARHybZXnOOHY
-9yZNwF9TnWZ93iecP+RHIcjn0aYsKSu/e1gci1Im8QKBgQDjuWNN8XxB8/7E9WYk
-hd0k7rDVarJme4+ovzIAK4brIJL6MDECjLR3ayFurlchl+FmhQ3zkSZp1fdvGwEy
-Ty6js2Geb/LdjqBKunV7EJd/Enc+CpbsMSoppnMad9VjdIfw3zGKEys8ggZE2JDq
-LYMmLvCAcwqQ6reBDRgCzdVLPwKBgQDKMj+QmvPbCH0r09iT3bGHllSj7PZPtHac
-TYubjoIFgYH+DirY+bNuY6id9IdVd+lfRCWA22J2bLb97xr0btZRb6PozG5LAMGB
-/sQPgDIP6ymXSrx30NpGycU4JHHFgSgf6kAHcwCajfoTMEtgwgQzJElB3HOd061t
-hLltDXKjsQKBgC22tXycEXmb5XTcXljOlooncFAnTxDLlRcm6n6mPjtNGrQmoHAG
-luOyGdACJ3OS7aiK5TYT2UY9saIYJbFXu+EYzWvkxTg8vWjC7Xp65i6YIl/N+GYJ
-qJEb3NdfXvLMHc34wBUbq/5Fi8SeRNj9seokWhsu/NwCgjvhyQQnFb45AoGBAJnV
-3TLiEcKGFOXxiggGVfm40LDfqw89WDjXbu5tYFNcE1D96m+mm3PTcwiqcQT/9Ji8
-umPthl5fnGJbNwDeC0VuUSDf2NJLwu5qrTS17mDaJIytGfN2/Xt6LAjpAX6pI6QU
-j56bSsxMVQWgatk1BAj9BJeNaJGd6Yc3wfRMlPohAoGBANpwcagCFv0rzDt5PxgP
-HF+ZpAUakUOmdvb6kLfesjW3BhdyEaJKk7g8Z7cfLnlL2tMUHoVswkk20j+VVC8m
-S6+9ks+YyoLiIpXUIfAHPhBJKTABqlVY8YkKm41CUAQeKUdAZAp+aiNAbWUkjRtJ
-Rj12+6JHxdB0u4JiztgDQVQ4
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC03q9JccjRRcH6
+bj0DURJ4qyjEWR/rQveVfmuQaEQy3IEXCPzU0DWRk1rQ+vfmVFsr/z2JIW8z/l+j
+2QrGENhNmYbhUkrqYVmujjS5ugVpvzPAwhjTAlo63gEB6NQ6ffP7XVDhriAaLXUd
++JzxuhT+baIGE+3CA9YeBmveJHqIAH3GDR/uxLVcCxg42FPoXWbluR6rqlQSY7dj
+1L+H4irq6vbcskib4F5psg3//iTnkFXguj7QwGrVJhqRy/zz3l9+1kwNoyjOD8Nz
+3ozWTCwGic9o0wACcikSlchiiO6jlaWq/LzHBy6dPuQKONhvBvtjlMRgXD0q0x1y
+cOdpzc5jAgMBAAECggEADMpUlfqEa3wl4ApMqT/h8QOVkfEFh1MIhBtZCvC8peYf
+ANyDWJ9SsnU7rlyZDEI54k4d8WUaYpBh/gm6r9AAI9iwB54UqydwOp5Wzy1+9X/u
+bnqrW7ymWdRaOOLYozxF9SgfsJ3qKj+9sP1kR9nTYzyogQqGvTodOalVlnN48MYN
+rNdPtiZ/kM75cOItodvDP18piSOurZlUEjpWfP7Ng1cTtcM0EJ1BPJdf43vWDrQ5
+v7InK362knuA49SVmNVJedHNJAE3Yd2TZzgGdxVpNdhU0blDAP0bd5Xf4aiDvvIc
+uLq2M+icDSW6bEONXggSDIvxe12aorLAy4pT7jztPQKBgQDdPF5LSeUovENrHUjH
++nkSCKWapTvV+2fyRQLvoFGrK2lbt7/WAjcB765GN+yx5oPM+TiEqC0hm7AiLOCb
+IGUVTinXc0myLTq2RYCZZjKt/AlOnbSJf2/gNk18J1KwsN9nOjeDxwGvmEPjJiUe
+f2JohocMcPYJfhu8ocO2YecaRQKBgQDRSoTm9R9PPObmQlTFyfcpaVubNVgaiRrG
+1GQ8X5SO/F+athbi9tSJsoRZAn9XvfJo7Qk0nNuIkk6JmJ+gm8XVG4ekQZ4hXTIc
+zBM7RMzHPqTsZNBfId3wxeRm4bt0FVqYUkFRfc76hGYbGgu8uJL52RrAyKUlNpij
+f6nS2LxkhwKBgGk8PAZIIi9cTh13kpU9ebWwU0Xabzn8GpfNZ/YgJnjrb3RnVWMx
+LoVHQ3i3RWniIrOvoMjJTp579i5rdnOT10FpKtIHTvjoNtNZADD3wgesqaixr5zv
+94GJkxYJhnXxzHLH6HxQf2bNYQ19qY52PZNG2pp6aS5exEbYE8Z/j3SZAoGAR5xP
+zRaiF+KmvrKDfwmT4D+EcJ7X/nxbBR03DtFFa4c+zxjuy8nY/yRt1GbeW49KmkxA
+khf5pckpxjrKo5GpJzm8N5+cE55nvyK0kdsAlkwA8kGsamCUKAYOGIW0Ngv4a5X5
+c4CwiVcz+KH40iH1aDe4x63fk9QSdh8AZHx0OZECgYAA2xWgNLeyEXFOhOLluadH
+vN0UJdrR6nPESS8pXM1EW2JoZYmk6a/YR2nChE5b0NGBhh0GCYjbgQRqRGkTWggr
+Jad3XdolyL83NDoqjWxGxLNnQ/0I22ypRemhEhrAFwQYiVZCZ2WW2uM8QUggTY1y
+IY6Li0pcWvrtbUcdEyuYog==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.req b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.req
index 1468dff7f..a40d26d3f 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp
index ace270674..598a04cb6 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp.pem
index c12f79d67..01fe64763 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.good.resp.pem
@@ -3,29 +3,29 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.org
- Produced At: Fri Nov 01 12:37:25 UTC 2019
+ Produced At: Fri Nov 01 12:38:23 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 6f5e8a1d1ee7f7b156e14e5f256318f0f2ef31c7440c12d789b0b3cc9f1224da
- Issuer Key Hash: 589cc71c3bc2dc61b60d4d478c1096fecffe8cd2a2d405e35da65532def68189
+ Issuer Key Hash: 20dff816e881964c9d0f21b821468f2829b9d9ca6e45ac7e8a2cce8b616d7626
Serial Number: 42
Certificate Status: good
- This Update: Fri Nov 01 12:37:25 UTC 2019
- Next Update: Wed Oct 31 12:37:25 UTC 2029
+ This Update: Fri Nov 01 12:38:23 UTC 2019
+ Next Update: Wed Oct 31 12:38:23 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIIB+goBAKCCAfMwggHvBgkrBgEFBQcwAQEEggHgMIIB3DCBxaEvMC0xFDASBgNV
BAoTC2V4YW1wbGUub3JnMRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAx
-MTIzNzI1WjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIG9eih0e5/exVuFOXyVjGPDy
-7zHHRAwS14mws8yfEiTaBCBYnMccO8LcYbYNTUeMEJb+z/6M0qLUBeNdplUy3vaB
-iQIBQoAAGA8yMDE5MTEwMTEyMzcyNVqgERgPMjAyOTEwMzExMjM3MjVaMA0GCSqG
-SIb3DQEBCwUAA4IBAQAxmFBib1Mn6hHcz0U9fFinnbycoD8mYoXsNyqCYcbskwcR
-t+VLW4NQEvuO53KuZDqiWSQ+9n6eMZXpwOSofz4SE4VTs5Q5qDjOMyTTh23S1eME
-St7ZmdxMkR2NB/2I5X5nHiBdcyuNup7UaHvKtGNwucmCFPVEx6pkohozF2zCJodF
-IAWnwatQMMR7bO98hsbLpPGebTsdUAki61ZXm/DnTIHPvl3weCa+SSqZEIkzheyc
-4Avx3AJz5xyWUzzVdNOxyqB44cpraNE4vuWJF4NiBARYJnEecjz/LFkLbKCbMjvO
-8aciMZ2xjdLfwTPiMyCi1VZcpNJhyDyNARD00E1N
+MTIzODIzWjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIG9eih0e5/exVuFOXyVjGPDy
+7zHHRAwS14mws8yfEiTaBCAg3/gW6IGWTJ0PIbghRo8oKbnZym5FrH6KLM6LYW12
+JgIBQoAAGA8yMDE5MTEwMTEyMzgyM1qgERgPMjAyOTEwMzExMjM4MjNaMA0GCSqG
+SIb3DQEBCwUAA4IBAQCQ50So8oYTDSufxiLu6MzbyAZBL3XeHwIlwmotNZY1lSDL
+ySo7V/VxvT+kW8HO6BEoQLjTumjnXBCIc6AJpnKGObpR1krXb+KtBFkuFfXGHgI6
+k/9saUTOLUdmyxRJ4TyVK2nMnSsIt2yjRf0xHMRsyCfovj20ElGdZD6LbttAqPij
+R+ARbnOA4xBj4I+mTWAVOtfk4MZ4ih8PNYIaU2Ge6c461yvKoPWux+j7kjfhakHt
+DpzfpC+16UGzhYPXhD8lbFKtuVUvODIaFyrtiwM1Dx9WzcYAyuxB4rvMfOuy3rrV
+37MECtMa72JApQq2z2ClmTHuR7108hFGTN+wD6c8
-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp
index 8a5885644..a1b0fe31f 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp.pem b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp.pem
index f5de86887..0f97e1784 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.ocsp.signernocert.revoked.resp.pem
@@ -3,31 +3,31 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.org
- Produced At: Fri Nov 01 12:37:25 UTC 2019
+ Produced At: Fri Nov 01 12:38:23 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 6f5e8a1d1ee7f7b156e14e5f256318f0f2ef31c7440c12d789b0b3cc9f1224da
- Issuer Key Hash: 589cc71c3bc2dc61b60d4d478c1096fecffe8cd2a2d405e35da65532def68189
+ Issuer Key Hash: 20dff816e881964c9d0f21b821468f2829b9d9ca6e45ac7e8a2cce8b616d7626
Serial Number: 42
Certificate Status: revoked
Revocation time: Mon Feb 01 14:27:09 UTC 2010
- This Update: Fri Nov 01 12:37:25 UTC 2019
- Next Update: Wed Oct 31 12:37:25 UTC 2029
+ This Update: Fri Nov 01 12:38:23 UTC 2019
+ Next Update: Wed Oct 31 12:38:23 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIICEQoBAKCCAgowggIGBgkrBgEFBQcwAQEEggH3MIIB8zCB3KEvMC0xFDASBgNV
BAoTC2V4YW1wbGUub3JnMRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAx
-MTIzNzI1WjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCBvXoodHuf3sVbhTl8lYxjw
-8u8xx0QMEteJsLPMnxIk2gQgWJzHHDvC3GG2DU1HjBCW/s/+jNKi1AXjXaZVMt72
-gYkCAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTkxMTAxMTIzNzI1WqAR
-GA8yMDI5MTAzMTEyMzcyNVowDQYJKoZIhvcNAQELBQADggEBAI9JKTYX6SyR2GCq
-2H2ZFce4B+Jpycg2/wPylxMG1xnvN3KsHkADcMvirvGRT8tNtFHs7E7T+L/+yhT8
-W86icgFt0WNYvMVFmNh0BQCtZPl8TLA450M9IGky6i/n3PQZctR4JWv8PbZFqzIk
-chNYk13UnH0cKrrTlZ53vf0qIK4+fHT3FWEqyko3eZC43ll7wKZ9Rz6wvStGqnKp
-HB4CUDsRsy4nFx+Jgd4p5koDf4Ew0QjyW+IPPsNkTyMWXU/J3VTRURS5B8gUkpM0
-ZZz5V31YKYMR//6TIAQTrmk75/7xtT3EB7AUo7GQOQaqCPevpvgpIqfGxBsARUUJ
-MC+HJAE=
+MTIzODIzWjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCBvXoodHuf3sVbhTl8lYxjw
+8u8xx0QMEteJsLPMnxIk2gQgIN/4FuiBlkydDyG4IUaPKCm52cpuRax+iizOi2Ft
+diYCAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTkxMTAxMTIzODIzWqAR
+GA8yMDI5MTAzMTEyMzgyM1owDQYJKoZIhvcNAQELBQADggEBAJMrKzgWwTaA3Svg
+hai75EynrAqlzg4y9QQ3tno0abJzG1jNdaWPyI92UiEmsyKcNuM51WqtGQI/BSfo
+01kbzyNAqpD6kfzO0bZ0Dp2rbrKK6qPLB9PBwXbfSZ7+oyzqoNac/lok4BusiMVT
+QUMdExWXjJY2QE9NeGBXP6/uyFqjEcmOHv00/mSUdoymajbFEj6K9t6NyrG1sEpg
+O3s+ZFm0CpvL2hKl6+D+FiX4snghdJDHDvZiLowZiDieargp4cKXa1RZ8wMHofkK
+lyJpByhSiMGgIGWu/7PwaXfyHcFPawj4zoDHzAg2itw+g4Y5eOJdEbNDJpo/QymK
+7uZ5GhY=
-----END OCSP RESPONSE-----
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 94e52bb08..3e69b7f87 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 cc8204392..667dd3f9a 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-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
+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
-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
+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
-----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 92052f4c1..caf1ef634 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.org/CA/ca.conf
@@ -1,11 +1,19 @@
; Config::Simple 4.59
-; Fri Nov 1 12:35:51 2019
+; Fri Nov 1 12:36:47 2019
[CA]
-bits=2048
-name=Certificate Authority rsa
subject=clica CA
+name=Certificate Authority rsa
org=example.org
+bits=2048
+
+[CLICA]
+ocsp_url=http://oscp.example.org/
+crl_url=http://crl.example.org/latest.crl
+level=1
+signer=Signing Cert rsa
+ocsp_signer=OCSP Signer rsa
+sighash=SHA256
[CLICA]
level=1
diff --git a/test/aux-fixed/exim-ca/example.org/CA/cert9.db b/test/aux-fixed/exim-ca/example.org/CA/cert9.db
index 8e1308357..b2bca534e 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/cert9.db
+++ b/test/aux-fixed/exim-ca/example.org/CA/cert9.db
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 50cfdd14a..44ca53375 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 643115630..4e32a860d 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=20221103224953Z
+update=20191101124302Z
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 3bedbe130..a1770ff76 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,10 +1,10 @@
-----BEGIN X509 CRL-----
MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjIxMTAzMjI0OTUzWjANBgkqhkiG
-9w0BAQsFAAOCAQEASnKVZ7VuNX6Ieek8I4zxj13zldXoYcs5LuvECQ7pb4Xy+3vX
-FgUe7tjA7ptWm+rV95/fjdcOGy0YSUUgiJoLwN3+wfBmsY9v8CFKv+DageVuXm47
-ACoqyVd2FIka4uEcduzXlAQm0OSpC9AFO5UejzvDDew2o8YZhxY+DVzJhUt1L3aL
-8Jt6DXZ6Bcj3s2s5z0DSZDeELTorx4iPjOmptvtp5lfetbxvw2m1/8MHopL1D09V
-4ELyRa3RvkXjL9zwTeEgCNCoMrUvgQBRr9A9Mz5HiCoD8Ax8vb32b3GP7O7VMxXX
-60ybNYUOedZDc6VRNECHykZLkfS/0JdA0CXALw==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAxMTI0MzAyWjANBgkqhkiG
+9w0BAQsFAAOCAQEAGqkJOqQO2437e4OefUlYu3ifqerU59X0R0SFOQdw/E8gK0kF
+Ntu/yACdpKpPGVbaXxbSSWNRHoNtT5/fd/6+Gi7SbW8YFwvZEqXmU0neoLV3k8cy
+Qqk67Y5h5uhss/Qic+9AEietoIBF6OOHAT0RIUgDJQDG/aKtsUWIfe8+DrDSBsMo
+KI1xB6OgVa3lvygsBmTfhE8to3XvtdOIzpduEpWOG80qMhw2ZuIPq824QbnJzG7Q
+jsUj4ewj/3jL9OAFrfvdIKUovUV+2IjEafFA+ttOLtZf9b4sW6YItINVNtT3oo8A
+fGPvStbXJEBeGdzhofJi+UKkZCS75c1DfgSF5A==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.chain.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.chain.pem
index d7cbbd678..ed2153bc1 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.chain.pem
@@ -1,21 +1,21 @@
-----BEGIN X509 CRL-----
MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjIxMTAzMjI0OTUzWjANBgkqhkiG
-9w0BAQsFAAOCAQEASnKVZ7VuNX6Ieek8I4zxj13zldXoYcs5LuvECQ7pb4Xy+3vX
-FgUe7tjA7ptWm+rV95/fjdcOGy0YSUUgiJoLwN3+wfBmsY9v8CFKv+DageVuXm47
-ACoqyVd2FIka4uEcduzXlAQm0OSpC9AFO5UejzvDDew2o8YZhxY+DVzJhUt1L3aL
-8Jt6DXZ6Bcj3s2s5z0DSZDeELTorx4iPjOmptvtp5lfetbxvw2m1/8MHopL1D09V
-4ELyRa3RvkXjL9zwTeEgCNCoMrUvgQBRr9A9Mz5HiCoD8Ax8vb32b3GP7O7VMxXX
-60ybNYUOedZDc6VRNECHykZLkfS/0JdA0CXALw==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAxMTI0MzAyWjANBgkqhkiG
+9w0BAQsFAAOCAQEAGqkJOqQO2437e4OefUlYu3ifqerU59X0R0SFOQdw/E8gK0kF
+Ntu/yACdpKpPGVbaXxbSSWNRHoNtT5/fd/6+Gi7SbW8YFwvZEqXmU0neoLV3k8cy
+Qqk67Y5h5uhss/Qic+9AEietoIBF6OOHAT0RIUgDJQDG/aKtsUWIfe8+DrDSBsMo
+KI1xB6OgVa3lvygsBmTfhE8to3XvtdOIzpduEpWOG80qMhw2ZuIPq824QbnJzG7Q
+jsUj4ewj/3jL9OAFrfvdIKUovUV+2IjEafFA+ttOLtZf9b4sW6YItINVNtT3oo8A
+fGPvStbXJEBeGdzhofJi+UKkZCS75c1DfgSF5A==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm9y
-ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMjExMDMyMjQ5
-NTNaMC0wFAIBZhgPMjAyMjExMDMyMjQ5NTNaMBUCAgDKGA8yMDIyMTEwMzIyNDk1
-M1owDQYJKoZIhvcNAQELBQADggEBAAMVgo6PyqClqqW6Vhvzy7/mtUCrYN1F857v
-qHmb2i5KYRkpX2c1AtnmHso7IMZBj4e0vgsQASIlYzOBlEG/yy51uObmv48gTKIy
-aiztSbaXfI8hc85ZB7sWJpeiQIRIko4odccMXKk6EfFi4rHHnKhvyOLVG7NF5U6/
-zmQ5yP8o2N2lKuUtm1ZtYv0q1vWuK3Az8iegu0mxPBhXrdBnbYR1wRXXikn2py1r
-1FBVKGQA/6xr9YjnBkR6x1IuRaS2MeTUFQdeYzwA7B1JiXk1ueZSPU7WHVBKTedj
-mqCpqUXFNAwaHVNzTCBsio/nl6i6MYJA4LmNXGxeX9+2Jg/EU8w=
+ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxOTExMDExMjQz
+MDJaMC0wFAIBZhgPMjAxOTExMDExMjQzMDJaMBUCAgDKGA8yMDE5MTEwMTEyNDMw
+MlowDQYJKoZIhvcNAQELBQADggEBAIox/W1/LgqMpi6gWyYmPdCu50OawjCflaNW
+rzyqaYheScW/uku0MFKnSy2dnKy5Ag6lK7C5fUbM/p+DBG/AcCvtGvByOeU3kfnF
+L9DRoSHQmnwHEdHXFYjKorYvIplj8j4dM/0ggtt82f/99WTZlQ0yVOKLFZyZvJm7
+pxcQ6cRN+VPqN2UbCm5mg9i1NdZRGmXXSi4xxdtK2Qgad2SAH8cRpWUXoQ5HV1xA
+1CxKAETJ4GDFGejbleWT7nn8vCpKZobIAhaGrcEmJy+4cEqP+M+ddJt/2+Wnj9tg
+dlbMs0u2/IPzusAo0sZkn3wrwNDg2WrrsdHRtWCbHFgA/q5dk1A=
-----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 51bd237d9..a37a86c97 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 718d47f1e..f0012b670 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=20221103224949Z
+update=20191101124259Z
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 a8fdd7d10..d5078e0dd 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,10 +1,10 @@
-----BEGIN X509 CRL-----
MIIBcjBcAgEBMA0GCSqGSIb3DQEBCwUAMDcxFDASBgNVBAoTC2V4YW1wbGUub3Jn
-MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDIyMTEwMzIyNDk0
-OVowDQYJKoZIhvcNAQELBQADggEBAGEDROgtzdMkSgH7ttCluyGNKBhR7RRO0gfC
-mp+Eez+dT6a5iOwSzqj8+2Qfp2OhexRFg0SCfIrQs1htRGD4//yGQ/WqOsRnsiUw
-OPZWIapX9gs9mvnD5TbyMFYwYOXebmQ/RhWsaKSKa1BIn66o6ztaM0lUmYJzSga0
-BS2PWO9qR4Nulx87Qvf5zxzHENqpnkDKpuVF4Nh/5knAVn1wMYeET4RAhBberzCP
-LVi8lQMpp1CX2XJ1onu63j6caeljTcIqCF0qPbNPta5HhxkeBYOyoWr6F2oiCDVG
-xiZTsisDAq2u3ASBxz3ZrzVNn3+Tyy0ErlVWf7pDJNuQ/jS/i6Q=
+MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDE5MTEwMTEyNDI1
+OVowDQYJKoZIhvcNAQELBQADggEBABS4AS7hdwbjfEILALVVPm0MuYgJK+qV2kR7
+idFgP2fJuU3XirsRH39+D715V3at6BRPUsAv0b5xXlamHzUxRCk1APiOUeukglmB
+utxS/cSbbqUhVJJ/ZJWfhe+EZp4O+d43hS8tE7HTwGtADG4g6UnEL+mcElAw+P3h
+cMt1pZ8/JB2QaxYdMy7h9W0SBKSVlDgxWk6lG+UiWzOsQ3b+8XZeImwQloO3iylp
+TbvsZsa4EZ/P7V8VPxgcfBxawcww/SzICva+93wx/SfCvwFaoLKwPHK7kWMh6GxD
+HxH8qddzg95X84nXooFYcBfAoAaaDLX9q+ZXKFb3HJBpkfxsnBU=
-----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 d9c6920b5..7473289ce 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 103579818..9f54f912c 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=20221103224953Z
-addcert 102 20221103224953Z
-addcert 202 20221103224953Z
+update=20191101124302Z
+addcert 102 20191101124302Z
+addcert 202 20191101124302Z
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 d89c32e23..a0f815fb7 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,11 +1,11 @@
-----BEGIN X509 CRL-----
MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm9y
-ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMjExMDMyMjQ5
-NTNaMC0wFAIBZhgPMjAyMjExMDMyMjQ5NTNaMBUCAgDKGA8yMDIyMTEwMzIyNDk1
-M1owDQYJKoZIhvcNAQELBQADggEBAAMVgo6PyqClqqW6Vhvzy7/mtUCrYN1F857v
-qHmb2i5KYRkpX2c1AtnmHso7IMZBj4e0vgsQASIlYzOBlEG/yy51uObmv48gTKIy
-aiztSbaXfI8hc85ZB7sWJpeiQIRIko4odccMXKk6EfFi4rHHnKhvyOLVG7NF5U6/
-zmQ5yP8o2N2lKuUtm1ZtYv0q1vWuK3Az8iegu0mxPBhXrdBnbYR1wRXXikn2py1r
-1FBVKGQA/6xr9YjnBkR6x1IuRaS2MeTUFQdeYzwA7B1JiXk1ueZSPU7WHVBKTedj
-mqCpqUXFNAwaHVNzTCBsio/nl6i6MYJA4LmNXGxeX9+2Jg/EU8w=
+ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxOTExMDExMjQz
+MDJaMC0wFAIBZhgPMjAxOTExMDExMjQzMDJaMBUCAgDKGA8yMDE5MTEwMTEyNDMw
+MlowDQYJKoZIhvcNAQELBQADggEBAIox/W1/LgqMpi6gWyYmPdCu50OawjCflaNW
+rzyqaYheScW/uku0MFKnSy2dnKy5Ag6lK7C5fUbM/p+DBG/AcCvtGvByOeU3kfnF
+L9DRoSHQmnwHEdHXFYjKorYvIplj8j4dM/0ggtt82f/99WTZlQ0yVOKLFZyZvJm7
+pxcQ6cRN+VPqN2UbCm5mg9i1NdZRGmXXSi4xxdtK2Qgad2SAH8cRpWUXoQ5HV1xA
+1CxKAETJ4GDFGejbleWT7nn8vCpKZobIAhaGrcEmJy+4cEqP+M+ddJt/2+Wnj9tg
+dlbMs0u2/IPzusAo0sZkn3wrwNDg2WrrsdHRtWCbHFgA/q5dk1A=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/key4.db b/test/aux-fixed/exim-ca/example.org/CA/key4.db
index a02c75bbf..2dfad37fe 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/key4.db
+++ b/test/aux-fixed/exim-ca/example.org/CA/key4.db
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 fc6b3352d..3542c9902 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.org/CA/noise.file
@@ -5,7 +5,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 3271.227
+cpu MHz : 3200.218
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -33,7 +33,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 3200.005
+cpu MHz : 3366.082
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -61,7 +61,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 3223.756
+cpu MHz : 3366.213
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -89,7 +89,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 3201.219
+cpu MHz : 3254.944
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -111,80 +111,80 @@ address sizes : 39 bits physical, 48 bits virtual
power management:
CPU0 CPU1 CPU2 CPU3
- 0: 39 0 0 0 IR-IO-APIC 2-edge timer
- 1: 0 0 0 28568 IR-IO-APIC 1-edge i8042
- 8: 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 0 169563 0 0 IR-IO-APIC 9-fasteoi acpi
- 12: 0 0 1882987 0 IR-IO-APIC 12-edge i8042
+ 0: 38 0 0 0 IR-IO-APIC 2-edge timer
+ 1: 0 0 0 963 IR-IO-APIC 1-edge i8042
+ 8: 1 0 0 0 IR-IO-APIC 8-edge rtc0
+ 9: 0 138642 0 0 IR-IO-APIC 9-fasteoi acpi
+ 12: 0 0 159802 0 IR-IO-APIC 12-edge i8042
16: 0 0 3 0 IR-IO-APIC 16-fasteoi i801_smbus
120: 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 DMAR-MSI 1-edge dmar1
- 126: 0 0 0 1957673 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 127: 0 1368 1116015 0 IR-PCI-MSI 327680-edge xhci_hcd
- 128: 0 556 0 0 IR-PCI-MSI 2097152-edge rtsx_pci
- 129: 0 0 17 5610781 IR-PCI-MSI 520192-edge enp0s31f6
- 130: 31 0 0 5 IR-PCI-MSI 1048576-edge nvkm
- 131: 626 0 13666510 0 IR-PCI-MSI 32768-edge i915
- 132: 0 63 0 0 IR-PCI-MSI 360448-edge mei_me
- 133: 0 0 0 46 IR-PCI-MSI 1572864-edge iwlwifi
- 134: 1333 0 0 0 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- NMI: 846 837 848 822 Non-maskable interrupts
- LOC: 30499015 29736550 30140520 28574775 Local timer interrupts
+ 126: 0 0 0 631946 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 127: 0 5232 629290 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 128: 0 506 0 0 IR-PCI-MSI 2097152-edge rtsx_pci
+ 129: 0 0 15 1151790 IR-PCI-MSI 520192-edge enp0s31f6
+ 130: 13 0 0 5 IR-PCI-MSI 1048576-edge nvkm
+ 131: 629 0 9169816 0 IR-PCI-MSI 32768-edge i915
+ 132: 0 65 0 0 IR-PCI-MSI 360448-edge mei_me
+ 133: 0 0 0 49 IR-PCI-MSI 1572864-edge iwlwifi
+ 134: 1068 0 0 0 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ NMI: 414 416 424 410 Non-maskable interrupts
+ LOC: 24459981 23584427 22971032 22354040 Local timer interrupts
SPU: 0 0 0 0 Spurious interrupts
- PMI: 846 837 848 822 Performance monitoring interrupts
- IWI: 304471 283633 5532033 309534 IRQ work interrupts
+ PMI: 414 416 424 410 Performance monitoring interrupts
+ IWI: 187590 174878 3992079 193459 IRQ work interrupts
RTR: 6 0 0 0 APIC ICR read retries
- RES: 5411677 5256427 5121010 5309043 Rescheduling interrupts
- CAL: 5094472 4863514 4782526 4800594 Function call interrupts
- TLB: 3285693 3215497 3242375 3283422 TLB shootdowns
+ RES: 3028942 3051947 3068370 3061457 Rescheduling interrupts
+ CAL: 2002847 1881949 1837149 1817615 Function call interrupts
+ TLB: 834574 821402 882329 886173 TLB shootdowns
TRM: 0 0 0 0 Thermal event interrupts
THR: 0 0 0 0 Threshold APIC interrupts
DFR: 0 0 0 0 Deferred Error APIC interrupts
MCE: 0 0 0 0 Machine check exceptions
- MCP: 154 155 155 155 Machine check polls
+ MCP: 126 127 127 127 Machine check polls
ERR: 0
MIS: 0
PIN: 0 0 0 0 Posted-interrupt notification event
NPI: 0 0 0 0 Nested posted-interrupt event
PIW: 0 0 0 0 Posted-interrupt wakeup event
-MemTotal: 16240472 kB
-MemFree: 5804000 kB
-MemAvailable: 11616600 kB
-Buffers: 1119520 kB
-Cached: 5392212 kB
-SwapCached: 196 kB
-Active: 4159408 kB
-Inactive: 5202460 kB
-Active(anon): 324232 kB
-Inactive(anon): 3375904 kB
-Active(file): 3835176 kB
-Inactive(file): 1826556 kB
-Unevictable: 176116 kB
-Mlocked: 80 kB
+MemTotal: 16241860 kB
+MemFree: 6240680 kB
+MemAvailable: 11408920 kB
+Buffers: 640704 kB
+Cached: 5386460 kB
+SwapCached: 40 kB
+Active: 3012100 kB
+Inactive: 5992504 kB
+Active(anon): 234668 kB
+Inactive(anon): 3612856 kB
+Active(file): 2777432 kB
+Inactive(file): 2379648 kB
+Unevictable: 256620 kB
+Mlocked: 48 kB
SwapTotal: 16601080 kB
-SwapFree: 16598008 kB
+SwapFree: 16598776 kB
Zswap: 0 kB
Zswapped: 0 kB
-Dirty: 184 kB
-Writeback: 28 kB
-AnonPages: 3026088 kB
-Mapped: 804944 kB
-Shmem: 849988 kB
-KReclaimable: 488452 kB
-Slab: 677284 kB
-SReclaimable: 488452 kB
-SUnreclaim: 188832 kB
-KernelStack: 19760 kB
-PageTables: 47112 kB
+Dirty: 236 kB
+Writeback: 176 kB
+AnonPages: 3234212 kB
+Mapped: 743448 kB
+Shmem: 869872 kB
+KReclaimable: 348752 kB
+Slab: 505304 kB
+SReclaimable: 348752 kB
+SUnreclaim: 156552 kB
+KernelStack: 19008 kB
+PageTables: 45172 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 24721316 kB
-Committed_AS: 10888888 kB
+CommitLimit: 24722008 kB
+Committed_AS: 10641944 kB
VmallocTotal: 34359738367 kB
-VmallocUsed: 85860 kB
+VmallocUsed: 82000 kB
VmallocChunk: 0 kB
-Percpu: 7712 kB
+Percpu: 7616 kB
HardwareCorrupted: 0 kB
AnonHugePages: 0 kB
ShmemHugePages: 0 kB
@@ -199,13 +199,13 @@ HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
Hugetlb: 0 kB
-DirectMap4k: 316904 kB
-DirectMap2M: 13176832 kB
-DirectMap1G: 4194304 kB
+DirectMap4k: 374248 kB
+DirectMap2M: 11022336 kB
+DirectMap1G: 6291456 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
- lo: 203397967 414262 0 0 0 0 0 0 203397967 414262 0 0 0 0 0 0
-enp0s31f6: 5122017628 4199030 4 121766 0 2 0 0 1451840647 3007819 0 0 0 0 0 0
+ lo: 307129 2471 0 0 0 0 0 0 307129 2471 0 0 0 0 0 0
+enp0s31f6: 672603131 685935 0 0 0 0 0 0 60859098 523148 0 0 0 0 0 0
wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
virbr0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-virbr2: 177806558086 17365569 0 0 0 0 0 57 943922498 11257216 0 0 0 0 0 0
+virbr2: 131939979990 12949352 0 0 0 0 0 82 724135061 8643862 0 0 0 0 0 0
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 ea630e470..700d94885 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
@@ -4,22 +4,22 @@ subject=O = example.org, CN = clica Signing Cert rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.org, CN = clica CA rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.db
index ac6ead7f4..852df629d 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.db
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.db
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 f3bcc27ac..5c49f01de 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,46 +1,46 @@
Bag Attributes
friendlyName: expired1.example.org
- localKeyID: 76 1F 10 D6 05 54 8A 7F 35 33 DE 28 2A 2E 61 22 D4 C6 1F 64
+ localKeyID: F2 67 BE 8C D6 E0 D3 F6 93 93 15 49 78 6C 7D 8C 94 C5 4F FF
subject=CN = expired1.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM2MjNaFw0xOTEyMDExMjM2MjNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Tbs8kog
-wuIt3jfmHK9VTEH4ux0xMk1HxhEtn1RRyXkEG/SDoPp1mND8p+8dCMUcpK4nIVfY
-6u9DIwf6UtOvPF2Sxa32YSIO8yuVOLGxg4WqRJqexq8PVCX6V94qNGsf2GdQfVJg
-oMhc0RWLMOjcOKyKdg+5VkwD146QZnl8E8lqDAnbmmrH5jbeAgmn/2WC8YXMzZ6u
-6PzAF8U3mUkmQJimTbLBvXXLdkNDKVrByv9vEu62aD2Chv++WJ4xYGshmGh4dfZU
-xuAK7qxr6wbCIy/Gf3zoG7ZZXywlybCWgL/rroDkfLyHrbWw6iCpnlZ0658bN6mY
-xfJlaTKLJ+mdywIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM3MThaFw0xOTEyMDExMjM3MThaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPrH9kRX
+io2ozwXcCqgLI8ae8WpQnAg/9h4M/BYYWtXMQGu4My929I7qL8xLj45XZx06i73m
+a9vOBjyYlvKh6BUdW43GzcTKL2DwF+6UjYUzvkYLuoQjYzia9+rZvi2k3awJqZtJ
+fnkJwrxyxDYYlSUo9Mhl9XVjiooD4zCmvnuxLH3JqnbENevBV+WRB+jMTyvL8GQM
+KEDZ8nx9UQyR7XNj9H5eyAez88TrNUdXq15GkhUeSss/9RVfW6xjXscTqMAdMyAE
+SKQ8eRQKfDld3cIBKS9Sr394yuI2lGMh4mw7f8lJJyNn7iJfN8EvskzPney45zz0
+PpxRh95vNq1KcQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBl8wj+8O0aJgUm
-nWyDvFm0u2AzMSz9Dtb1jurttZ0jjUox+kjCd724+KBf6/vRr8ZqUEPO6UioXdXD
-2N5mybQqkP2QrPGQBDduqcsmhZPxKUCM4trwqoOCPCWkrTASGRQ7BV8V5DSXdx6p
-U9XoEogoGX2o39V/Pf6/sbHkALvEDMCkGlAFJNpAROhtOIql3jAmMt2IA5qLJk7B
-oYdkPVzV3h5gk3fm0C0TusOXUp0FIvmylftVpjw2FGtAViJ0bAMGOcq2C/YhdJGY
-H7dPYtvBJiyMPKXDz/r9d2hJiqCDZFaSy5HQymXfThcW/Gr6OlsVapgIE4UHAYHR
-ZRdfsk/7
+cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAQ1pW1ZyHpP9eK
+Ao6nqHZUIPFnyW4alfez+eTdgo9vg7ua7oVN/sxm+T5yj0H3QGuvy2nIGaKC1KGu
+zNZk1Oxq76GtkDrCEtTYeQ3qvPkWzdqBrwYPWpKLgMoCn8kRVpAmjFLL1D7Ot5rD
+Nzbi8bSNrKzuKWmV+1xuS5n4u6yySrDxz1WzHFixLACbEAub5L+ngZ95Ws1hmJgv
+FiyqOLt9yKB0Zd0gA2ndiqzcn3WjxmrnJPNoeiPsWjo39+pNil0zvhd0UbqAHygg
+BuX/fd5mx8ICX/XfYik3tiBB3ndlewg4ef1UZqY/oXzvge9C5FdqpKDFKQE4LiGc
+4BpHDCZv
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-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
+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
-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
+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
-----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 633dd858c..ab0e1b8a3 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,34 +1,34 @@
Bag Attributes
friendlyName: expired1.example.org
- localKeyID: 76 1F 10 D6 05 54 8A 7F 35 33 DE 28 2A 2E 61 22 D4 C6 1F 64
+ localKeyID: F2 67 BE 8C D6 E0 D3 F6 93 93 15 49 78 6C 7D 8C 94 C5 4F FF
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----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 277386d1f..030d9f824 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 16dc5537e..11be80091 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 eb26ed9c4..a5f66dce4 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 3d45ccaac..8ce970851 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 b097180e9..8bec76d18 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 f21c4fc13..1f45fd50d 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 479ef548f..eac70ae9b 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 dd28a09d3..0a073251a 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 24309c702..cd91488e1 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 cbe4617b3..b308294af 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 3c191a99c..9b93243b5 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 1dcecb515..653c98293 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,27 +1,27 @@
Bag Attributes
friendlyName: expired1.example.org
- localKeyID: 76 1F 10 D6 05 54 8A 7F 35 33 DE 28 2A 2E 61 22 D4 C6 1F 64
+ localKeyID: F2 67 BE 8C D6 E0 D3 F6 93 93 15 49 78 6C 7D 8C 94 C5 4F FF
subject=CN = expired1.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM2MjNaFw0xOTEyMDExMjM2MjNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Tbs8kog
-wuIt3jfmHK9VTEH4ux0xMk1HxhEtn1RRyXkEG/SDoPp1mND8p+8dCMUcpK4nIVfY
-6u9DIwf6UtOvPF2Sxa32YSIO8yuVOLGxg4WqRJqexq8PVCX6V94qNGsf2GdQfVJg
-oMhc0RWLMOjcOKyKdg+5VkwD146QZnl8E8lqDAnbmmrH5jbeAgmn/2WC8YXMzZ6u
-6PzAF8U3mUkmQJimTbLBvXXLdkNDKVrByv9vEu62aD2Chv++WJ4xYGshmGh4dfZU
-xuAK7qxr6wbCIy/Gf3zoG7ZZXywlybCWgL/rroDkfLyHrbWw6iCpnlZ0658bN6mY
-xfJlaTKLJ+mdywIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM3MThaFw0xOTEyMDExMjM3MThaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPrH9kRX
+io2ozwXcCqgLI8ae8WpQnAg/9h4M/BYYWtXMQGu4My929I7qL8xLj45XZx06i73m
+a9vOBjyYlvKh6BUdW43GzcTKL2DwF+6UjYUzvkYLuoQjYzia9+rZvi2k3awJqZtJ
+fnkJwrxyxDYYlSUo9Mhl9XVjiooD4zCmvnuxLH3JqnbENevBV+WRB+jMTyvL8GQM
+KEDZ8nx9UQyR7XNj9H5eyAez88TrNUdXq15GkhUeSss/9RVfW6xjXscTqMAdMyAE
+SKQ8eRQKfDld3cIBKS9Sr394yuI2lGMh4mw7f8lJJyNn7iJfN8EvskzPney45zz0
+PpxRh95vNq1KcQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBl8wj+8O0aJgUm
-nWyDvFm0u2AzMSz9Dtb1jurttZ0jjUox+kjCd724+KBf6/vRr8ZqUEPO6UioXdXD
-2N5mybQqkP2QrPGQBDduqcsmhZPxKUCM4trwqoOCPCWkrTASGRQ7BV8V5DSXdx6p
-U9XoEogoGX2o39V/Pf6/sbHkALvEDMCkGlAFJNpAROhtOIql3jAmMt2IA5qLJk7B
-oYdkPVzV3h5gk3fm0C0TusOXUp0FIvmylftVpjw2FGtAViJ0bAMGOcq2C/YhdJGY
-H7dPYtvBJiyMPKXDz/r9d2hJiqCDZFaSy5HQymXfThcW/Gr6OlsVapgIE4UHAYHR
-ZRdfsk/7
+cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAQ1pW1ZyHpP9eK
+Ao6nqHZUIPFnyW4alfez+eTdgo9vg7ua7oVN/sxm+T5yj0H3QGuvy2nIGaKC1KGu
+zNZk1Oxq76GtkDrCEtTYeQ3qvPkWzdqBrwYPWpKLgMoCn8kRVpAmjFLL1D7Ot5rD
+Nzbi8bSNrKzuKWmV+1xuS5n4u6yySrDxz1WzHFixLACbEAub5L+ngZ95Ws1hmJgv
+FiyqOLt9yKB0Zd0gA2ndiqzcn3WjxmrnJPNoeiPsWjo39+pNil0zvhd0UbqAHygg
+BuX/fd5mx8ICX/XfYik3tiBB3ndlewg4ef1UZqY/oXzvge9C5FdqpKDFKQE4LiGc
+4BpHDCZv
-----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 3519e85fc..15ae6376e 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQD5NuzySiDC4i3e
-N+Ycr1VMQfi7HTEyTUfGES2fVFHJeQQb9IOg+nWY0Pyn7x0IxRykrichV9jq70Mj
-B/pS0688XZLFrfZhIg7zK5U4sbGDhapEmp7Grw9UJfpX3io0ax/YZ1B9UmCgyFzR
-FYsw6Nw4rIp2D7lWTAPXjpBmeXwTyWoMCduaasfmNt4CCaf/ZYLxhczNnq7o/MAX
-xTeZSSZAmKZNssG9dct2Q0MpWsHK/28S7rZoPYKG/75YnjFgayGYaHh19lTG4Aru
-rGvrBsIjL8Z/fOgbtllfLCXJsJaAv+uugOR8vIettbDqIKmeVnTrnxs3qZjF8mVp
-Mosn6Z3LAgMBAAECggEAAKXxsE6hEhSgwV7odxTvCYorwf0eP3lcbIKvHwB9jpD1
-iIXRem1RrowweNIfp3JMt+ej9Fzn5VnOIG9U1WFIt22TehhPwGw1NlNtzx5fRhW3
-XgVrf58ZWcQToMVI6Of6HCGy+qAMjYEJCTDACoEdUv/1J5LzgqCg4lDaOEP7ESy8
-JW4HEPdqQeFgHtF+fCP3TaU1pvf7E3W8GuPX9oojvO9UN8BUof4HoIyEy5CfWHHx
-ngLssMUKSiRAvuu0DPts//3foSrQmO6PpYzon1ABCVYlb1ddXFE+7vbVAFQdroJv
-azBdam3diSQl5yX8la2z72kLQ1AMDORwpG8KZF1jSQKBgQD+OxPdgw4NNy5RvWjV
-rY4EKQ2yg0n4kyVtc7g133qW4lvGiju3QYKORs+N9dPJL8WZnpGbIJZ11EKoImjy
-S0+Z1Vlf8Pekea8g4PN1nCvNhykAxuaAPWlvzcXL6QcIrF9O21fL3hbhZNvtak6A
-sLSfVN870dQ91LkPTl97KmbJCQKBgQD68ulP+Sg553QYUGDX+tNdOJh1LtyzYaAs
-YdAMwZHp+2AsdR2YkAGdxgrzDoqR/S8fVSwI/kJa0gpwcIY6I/nmJF0chALm52YV
-PW7F8gQ7FwDHdy3fw2lfVutWHnsJSZByp5CuF5eRMng2t5eLKj8FRy/I1gpfk/8i
-+HTzCDxJMwKBgFz4/+/PQLFGj9LmwNL78GbHGLJC3ydfsJ1RZ3mUK8HIMCXwYZxI
-AdXEQZ053GTD6rCeU8N2bG/U2zeftd99+TNZ2aCDgB0PPyN4ALDvFvnHxw/4rU0S
-qF9x0jcbFi5u00AEaRwuMRHmj6NIcEMR3Ew0fprixoqCI9dcIwDo5cP5AoGAZ05G
-U8DLGYM5nKTCKUc9abvZryvaeRHwYTTm88lf6wWrosGXrG1j7PJRIZvT2aNzmZ9z
-YERjRoX+/CimaRrUTjScDBggJbQOpyHCD0TBDx46GOLsBJiqMTBT8wDbP4iEKV7n
-xXM61vAC4uuTPBvpE6ApgLD0VkJTnq7PXhj+0FcCgYAUcUfkEXoQZ7EtkjazJk7Z
-P7q4K+H4vfkkpfXG49k8yXw0HWlm/cwTRH7okYqRxMRENGJ9O4IbV8T04DbpYTFp
-/6f2WM1jfX13ATHFdY6gmDybuFfYnc/MQ/uwNvgyfUxGpEmi12WDw33e6IY2awYd
-REkIezwFJE/YrCmqXHycDw==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCw+sf2RFeKjajP
+BdwKqAsjxp7xalCcCD/2Hgz8Fhha1cxAa7gzL3b0juovzEuPjldnHTqLveZr284G
+PJiW8qHoFR1bjcbNxMovYPAX7pSNhTO+Rgu6hCNjOJr36tm+LaTdrAmpm0l+eQnC
+vHLENhiVJSj0yGX1dWOKigPjMKa+e7EsfcmqdsQ168FX5ZEH6MxPK8vwZAwoQNny
+fH1RDJHtc2P0fl7IB7PzxOs1R1erXkaSFR5Kyz/1FV9brGNexxOowB0zIARIpDx5
+FAp8OV3dwgEpL1Kvf3jK4jaUYyHibDt/yUknI2fuIl83wS+yTM+d7LjnPPQ+nFGH
+3m82rUpxAgMBAAECggEADIgNXaY0LqbeM55+GLESbNuVCJIXGB1LbiFtmPH1koT9
++/fEqLctLJ7r/StxlD4neTEsIpX1OWDsgyuKQHH4vea01/U/hPVwvY8XIRKvKSAr
+7EaocPIHUXDCJFjYRyuTN3EFlCFfQFnQs53FYJhWAEWL011XPtyrijVAljctL2KT
+mYjOHLglbxQIiug4kZ8Mg9rXBt6bg5ZDBYJyKw+hdBmomta4LSVXrW6HmwfBSI9D
+JBkoBIsK/9sldlQMgQ8hHfjEEwZBxyjwOx8rVCcpQQPN07Lz1Aba3yyX2mqLSubK
+wx1MhPbuZITYywvFXy41dliLmA2BBWKVzNYTvUcH0wKBgQDe6TE0QJN0AX29zVEs
+Qi8YGV+5yuieH6ZVQ/iHIumQiQiQy+BEbkeTjtgRnTcSIjj3w2pSK8qGiYkynhwv
+aol3PzTlKtIKcCtaRjbPqFtjpNVXnsFJwWQONCg7AsQyMvHGipMrYJPyF2COYCWk
+m85pc4Jcs65yFD4LZE6YO70YhwKBgQDLQCjwIi9TAYNNKg0nhMm455Q/ut2Tz9mD
+LV9gYBLQMtgSGo9RRreO0oeP8YYP86Rfa4tRh7unTbHH3re9LLlI1FpBj2qlVcxp
+YXw/98fxjTAju/tCcTpJoA0zJgY5VfBBfiGWRbG5//QHE6ca7+Z9hpIVVav2mbdG
+XSmVpMDbRwKBgAciy/JyRsYl7hKPahPSopNQ7KGT/1JgjQCZxnD9CyEXYfDQtgM6
+zIvKvNwDfmnUMqKr3NF4mWkpKf021owmCvSIT3cuob63zIt9R+/p4dMUyceeS23D
+BSL3RHpvIjzBKMBEW2W+F75eRTcJmOrmGfuCOSAimGkKgNn4ghOZhfotAoGALx/a
+HgsfA9TW954nXKFKEAgJdFlEJJBNcz+i3HqKAiG3vULRNdv6lS+05KfwGGS6GLGb
+pLSeyqSV8qxt13u2He+2WXsCFAF3mntSzpYJkrTUk4RzNi2AgS+Nv+0yBjspsFWp
+Pek80s5IaxegZ/t1amc4GaA6dbugJb1V9e80E+MCgYEAuq3zlI627BfkEvR7kxZn
+ZN8N6hQfG+DEjp/mwWF5Sbzc2Lcw/XHH5iUVRyvvkiLmcPkaI0cyfGPevAFf68eL
+hIVVoure8WRK1YFYpE5uzPpwMbcwp9lwx0pjLvGOrD4S3YwawAM8Zsf10GdStmhP
+sewqoOLZLqVcrsnuWuBnVNc=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.db
index 85f2f03d8..1730eea3d 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.db
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.db
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 ea630e470..700d94885 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
@@ -4,22 +4,22 @@ subject=O = example.org, CN = clica Signing Cert rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+ggEKAoIBAQC03q9JccjRRcH6bj0DURJ4qyjEWR/rQveVfmuQaEQy3IEXCPzU0DWR
+k1rQ+vfmVFsr/z2JIW8z/l+j2QrGENhNmYbhUkrqYVmujjS5ugVpvzPAwhjTAlo6
+3gEB6NQ6ffP7XVDhriAaLXUd+JzxuhT+baIGE+3CA9YeBmveJHqIAH3GDR/uxLVc
+Cxg42FPoXWbluR6rqlQSY7dj1L+H4irq6vbcskib4F5psg3//iTnkFXguj7QwGrV
+JhqRy/zz3l9+1kwNoyjOD8Nz3ozWTCwGic9o0wACcikSlchiiO6jlaWq/LzHBy6d
+PuQKONhvBvtjlMRgXD0q0x1ycOdpzc5jAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-CSqGSIb3DQEBCwUAA4IBAQAr7J+XGw4n87Wd215ggc4p+DUkwWtPuOqa8InsNKoO
-vQmt+cYW1/7X11TyELm538OepS7Zi7d0x/IAvGD2STaxLPCLOfgs/cyCXJ3egSeI
-mQpfDvHeGiK1U4aew63v19YsbD+HDAS2JQQ4pbIdVk2YpDUNct9ebetgP8229e4S
-idcTIbo3GCt6joGoO/oS0ikTHf8Q7Ed3KB0HSdqNdcL/+ZPW9ghfwTR1K7vxEydv
-E0DpSgAsv+O1AE1Tule+CY5jb30l4pb3bQ9rUJoR1Oami6sh6ng+74BTGVhPjZyD
-V8lVTC9b9a3gi8oNsi3/cJWa+f7tmhQbuvdLghnnM5V6
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.org, CN = clica CA rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzU1MloX
-DTM4MDEwMTEyMzU1MlowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOH7
-uKsF2yjeH8uX20YzRctGNptj9pfsWpbeFkE/8sWAVbnUptsrk45X3QvxrVBj9uSd
-LlpGHg8nH5LWRoVLuQ4uD3ahetu15+wut8h/aas5PZWUqfulyNT0OjC7MZ1LLofN
-MLMeB0xQ+3orFw00P25H1BEFkzI0CzYhxBKcXdQw0SjOyQUJMlE3C3aaCxbSsEm1
-PNWzHrQ95URAesr99ZSvVw1qA7KqdEk+KbLClHEg8d2BWbEYDJO6vAxL6as+eD/V
-jsLUqkCJ1i8iYKjRYKqL/blF6ue2GQH2WXNhLwMPsR1XKJnXaPN8GpLqv2n/3Ra1
-RAJQDyyurSv+cLFBNb0CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBALvUeRfFhbm9/7ZYvOO82Xot
-pxuYKsyggeO6OtxEnsKWGH6rzO5pb+f/aUuBHbroPIWVgExlbtFEf4Fpbnp+HI2u
-C4yfUgRUkGmkK6cpX53IY6sB7+SeWLmtYaPHf1SmJkAJz+4EoVXMJXcPBmXb1LZU
-bPSrx0uD2HqsVwxLSeiEVoy5iOO6vlDhzmsSo/djSFwYy6VLTLSOZp88orttRhd7
-0JuZ9p8bh8qZb/ko0lkeUecjRpF3DO4c9wuPZ7yQbuPZ34VjJjDtYRJjnnH63jZ4
-IkgJMKJo9SdgGHxgOcw6O40mQacbvTsrTOX6xvHhwJI8z6//mSSVtS2O0p9ztvM=
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.db
index 6a81724c7..663ba0e90 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.db
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.db
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 666cfa01c..24fcb5274 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,46 +1,46 @@
Bag Attributes
friendlyName: expired2.example.org
- localKeyID: 02 20 D1 08 3A FE 2F EF 1E 3C 25 66 95 53 7D E6 9C 02 04 B9
+ localKeyID: 4C 7E 06 33 19 DA 52 05 F8 FD 25 12 D2 39 8E 7D 8D A9 B2 8B
subject=CN = expired2.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNzAwWhcNMTkxMjAxMTIzNzAwWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkwW6Hj
-+v99C4FzJbiSCXjpYjRkKNFaeniNYYnyfv2vrj0M/cfCWegS8jumijAOtyx8OpaF
-g+dIrDMeR+XdAYiyFsJ5zOOPqOZWK3vRMMLqqhnbL7m9YAo4M86+nLaAZjj2Y+77
-zlXtM703hoYJuxqTdDzu0o/H6NSuroWTWNnSXBCRDkXKe51gScXhWc5PvDOazytG
-pjhfiHIamJ5XKjv8mFVZBPMv7S4jD3kPgwTbFBJpg3hYa/ZCEMz73iuBglWfPkhs
-yliijUJT+N+O58RGt4Qa6Gz/lLnY9mkumgxUIfhokagHYBGR04rorQN5c+3UGp2Y
-G0bXNZOwvFEqzJcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNzU1WhcNMTkxMjAxMTIzNzU1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMU/BlQR
+887/4OPJolHZRwVekgcWxUzDpGnRggvB3pRZQq4j/96VZQHTyL288MAo+F47mTXw
+RVoBKENmY9wWUrPq40BIMnxK+7dRva2Yq4PGB+ePbGmsCQweRKeqnK/hicW2HZ/L
+xRhBQK8J83Vb5F+PvZ05YwccYZ6qDllyEPx4OiZr3NzPYbBlQxWTC2V0mXmBxOMs
+66Vp/9V4ACKeSCrmZEwU+6497enRv20ZfPT/0G4BeGAfz26hBl20ThbSJI2ivGci
+UtCFrFu3kNMb9PhpNe3kdcQKpAPM707vgCgpbAgIW/CDW6CNDAtdB1nsyYnXYLXr
+Gy+hZeeZImserrkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAgwzs6ES1kFpM
-0lXlonr0EwnuRhyHH6vF5f3ZQhfoyz8k+LZVvXkyYYcvRzjIuL+214zYawaG7ejq
-AoZN/HgezRsYHCbvUgYJ3KIMo1rhZn1NDNVilsFpIw2O9vNvJw5WQr1CGcBta5KM
-x1XOeqWW0W6FDtLYm1RMBV+F3DG4oPuqRPZe9GXFa704q7DHdeu8iNoOSgHAqOO6
-CXe7S199nAyrSlWU2f/Oo4NaB4NRqfTc5ixaX3HlmO8zVaZgxPaCuLUluBfMNuNa
-Dyz9jt6k0hwrnUZyxGd2PNunDqUSuaC5bWo12VvbRuwZzHd1f5vq5tOML2RzKNVY
-CIuaojP0Wg==
+eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEApBwmGSJLzhFn
+2HMFrdtqQiDIk9cw7w98GZhNje8Cmcm4FCC/3r/UMYgb8fq4j7CC7T2JI2pALTc7
+XBJaUZ/MX4r4QSrXYdxGas8W5vK8MqbqwCQpjEb0y9zqIbZx7iC/qnBLKMOAXO5D
++RipFZycE99mHu0hhj2FYTUaAe5B+rOQ9yflb2iuiaD/KZDqR1PyoouX4HnvESNL
+TBoKZfMOlA9xTvJiARzK5gmTPwskbwEw8ZQIWJuk2S9UkE1rPuoAKBNAo5zhyxuo
+n5x7ZF4BtFnglyuolxnrSdmaJGnuhNLNdleBHEVL+u2QJHVOajwfHGdYOHQwx+zp
+mW1Qkps/RQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----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 925264e9a..66bbbb278 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,34 +1,34 @@
Bag Attributes
friendlyName: expired2.example.org
- localKeyID: 02 20 D1 08 3A FE 2F EF 1E 3C 25 66 95 53 7D E6 9C 02 04 B9
+ localKeyID: 4C 7E 06 33 19 DA 52 05 F8 FD 25 12 D2 39 8E 7D 8D A9 B2 8B
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIS/GUpWg0nOoCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDxeYe78kqUFZjFv28i+0DEBIIE
+0El6Bj6oquV1M+yYpV2jYAsWhIWhLmnGHq84lfMKVbF/VFnqWYkxW2DDjj+EL33Y
+MGZGA1lNMDMHIfgYUrxJzcrP3Al56JcUqMYVUfslqHVK3XGJ4dtbyR9YbbJYfItY
+SEnhtpUIlXzdgsX/nH2Tma7U9LO+wtclNH4kUwzTc1uKY+sc2zhWSr17PS9PVSEA
+gG4yVZmvHkieiOxlKmnsRRVwxud48/z5PStwTDHf5tb87V6s24vo5dj8IrK02hzD
+zOZDwbqtXde+ikKDYMbGSYB6S5YZsJyx13m/lGc59tEtwXIgZBxdBMjz0+MtQB3e
+2zXepVn7OdDgf1DWS7LY5gz1x2b0p8Mc1Dbmb0IXjuBGanLzt5P6zbgNAN2upjmI
+onbesZfYwbbvY29hPwMK/Xj8qqoui3sXpDR3nSSMDx6CZTtpooOa1nLKaG5RGMcF
+pJ8dHuP+e8cE9iyvjRPTiajqWACyuD7S5arS4NVM2PhFUQS6uqZtiu0mxWAN6rqF
+fSjqnJZ3m5mp8uyTzwa/A5BOxUt6fWYGnlrD9Wo3dZvHCjih2jH0tieMu1YzqvFg
+Nl7YqaMJ7EtocVcgsS2jXfV+6egrtCDOtLEwO31PNLHvdTLsdzNFKZlhJRWuLTTN
+ooO7dJBuW7Pqg4Ri7NvxQfUvWftjtGS/atNd3M0ckdbzUVgtSuK0MfYr2S3Cebe6
+76+9hcf4l34aoj9m3UsNXs60kfP9mh1RLIr2o3e6RhKW+BHc92AORGb3NA9zKPgK
+6czhSoh5lrVBctVkLOgWYgSEzjMWTfBeqgGgd8tYDKLjk2ymUXLLTPUvlCoAUJ7n
+appmMepY+RARBg4uY1GVvTYUf1xx613+023K8dsNrjNQ0Qeu5q1LJQeEEAXJTY+R
+4HgQ4QUac8VOxovTtq1vwThK4frIa92+9WbzLALlTAsuGJEWH8EfDPaqqmep1+/r
+oI3k1yOSbK8LHAFFdyBjYGVwxNQebc487ZHdJEXLLM4YfPODFEYrVPPPILyszy1r
+1XBfJbqOe00KazYOuzcAu8C83iUL+50hv6T2UlgDxxzF7JHabf1V6/YZTFlDhX8t
+nYzcQy/p+N4ctAu7VmwrGPkg7b9jB357WT7rDVgTp2r1xnNYjO/mY5nX/qs7/n2P
+ezOh7Sb8nWlYBWd2bCZO9riDVFHNPwa/nD4M2O0R3myR6VFZPjv5w26A/eoKhK+e
+XTV8eviS+AEWd5Z78Gnklht4gYw3SFCyR/0RikXUqBiVgccg8FPoGsN0faGDq1Ad
+ODgwAB5qBUEQ5uVSamvU5PsWog6N1CI50Ei9W4FcPwH6lDJUo2LFNotKBmkGnI3m
++REdlkstCvbObAJjaDbaazNGXGowl73E56DZnaekoZG/MyPpBRXEIlzCYmHb4rpN
+OynjVpKeWKVE6hLbtL/jMvOdDbvKAsMl+qVSTROiFoKbYmdqTdD+A+BB7Tdll3YR
+iC1D7snKGOvOD6OpMGkJb0azvypuKLE8M+e+Ptcn3nsQVBbsXA6FP+BXdXNUciO3
+3TduYhymfX7qxSdDDwiEOk+vKp8CnmMyArrajpXGK98b4RXGUPKu1RDKbod+/4h3
+a/FOjTKWaoqVfMpjyOGfTTVsvq89lxLOvEF+84CmuHwM
-----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 5c3a7b69d..337c47f17 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 7ad0abd2e..80e4cea84 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 27edf3a4a..8d17d6a28 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 7ad0abd2e..80e4cea84 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 1f3691d47..8294217d3 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 df3e2d2ae..2b5f0f162 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 df3e2d2ae..2b5f0f162 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 0f8356664..748bfb94e 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 ca11848dc..3ad1934ba 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 ca11848dc..3ad1934ba 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 75b37aa40..173bab7fd 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 e406f6ab8..c9e6b5059 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,27 +1,27 @@
Bag Attributes
friendlyName: expired2.example.org
- localKeyID: 02 20 D1 08 3A FE 2F EF 1E 3C 25 66 95 53 7D E6 9C 02 04 B9
+ localKeyID: 4C 7E 06 33 19 DA 52 05 F8 FD 25 12 D2 39 8E 7D 8D A9 B2 8B
subject=CN = expired2.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNzAwWhcNMTkxMjAxMTIzNzAwWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkwW6Hj
-+v99C4FzJbiSCXjpYjRkKNFaeniNYYnyfv2vrj0M/cfCWegS8jumijAOtyx8OpaF
-g+dIrDMeR+XdAYiyFsJ5zOOPqOZWK3vRMMLqqhnbL7m9YAo4M86+nLaAZjj2Y+77
-zlXtM703hoYJuxqTdDzu0o/H6NSuroWTWNnSXBCRDkXKe51gScXhWc5PvDOazytG
-pjhfiHIamJ5XKjv8mFVZBPMv7S4jD3kPgwTbFBJpg3hYa/ZCEMz73iuBglWfPkhs
-yliijUJT+N+O58RGt4Qa6Gz/lLnY9mkumgxUIfhokagHYBGR04rorQN5c+3UGp2Y
-G0bXNZOwvFEqzJcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNzU1WhcNMTkxMjAxMTIzNzU1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMU/BlQR
+887/4OPJolHZRwVekgcWxUzDpGnRggvB3pRZQq4j/96VZQHTyL288MAo+F47mTXw
+RVoBKENmY9wWUrPq40BIMnxK+7dRva2Yq4PGB+ePbGmsCQweRKeqnK/hicW2HZ/L
+xRhBQK8J83Vb5F+PvZ05YwccYZ6qDllyEPx4OiZr3NzPYbBlQxWTC2V0mXmBxOMs
+66Vp/9V4ACKeSCrmZEwU+6497enRv20ZfPT/0G4BeGAfz26hBl20ThbSJI2ivGci
+UtCFrFu3kNMb9PhpNe3kdcQKpAPM707vgCgpbAgIW/CDW6CNDAtdB1nsyYnXYLXr
+Gy+hZeeZImserrkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAgwzs6ES1kFpM
-0lXlonr0EwnuRhyHH6vF5f3ZQhfoyz8k+LZVvXkyYYcvRzjIuL+214zYawaG7ejq
-AoZN/HgezRsYHCbvUgYJ3KIMo1rhZn1NDNVilsFpIw2O9vNvJw5WQr1CGcBta5KM
-x1XOeqWW0W6FDtLYm1RMBV+F3DG4oPuqRPZe9GXFa704q7DHdeu8iNoOSgHAqOO6
-CXe7S199nAyrSlWU2f/Oo4NaB4NRqfTc5ixaX3HlmO8zVaZgxPaCuLUluBfMNuNa
-Dyz9jt6k0hwrnUZyxGd2PNunDqUSuaC5bWo12VvbRuwZzHd1f5vq5tOML2RzKNVY
-CIuaojP0Wg==
+eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEApBwmGSJLzhFn
+2HMFrdtqQiDIk9cw7w98GZhNje8Cmcm4FCC/3r/UMYgb8fq4j7CC7T2JI2pALTc7
+XBJaUZ/MX4r4QSrXYdxGas8W5vK8MqbqwCQpjEb0y9zqIbZx7iC/qnBLKMOAXO5D
++RipFZycE99mHu0hhj2FYTUaAe5B+rOQ9yflb2iuiaD/KZDqR1PyoouX4HnvESNL
+TBoKZfMOlA9xTvJiARzK5gmTPwskbwEw8ZQIWJuk2S9UkE1rPuoAKBNAo5zhyxuo
+n5x7ZF4BtFnglyuolxnrSdmaJGnuhNLNdleBHEVL+u2QJHVOajwfHGdYOHQwx+zp
+mW1Qkps/RQ==
-----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 c9eea38b5..7760e18ba 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCpMFuh4/r/fQuB
-cyW4kgl46WI0ZCjRWnp4jWGJ8n79r649DP3HwlnoEvI7poowDrcsfDqWhYPnSKwz
-Hkfl3QGIshbCeczjj6jmVit70TDC6qoZ2y+5vWAKODPOvpy2gGY49mPu+85V7TO9
-N4aGCbsak3Q87tKPx+jUrq6Fk1jZ0lwQkQ5FynudYEnF4VnOT7wzms8rRqY4X4hy
-GpieVyo7/JhVWQTzL+0uIw95D4ME2xQSaYN4WGv2QhDM+94rgYJVnz5IbMpYoo1C
-U/jfjufERreEGuhs/5S52PZpLpoMVCH4aJGoB2ARkdOK6K0DeXPt1BqdmBtG1zWT
-sLxRKsyXAgMBAAECggEAHAvYJM4WHaQs9BiSeDY9O730eZrg6VOGWdWWBbgdNRCa
-YaR1rVeab840OY8x+SV3V/h//dPEOeLiKNcsM/6e8noTK8nlHRQDe6ttKelTm/wq
-ln6vOqsZ8JfAftU6RUajq22sw0Eaw0O+/+7kbfPPAGjRLAiq/wq0ng0XAS2b3P+t
-Gk6pnDrgB/RFgC8nyOLqcMe2/tPqOt7aBiMU7zYgXKXBErLqX0nPLk5EuDJif2LO
-KnScRRJd8OlOtHvwPiz6UsYxwyKMbGdNObA1+tCBbSdu/GXgQ2y1JHqbM+qdo3AY
-IGTv4snYSri+8BO0Cj1vQ2OuDDAXeHNgJ3Ddc2V0gQKBgQDW7FwnHGXyN+K2ZyWj
-ZP5Y9GfvmamrACEAJiHrutaJa0hYG4NBkjIq4i0QXTL2CMAzb7BvFmck6HzwbzBP
-+ZTXROkRc6zDzIffmcE5QMUF9OM7/UGWqHf1rKZdx+KdjkVaSEGslDzbCdQNd0Mz
-eohx2BMzU9yjwXyw/MilsQrl/QKBgQDJhlU8HNhfGlx1GmHK9VGvsiP8chAjNoWs
-wCnOA0n4OD3rMjNVnNb2IoxbtGOmlKzYB1K/UuTDxZZiZdbBO2pk8ciK3hL7Qt+i
-s5E/jIngW27iXUL3EAGTVfgqMlB5VWR4H9IOvrstc+xMFvo1V4QzdLHJ4hgg+xta
-G5hru5Q3IwKBgQCnqQkWhaPNueUFMB//gAie8kKmejQOrvIPgK/TihRUbTmpagUR
-wO+b3ocTDfF0V01Aku+LKWnbM/ZLRiHlMaj36cz7jUaIE+Um/HXsqOdKB0jBAocI
-9XFnWIEMBaN2D4dwr490BswWf2tJ+fCVlxAb51jLIK+tm4IfO4N3Jk5/LQKBgQCR
-ieRQj3xr4nvXToBFtTmTK5H1pOKmq5+KjRUj5RgsnWGKVCzirWxJQdYf/HzjNwhE
-07Uc216/TBk5YtbfomtKD5uHPq5yq28a75f8TyDb2OyRqkzMZNDeeP3Ka5/WoKb4
-YfKwF2rSfp+urAFzOIsPJj2n0RMf7nlob/l6BHQcBQKBgQCwyy09c11kPXxsX9Xa
-Lo33fjBRrS3OjHItC6UMgFSJ5oksRn0A8+EGwf4ERBkEhECfhnCjiejq4B2rStV1
-ySH6KpIsOaaQFYu8gAONSFrogEI+RtbDnVt5C1/iqhVjCEWGM6Y0rNzqGHguWaJg
-Wr+lK4PLXv1BjUxAQT29GUPO/Q==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDFPwZUEfPO/+Dj
+yaJR2UcFXpIHFsVMw6Rp0YILwd6UWUKuI//elWUB08i9vPDAKPheO5k18EVaAShD
+ZmPcFlKz6uNASDJ8Svu3Ub2tmKuDxgfnj2xprAkMHkSnqpyv4YnFth2fy8UYQUCv
+CfN1W+Rfj72dOWMHHGGeqg5ZchD8eDoma9zcz2GwZUMVkwtldJl5gcTjLOulaf/V
+eAAinkgq5mRMFPuuPe3p0b9tGXz0/9BuAXhgH89uoQZdtE4W0iSNorxnIlLQhaxb
+t5DTG/T4aTXt5HXECqQDzO9O74AoKWwICFvwg1ugjQwLXQdZ7MmJ12C16xsvoWXn
+mSJrHq65AgMBAAECggEAC4yHZRRBA4GBbCzx61tuuF6Da9VWO4qn/YcmF2SkUOjS
+CeqzMFfseFkrY4qkyQeNFU1liN423VB8iEe+OJR5Bq5N3IVtqU/loaPwWHH8NuS5
+MUJ5TU2koPhDulJ3xqeMvs4NOX4/nc4ySJ1rSxeUjVDYABTsWq37fEQGP4/5dSLF
+hYdPyjdk93kuD8CNpuORXAonifOcC4fqFIqZ0dC99wqZ6jixHTi6ZspiHD7g5UMs
+f4D1tKCp6kVhxcuBNvfRIhKuXPLwm942e6F8p7xGk75RYjTpVQoQOJN2MCTpTCMv
+xxEy9mRfWfPFaXVZmbeH7eEZPzwXOG2xVLfPMN2DtQKBgQD5d6Ttm0YnsiE9JTsx
+9GD6YwJ0H8KYSRSIC4Gzc+sjQ6TWxT5RF6aXkGn5C83iNaw5bcDOHxk161j/k4rR
+ILMKhKOgNo1e2YuVSeepHMbKQP3qIYhlLHdUCKohA4vp9k60DmrMr/2qXLks+9U4
+wkffvV+SLF8n5Gan7T5Vq7Y59QKBgQDKaU4cM/bK9LL3jLsX8LhW6ZBwbc+QpSwM
+Ki+ENgrnrIa40c1BAHGzv4r5MPHdOAqrllRdfkL9dJWYiENW3okrwVMB/uSKGgwY
+pdY5UpDa/c9Tb3kzIwP+ECOJ6/sQ1E4bYRuZDZA717En0Gr3O9HV8MJAbhI3V2CV
+0mIk+4mTNQKBgQDLqOiFblE80QifwYhtBOQzJad4JAGaj3bqhfJSDZ12QaAOEiMI
+0vUXITfSsNdZCJZcoARagjrzsPoMVGhsyHRCbvyiLEcHmzSAIUC16B9GOP7SKKQQ
+bNfSS+yQXTPZQlMIXgjEqBy/+0jVt5Zf6wQAXbrrO7xHdgh0qZNNH4z6DQKBgERW
+FSb0bEfNIXbuLmRAwxuksz0h9cfR2/Mncu9iB4B8AOf4/SEK81hKPLMw0Rdsyj1v
+/X+rFxbW+4KJzqJPc2QwWsP7uFDfxmGz64Vi2MD2m76BjhuzoK9v52+zGgpugwg/
+Wr/rklyBz6+vb82Uhp2CMTLrdn70owkyBCyUN7hZAoGARL9m0rwJFXrv9Um6GCnl
+CVCizbTXvXaVOt2u839LstdbICIFbwCLp38a9BXg6c0u9+MPuUxksZjSL0ddFjXu
+enhok5vysXRvnoGGcdID/ncSK6AHDT28F3lAGVp88+oH9lk7WpJJd8z5Lk8TrWqR
+y2YbFd1VdCwosPAcOw41lcg=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db
index a1e9626b4..8173f2720 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db
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 ea630e470..700d94885 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
@@ -4,22 +4,22 @@ subject=O = example.org, CN = clica Signing Cert rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.org, CN = clica CA rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert9.db
index c6292226f..7f330eb11 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert9.db
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key4.db
index 0bd8e00a0..df0bb0090 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key4.db
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key4.db
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 be5879b1c..8854ecaf2 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,46 +1,46 @@
Bag Attributes
friendlyName: revoked1.example.org
- localKeyID: 6B 71 89 63 8A 31 61 F6 EA 43 4F 75 E0 8E 22 88 10 8E 47 E0
+ localKeyID: CE EE E9 BF FF 6B 7F 56 47 DC A6 4A 56 2C 22 18 AA 75 54 CE
subject=CN = revoked1.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM2MTBaFw00NDEyMDExMjM2MTBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzpvCWB9C
-tulwwGFbzHnol6tMMYE8zZKLip4M1gh0520hF3G9yVPpd0nmcE5hXGR2eq1ARV9w
-/H/w8ijL1iSKYZQc+QgiteP4VIXnRGwYMVrhVFNUM2/uWx1zAOMMZCUDVME1vbcJ
-sL6eTnXD1nKI2rLVAWK39utIshwTfqVF3ZHL29CJFCzVkBZ3E8eid8xl80U4CW9b
-ExnTytRNBf4TF2+3Mb6HSipa2QTiQOMG/pR+RgMoS03eIu9IbA5os1MLAqeM9Eue
-2GIntOe0RWtozPkBLVYPd74+NuCuVj/YMVW6aSBgVPIGoVmKspsqVPO8zPV20R8d
-ylnYERLViEPGkQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM3MDZaFw00NDEyMDExMjM3MDZaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9J6eR4oN
+Vo1OO6HkksMck+ZIJxlRY2dmbEtt7p7UfLuai8l5NnzD3+iaSEAvlPYX2hWzDGIj
+FwFl7tUgtXWyv9FmdrnGyO74q5IJPTJInki5gHOjHEqsIpzvL3KR1SPyfU0vXEwb
+wftXo6ua+AIg500WkZ+7lMnFBCM0VqwGrajLBNCk/HRS1EsoBLox0FsWjHewrzAM
+r1s4e2srxekJbZy0j/yCQffLiy/JKQsoYtZldE+9UtfDHS9Es3nnHEfRuN4DaKwk
+YH6LTugWERadZoL/garwL080m0B06bdz4KqbNAy07AvFimw82XtZf7z1d+67bFjV
+HRRmD1jr+H5hDwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQCiWdyPnuIJkcK2
-CPwihdUIb/8amg7qsmLSkuHLxvYrL8Q83xpK3o221KLFcIG+WFRpMTTlT9RN+CFm
-scBlztOi/UvtNLwKUqCPMbMW3WPZ/Qkdb8z7kA1Ar0kPyogDeLmhmu5ekI7ngsW8
-GoTkd2NgNVA6XNrfkCZD9DV27t/e2mAoh/YfRjr5t7Vi1khyaekvDSjhg3VaUYRF
-BlVoX59jiuWASlpZyPSBBR6HFEyvs5BF/6GELP1f3ZAVM6SCFyEMOKytgiIiEhH3
-Agd+I9knrlnTeMk4SqGvbfJcmlvhonwuB4Mf1k1uQ5WkBTOGWA5t9VfR61DvBREm
-jUFy8hSO
+dm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQA0ZKwSFQ5q8X++
+cfyABSogKfO1OkSlj/ZX6filxMnsKEM3nWc0Znzb/yJ5YVkXKpWrjkR4xtZjImIq
+n0CwIWq+oLQA9Gi3KeNn+k0zEqZlGDvkwTm1PZCvQf0IHLT7dsNZm4EBn7ldYLUp
+oc/55L+515BlsRi1LgNGe+AjMmgKfxkYyMv65HxgwGv4n96bPorT1GVUUTrz7TM0
+Jj1ZaZId78qBF3DRMsbnSKbyUpYEHw2yWU2loWdV0Agpmrf4K0mnAl3g8WJ5mWoE
+IHZ8QVWWyX6RpzPVyZWwOlqe4h+fXSxm1Cpm5S2swNvSLBjwlFwuqFjXrXIfJJF0
+KSNftqrR
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzY1MFoX
+DTM4MDEwMTEyMzY1MFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+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
-----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 afe638afa..dd9ced08f 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,34 +1,34 @@
Bag Attributes
friendlyName: revoked1.example.org
- localKeyID: 6B 71 89 63 8A 31 61 F6 EA 43 4F 75 E0 8E 22 88 10 8E 47 E0
+ localKeyID: CE EE E9 BF FF 6B 7F 56 47 DC A6 4A 56 2C 22 18 AA 75 54 CE
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIp156rRyTiPECAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBCf3TtMrepN93+IW2BXWjwdBIIE
+0DpbSHAxkgGDhJm6n+O8HsdJDp4DqUuSPDkcHV791CHSylcwIRjoI/pitoTW9CeT
+IKCJ6Fp9uqEk0Ahlga4PP23n0d+cOCeWg8FP56ccSRBIYp8vtnPgcKkyFx3iHMBf
+uDtN9kOYM/gCmtlAPLzitmca2UL5UMZomAE7SvGaMMFly2zCjSVntJISA02pDKlA
+VanQJWwa/jkISui24WJCiLCUD0dlJw5sgLsnytp+2gWSIPwh4oEndIDaMEnnDv/9
+AiV9ULlzyOJPVhmGY33m31PHbNjUgsx90unDlnH7p8+ve4O14ULrf4++54QNryiH
+kToKriqgN2AMEaGNIjbJa+S8OwHTTSQ+GktL4Q7B1VyDR9Z5GeB3Vya+n/O9E/iL
+rK9QrLXsfmVnlUhgG31GUizMM8xYNOJPmu0w9FNDI83JgMcUxqUhvXTRdmlPPxOM
+lqHU5ihP6+HDEoi2FR7KWzfw5KArPIouSIDMVHn3J1SgcaFX3c5+TaFKRK6sWMlX
+l34MBPpANtIlXP1VvHEaa7VtnNKo2Uam+CDoWUvJ7jsQbjCnAxt+XRkoOfGlrX2c
+29/X7MFkZ8dIT3Owz8lW35BCpjZV7GhMjdibirh4epe1bek0eeiRGUekFUwWRSuz
+bGZ+VSSO8ZFOMfFjYnNVB8y5g4Se3kjsqZdHhdV/A6qdmvpDxW9cgDz3FJ9MlWo4
+PdBbHhib+AZ0c9kbWPZifOFRtN6gjRbxqxNe3AuARnveySMCVl++mEsBctCT1nHb
+iVnqAZ36Rb87AsZhUP+6Fw4TOOBEF8zrSO7NXkoWKi6KokWmNjJqxWSko8E0UzVi
++owDbH3BCuLijltlZC/uoAljS5/o4Pn1QiKe94cwky+VD5rDGChEY+te/JTkFF3E
+wOQj2vGyNrY/Mqf35JIeSMmJX6QiQp4Eqk2htuyJtYr1X3pbEk4h9faLnKalZOs+
+3D0H6JSzOARTWPQQEjzKLZWHUbszu2ERpkMNeuzEbnEKJWMwT/1W+Zs6DRqWZQ9d
+CCynaD5VQwlfDYj6Vw93VWH8+mdRY3kZd+5HKkJl+MRFrz9+loprXTiuqbNEFQH+
+8e/CT04r10HZNh8E3blD5YheAI0LZQP/lu6jvRNnbiwwNwkxDp6aNZKQvhdLod04
+Jujp+k3OZOFuHsKNHU+jIWPVnyFniGMK50A9w5DKeyc+aNqxsFlN3+oD8HSRl7GI
+OcCWYr+zDajnVetknL6q36SmFcTTyvxfDta/ZNsaNonMuqwnEdHOmgr7uRddoOJ7
+KFSIpxFSb65prgw2EjfBd/82JWG8kKhDXXOPTRHEWzaUJqzqFRPoYIWaO8R7u5m7
+bXsY8Ykl/QbR1+7kqQagcdwNN7UJ8ggL7qWxVx8P+yr8vp6bEX2oBNdwo3tXq3H3
+9W8DNiFZ1R7ndKgacet2XY9kIxEmlYNCBlRwHweQKOYtJ5pLt5PyTpCGlSKQKr4r
+VVs4OPi3nPDmE3lFP66gDBrMd8Yn5TB9ct3iaKyMua7zlZopySKp5wjH4G0tQgMz
+59eJx7fWE2APUxWat0lxh7Id79w/43ppI3ZikKicBeEBqGDgDj0Ky3JTgJWVxXxg
+QjtYFP9UZe28thzMjo1WSlzOMci8ZCyPz7btZZ9MOx0p
-----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 c4e521f1d..6516edd1e 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 688dae974..46a88278a 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 29f22639b..f4ddbd3c0 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 58cf8865c..8d567ed6b 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 804369950..789e15b95 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 89ea685d8..19bab090a 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 9b89d2104..f4b95c246 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 45c5d7bfc..31c7a6cce 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 755353868..7f25ce78d 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 7a5e68f4b..1664ac547 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 d8f6dc1a3..cf5ae6f69 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 f41b56d37..f08c4b769 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,27 +1,27 @@
Bag Attributes
friendlyName: revoked1.example.org
- localKeyID: 6B 71 89 63 8A 31 61 F6 EA 43 4F 75 E0 8E 22 88 10 8E 47 E0
+ localKeyID: CE EE E9 BF FF 6B 7F 56 47 DC A6 4A 56 2C 22 18 AA 75 54 CE
subject=CN = revoked1.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM2MTBaFw00NDEyMDExMjM2MTBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzpvCWB9C
-tulwwGFbzHnol6tMMYE8zZKLip4M1gh0520hF3G9yVPpd0nmcE5hXGR2eq1ARV9w
-/H/w8ijL1iSKYZQc+QgiteP4VIXnRGwYMVrhVFNUM2/uWx1zAOMMZCUDVME1vbcJ
-sL6eTnXD1nKI2rLVAWK39utIshwTfqVF3ZHL29CJFCzVkBZ3E8eid8xl80U4CW9b
-ExnTytRNBf4TF2+3Mb6HSipa2QTiQOMG/pR+RgMoS03eIu9IbA5os1MLAqeM9Eue
-2GIntOe0RWtozPkBLVYPd74+NuCuVj/YMVW6aSBgVPIGoVmKspsqVPO8zPV20R8d
-ylnYERLViEPGkQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM3MDZaFw00NDEyMDExMjM3MDZaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9J6eR4oN
+Vo1OO6HkksMck+ZIJxlRY2dmbEtt7p7UfLuai8l5NnzD3+iaSEAvlPYX2hWzDGIj
+FwFl7tUgtXWyv9FmdrnGyO74q5IJPTJInki5gHOjHEqsIpzvL3KR1SPyfU0vXEwb
+wftXo6ua+AIg500WkZ+7lMnFBCM0VqwGrajLBNCk/HRS1EsoBLox0FsWjHewrzAM
+r1s4e2srxekJbZy0j/yCQffLiy/JKQsoYtZldE+9UtfDHS9Es3nnHEfRuN4DaKwk
+YH6LTugWERadZoL/garwL080m0B06bdz4KqbNAy07AvFimw82XtZf7z1d+67bFjV
+HRRmD1jr+H5hDwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQCiWdyPnuIJkcK2
-CPwihdUIb/8amg7qsmLSkuHLxvYrL8Q83xpK3o221KLFcIG+WFRpMTTlT9RN+CFm
-scBlztOi/UvtNLwKUqCPMbMW3WPZ/Qkdb8z7kA1Ar0kPyogDeLmhmu5ekI7ngsW8
-GoTkd2NgNVA6XNrfkCZD9DV27t/e2mAoh/YfRjr5t7Vi1khyaekvDSjhg3VaUYRF
-BlVoX59jiuWASlpZyPSBBR6HFEyvs5BF/6GELP1f3ZAVM6SCFyEMOKytgiIiEhH3
-Agd+I9knrlnTeMk4SqGvbfJcmlvhonwuB4Mf1k1uQ5WkBTOGWA5t9VfR61DvBREm
-jUFy8hSO
+dm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQA0ZKwSFQ5q8X++
+cfyABSogKfO1OkSlj/ZX6filxMnsKEM3nWc0Znzb/yJ5YVkXKpWrjkR4xtZjImIq
+n0CwIWq+oLQA9Gi3KeNn+k0zEqZlGDvkwTm1PZCvQf0IHLT7dsNZm4EBn7ldYLUp
+oc/55L+515BlsRi1LgNGe+AjMmgKfxkYyMv65HxgwGv4n96bPorT1GVUUTrz7TM0
+Jj1ZaZId78qBF3DRMsbnSKbyUpYEHw2yWU2loWdV0Agpmrf4K0mnAl3g8WJ5mWoE
+IHZ8QVWWyX6RpzPVyZWwOlqe4h+fXSxm1Cpm5S2swNvSLBjwlFwuqFjXrXIfJJF0
+KSNftqrR
-----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 412ac93c2..02ce47c1b 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDOm8JYH0K26XDA
-YVvMeeiXq0wxgTzNkouKngzWCHTnbSEXcb3JU+l3SeZwTmFcZHZ6rUBFX3D8f/Dy
-KMvWJIphlBz5CCK14/hUhedEbBgxWuFUU1Qzb+5bHXMA4wxkJQNUwTW9twmwvp5O
-dcPWcojastUBYrf260iyHBN+pUXdkcvb0IkULNWQFncTx6J3zGXzRTgJb1sTGdPK
-1E0F/hMXb7cxvodKKlrZBOJA4wb+lH5GAyhLTd4i70hsDmizUwsCp4z0S57YYie0
-57RFa2jM+QEtVg93vj424K5WP9gxVbppIGBU8gahWYqymypU87zM9XbRHx3KWdgR
-EtWIQ8aRAgMBAAECggEAHjjNiFtmRGBIVHPJXFM20TzG4/TuInn9vHSbFxHcm9+s
-OAQ0yUbjf0YJlcL5Xez6Ib7HCH7KBb1nTtzl2Di3H0ftpwXoIegrcp21sx4Gue17
-yXx49B865AwePvJ3ZQy+/H5YsJweKELx4DM8xtkxKKCBJPc+RrmrBBa0SVG+swa1
-wyLtZAB8oVRu17uFH6DS9OuWrcHUKaSr79s0lZ0RCag92zn/ZPz7KgFEX0gCH463
-FSJFicxRreRoViTV6b5W1Ke1hW8JqThlcAVEhHCAkesJew5I95T3Mjm7+q2On9B/
-PCtUrNxmNiSxwCwdcUt0H1+EY/ZlvzaIy4Vrc9KTewKBgQDzBa98HvVQLLb+YbPU
-jf9Hl3jQ83YwO5VqtJAPXxB5Iq7Qi2p95pasJriiElak3sqtK9tGOzzbmg4gbcyh
-hpqF06Abg4rWS4YCX+EB2uAHl0xEN301m37ejFIO9wwDdMJtZQMk1z4nX5MWXwrp
-czLevGRSabPgYx/G7rre3u9ZBwKBgQDZpERrbQq/dh4buG/HC90m9tQeGA5Yj2uW
-N2OsW/cheViKX8eVJViU96MfcPAxX7WO04pWQD6ieVXY+Vok5BrzNIrc/OUtwJkM
-GU9fF+82lBkX2+kBpzb7LFQAVlXwBLauv8NSzHb4n/M9fix06ty/tOanyg59kg2J
-lQF7jGv1pwKBgHV8YyjrQocfBtyV2T1B5I70wHirqpCIzaRHZHm56JnXVZIGRFZX
-WrIhChN4MCEGgA8V66zZSIOVx4yP6GSSUTOvanDCuCT/X+rX9UxTRwkEcN9tv/9h
-jAUE60rGzi0Bjlkag1mVITwhrVccXYccpRQfGZTp+wbYhO1ETl0eg7GTAoGAQeSs
-GmI/OMyIPRhQL1F2OY/NlPbvkPyLNEW81bhaUDYvCmYJRSyzbxayupg1AJ3bmEyP
-u6Fj1UkrJrAIDNdLGYs058dhk8KWE8Wt9DqI4FtiZYjdOPTpfo5jOF7rUen7bVj9
-yBnDg27Z9Co5R4S8JQaeNvrD/Fy14IvOkRtorE0CgYEA1Vt5dNGc0XUe3Ln6F013
-JXHMga3rTgcRqOSOiHnpJk86NDV9OpL0O71xUQFytm2Gqd/6aSSBoGbqBBaQngYg
-nXAOvGDurmyTk3fIFW121/TtwCWISS0J/PgBCtspfswdJILPaUiFLV0Ko0d2h2+e
-XI4Nte3DFX+KKqz2XCd6M/g=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD0np5Hig1WjU47
+oeSSwxyT5kgnGVFjZ2ZsS23untR8u5qLyXk2fMPf6JpIQC+U9hfaFbMMYiMXAWXu
+1SC1dbK/0WZ2ucbI7virkgk9MkieSLmAc6McSqwinO8vcpHVI/J9TS9cTBvB+1ej
+q5r4AiDnTRaRn7uUycUEIzRWrAatqMsE0KT8dFLUSygEujHQWxaMd7CvMAyvWzh7
+ayvF6QltnLSP/IJB98uLL8kpCyhi1mV0T71S18MdL0SzeeccR9G43gNorCRgfotO
+6BYRFp1mgv+BqvAvTzSbQHTpt3Pgqps0DLTsC8WKbDzZe1l/vPV37rtsWNUdFGYP
+WOv4fmEPAgMBAAECggEAE4zAY5ackvKUx7PxkOp3qeOj7T6watGvCtqgZ4tZZLqY
+PbHAC+MUGHH+L+YJUiNfgUtuACsGWOarXyy4rNKXkuLzsxYNKq6GldevAK1jG7Co
+5U4t7ACVGehm6T4ueiqhokf9Oqgj08X4RBlejObxUEBbRw94A1/OF2g6MkRp/Y4x
+jfS5R4FB1yiBoGPG76JXCQ3fHrpzebcoz094XXHIos0afn6cU54ST/jj7gWJXwaI
+0SgPMbjxN9QS4rruXNtVseF7K9qwidroCSWPmEK0aKvYlDb7Y0yrLSzrhT5oyTMn
+1dylLaqwfZm8IyAztiD4fI/YCwrsoJiKeArLIJ9TIQKBgQD8WmMYqlZZOI8tFHJX
+ofp7wE5tE+JakBxpd15TKKtdvof3mzrXUwFBMBU+QnUBi35bv1dKKHjWwArxTmu2
+zG9P947depaIsjKf0k0SEpzqca9+4MQuPdV8tufW2m40Ye7BkopBcdz3Woj8fyUR
+JKIdwPdHW1B58zcIOBlbrUcvXwKBgQD4J57Fk6rJzYn9Z1+ffiF0r925iH2Z76xu
+BXyLmt8KlxhjsbmgydzJLTb+Xj8dm8zkwULKX0wwrBBEh44YNbH3DHkU9BIJh3NN
+tcdHKM3lsDUD/Wn2Tx7ZelgYOiu1b/nS9217IruHtX1GVsTNBhMr5z2cXN/m/Z+A
+cxp1OnYcUQKBgD+UhmMwh5DzLx+shyKNLQ8A5MGWwPEQXhg0ew94r7RuzNMVyT13
+LFnAQ5nsJI6/FpcHHncQu2FgAWHK4FiuKV18ggJLYKIQQ7EAy2pCRkbLXewZtVPx
+QFirvL3lSt7nzb/3q93RUlr/9IOphS1MjYvxklvoJd6T6MmpWLpAbi8BAoGBAJSb
+rYJmtz2Y4E0nreUmtMRbWW31ZjpchKdyk65K9c0yxQFW+nJm0NiNQkS8jhGeLurD
+LcthnI/9StSvVRH8ffITvyMkMvUP76YW+RsNPZiSmH0mMmG16iSVFtKTa3+BalvD
+nwXBvAo+TqJj7gFV5P9CwOu11sRPGEjlJXAUrYyxAoGBAOAmF/OkKSJ60v91WzEu
+fQM4bJ0ppPJxGGkfnxwSE/IbkoRJFX0+st9Wn4BQ84bdeDsHqVJBHqzMaum1SUQF
+DW0D7wnvfjiEKufQqIHtKDSjjT32gHHxglPnzTRaOiUG2Gb0AUkSJyb/p+6DLduL
+TiizG27zqjzLsuvO3/NqRkEx
-----END PRIVATE KEY-----
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 ea630e470..700d94885 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
@@ -4,22 +4,22 @@ subject=O = example.org, CN = clica Signing Cert rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzU1NFoX
-DTM4MDEwMTEyMzU1NFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+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
-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
+ggEKAoIBAQC03q9JccjRRcH6bj0DURJ4qyjEWR/rQveVfmuQaEQy3IEXCPzU0DWR
+k1rQ+vfmVFsr/z2JIW8z/l+j2QrGENhNmYbhUkrqYVmujjS5ugVpvzPAwhjTAlo6
+3gEB6NQ6ffP7XVDhriAaLXUd+JzxuhT+baIGE+3CA9YeBmveJHqIAH3GDR/uxLVc
+Cxg42FPoXWbluR6rqlQSY7dj1L+H4irq6vbcskib4F5psg3//iTnkFXguj7QwGrV
+JhqRy/zz3l9+1kwNoyjOD8Nz3ozWTCwGic9o0wACcikSlchiiO6jlaWq/LzHBy6d
+PuQKONhvBvtjlMRgXD0q0x1ycOdpzc5jAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.org, CN = clica CA rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert9.db
index 8b6b42cdb..662719e76 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert9.db
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key4.db
index 390b3131a..1cc6623b4 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key4.db
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key4.db
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 8e46e6398..39a5457e2 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,46 +1,46 @@
Bag Attributes
friendlyName: revoked2.example.org
- localKeyID: 95 E6 1C 41 E2 69 DC 81 99 22 6F 48 A0 41 F1 A0 DF 9B EC CF
+ localKeyID: AA 42 5F BC DD 9F E3 A3 60 AD 01 27 1E DB 4F 88 86 94 24 FA
subject=CN = revoked2.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNjQ3WhcNNDQxMjAxMTIzNjQ3WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2pJ5A8
-MDVunja1LeS0S8nOvQiOn881t+vyz97zzWy3stf3hqROR6vWYyx/PFwbILEW6f2a
-7uuR78DHjyH4pExI8SEXxfQvtmbQL5B3xqgifybUWrt3tbS5CMh6V/fD6dDZDanP
-/NeUzd8e4AxQLnfXCjvSYke2lm1iR3i9Z+y927FjVFLz4iZTbI7FfWTfPshGGSsG
-s1OEa2S7ab20Onln0A8Mvbkk68r8T5BEGcIQGaXMBttm/le+zj0de3ONDW0+MKpc
-bGPzk4PFlcqnyWoyUA2gQwh2ynmxZBFGJP8TqLKG6c4bO4TOWSRE80PL7KClhuo/
-wnq5cf5bS/QicMECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNzQzWhcNNDQxMjAxMTIzNzQzWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL+0gBE4
+GsyO3ZKyee4AjdZcSUsfvoCIZzIUTu8XYuS3X6Xjngz97iCRjK3qGK7BZHUdT3w3
+bXjuis+rTcT70DeR/IjbjwBx4CfxCYwTw3G/rTdDj3aBaEHxxINcDRPVNvMYm0TB
+bYd7RLv1zNqiT1OgIJR61X0qsXtZJxgqZmdD7u2DmOlNvd+7pAor7LxTptP2bM1t
+R5uaQE8Ky77ZVrFQE4VhJrhRIHpPNJF5zjyIgKWr5t7xYTvPBOTVohFP/pqHHn83
+GMeB7lgcD6KI6JY7OOpCfyGAQM1UaftRAFFVLe35NbjYdAeT7Wdkwa5iznEUtfiy
+hMbMLT770RRbW0kCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAaXvXek1+Lr6U
-y9KdYnyuDXS0RLo5AubGHZiS2R/8qAlTNunnRjnrz7XQqeNnJaEccPGqEepY9Zxg
-M1GTKEO8FymEmcfvM6CzrGnzhFAemUjaT3zj3OcSNYruQBEgwxGjBXgAiIbmuLpw
-s9KbLsqJi/pKzk1DJWrLE0CKjJiJJ3zla1XT2tSYtYPmfLcQ+pGfgFhM3hUz1gFA
-jFcZA+s6vxZ27+LEa6sieC7VUmCv5pgcA8irb/N4ypW66aoEmv6HGLABmpw9JHM5
-zz7kgv5uvchzXvuP6gfF36mR8rAygCSs2yQXwGjv9GWBTl+cXCaisBBVdW41B7ko
-rxeZw0WdQA==
+ZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAcZx4kfIXRwvG
+hHtlgpXJD+5XHR/n5EP+9yYCCzLflKkYfi+uQ7hUgJktFz8ZHlGFqII/0qyYNHZu
+qUif1fwoq7h9ZmIwIzTs83T6tSrqLSpsYrG/StW8d6778INj1nE9LTbzdve6MgZb
+b8O1NlHdRvJxw+ypRpttn7/H29ZmvfYaxdOUS9pS1WETx1Kw7VpuZqOZ1/tikksx
++qk6EpxXblkF/xbo01SPc+wGp8ztNxsakkNQPrEEPiceIBEuBq87WQb9OSXyMRmf
+V0JVUJmJx0bkAISpHy8mUiuyVV/mqFog/880DB42ZotHk/R9oPvwdOBYOEIsTC8X
+8228+RMKxg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-CSqGSIb3DQEBCwUAA4IBAQAr7J+XGw4n87Wd215ggc4p+DUkwWtPuOqa8InsNKoO
-vQmt+cYW1/7X11TyELm538OepS7Zi7d0x/IAvGD2STaxLPCLOfgs/cyCXJ3egSeI
-mQpfDvHeGiK1U4aew63v19YsbD+HDAS2JQQ4pbIdVk2YpDUNct9ebetgP8229e4S
-idcTIbo3GCt6joGoO/oS0ikTHf8Q7Ed3KB0HSdqNdcL/+ZPW9ghfwTR1K7vxEydv
-E0DpSgAsv+O1AE1Tule+CY5jb30l4pb3bQ9rUJoR1Oami6sh6ng+74BTGVhPjZyD
-V8lVTC9b9a3gi8oNsi3/cJWa+f7tmhQbuvdLghnnM5V6
+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
-----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 9d99894d6..2211a19eb 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,34 +1,34 @@
Bag Attributes
friendlyName: revoked2.example.org
- localKeyID: 95 E6 1C 41 E2 69 DC 81 99 22 6F 48 A0 41 F1 A0 DF 9B EC CF
+ localKeyID: AA 42 5F BC DD 9F E3 A3 60 AD 01 27 1E DB 4F 88 86 94 24 FA
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----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 e9ea4df2f..a74291013 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 cdce8ef47..4cb4a02cd 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 63ffc93ad..3164d22d3 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 3f58275e7..4cb4a02cd 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 9fbbeea5b..c0a94aaff 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 2710eb6d1..9b392bcf7 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 2710eb6d1..9b392bcf7 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 0719a7a08..1ab7aa915 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 a1103b680..14f31458e 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 a1103b680..14f31458e 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 be6224e0e..5aa7dd98f 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 e75313bdf..303a4dc65 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,27 +1,27 @@
Bag Attributes
friendlyName: revoked2.example.org
- localKeyID: 95 E6 1C 41 E2 69 DC 81 99 22 6F 48 A0 41 F1 A0 DF 9B EC CF
+ localKeyID: AA 42 5F BC DD 9F E3 A3 60 AD 01 27 1E DB 4F 88 86 94 24 FA
subject=CN = revoked2.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNjQ3WhcNNDQxMjAxMTIzNjQ3WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2pJ5A8
-MDVunja1LeS0S8nOvQiOn881t+vyz97zzWy3stf3hqROR6vWYyx/PFwbILEW6f2a
-7uuR78DHjyH4pExI8SEXxfQvtmbQL5B3xqgifybUWrt3tbS5CMh6V/fD6dDZDanP
-/NeUzd8e4AxQLnfXCjvSYke2lm1iR3i9Z+y927FjVFLz4iZTbI7FfWTfPshGGSsG
-s1OEa2S7ab20Onln0A8Mvbkk68r8T5BEGcIQGaXMBttm/le+zj0de3ONDW0+MKpc
-bGPzk4PFlcqnyWoyUA2gQwh2ynmxZBFGJP8TqLKG6c4bO4TOWSRE80PL7KClhuo/
-wnq5cf5bS/QicMECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzNzQzWhcNNDQxMjAxMTIzNzQzWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL+0gBE4
+GsyO3ZKyee4AjdZcSUsfvoCIZzIUTu8XYuS3X6Xjngz97iCRjK3qGK7BZHUdT3w3
+bXjuis+rTcT70DeR/IjbjwBx4CfxCYwTw3G/rTdDj3aBaEHxxINcDRPVNvMYm0TB
+bYd7RLv1zNqiT1OgIJR61X0qsXtZJxgqZmdD7u2DmOlNvd+7pAor7LxTptP2bM1t
+R5uaQE8Ky77ZVrFQE4VhJrhRIHpPNJF5zjyIgKWr5t7xYTvPBOTVohFP/pqHHn83
+GMeB7lgcD6KI6JY7OOpCfyGAQM1UaftRAFFVLe35NbjYdAeT7Wdkwa5iznEUtfiy
+hMbMLT770RRbW0kCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAaXvXek1+Lr6U
-y9KdYnyuDXS0RLo5AubGHZiS2R/8qAlTNunnRjnrz7XQqeNnJaEccPGqEepY9Zxg
-M1GTKEO8FymEmcfvM6CzrGnzhFAemUjaT3zj3OcSNYruQBEgwxGjBXgAiIbmuLpw
-s9KbLsqJi/pKzk1DJWrLE0CKjJiJJ3zla1XT2tSYtYPmfLcQ+pGfgFhM3hUz1gFA
-jFcZA+s6vxZ27+LEa6sieC7VUmCv5pgcA8irb/N4ypW66aoEmv6HGLABmpw9JHM5
-zz7kgv5uvchzXvuP6gfF36mR8rAygCSs2yQXwGjv9GWBTl+cXCaisBBVdW41B7ko
-rxeZw0WdQA==
+ZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAcZx4kfIXRwvG
+hHtlgpXJD+5XHR/n5EP+9yYCCzLflKkYfi+uQ7hUgJktFz8ZHlGFqII/0qyYNHZu
+qUif1fwoq7h9ZmIwIzTs83T6tSrqLSpsYrG/StW8d6778INj1nE9LTbzdve6MgZb
+b8O1NlHdRvJxw+ypRpttn7/H29ZmvfYaxdOUS9pS1WETx1Kw7VpuZqOZ1/tikksx
++qk6EpxXblkF/xbo01SPc+wGp8ztNxsakkNQPrEEPiceIBEuBq87WQb9OSXyMRmf
+V0JVUJmJx0bkAISpHy8mUiuyVV/mqFog/880DB42ZotHk/R9oPvwdOBYOEIsTC8X
+8228+RMKxg==
-----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 456b8e386..974fd124f 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDNqSeQPDA1bp42
-tS3ktEvJzr0Ijp/PNbfr8s/e881st7LX94akTker1mMsfzxcGyCxFun9mu7rke/A
-x48h+KRMSPEhF8X0L7Zm0C+Qd8aoIn8m1Fq7d7W0uQjIelf3w+nQ2Q2pz/zXlM3f
-HuAMUC531wo70mJHtpZtYkd4vWfsvduxY1RS8+ImU2yOxX1k3z7IRhkrBrNThGtk
-u2m9tDp5Z9APDL25JOvK/E+QRBnCEBmlzAbbZv5Xvs49HXtzjQ1tPjCqXGxj85OD
-xZXKp8lqMlANoEMIdsp5sWQRRiT/E6iyhunOGzuEzlkkRPNDy+ygpYbqP8J6uXH+
-W0v0InDBAgMBAAECggEAATLN7l+V6rVLWGt0zgopjgZ5jDd/zZhpIv+zM7f/La3K
-PdtBQHNM9E69fSWcioc9UP/elyPmRhbXlzuYeUbMjw3eoxojRQSLSSkH2m1CwfGB
-xP5APTr90uzQPPIW0bSlZ+JQa7mwthlFu/nnLYYw96GAA5xKtqMVGEQGIWlV5fuc
-cHvyveAhMfpaNhrjUDrHtfSfjgm/x6/24F9pjIIvgKcmpImp403cFxrx8xXb4EIb
-VIMdJ6VpIaeyaVMpXEX0DhrsvwYW0uz7xOcqurEQuFQ0WTtevRRr8Ly3tHZKsGN7
-/Yrl2Hcbhat39JwGjXtWp7St7EQt9S7S9LBFVOqyIQKBgQD9MMfNqMa0qWx7qhnI
-6h6gH2MRLOW6VVev3yFKmFJ8idkkzrfWUe5hsdycEQ0RkRu3Tzg2KaHDeUaS6y6W
-k0yC5UV2qkrTzfa0c5opxHzX1th5D9LdvHpKxUrMO4Vg6/wsd+TqO4GaEoHPVSGh
-PxGC3FTYvz2UpbOEtEbpNL9QoQKBgQDP8VwXkod0w1vTven+rkM5zo6bCoO3MoFm
-0IFkrp6hCBwTgaZ17lOJ7t6vZEd1tdYjtYc9TP1fMJ2EA6/iouq1WcD642sKFzd0
-6gvJSyj4jyYwmxOcVrVzw0sV/IIYJFHyexm5yIzx40EfJ5y1HcqjuFGECXc1nLHg
-Sx8o/sGMIQKBgQComWgjmiUfvsZfnwjmkohsRhpZIJWlvBjVI3duzfn3tm+jpAgl
-Lo/X/HGUd4JFVWSob5dV8eknWsXVJcjzOgk0DOpxt7p2SmvjBCv/bjlYHVgvXYsk
-XtLsoW5Ki8Qoo1xcXEZSd+e4qmRIpT7suiu2AXR6lPaz2petYcLqnlZboQKBgQCi
-6OTNUu7se2ElslPwQ3ZHg5wVu1cV32uhsRiuWF/OqRvV7G0NV3n7RjkQD/AsOBlc
-QIuDax3VxbCiDIFvfVOEYJzf8euaLDY2UmaJfWjL0tqImfXzNbtSxl29C+agI1RQ
-NEEjXAuQNgp+7fnHq19mhLDYUNIkHm782d2/sFbSAQKBgFqWIQjFx5Qvp5FyQpgR
-yL+vCG6w8RPk5mWMnujI3z4UZSfLk6DumQ4kIhIJ/JBVcMDreVg2rQvxw24SsO9i
-hLD/Qdx/kTLflYicBiov2it1bp3/xFl7/GZaCJLG0kqF2RFhamdHyKNu8TAjKVgt
-acDVRxMJt05AbgmIjGgpaj79
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC/tIAROBrMjt2S
+snnuAI3WXElLH76AiGcyFE7vF2Lkt1+l454M/e4gkYyt6hiuwWR1HU98N2147orP
+q03E+9A3kfyI248AceAn8QmME8Nxv603Q492gWhB8cSDXA0T1TbzGJtEwW2He0S7
+9czaok9ToCCUetV9KrF7WScYKmZnQ+7tg5jpTb3fu6QKK+y8U6bT9mzNbUebmkBP
+Csu+2VaxUBOFYSa4USB6TzSRec48iIClq+be8WE7zwTk1aIRT/6ahx5/NxjHge5Y
+HA+iiOiWOzjqQn8hgEDNVGn7UQBRVS3t+TW42HQHk+1nZMGuYs5xFLX4soTGzC0+
++9EUW1tJAgMBAAECggEADSTNqpCRktChS7lxr3Iph2barhxKMhMYGziF/HHaqZKS
+i+POLncbFG/SSMrOAC5ZikeVD2/X8USOryQgQAchXKwFV+dQ18+W9joaJNjmi7Yg
+BNPcolwHR00xo22EZoWV/8ciPy2xaip3GRmGXv+lp3bJQRDmcg9jLZE8Y1Vl4cLJ
+k4lblsEpfcksqV67H2xrnaTZR5jF8jsl3+8cVRVz0SGzvUZScqGUNVTOB8ZbaM0c
+BTvq+VQDFzQcjIfsO6GO4wXeWZZxXw/bY11obusuWlkRx9Y+9emhS/AZyl8+IGNj
+3RopRYMB6EcYVF/0m51neBe8rMSltGpGi8w+Y08WQQKBgQD+cyn1bSnXmd86QsbL
+NlNcbmIlbgwTOcS+Pals9x5+mkbR7Wacr9jeEoGQar2xv5z8sK1Mb4JpteqKdrqH
+ipN4JBdRsExyNmWB1NdtuPV2sJGgogiZi8TWKUXWjP3+mhEOMZcF95aR4O50zTs7
+Lo3ZY04ORC1mjs/NUu5yOgsuiQKBgQDA33sGTg5rxvzIqhwrrVpFDUt40ifLhDRg
+PiXEx2LTq3hyKDrvKZOYFyv9JwiAUt99eJVyu4zErUGbcd/zaybzCKvXorXeIumm
+VailOglOW9QTMSTABhAfhoePDX9EewJkO1iO52Cq5Hq/6ZZdn98JYQeqydv7T+wy
+VvWYXSGWwQKBgC4q0RshwmzHE3SrtwwaAEgOEyq9a911Jthpsbr+n37TGTRvwaV+
+Vnf8nZuJcn+0x5QlrlvnA5+QjUywPCnpn9Y1njGJLmWurv4+kxPqckclxFaD79GE
+RaOh+3TxQgiXBa8wmjlP8fbn+/wfXLbhPIWL+hamkiJAmT2k5XS+SVcZAoGBAIgX
+aLRbMXvFDar9tSDwkeh1aBKZnzDQWTCryXSfB9G5hSRv1J3a5WUEvKpE94+sajwb
+cMBjLAG/CrMHV/FnYzVLog1mpxNV6S3P9U6Ys+ZRj0P3ginoXUoRX+eFq46DiX12
+DpfPFXuf+ikeRlZLr1Hr4EAXbRxYGZ6vk13uIPxBAoGBAIaSxlnzptyC9b0XrluI
+630t+vT/CLi/bhuuPZpVteVJ1gvdN8y/p0hcY+ZPlm/uVgNV+69T2xU9CDtwpsit
+nCof92sLgF5bykiSumlvI3U4OUCpyPHQkv0FMamCaYRIqlRMOsnXGqnFqjGUUe8z
+W92B+ZGo4Ery8Yih7eu1fTr+
-----END PRIVATE KEY-----
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 ea630e470..700d94885 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
@@ -4,22 +4,22 @@ subject=O = example.org, CN = clica Signing Cert rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzY1MFoX
+DTM4MDEwMTEyMzY1MFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.org, CN = clica CA rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/cert9.db
index 27e21f7ae..2d209899a 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/cert9.db
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.req b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.req
index b11b02bd8..5199a7d70 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp
index f4e79d40d..d1f668e75 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp.pem
index b6d767e93..9cf99b5a5 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.ocsp.resp.pem
@@ -3,50 +3,50 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.org
- Produced At: Fri Nov 01 12:37:25 UTC 2019
+ Produced At: Fri Nov 01 12:38:23 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 31bede3e179c33c80b8b72b7e1e0adc35c54333b3a482c086f90d61b87a95ddd
- Issuer Key Hash: 8c7017ea5bb8441d74ecfa389d95dedfc473fd667787a62e1ac334ea5f80c02e
+ Issuer Key Hash: 24976770829b0940d0994524c1e551d9fa53aad3c864caa45c7e81bc042e8a59
Serial Number: 65
Certificate Status: good
- This Update: Fri Nov 01 12:37:25 UTC 2019
- Next Update: Wed Oct 31 12:37:25 UTC 2029
+ This Update: Fri Nov 01 12:38:23 UTC 2019
+ Next Update: Wed Oct 31 12:38:23 UTC 2029
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 6f5e8a1d1ee7f7b156e14e5f256318f0f2ef31c7440c12d789b0b3cc9f1224da
- Issuer Key Hash: 589cc71c3bc2dc61b60d4d478c1096fecffe8cd2a2d405e35da65532def68189
+ Issuer Key Hash: 20dff816e881964c9d0f21b821468f2829b9d9ca6e45ac7e8a2cce8b616d7626
Serial Number: 42
Certificate Status: good
- This Update: Fri Nov 01 12:37:25 UTC 2019
- Next Update: Wed Oct 31 12:37:25 UTC 2029
+ This Update: Fri Nov 01 12:38:23 UTC 2019
+ Next Update: Wed Oct 31 12:38:23 UTC 2029
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 6f5e8a1d1ee7f7b156e14e5f256318f0f2ef31c7440c12d789b0b3cc9f1224da
- Issuer Key Hash: 589cc71c3bc2dc61b60d4d478c1096fecffe8cd2a2d405e35da65532def68189
+ Issuer Key Hash: 20dff816e881964c9d0f21b821468f2829b9d9ca6e45ac7e8a2cce8b616d7626
Serial Number: 41
Certificate Status: good
- This Update: Fri Nov 01 12:37:25 UTC 2019
- Next Update: Wed Oct 31 12:37:25 UTC 2029
+ This Update: Fri Nov 01 12:38:23 UTC 2019
+ Next Update: Wed Oct 31 12:38:23 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIIC/AoBAKCCAvUwggLxBgkrBgEFBQcwAQEEggLiMIIC3jCCAcahLzAtMRQwEgYD
VQQKEwtleGFtcGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhGA8yMDE5MTEw
-MTEyMzcyNVowggGAMH4wVjANBglghkgBZQMEAgEFAAQgMb7ePhecM8gLi3K34eCt
-w1xUMzs6SCwIb5DWG4epXd0EIIxwF+pbuEQddOz6OJ2V3t/Ec/1md4emLhrDNOpf
-gMAuAgFlgAAYDzIwMTkxMTAxMTIzNzI1WqARGA8yMDI5MTAzMTEyMzcyNVowfjBW
+MTEyMzgyM1owggGAMH4wVjANBglghkgBZQMEAgEFAAQgMb7ePhecM8gLi3K34eCt
+w1xUMzs6SCwIb5DWG4epXd0EICSXZ3CCmwlA0JlFJMHlUdn6U6rTyGTKpFx+gbwE
+LopZAgFlgAAYDzIwMTkxMTAxMTIzODIzWqARGA8yMDI5MTAzMTEyMzgyM1owfjBW
MA0GCWCGSAFlAwQCAQUABCBvXoodHuf3sVbhTl8lYxjw8u8xx0QMEteJsLPMnxIk
-2gQgWJzHHDvC3GG2DU1HjBCW/s/+jNKi1AXjXaZVMt72gYkCAUKAABgPMjAxOTEx
-MDExMjM3MjVaoBEYDzIwMjkxMDMxMTIzNzI1WjB+MFYwDQYJYIZIAWUDBAIBBQAE
-IG9eih0e5/exVuFOXyVjGPDy7zHHRAwS14mws8yfEiTaBCBYnMccO8LcYbYNTUeM
-EJb+z/6M0qLUBeNdplUy3vaBiQIBQYAAGA8yMDE5MTEwMTEyMzcyNVqgERgPMjAy
-OTEwMzExMjM3MjVaMA0GCSqGSIb3DQEBCwUAA4IBAQAlWl0wtZoCBDJoO0LmcRYK
-qo5iJbPH0E/M2m6C7XjexfYay2+xPVxhJaQgP7mHOPmoOkps7B72m0H/yfORXBT1
-zAkROqUrZNLnEhQHmlqBEEs6aLkbRDw2kTImuWYgq3hY1/zff4aPoh8S46G4JpG8
-nOftKr9Gc3qNyt67t2RXnbvst1JzckE55yMiETS/eAU9e8eos/3UtezLGESTIMpw
-yLarmZKtQeX4rJT6UL0vzO9tRC70BzlrnVM945IUVaL+AyIQsyX3wuXmAZfmz4/G
-xwrXH6TIggCoC6rCHwmbmWHMpkIujJFEd2SaF9EVIek++P8BkhjW2kIM+dbSkmJ/
+2gQgIN/4FuiBlkydDyG4IUaPKCm52cpuRax+iizOi2FtdiYCAUKAABgPMjAxOTEx
+MDExMjM4MjNaoBEYDzIwMjkxMDMxMTIzODIzWjB+MFYwDQYJYIZIAWUDBAIBBQAE
+IG9eih0e5/exVuFOXyVjGPDy7zHHRAwS14mws8yfEiTaBCAg3/gW6IGWTJ0PIbgh
+Ro8oKbnZym5FrH6KLM6LYW12JgIBQYAAGA8yMDE5MTEwMTEyMzgyM1qgERgPMjAy
+OTEwMzExMjM4MjNaMA0GCSqGSIb3DQEBCwUAA4IBAQA4cv8w4eGUIxWhFqHSiWXb
+S/XwfRdpojod0YE/VPhihafLHZEnTf+SFuieC0Xt4v3/prOJCzGIbE8gqn8V4xLd
+RK2WIsiQlV4drSXg4ADIPd6wc3QS3C1RtapIsl0Df3I5xr9B1Gc/JFpwTiu5Ets2
+trdsifSRvPpYdBR26YI9mckCAjBFgefpSQx8LiqED9EUbhK0q5L+Fx9aIiOdCQTT
+9Tjz5oZAQTXqt94ZAR5KgYFlDnhlAIMcpRs+06iWLskxb+oIG40rJWz6ymWAaakw
+25q88CcwaUOd4tEpxYfB1NQ1kZ0y4PI1M0HkkoE5UChKp8HfbB84HEtgnVbCNIQT
-----END OCSP RESPONSE-----
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 80e6de622..25aeb87bc 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,30 +1,30 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 51 D9 48 83 58 86 9D 31 E5 60 92 19 C3 53 65 91 E4 0E 27 AF
+ localKeyID: 69 1A 00 32 B5 4D B3 95 53 FF F6 2C D7 0C E6 9C 50 D0 31 DB
subject=CN = server1.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM1NThaFw00NDEyMDExMjM1NThaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7uOKcu9is
-uMJk/Oj1u+zVn5Uq6oXyzGgt0qY/hA2jPMpucIfpO8jJ0vbs44TkV6jSN4Uxfseu
-X7SlKncVEcAOqwb6cjI9Ef30T3asC0ueHwwnBsIvKTpwg2kaWOY3FVK2gnONT/zI
-iWlMTt+xy+et9GMRRa9LzNaOgVZF0R/H8zEr66wjcpv+YYk1mDDTL5Yq83wUEibu
-ubRUXOTdEzE4GWF9S1++36dzelgGFTAVawaEJ2jy2GYvu02yCL+bCdgNIGXf4dLP
-bGP//RhQdgr5T8WKFDD9g7oXvrZ95+2AKqLdC4mYQR05ZrXsk7zTr98VSa3+cdqK
-0Ay7qkfxpwSNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM2NTRaFw00NDEyMDExMjM2NTRaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC20P0Ej8wS
+E/bvkC0i7a6bHWTWr2Zf0L32/7JPIhoDaADjapzWXVm8Wj8AwDCzKtYN+GqS6KBo
+QlDWYPzPHnECeKUO4PovlI+1ZL4vR8xH12FqX8pIZbd/NnE7bDk2YUlSJVHgabl/
+jLzePwO54RscnaE47SqDWoGZs8W7BaNGLD7c34WAQOtUSB3dhyW6EdZe9fOqSPck
+dlcGxsrKk6RieGwAtPO4LMWrI+24dzoAoSy+ZWsY2ciIE6lUg+VDI6Gj9YljeoOg
+4NJlOTs+rD+fqH5fHkzWoiVxrthiuxH9jnafMs7l3/EJiUIFyTecbI3A3VR/PJKh
+mpNwyesA+erxAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBnghNz
-ZXJ2ZXIxLmV4YW1wbGUub3JngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBs
-ZS5vcmeCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxl
-Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAhxZ0+ssaw9jYa+PNc6SQssWh7CMTHMNJ
-sTkktbeBQGJJqs/CQxOqZALBaFFDbI0aSACzNzLGlOwwbB9OcBUxvLB2MVnyw1Nx
-FFl8mqqquk0Qv1QPs01UPXYPe3WmAKYVmtAFC8ntHEiAWasxJ3LRCSO+y/38Aq8T
-wOjSckUga0Uf/3gQLW48oySHSgnzjyFP9XvrUyko4bFdIBRLVMYcal4Aw2QNR9sw
-gx77E5wuM/w9bANgLDZ03mH1LcfzYTD30uAfgt8X5vrHKcN5FpX/I07X0gq6maYf
-0L8OyGpYjHBxR53BwJfiWlYcOA4/SCmmsRwIc3kRzpva2rfngePnyw==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5vcmeCImFsdGVybmF0ZW5hbWUy
+LnNlcnZlcjEuZXhhbXBsZS5vcmeCCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
+Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAie/gY32BCZbuvGas/Ds5WVlpMXZNcuG6
+kowLRkGcrQQq0GWm2fZhDSbbHK+opC8Dyf4s+rWifNmqdFQV0h5tS4/SL921IRt5
+9QgKtsSfLOJeGu8wZVyBqfaq4u/1uHTgfIiUfA2iA8EZH2fsiB0TUuqWqL49rt7V
+bXKhUeTSI0bjLiIbOhnGcHXg0BMZIVeo5kByA2OnxFSBMQJdVd2+BK5PW2xIKCsx
+NuqSJCVN6bixgXoszY7zGBmbWl6WV/pxLeaXZt0+zqBLXQiaL8tkTfnSnsGAyiym
+tozi9F1FD+jnbdlpVswA/FU2FD6cul/k/WssfMWOrg0PxgYa0plZ2w==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -32,22 +32,22 @@ subject=O = example.org, CN = clica Signing Cert rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -55,19 +55,19 @@ subject=O = example.org, CN = clica CA rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/key4.db
index 72c4c0d41..e362c09aa 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/key4.db
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/key4.db
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 ef1f94811..8f7a83a08 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,47 +1,47 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 51 D9 48 83 58 86 9D 31 E5 60 92 19 C3 53 65 91 E4 0E 27 AF
+ localKeyID: 69 1A 00 32 B5 4D B3 95 53 FF F6 2C D7 0C E6 9C 50 D0 31 DB
subject=CN = server1.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM1NThaFw00NDEyMDExMjM1NThaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7uOKcu9is
-uMJk/Oj1u+zVn5Uq6oXyzGgt0qY/hA2jPMpucIfpO8jJ0vbs44TkV6jSN4Uxfseu
-X7SlKncVEcAOqwb6cjI9Ef30T3asC0ueHwwnBsIvKTpwg2kaWOY3FVK2gnONT/zI
-iWlMTt+xy+et9GMRRa9LzNaOgVZF0R/H8zEr66wjcpv+YYk1mDDTL5Yq83wUEibu
-ubRUXOTdEzE4GWF9S1++36dzelgGFTAVawaEJ2jy2GYvu02yCL+bCdgNIGXf4dLP
-bGP//RhQdgr5T8WKFDD9g7oXvrZ95+2AKqLdC4mYQR05ZrXsk7zTr98VSa3+cdqK
-0Ay7qkfxpwSNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM2NTRaFw00NDEyMDExMjM2NTRaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC20P0Ej8wS
+E/bvkC0i7a6bHWTWr2Zf0L32/7JPIhoDaADjapzWXVm8Wj8AwDCzKtYN+GqS6KBo
+QlDWYPzPHnECeKUO4PovlI+1ZL4vR8xH12FqX8pIZbd/NnE7bDk2YUlSJVHgabl/
+jLzePwO54RscnaE47SqDWoGZs8W7BaNGLD7c34WAQOtUSB3dhyW6EdZe9fOqSPck
+dlcGxsrKk6RieGwAtPO4LMWrI+24dzoAoSy+ZWsY2ciIE6lUg+VDI6Gj9YljeoOg
+4NJlOTs+rD+fqH5fHkzWoiVxrthiuxH9jnafMs7l3/EJiUIFyTecbI3A3VR/PJKh
+mpNwyesA+erxAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBnghNz
-ZXJ2ZXIxLmV4YW1wbGUub3JngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBs
-ZS5vcmeCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxl
-Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAhxZ0+ssaw9jYa+PNc6SQssWh7CMTHMNJ
-sTkktbeBQGJJqs/CQxOqZALBaFFDbI0aSACzNzLGlOwwbB9OcBUxvLB2MVnyw1Nx
-FFl8mqqquk0Qv1QPs01UPXYPe3WmAKYVmtAFC8ntHEiAWasxJ3LRCSO+y/38Aq8T
-wOjSckUga0Uf/3gQLW48oySHSgnzjyFP9XvrUyko4bFdIBRLVMYcal4Aw2QNR9sw
-gx77E5wuM/w9bANgLDZ03mH1LcfzYTD30uAfgt8X5vrHKcN5FpX/I07X0gq6maYf
-0L8OyGpYjHBxR53BwJfiWlYcOA4/SCmmsRwIc3kRzpva2rfngePnyw==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5vcmeCImFsdGVybmF0ZW5hbWUy
+LnNlcnZlcjEuZXhhbXBsZS5vcmeCCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
+Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAie/gY32BCZbuvGas/Ds5WVlpMXZNcuG6
+kowLRkGcrQQq0GWm2fZhDSbbHK+opC8Dyf4s+rWifNmqdFQV0h5tS4/SL921IRt5
+9QgKtsSfLOJeGu8wZVyBqfaq4u/1uHTgfIiUfA2iA8EZH2fsiB0TUuqWqL49rt7V
+bXKhUeTSI0bjLiIbOhnGcHXg0BMZIVeo5kByA2OnxFSBMQJdVd2+BK5PW2xIKCsx
+NuqSJCVN6bixgXoszY7zGBmbWl6WV/pxLeaXZt0+zqBLXQiaL8tkTfnSnsGAyiym
+tozi9F1FD+jnbdlpVswA/FU2FD6cul/k/WssfMWOrg0PxgYa0plZ2w==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----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 45fe71b16..85f893ad2 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,34 +1,34 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 51 D9 48 83 58 86 9D 31 E5 60 92 19 C3 53 65 91 E4 0E 27 AF
+ localKeyID: 69 1A 00 32 B5 4D B3 95 53 FF F6 2C D7 0C E6 9C 50 D0 31 DB
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----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 9284d1724..363f906e8 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 0b92d9687..2a7bc0d60 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 28c3e2923..f1a7cdd92 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 1f1f35318..89dc61c7e 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 dc893b8a2..5dce5b7b1 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 961aaa2ef..d35803055 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 baea425cf..ff7f24978 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 919688f43..e7a0372ad 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 497ca6e6d..d3e04539f 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.good.resp.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp.pem
index fc6a28418..d4c4ca65b 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp.pem
@@ -3,29 +3,29 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica Signing Cert rsa,O=example.org
- Produced At: Fri Nov 01 12:37:24 UTC 2019
+ Produced At: Fri Nov 01 12:38:22 UTC 2019
Responses:
Certificate ID:
- Hash Algorithm: SHA256
- Issuer Name Hash: 31bede3e179c33c80b8b72b7e1e0adc35c54333b3a482c086f90d61b87a95ddd
- Issuer Key Hash: 8c7017ea5bb8441d74ecfa389d95dedfc473fd667787a62e1ac334ea5f80c02e
+ Hash Algorithm: SHA1
+ Issuer Name Hash: 93b3f1cb1ca9bc1add813d73174304d08ac43c4f
+ Issuer Key Hash: d913d87b6c591d44cc2db317cbe7ea7dab076717
Serial Number: 65
Certificate Status: good
- This Update: Fri Nov 01 12:37:24 UTC 2019
- Next Update: Wed Oct 31 12:37:24 UTC 2029
+ This Update: Fri Nov 01 12:38:22 UTC 2019
+ Next Update: Wed Oct 31 12:38:22 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
-MIICBAoBAKCCAf0wggH5BgkrBgEFBQcwAQEEggHqMIIB5jCBz6E5MDcxFDASBgNV
+MIIB5woBAKCCAeAwggHcBgkrBgEFBQcwAQEEggHNMIIByTCBsqE5MDcxFDASBgNV
BAoTC2V4YW1wbGUub3JnMR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNh
-GA8yMDE5MTEwMTEyMzcyNFowgYAwfjBWMA0GCWCGSAFlAwQCAQUABCAxvt4+F5wz
-yAuLcrfh4K3DXFQzOzpILAhvkNYbh6ld3QQgjHAX6lu4RB107Po4nZXe38Rz/WZ3
-h6YuGsM06l+AwC4CAWWAABgPMjAxOTExMDExMjM3MjRaoBEYDzIwMjkxMDMxMTIz
-NzI0WjANBgkqhkiG9w0BAQsFAAOCAQEAGQfSUdrtYbXGTqBV2qjk+N5FvprY1YZI
-5ilEKYiS5EO9+UoyxSt3MJ3LaeQnz/MWtEe69WbXPoaGXyl6WidmbKP+2RrG97m9
-EcvnnVTK1t/lKz5V+xWztzCZWgEFo2iRBOZRrXBH4YVffT3G6sX4TuTf4tT2JxJq
-fJhLSr4cMcLJ0jODoV3L6UtRa3m+pGIOtNgl9xogrsUwbM/dnxS1gq5k5mfnegc6
-xjb9hXTyEH7EUERYpHt0rriV1w1wufMUyVBMDLooHWjNSA5YsCa2mehDmwFh9/xu
-oqlaGII1CF3IYM8Sievr55PzHiQonIxHiMM25Y/JVxcp3ZXrC/5Ohw==
+GA8yMDE5MTEwMTEyMzgyMlowZDBiMDowCQYFKw4DAhoFAAQUk7PxyxypvBrdgT1z
+F0ME0IrEPE8EFNkT2HtsWR1EzC2zF8vn6n2rB2cXAgFlgAAYDzIwMTkxMTAxMTIz
+ODIyWqARGA8yMDI5MTAzMTEyMzgyMlowDQYJKoZIhvcNAQELBQADggEBAF2M5iiS
+1I4kumGw2qpaS849QvugZfeDi6VS6DXEfTJOGI8uIIvxWjMwHIcLS/8w6kVBqOgm
+R9FKNGS4CaNrTAHZn/AW1/mBB3NciLlvmoOcI/2g8K5+ApGvrIOAEL0EWdXooga7
+zwWhuAeTDomTOFmjf8qY/97QSXlCqqgd9DHtZ30U6EoQwCpcE4UB1aJ2lmVgTAeR
+W6jS/uotQ6IToaWSIs/jkz9/GCvz4Mm1NrWpPpxnI8g6zOLNrHDbfSSiXOxjCIl/
+d/o/+SXOALVtKsTVhy0HbGv9PqW3uocpw0ZPXODBh9XiRf0hjltwUt2xkiDzAuoq
+LiypmkD0Z7Ya9Ew=
-----END OCSP RESPONSE-----
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 79761e33e..698c4102e 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 116aa8597..7a3261525 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 e37e51c74..f32523f16 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,28 +1,28 @@
Bag Attributes
friendlyName: server1.example.org
- localKeyID: 51 D9 48 83 58 86 9D 31 E5 60 92 19 C3 53 65 91 E4 0E 27 AF
+ localKeyID: 69 1A 00 32 B5 4D B3 95 53 FF F6 2C D7 0C E6 9C 50 D0 31 DB
subject=CN = server1.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM1NThaFw00NDEyMDExMjM1NThaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD7uOKcu9is
-uMJk/Oj1u+zVn5Uq6oXyzGgt0qY/hA2jPMpucIfpO8jJ0vbs44TkV6jSN4Uxfseu
-X7SlKncVEcAOqwb6cjI9Ef30T3asC0ueHwwnBsIvKTpwg2kaWOY3FVK2gnONT/zI
-iWlMTt+xy+et9GMRRa9LzNaOgVZF0R/H8zEr66wjcpv+YYk1mDDTL5Yq83wUEibu
-ubRUXOTdEzE4GWF9S1++36dzelgGFTAVawaEJ2jy2GYvu02yCL+bCdgNIGXf4dLP
-bGP//RhQdgr5T8WKFDD9g7oXvrZ95+2AKqLdC4mYQR05ZrXsk7zTr98VSa3+cdqK
-0Ay7qkfxpwSNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM2NTRaFw00NDEyMDExMjM2NTRaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC20P0Ej8wS
+E/bvkC0i7a6bHWTWr2Zf0L32/7JPIhoDaADjapzWXVm8Wj8AwDCzKtYN+GqS6KBo
+QlDWYPzPHnECeKUO4PovlI+1ZL4vR8xH12FqX8pIZbd/NnE7bDk2YUlSJVHgabl/
+jLzePwO54RscnaE47SqDWoGZs8W7BaNGLD7c34WAQOtUSB3dhyW6EdZe9fOqSPck
+dlcGxsrKk6RieGwAtPO4LMWrI+24dzoAoSy+ZWsY2ciIE6lUg+VDI6Gj9YljeoOg
+4NJlOTs+rD+fqH5fHkzWoiVxrthiuxH9jnafMs7l3/EJiUIFyTecbI3A3VR/PJKh
+mpNwyesA+erxAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBnghNz
-ZXJ2ZXIxLmV4YW1wbGUub3JngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBs
-ZS5vcmeCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxl
-Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAhxZ0+ssaw9jYa+PNc6SQssWh7CMTHMNJ
-sTkktbeBQGJJqs/CQxOqZALBaFFDbI0aSACzNzLGlOwwbB9OcBUxvLB2MVnyw1Nx
-FFl8mqqquk0Qv1QPs01UPXYPe3WmAKYVmtAFC8ntHEiAWasxJ3LRCSO+y/38Aq8T
-wOjSckUga0Uf/3gQLW48oySHSgnzjyFP9XvrUyko4bFdIBRLVMYcal4Aw2QNR9sw
-gx77E5wuM/w9bANgLDZ03mH1LcfzYTD30uAfgt8X5vrHKcN5FpX/I07X0gq6maYf
-0L8OyGpYjHBxR53BwJfiWlYcOA4/SCmmsRwIc3kRzpva2rfngePnyw==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBwBgNVHREEaTBngiFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5vcmeCImFsdGVybmF0ZW5hbWUy
+LnNlcnZlcjEuZXhhbXBsZS5vcmeCCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
+Lm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAie/gY32BCZbuvGas/Ds5WVlpMXZNcuG6
+kowLRkGcrQQq0GWm2fZhDSbbHK+opC8Dyf4s+rWifNmqdFQV0h5tS4/SL921IRt5
+9QgKtsSfLOJeGu8wZVyBqfaq4u/1uHTgfIiUfA2iA8EZH2fsiB0TUuqWqL49rt7V
+bXKhUeTSI0bjLiIbOhnGcHXg0BMZIVeo5kByA2OnxFSBMQJdVd2+BK5PW2xIKCsx
+NuqSJCVN6bixgXoszY7zGBmbWl6WV/pxLeaXZt0+zqBLXQiaL8tkTfnSnsGAyiym
+tozi9F1FD+jnbdlpVswA/FU2FD6cul/k/WssfMWOrg0PxgYa0plZ2w==
-----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 0757e199b..ffe97154e 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD7uOKcu9isuMJk
-/Oj1u+zVn5Uq6oXyzGgt0qY/hA2jPMpucIfpO8jJ0vbs44TkV6jSN4UxfseuX7Sl
-KncVEcAOqwb6cjI9Ef30T3asC0ueHwwnBsIvKTpwg2kaWOY3FVK2gnONT/zIiWlM
-Tt+xy+et9GMRRa9LzNaOgVZF0R/H8zEr66wjcpv+YYk1mDDTL5Yq83wUEibuubRU
-XOTdEzE4GWF9S1++36dzelgGFTAVawaEJ2jy2GYvu02yCL+bCdgNIGXf4dLPbGP/
-/RhQdgr5T8WKFDD9g7oXvrZ95+2AKqLdC4mYQR05ZrXsk7zTr98VSa3+cdqK0Ay7
-qkfxpwSNAgMBAAECggEACaMJYfC7Gdm074LTNF0ucvs6DbuOxz3WGzL+VF4s23v/
-T/0U5vP3+uoNtAH923QTrYCco8lzwZQ+aThX+MGGNcmMadgnXjkrHMhSBcIk8ffE
-UlYq5v1QFHCjfHO81I0Hbp9N5zIRvmesVVSLsdXZl8pMZKPjUyaTbD89W0znR5NP
-da5Kvp1JfM2zKcGXWmA6Z/Cnhb54qqJKM1ui+qVRWhBBPU03DjqgXZyAIAmdVdoF
-brE0m56/GQnswYsEU6YZ9voNRUdqB6QkMy7nU7q49jwKZDFM7AeW8rPK34c066hl
-U61kgTQBEO4/7oRa5CkYZqsPV0HMqonHh4to0uSygQKBgQD+v20QZ9ASl5WDV/zb
-JDd3h1lpDXy+VH/KxwFjyS+9PoOcLTMz/5eZpG9HR5JyvGzTPZwSrGIpoI5TaEwp
-EtIZwMMwTC8/4uuEVK2mA30zuZ4Yx/IPVl5F/sFA1JegstHL8eOZ3SzgdlLpU83H
-XuHJar169ldEaARXU4DqunL9YQKBgQD89abeKnBto7D81xoMU0jZi7hUsbFs+qbM
-TgMB6ojzRdf1hH4qyJlQNTEMZ2a+oGEknLJiiXYPr9LnXT+CXR3DsrOA8gIGn42k
-3X/2RDExwZTWd0XUyeMicRIdEHXnf1ydxdc1xDXHVDzUlEEsMfmYZOoRiFg41/XX
-Wcf8w4wKrQKBgQDE33uSKiiLtco+b0lismKLZXab0WiOTw9TzugsDddvEVj04Zmo
-neazPnkhRRbQxP31Yq+zXrWeJg7YNsplE757WJWAReBeJyiMZESvABNKXjDoRd20
-LLM+tNr1F1b3QjsQuieDSYLdFZSN7c4iPhmQZ4V3+dkHbLuuIUKIJP+pAQKBgB4w
-+5+clRqg5Ojoi3VZI2LDqFaDdte4+tt7nCRIZ9wRQ/tLuvtEQfguwRHn7X1nCvEh
-urDEE1E//P4cRQ48KudGluIXAGLl/DPnM/SiovR7VFZcmfsRtYhQ0oahhlEBBH7Y
-NB14s6p8xV3h6/1oYY/sy3sYON9f9zmiv5nNhRNpAoGAYEWyMrZTlqZkObWYTy0i
-GhCRSTve0RDL7Ou552xEAhofnAuJDvnVOkFJP5lVSqOCPJEclLUx2BtxAd2lCPte
-1ifzOh3Pqr3YCo2V1DahIKxZkTFIY1dtN1cmXQtKCPLEJ0mr72NWSEA0y1M8pT0v
-A9PyqBK9dR8fHBTxTM5RoX0=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC20P0Ej8wSE/bv
+kC0i7a6bHWTWr2Zf0L32/7JPIhoDaADjapzWXVm8Wj8AwDCzKtYN+GqS6KBoQlDW
+YPzPHnECeKUO4PovlI+1ZL4vR8xH12FqX8pIZbd/NnE7bDk2YUlSJVHgabl/jLze
+PwO54RscnaE47SqDWoGZs8W7BaNGLD7c34WAQOtUSB3dhyW6EdZe9fOqSPckdlcG
+xsrKk6RieGwAtPO4LMWrI+24dzoAoSy+ZWsY2ciIE6lUg+VDI6Gj9YljeoOg4NJl
+OTs+rD+fqH5fHkzWoiVxrthiuxH9jnafMs7l3/EJiUIFyTecbI3A3VR/PJKhmpNw
+yesA+erxAgMBAAECggEACqJTzW5LOb6lOGCDwkqJbmbCelsf59voaOk3vIhTHgvw
+h/SoJISv7G0NdCQ50Po2vapLvLmWYb+Ace/t/2LvF5c1TA0Z0HxiSElmEgb++CuB
+nvftItKeiWJSf4Ph52q3op/JcvXYv0rMTls5AsN4LxfGNzL91uqEARD8I/mweoDi
+26NuB4eAq8UB1VvQNPOr4lBgsuWJRPk0ns7b0/CBUSb+7rNpnBIlALlbFQmCXHio
+CNXx60EIZjItSw7XaurMr1gHrQ8MjdQDlKTdEwYnU+kigU8S+L6x5x2nltQs21DE
+KCO2NxxL7P0WdeGYbmzUgocswyE8koP7A2p19wbMjwKBgQDehkTxw6FVHdTYiuJL
+NiMSwaI34VspvceVd2qhmT1lKIDT/Vra7/xGY/Ps7ZtD4UmGUWetUc1hFf1wO/iE
+2+AHTQ8bEujLZ9/FMzJ8jmxn89bwiL5RvEa+eoAw+mYMfTVCqdUIF6EYBz1MYFkD
+wBQtXg5U2vFjJuK1/lT5VTTtqwKBgQDSUYDS3R+czD8TEUhbRoG08UjrxRuW/rg6
+yD2HopozQFkeBAXPQuUt/2j2UtxzEugYwUUkUZEZohAUR7AzXu8ELL82ROzlKvEt
+BtbZjrDh/03Q3xl8Cdk3JISkLJH5H5VUWuk92NUidKWaAZ0hLfPf5b7Oa5UsyZj4
+9u4Kc5EV0wKBgB9hW/OkHOo97LgkzcjBd6y7db7fntWCF9UyI+1qCMhtL821Wsyp
+LzBWBB4TW+P0r0Or0y0T7hyU10quiltiDnO5IDo3LnEQ0vOiRqpeA1edgWAmSICK
+RoeyCsXdaeq09X/TJ2Gew276BmDw7VykB7RmIStCPOw4nZwAo8cNhwtFAoGAJZD9
+S6zHisBIu+UoYXVUkbdPaR2J8gyJZ6aApwt6M5FY2a2qQ/0U5oRqgSUHz14fKtzK
+ttQC8OsrqBOt+18Hnl1Hwi/JiJ2E+p/wHGgKXDO3+IkBClDQBbN2JcT4ReFIUQr0
+AmIKn97p/XowUM7ecq2cyU4aFSflNQMWPbOqxJUCgYBKMkoPJv9HqlXciQgRGLVI
+P6bEfjZJE572sXKo5JxSod1rz9PddSdEvpXr3sQCOyZWlTb7/p1gPENGMeorYunj
+ah1dvbBp/fO10iIjT3WWT1F2YdfY7Y+pGtqkQJifkEP+RsDZ8ro3gSUYP6u1fQ6P
+76L4avZ4lPBQYj21NN7tDA==
-----END 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 ea630e470..700d94885 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
@@ -4,22 +4,22 @@ subject=O = example.org, CN = clica Signing Cert rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.org, CN = clica CA rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert9.db
index e2809a219..6159cc2b0 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/cert9.db
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert9.db
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 913ba3523..ba8adeea7 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,29 +1,29 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 45 80 0B DD 8D 96 2E 45 1C 36 B3 A1 66 48 C7 5E BD 4E 91 D5
+ localKeyID: BC 8A 92 65 1E 61 99 19 82 81 22 7E 0C 34 CC 63 E7 F9 1B EF
subject=CN = server2.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNjM1WhcNNDQxMjAxMTIzNjM1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxJVCxi/r
-SMEgqlJC6ikVWLC0ft0hcxzUnffdF6XMAuNzmEcuCzC23mLsdXraebL3hDqfFqgU
-wMQ1/g/KdNaiV1wm/gxLgYreXI8AJWHwPECDGNj6ecCR0yXs5Lk/0YqKhCWo59L9
-x3WPdUnyFSdpmc6yaN/306iFdrcWmmZUvGmK0eoyOEg+Ktqd6rIUVjZePitZAYVz
-7xavmQaDIcX8mlG0xhQiFk+qUESiqlF4Nn6tSxb6NP2EMVniM1yAz8KvMQ1ManN7
-3QSi14RVXHNZ/GroiXDhfpc+YlZOH7kA6QQZbuaNFSp5jq4NTWRzPdja/3s9aKSl
-oABQvZp7aAROSQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNzMxWhcNNDQxMjAxMTIzNzMxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIlcrccB
+Hw5O9aZLRPURf3ZeoAtYAoUxua7l1tez7ptYbNvIdP2hRwbEtLMGTzYWJPzUN9VD
+2I44gGPZW73T9TnDoGvn3JlN+Dns6xYB+nsm/ONr0B7MVB+hFQ1NGMPgHP5b9AsO
++rRp08DfffmLahG1tD3j2Wi5/RMrjPUOANQX7/TKFr0P41KCrY9Wb6ARC4vQ8Mwq
+ZP9coKc7DscX6Xae9NmgIbuA+/RZp0LuBf6PavS7FLVn8RWZzMkhazfXTO17J+gn
+WRSHmpkItzHev5zCOovVgCBfmKrtBUGXLdYZrN7lEmzRklnrheadej29MXI+Zjgv
+aCfn6K+4aBdgmwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
LmV4YW1wbGUub3JnLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
-bXBsZS5vcmcwDQYJKoZIhvcNAQELBQADggEBAD5BuKJ2ZP7rpPdgJDZnLOWVPsOF
-SAjL73Ljs/XInwlL9NkOOHgGYJ0/CnkfHv6t+5kiDhKj4omw19CGgqMfcnFI0ipR
-UXuQ1cuztqXmhbHe8lstRhbR2hTXlnLf3Y5lLb0Zx8AT2pMJcaL+cAJq9H0hCsZv
-o51GEE6gop25tVxsrOmSRlz6EgnI/3snTzKKP39gSuAmbvVuQhf+bS8yCBQsS/NA
-e3JfZkSGA2AVvGOz8wd0n0cSmW9rhRJJp/i4f+AYtCqIta7FsspxMLfh7cWrdZfP
-SQ5hhRy5i91zYyH4WG/CYz/ParFG1RJjxeyc6qpJzrcxybry65zOjN1Pfq8=
+bXBsZS5vcmcwDQYJKoZIhvcNAQELBQADggEBACiFDxU3xK66xmK1DqtjxAZzFt2q
+KOQea4bvC4TO3pj0+pKCIFImGc/4RKVQtThClBO3DFw8X1yVieqZU0tFkU54qTTH
+p9Iojp9dyxHC5whHlzrRmD0bk/aWPdq0P5kGNON4zFzo9bvEEMOMhjLzp7ALfh3j
+uhZb/HcoswS8oS+XAf5ZMVaiLXQ6rMiTlXDd9jntCdjCHWoxYGQJn5bmlvDwRfyO
+gwYAz/H4OK2a07gN4xcAyR3dZ2kUBuP0hfOOS+9TqOx41rkQ8rHot7jr8NMLrMpW
+mW96Gju3CaWK6NY33XAHFuSf1tPacQINNLgA8o23w0p21YAIk8e51/eujGA=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -31,22 +31,22 @@ subject=O = example.org, CN = clica Signing Cert rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -54,19 +54,19 @@ subject=O = example.org, CN = clica CA rsa
issuer=O = example.org, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/key4.db
index 199fb340f..87dc3c319 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/key4.db
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/key4.db
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 e0cf2a665..8847f18b0 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,46 +1,46 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 45 80 0B DD 8D 96 2E 45 1C 36 B3 A1 66 48 C7 5E BD 4E 91 D5
+ localKeyID: BC 8A 92 65 1E 61 99 19 82 81 22 7E 0C 34 CC 63 E7 F9 1B EF
subject=CN = server2.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNjM1WhcNNDQxMjAxMTIzNjM1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxJVCxi/r
-SMEgqlJC6ikVWLC0ft0hcxzUnffdF6XMAuNzmEcuCzC23mLsdXraebL3hDqfFqgU
-wMQ1/g/KdNaiV1wm/gxLgYreXI8AJWHwPECDGNj6ecCR0yXs5Lk/0YqKhCWo59L9
-x3WPdUnyFSdpmc6yaN/306iFdrcWmmZUvGmK0eoyOEg+Ktqd6rIUVjZePitZAYVz
-7xavmQaDIcX8mlG0xhQiFk+qUESiqlF4Nn6tSxb6NP2EMVniM1yAz8KvMQ1ManN7
-3QSi14RVXHNZ/GroiXDhfpc+YlZOH7kA6QQZbuaNFSp5jq4NTWRzPdja/3s9aKSl
-oABQvZp7aAROSQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNzMxWhcNNDQxMjAxMTIzNzMxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIlcrccB
+Hw5O9aZLRPURf3ZeoAtYAoUxua7l1tez7ptYbNvIdP2hRwbEtLMGTzYWJPzUN9VD
+2I44gGPZW73T9TnDoGvn3JlN+Dns6xYB+nsm/ONr0B7MVB+hFQ1NGMPgHP5b9AsO
++rRp08DfffmLahG1tD3j2Wi5/RMrjPUOANQX7/TKFr0P41KCrY9Wb6ARC4vQ8Mwq
+ZP9coKc7DscX6Xae9NmgIbuA+/RZp0LuBf6PavS7FLVn8RWZzMkhazfXTO17J+gn
+WRSHmpkItzHev5zCOovVgCBfmKrtBUGXLdYZrN7lEmzRklnrheadej29MXI+Zjgv
+aCfn6K+4aBdgmwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
LmV4YW1wbGUub3JnLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
-bXBsZS5vcmcwDQYJKoZIhvcNAQELBQADggEBAD5BuKJ2ZP7rpPdgJDZnLOWVPsOF
-SAjL73Ljs/XInwlL9NkOOHgGYJ0/CnkfHv6t+5kiDhKj4omw19CGgqMfcnFI0ipR
-UXuQ1cuztqXmhbHe8lstRhbR2hTXlnLf3Y5lLb0Zx8AT2pMJcaL+cAJq9H0hCsZv
-o51GEE6gop25tVxsrOmSRlz6EgnI/3snTzKKP39gSuAmbvVuQhf+bS8yCBQsS/NA
-e3JfZkSGA2AVvGOz8wd0n0cSmW9rhRJJp/i4f+AYtCqIta7FsspxMLfh7cWrdZfP
-SQ5hhRy5i91zYyH4WG/CYz/ParFG1RJjxeyc6qpJzrcxybry65zOjN1Pfq8=
+bXBsZS5vcmcwDQYJKoZIhvcNAQELBQADggEBACiFDxU3xK66xmK1DqtjxAZzFt2q
+KOQea4bvC4TO3pj0+pKCIFImGc/4RKVQtThClBO3DFw8X1yVieqZU0tFkU54qTTH
+p9Iojp9dyxHC5whHlzrRmD0bk/aWPdq0P5kGNON4zFzo9bvEEMOMhjLzp7ALfh3j
+uhZb/HcoswS8oS+XAf5ZMVaiLXQ6rMiTlXDd9jntCdjCHWoxYGQJn5bmlvDwRfyO
+gwYAz/H4OK2a07gN4xcAyR3dZ2kUBuP0hfOOS+9TqOx41rkQ8rHot7jr8NMLrMpW
+mW96Gju3CaWK6NY33XAHFuSf1tPacQINNLgA8o23w0p21YAIk8e51/eujGA=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----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 a8b1536cd..369ac5100 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,34 +1,34 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 45 80 0B DD 8D 96 2E 45 1C 36 B3 A1 66 48 C7 5E BD 4E 91 D5
+ localKeyID: BC 8A 92 65 1E 61 99 19 82 81 22 7E 0C 34 CC 63 E7 F9 1B EF
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIB1vESDtDVQMCAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBCOW14kOG6jOVN4gDCgvkONBIIE
-0DgVv2ZkqSSYMNXsZxEQKW8QPTNbusu5IUva8+4VJonXYaqiIwLfkuTSplflrAIu
-cGbROGFgalbOdM1bkDKFKMQu2VE0R5mDxbPJE6ED7s9AJW5d3IYBPeU9jo80A9PK
-8irZ208hOMUdGj18CKaTVjsOpXDmopjqTzawsqm3qmI+MXle9PEzBEqTlk/VndLh
-PUQM1pYkfxcOR54EVsCKqP+wF7UVW5PU0y/Cjdlb+FX03KbnxSTsLHZX2XxoUq+e
-oAcoaz7eANy9YHnttZCblosH7thr5kVgxVIwb3kKMKsV8N4cIOv91ZRdORISIsv0
-KrdyMlG2WsXHH+mbzA6ATlJlQ2kKe0gKuGq+zWYp8pjxXPnWTg9XsY8Hv8Q/aIQ6
-LsjajQFV/vSN0fcCQJAr4TXthfjXoD/omDYWv0i3zuheIuyNwRx2yFaIlip/xjyh
-PgtmJ5jpuv38tzn6mITmnUap51BFsCKBHLH7rWP7MY7jWkGnhEXc/9fmwK7gVAR2
-K6xP7VfBVKRMIiz5LvokDowOL9VFPXW590J5lqGB+jX1PdCJbBz8R7lXqHEs2JSN
-3/vCx5MQSJpAh6WFlR4+zEvFU4wioPandShs9saLkVnJTLDXxtJ+7MJM8L+iQXIx
-QH2rIEjyhGWVZ792X09yZewj/toun9U1rCAHjgsXpmsAf1uIhCnQqtrmNDHKwcoX
-a9WUbp4Ndr+egUmnoDSfNlYJGboxZ7CNv40FIngVBNMO0zwKxlWE4MIbJJ/zBYtF
-CxuznouDXSifAp2gephTiHezlZ6RqB5axyJOndGf0LLjz+6MIyk3lmLylkoJiIhh
-df4ma1RaCQX8rOpz/EI4UANULfj0lGxTov+yoS4SSCMfCASz/mCC/j3AtAO30tKy
-lsMizEHcaWFkzOSxO7xCyzXGVAc7/ZemdQ/FE62AbBwA8k6Wdz4Uh+b2C29dvAyV
-KV2IlR1zMrxRSWFGIo4vVcnKfxRJDYmyBCRvKfSewfbLyRRckBuBh7qm3gWab1qk
-M5d8dRQBGFNVQ247aYqEdCTH25PGSP1CbIl+uqM843S1uzCcM65I88YJJbCO8gIZ
-JlMz2FUb8nDhT117n09wKRtCx2GV5x4Xr/DNUbpgIXpYgswX1gDrX8hyWwGYR9tA
-2cSBKx4OwxlIE4XPeCoEu0aiI6iAgseunOrcJP3N3Nkromst3mcv5XLP38vZJInj
-MjtURXqvjrGVXmGCxDa0+f8rKLu+YCuvsG2El8BNVv1trhtsq8KMnV19dx7T/E+g
-VRSMs4SFE7fD+Xm2VUOdPrSnRz0bAdxiDn7tvhK2J3mY7IZo1DjYrIMroxX9PI64
-n+LRjtN70BKazspJ09BkjwnLiwZklK52StW3QVvCEtVHgkaTkH5oyXCO+SrJEkEb
-ivl/7lDlFSxKzz3bTIPomK9cV4U8Gm6uSXQ273igFiGB4DWWkhAs38Zhv7MHTT97
-iA+Ox2HdbPJfvUtKc0dg6ma3P8jJIeZ4+m+tFI7pQI3+Fv4S1JmEJvG5dY98tTLs
-EzvF12q9dLHK89hR05jxVrHRJ+/QLywIFJ+eI5PKSooOH53JVaRzCP6K2/pCQFhW
-9g48n2+iYlVtJm2ClIVLp1zjo70ZunNDBjGJT9XeR//g
+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
-----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 76b874daf..2ebd1e442 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 e8b425ed7..94e0f8a3f 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 db002596a..92ce8ecef 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 e8b425ed7..94e0f8a3f 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 093788365..46b9d60f2 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 d1a4bfb9e..f20f14e29 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 d1a4bfb9e..f20f14e29 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 95d77f2cd..7b2bb6493 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 77d029512..13377e4f4 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 77d029512..13377e4f4 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 335663912..6d8c350f2 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 ef8df8adc..774cb2d54 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,27 +1,27 @@
Bag Attributes
friendlyName: server2.example.org
- localKeyID: 45 80 0B DD 8D 96 2E 45 1C 36 B3 A1 66 48 C7 5E BD 4E 91 D5
+ localKeyID: BC 8A 92 65 1E 61 99 19 82 81 22 7E 0C 34 CC 63 E7 F9 1B EF
subject=CN = server2.example.org
issuer=O = example.org, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzNjM1WhcNNDQxMjAxMTIzNjM1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxJVCxi/r
-SMEgqlJC6ikVWLC0ft0hcxzUnffdF6XMAuNzmEcuCzC23mLsdXraebL3hDqfFqgU
-wMQ1/g/KdNaiV1wm/gxLgYreXI8AJWHwPECDGNj6ecCR0yXs5Lk/0YqKhCWo59L9
-x3WPdUnyFSdpmc6yaN/306iFdrcWmmZUvGmK0eoyOEg+Ktqd6rIUVjZePitZAYVz
-7xavmQaDIcX8mlG0xhQiFk+qUESiqlF4Nn6tSxb6NP2EMVniM1yAz8KvMQ1ManN7
-3QSi14RVXHNZ/GroiXDhfpc+YlZOH7kA6QQZbuaNFSp5jq4NTWRzPdja/3s9aKSl
-oABQvZp7aAROSQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNzMxWhcNNDQxMjAxMTIzNzMxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIlcrccB
+Hw5O9aZLRPURf3ZeoAtYAoUxua7l1tez7ptYbNvIdP2hRwbEtLMGTzYWJPzUN9VD
+2I44gGPZW73T9TnDoGvn3JlN+Dns6xYB+nsm/ONr0B7MVB+hFQ1NGMPgHP5b9AsO
++rRp08DfffmLahG1tD3j2Wi5/RMrjPUOANQX7/TKFr0P41KCrY9Wb6ARC4vQ8Mwq
+ZP9coKc7DscX6Xae9NmgIbuA+/RZp0LuBf6PavS7FLVn8RWZzMkhazfXTO17J+gn
+WRSHmpkItzHev5zCOovVgCBfmKrtBUGXLdYZrN7lEmzRklnrheadej29MXI+Zjgv
+aCfn6K+4aBdgmwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
LmV4YW1wbGUub3JnLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
-bXBsZS5vcmcwDQYJKoZIhvcNAQELBQADggEBAD5BuKJ2ZP7rpPdgJDZnLOWVPsOF
-SAjL73Ljs/XInwlL9NkOOHgGYJ0/CnkfHv6t+5kiDhKj4omw19CGgqMfcnFI0ipR
-UXuQ1cuztqXmhbHe8lstRhbR2hTXlnLf3Y5lLb0Zx8AT2pMJcaL+cAJq9H0hCsZv
-o51GEE6gop25tVxsrOmSRlz6EgnI/3snTzKKP39gSuAmbvVuQhf+bS8yCBQsS/NA
-e3JfZkSGA2AVvGOz8wd0n0cSmW9rhRJJp/i4f+AYtCqIta7FsspxMLfh7cWrdZfP
-SQ5hhRy5i91zYyH4WG/CYz/ParFG1RJjxeyc6qpJzrcxybry65zOjN1Pfq8=
+bXBsZS5vcmcwDQYJKoZIhvcNAQELBQADggEBACiFDxU3xK66xmK1DqtjxAZzFt2q
+KOQea4bvC4TO3pj0+pKCIFImGc/4RKVQtThClBO3DFw8X1yVieqZU0tFkU54qTTH
+p9Iojp9dyxHC5whHlzrRmD0bk/aWPdq0P5kGNON4zFzo9bvEEMOMhjLzp7ALfh3j
+uhZb/HcoswS8oS+XAf5ZMVaiLXQ6rMiTlXDd9jntCdjCHWoxYGQJn5bmlvDwRfyO
+gwYAz/H4OK2a07gN4xcAyR3dZ2kUBuP0hfOOS+9TqOx41rkQ8rHot7jr8NMLrMpW
+mW96Gju3CaWK6NY33XAHFuSf1tPacQINNLgA8o23w0p21YAIk8e51/eujGA=
-----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 8bb97bd39..cdb7fa9e3 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,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDElULGL+tIwSCq
-UkLqKRVYsLR+3SFzHNSd990XpcwC43OYRy4LMLbeYux1etp5sveEOp8WqBTAxDX+
-D8p01qJXXCb+DEuBit5cjwAlYfA8QIMY2Pp5wJHTJezkuT/RioqEJajn0v3HdY91
-SfIVJ2mZzrJo3/fTqIV2txaaZlS8aYrR6jI4SD4q2p3qshRWNl4+K1kBhXPvFq+Z
-BoMhxfyaUbTGFCIWT6pQRKKqUXg2fq1LFvo0/YQxWeIzXIDPwq8xDUxqc3vdBKLX
-hFVcc1n8auiJcOF+lz5iVk4fuQDpBBlu5o0VKnmOrg1NZHM92Nr/ez1opKWgAFC9
-mntoBE5JAgMBAAECggEACh9whpGZoU+2naaqRPIUJBLHXKAI9KtHpJHKrAjQ2lY5
-kd4aeB+MTyPTbtJCdVFarw+wuQMzPGDuMdTA1WbnCa4YYO0jpzpOLIB9nq8uJoAg
-8BLeRQ4+RBv4GKgUafcjHl5tFfD2ugJq/nxuD5pNtQqgg8eCtL7BDqWrb4x08RW7
-+f6xB+hl8cRDOmupEJnenElwUoiF1IDN5Cx4cw7gjhR3bTed+5HJYwye7+lc1MdS
-rZr/idRU23Ezyf+22N8nXXqOgKKQvW0nvz8UwaXNaRb8NeWbOlRZ9MjhTGUxbwYC
-x5xgjHSNx0/7ZXYv/JPdGya8aMbkj8mdFmOqQCK3oQKBgQD8JS+shPEuNTDBS6Ka
-BBKgri53hjI7KLMtXcu1fOhhmvzdHkC1q9Ezkqhkp2wdrV+L+AaK90c+uh0bmwZR
-VXW02SNhhCSRCOrQFzvqEgmRu35nqyDqlSIZicSb8wppVtNTBuhmchFNNymHmPj7
-GJS/0mDf+OsSpwQ5aBw5wjHVuQKBgQDHlp9TTf/4X9koyYyRYXLmkg0bIrKHMM55
-yzyTnGH8tH8TV2nj/btcmes1/Kch0kscoHHEiXJTqxTbcMuzSuPDvCV3lO1RMuSK
-B7wVIx1VHDKhOwYqKJV+kzW7Qa0bW2NBDvspUuPnTYDw7v6PlZp0uYvOJAPjhQEb
-cvHVagyFEQKBgA3U0F+rTzuUqV8BEiNWs9rikyP1VY4PNnz3lzQWbPzlrpdGkJAm
-o6wrkFctI+4g04vvCBTZaawUM4KPJ3KQuIs6GgnAYO0fyxmtHJlDcgjvewiex4h2
-s88o0oMnetu6ao80Ys0z1qUgsIOCra3AdHBtTukaU3LLfJzVjC7S6z7pAoGAcr1Y
-ot94hCU2Boi30uwezgawmiT8VVPtn38DOCjy/AAX/dqG+Zbom3exDLxOqNbob3Cd
-dss9enQj7XOO52fqQKBtOa3YMJH9aIzBx7UEK+WmBaKVDK+AIeAnR5ueFNgY21Ht
-efg5JMQdmGUM2ya6QNhaUwvJYIcZ99nAxVvODsECgYEAqz+aj8baYCW7hVZ5eybK
-tplb1rhBo26RISZdJDMKFHH+uJg0jS5knM6+asUM/YLM8nAPlmbEjZrLaQQmoT/m
-kX7oAyPuoVF0zXHi7marUBBZcNTyqN3I00T8cU5uDHkylk1OHRfRweMXDnJNHlnW
-tFIGSSlZe8HFN3na8BSpkYw=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCgiVytxwEfDk71
+pktE9RF/dl6gC1gChTG5ruXW17Pum1hs28h0/aFHBsS0swZPNhYk/NQ31UPYjjiA
+Y9lbvdP1OcOga+fcmU34OezrFgH6eyb842vQHsxUH6EVDU0Yw+Ac/lv0Cw76tGnT
+wN99+YtqEbW0PePZaLn9EyuM9Q4A1Bfv9MoWvQ/jUoKtj1ZvoBELi9DwzCpk/1yg
+pzsOxxfpdp702aAhu4D79FmnQu4F/o9q9LsUtWfxFZnMySFrN9dM7Xsn6CdZFIea
+mQi3Md6/nMI6i9WAIF+Yqu0FQZct1hms3uUSbNGSWeuF5p16Pb0xcj5mOC9oJ+fo
+r7hoF2CbAgMBAAECggEAMI/88jCd/TgF2LeaU1zTEzzKeR2VXQXPufzXWDteGdLy
+V9PQettymxrIDGWPhgy1fDDjPZSM9ohnPSd3TBJLeQYlUHTz6b6SYIGdUqwQoyX3
+8E4Xghie9N+wib7BULmIJR0o0dU6jcpfrQfOU7xWWRrMXZ7POyg8Avt2lChZORR0
+/Kh7m+g8LctP/4iyu+4zY2uMY9g/c5v8umciObwIoo956OcR/78WrNcdvvdYu7So
+0+kx6ElHRWKnbI4Kv8VDZ+t7XYEaESj2Wgr1QPFrLVZT8m7C8DbKKnUvSQyYENhY
+mRqak8VbqjAnt0prvL69CGm/yjgM/BQ0A9BL+V0pMQKBgQDTJkxgawDa8xPx1Obc
+qRA4P9q/rayspxtJHukwUNOo3hlVm9tT7AGoV4ap3c+Cd35VNoGMxujD5tjuTVa2
+BvMK4d+GAROSU3TPfOeNOB+5RoWvu2D7zuZgPX5tqhVVtwCc+JMxpQtn72nMsagv
+WGNsxAl1hZ8aYZjg7caxdRhREwKBgQDCot/EbmM45wFZFwtv93A7U6ClAe4VDtmF
+nSU/U0yX2swWOGAaGNAJykDYXxKNACfr5KW5gzsd+09/4ARlm+xuwgZjDeb9GOcR
+3Hc9sjKYXO7sDtCzMvDnskR0U093y9+higqzdg8S5JO3YJs1rKyXlsJv2wjXZzXC
+MUHLNIcrWQKBgDEP6RdORbiaWrwKeEo1jmtDixSWylSjz5dB83UiksveL4zQ1jm9
+0PTIwaWewKTUFyq9q4SGg3dhoG5e0hMhsj+JFGMSxPVvJuk/YJ5TuCtY059trq9T
+9/vMzh+1MZflGeNfbvROIURZQQArF6VIqHGRa5E/JyT+IIPDPDPnvWq5AoGBAJzP
+3psDGNviedqOT3+xCnIx6U6oJGpA4Y3d0wGXGjGKbT1FxF+iOBJ7Kg1pY6fIRWGv
+gLna+gkozZ9IHCLFIhMGLWEm9UBbDOf+CO/jHxJUZYY4VXrbAu6ZWL+j03XAAvfC
+IOb/qhtdn4lxwvrWmOM06oh2H0R0egJv7wNJ2dFZAoGAYY4pNDUeAB1JU5ABFMWk
+h08UJlAgcs69ANQ0D684kvv9GcSYyRCUh1sDRKJi9K7piMkh23/LjI//k8chNiXc
+ps0OlqnmxOVlOOjLnDEWQMv4q7bXOnaVAI4+2XOHTH98qVmAUaURSTXDhtmnJZAz
+t1wbfasVoJjt/MLoX80dqSM=
-----END 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 a3dff7cd8..236516fd1 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+jCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTIzOTAxWhcN
-MzgwMTAxMTIzOTAxWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABADEa/sb8sDc
-tmjQBgJ5sPgLu14kC4tdzsqnJTkTSPo0mZJsc1ttimG5QF7lDgf+h359ap8El1sA
-Pg4dOmsBxR5CxwAR6foTHLsxz869uZfTLrMLFwrCxz1EaM73ExztBQJSp5svNVNW
-7nltA/QxoBIx70aKErXwBVggZKWClqIMj4LyuqMmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBt35ls/ex
-s+gqF79F7LLmscjOSFtA1n6gFsggJNVtOhf+cILt0OOuVsqjIjfSFTA4o3p1H630
-v3iv5bIgxa/sEWsCQR2YoA6jXctt/VzkQHoSTr8c+lJa+hTgSyuGXYm0n8CYYQoo
-K7TEYA21yAE5aR5yLKOJwXEe29BVw8p45EcbvlDL
+MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTI0MDEzWhcN
+MzgwMTAxMTI0MDEzWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAHFlfkV5ujJ
+2IZi3BPbrJro3l5tSbUK435+/uDT3inABK3dLqXqhm88jZJeghutsbqBRXK7bKRF
+/KPFImDwJoJrNwBo2yc2QaQ0f7GF/4szibwk68IWWXyTAWIxBQYU7aHznUXi4ERD
+Xs6Leo2a6Gm5tQPEZSrqDsLPrme0gLuHbBA/e6MmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIAz0It57ge
+UKe0J1liZexOkw3d84diDBlwkoh4yfSRSKocq0se/hFqpAGk+2ksGecIibKE+8j1
+q79Rg5rIlsQ9QJgCQgEdAYZ2ZsESXmHrjryj+NWfHLRneFU/snODu6itzM/DtiT2
+Fs7QzDEGA4Ld1mw2wdjyYFPtfhy9N96Z8s+G6zW4NA==
-----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 13ca203fb..0740f4194 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-----
-MIICGzCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTIzOTAyWhcN
-MzgwMTAxMTIzOTAyWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTI0MDEzWhcN
+MzgwMTAxMTI0MDEzWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQBTtoPOj6CUL54/jDfKjvAqXxX+YWEWdks79gLOw///3rSCtYmwO/b/Ci7ZDwC
-mKiFjY4x1EBe9vl6dTDnATa5zb8BcI7XabmMKkLz3V4WDenCjxXbC33iegxRSYqO
-1oUDSjnV9oV3y5sOv42hnbA9bAM+mxpeeNpk1VIyLD1gy9kY32OjPjA8MA4GA1Ud
+AAQB55ZsSUntx19atRYnsd1AH08EZSORSLk6NVW9d6TSl4mRMGAQVSE4FnuN4GBW
+ZuxiqtizQCJ/cMaHCqUYtg2klQUAOVe/mnV4OlxsoaK+uDTzxst9sfO2TY+Q9POr
+Vs3IF6jb+k6LQxkcYEftBrpUBMMYZ/+YLu2BHXZ4gSqZ08b9J1GjPjA8MA4GA1Ud
DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GKADCBhgJBYoCsO3dlM2opKA1tNbb3o9Scdyjt
-NIZV30x7kxtfjMqQPQmV6yDTZetm8To5PL6ZQYs4ODCKBxCa8cYqHRRAh9ECQXum
-1F+GXwOtq4hOKEFJ8PIkPx8Xqxe6nDX0NZWa6+SmsWjphTJCc8bAkVomWDm4ehz+
-4Wa52QIWgzdrcw2wfqD5
+Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJBca4Zqtw9OxMwjhWL96RXZYH9c6XU
+Jv65GbUpUrG5bZpdGqTVl/yaQfQZkZE4aGjnINQ9kGZNkSzTbp3TR3Z+0ZUCQgGl
+Utny0JiKf70htpjYMaKfsI8JjTItvldX2k0PK9mTDyqYaa4rQyqumePtPLSFJttR
+w9um7wzOaa1xltQsue7Jdg==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert9.db b/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert9.db
index 785b12cf6..e0e539e6e 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert9.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/key4.db b/test/aux-fixed/exim-ca/example_ec.com/BLANK/key4.db
index 401313538..d65bbc20b 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/key4.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/key4.db
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 a3dff7cd8..236516fd1 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+jCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTIzOTAxWhcN
-MzgwMTAxMTIzOTAxWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABADEa/sb8sDc
-tmjQBgJ5sPgLu14kC4tdzsqnJTkTSPo0mZJsc1ttimG5QF7lDgf+h359ap8El1sA
-Pg4dOmsBxR5CxwAR6foTHLsxz869uZfTLrMLFwrCxz1EaM73ExztBQJSp5svNVNW
-7nltA/QxoBIx70aKErXwBVggZKWClqIMj4LyuqMmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBt35ls/ex
-s+gqF79F7LLmscjOSFtA1n6gFsggJNVtOhf+cILt0OOuVsqjIjfSFTA4o3p1H630
-v3iv5bIgxa/sEWsCQR2YoA6jXctt/VzkQHoSTr8c+lJa+hTgSyuGXYm0n8CYYQoo
-K7TEYA21yAE5aR5yLKOJwXEe29BVw8p45EcbvlDL
+MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTI0MDEzWhcN
+MzgwMTAxMTI0MDEzWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAHFlfkV5ujJ
+2IZi3BPbrJro3l5tSbUK435+/uDT3inABK3dLqXqhm88jZJeghutsbqBRXK7bKRF
+/KPFImDwJoJrNwBo2yc2QaQ0f7GF/4szibwk68IWWXyTAWIxBQYU7aHznUXi4ERD
+Xs6Leo2a6Gm5tQPEZSrqDsLPrme0gLuHbBA/e6MmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIAz0It57ge
+UKe0J1liZexOkw3d84diDBlwkoh4yfSRSKocq0se/hFqpAGk+2ksGecIibKE+8j1
+q79Rg5rIlsQ9QJgCQgEdAYZ2ZsESXmHrjryj+NWfHLRneFU/snODu6itzM/DtiT2
+Fs7QzDEGA4Ld1mw2wdjyYFPtfhy9N96Z8s+G6zW4NA==
-----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 f7c27d210..e31cf5a75 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: 28 97 80 2D 76 7B F2 EC 6D FA A5 08 5F 53 F3 F9 89 7F 86 2C
+ localKeyID: E5 51 F6 5C 01 82 88 77 48 E4 35 A3 95 DF DB 7A 24 DD F1 32
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAmLgcm4cGtLTjHuRG
-GxAk8aoaZTqOWf1++W5Mbt420BwjjXf4AI1JVUXHztebps6r9jEwFaKk4yN2wjdh
-RiODCnOhgYkDgYYABAD+B8nYuLy/HL1BT2atxvBAUYJmKn+16JNFyP92GJkJKtKD
-pwGYQtgttSQtBYwrmN/82KepnJv3pg8munLBka8UNAAjz5MeeTOjIpfj9cvcMPDF
-tStiOrl3ohAMDXiR6heFuAr3BtVvT/gGeBrfZp/Dw6+UWkpkGQ+M526VO+Mo4K0v
-hw==
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIByWk2wys8x6eK4OJj
+U0K6OYS/g4AlAA3IsomLcJqX33uQP/O4QKguJv9PYX16qgv7LXGGNV7KxRfgt7j0
+u/NIH4GhgYkDgYYABADnDDneIeBw6fbfJWQcnAtghnfvH2DTLXvt6CSQEbyTVoCI
+R+xaI3WsZCi8gvOysFuyFnPbBLp6ohpc7725bkRkcwHUzY5Uwx5JywsIjJwehu3u
+AV8cE0M/R5seDndr3PUp9ei0ZgHj6N3T+loD0SSJHrfRbuft2dc3K91lxNguktuR
+Ow==
-----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 5346e46e1..349e1846a 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 212421238..037e84aa7 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-----
MIICETCCAXOgAwIBAgIBQzAKBggqhkjOPQQDAjA5MRcwFQYDVQQKDA5leGFtcGxl
X2VjLmNvbTEeMBwGA1UEAxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMB4XDTE5MTEw
-MTEyMzkwMloXDTM4MDEwMTEyMzkwMlowODEXMBUGA1UECgwOZXhhbXBsZV9lYy5j
+MTEyNDAxNFoXDTM4MDEwMTEyNDAxNFowODEXMBUGA1UECgwOZXhhbXBsZV9lYy5j
b20xHTAbBgNVBAMTFGNsaWNhIE9DU1AgU2lnbmVyIGVjMIGbMBAGByqGSM49AgEG
-BSuBBAAjA4GGAAQA/gfJ2Li8vxy9QU9mrcbwQFGCZip/teiTRcj/dhiZCSrSg6cB
-mELYLbUkLQWMK5jf/NinqZyb96YPJrpywZGvFDQAI8+THnkzoyKX4/XL3DDwxbUr
-Yjq5d6IQDA14keoXhbgK9wbVb0/4Bnga32afw8OvlFpKZBkPjOdulTvjKOCtL4ej
+BSuBBAAjA4GGAAQA5ww53iHgcOn23yVkHJwLYIZ37x9g0y177egkkBG8k1aAiEfs
+WiN1rGQovILzsrBbshZz2wS6eqIaXO+9uW5EZHMB1M2OVMMeScsLCIycHobt7gFf
+HBNDP0ebHg53a9z1KfXotGYB4+jd0/paA9EkiR630W7n7dnXNyvdZcTYLpLbkTuj
KjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAKBggq
-hkjOPQQDAgOBiwAwgYcCQgG/IwHoWVb4vMuJPlt7yoO5unPpCvbM/vwHyNoOIZmI
-AIV04OHlUFcXJ0Kv/ocKEOMoMK7Q3F0/78S/W6heEmdqcgJBaIZoGPcqDnGXLCfx
-Xy+fTpc1D1Txvy0xvld/QMzJnOLzkaozbEj+MGxQYsoWX6poQ4s1dhzQ2zw0VAbj
-AAwRp98=
+hkjOPQQDAgOBiwAwgYcCQgGGpuIqLp7mmeNqXnc+I3P+yN3EXQdn0D0iBVwD31Ka
+GbQaVoErG/wbHVhX7d0HKO67DZFbGepzfh95sDRUVV1mFQJBLCXoEWld4Xks0VR5
+XFPTSg/OM1FYhTjbCIWMRB6x9JBX+vHFHUlb/W4HbEMxAMU0r3KM0dxhBoupJKJS
+9aSelHw=
-----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 13ca203fb..0740f4194 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-----
-MIICGzCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTIzOTAyWhcN
-MzgwMTAxMTIzOTAyWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTI0MDEzWhcN
+MzgwMTAxMTI0MDEzWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQBTtoPOj6CUL54/jDfKjvAqXxX+YWEWdks79gLOw///3rSCtYmwO/b/Ci7ZDwC
-mKiFjY4x1EBe9vl6dTDnATa5zb8BcI7XabmMKkLz3V4WDenCjxXbC33iegxRSYqO
-1oUDSjnV9oV3y5sOv42hnbA9bAM+mxpeeNpk1VIyLD1gy9kY32OjPjA8MA4GA1Ud
+AAQB55ZsSUntx19atRYnsd1AH08EZSORSLk6NVW9d6TSl4mRMGAQVSE4FnuN4GBW
+ZuxiqtizQCJ/cMaHCqUYtg2klQUAOVe/mnV4OlxsoaK+uDTzxst9sfO2TY+Q9POr
+Vs3IF6jb+k6LQxkcYEftBrpUBMMYZ/+YLu2BHXZ4gSqZ08b9J1GjPjA8MA4GA1Ud
DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GKADCBhgJBYoCsO3dlM2opKA1tNbb3o9Scdyjt
-NIZV30x7kxtfjMqQPQmV6yDTZetm8To5PL6ZQYs4ODCKBxCa8cYqHRRAh9ECQXum
-1F+GXwOtq4hOKEFJ8PIkPx8Xqxe6nDX0NZWa6+SmsWjphTJCc8bAkVomWDm4ehz+
-4Wa52QIWgzdrcw2wfqD5
+Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJBca4Zqtw9OxMwjhWL96RXZYH9c6XU
+Jv65GbUpUrG5bZpdGqTVl/yaQfQZkZE4aGjnINQ9kGZNkSzTbp3TR3Z+0ZUCQgGl
+Utny0JiKf70htpjYMaKfsI8JjTItvldX2k0PK9mTDyqYaa4rQyqumePtPLSFJttR
+w9um7wzOaa1xltQsue7Jdg==
-----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 067cc01c8..ca8e1e74f 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
-; Fri Nov 1 12:39:01 2019
-
-[CLICA]
-ocsp_url=http://oscp.example.com/
-sighash=SHA256
-signer=Signing Cert ec
-level=1
-ocsp_signer=OCSP Signer ec
-crl_url=http://crl.example.com/latest.crl
+; Fri Nov 1 12:40:13 2019
[CA]
subject=clica CA
+bits=2048
name=Certificate Authority ec
org=example_ec.com
-bits=2048
+
+[CLICA]
+sighash=SHA256
+crl_url=http://crl.example.com/latest.crl
+signer=Signing Cert ec
+ocsp_signer=OCSP Signer ec
+level=1
+ocsp_url=http://oscp.example.com/
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/cert9.db b/test/aux-fixed/exim-ca/example_ec.com/CA/cert9.db
index a545327c6..b38f757ea 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/cert9.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/key4.db b/test/aux-fixed/exim-ca/example_ec.com/CA/key4.db
index b9c9d453c..20e5077da 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/key4.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/key4.db
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 79012c566..764d2c024 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
@@ -5,7 +5,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 2801.293
+cpu MHz : 3247.978
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -33,7 +33,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 2800.004
+cpu MHz : 3219.870
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -61,7 +61,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 2800.040
+cpu MHz : 3297.002
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -89,7 +89,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 2800.139
+cpu MHz : 3257.630
cache size : 8192 KB
physical id : 0
siblings : 4
@@ -111,80 +111,80 @@ address sizes : 39 bits physical, 48 bits virtual
power management:
CPU0 CPU1 CPU2 CPU3
- 0: 39 0 0 0 IR-IO-APIC 2-edge timer
- 1: 0 0 0 28568 IR-IO-APIC 1-edge i8042
- 8: 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 0 169980 0 0 IR-IO-APIC 9-fasteoi acpi
- 12: 0 0 1882987 0 IR-IO-APIC 12-edge i8042
+ 0: 38 0 0 0 IR-IO-APIC 2-edge timer
+ 1: 0 0 0 1001 IR-IO-APIC 1-edge i8042
+ 8: 1 0 0 0 IR-IO-APIC 8-edge rtc0
+ 9: 0 139129 0 0 IR-IO-APIC 9-fasteoi acpi
+ 12: 0 0 203647 0 IR-IO-APIC 12-edge i8042
16: 0 0 3 0 IR-IO-APIC 16-fasteoi i801_smbus
120: 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 DMAR-MSI 1-edge dmar1
- 126: 0 0 0 1964147 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 127: 0 1368 1116015 0 IR-PCI-MSI 327680-edge xhci_hcd
- 128: 0 556 0 0 IR-PCI-MSI 2097152-edge rtsx_pci
- 129: 0 0 17 5611255 IR-PCI-MSI 520192-edge enp0s31f6
- 130: 31 0 0 5 IR-PCI-MSI 1048576-edge nvkm
- 131: 626 0 13681759 0 IR-PCI-MSI 32768-edge i915
- 132: 0 63 0 0 IR-PCI-MSI 360448-edge mei_me
- 133: 0 0 0 46 IR-PCI-MSI 1572864-edge iwlwifi
- 134: 1333 0 0 0 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- NMI: 852 841 852 825 Non-maskable interrupts
- LOC: 30596280 29809486 30193297 28627049 Local timer interrupts
+ 126: 0 0 0 703592 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 127: 0 5232 633002 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 128: 0 506 0 0 IR-PCI-MSI 2097152-edge rtsx_pci
+ 129: 0 0 15 1152253 IR-PCI-MSI 520192-edge enp0s31f6
+ 130: 13 0 0 5 IR-PCI-MSI 1048576-edge nvkm
+ 131: 629 0 9212958 0 IR-PCI-MSI 32768-edge i915
+ 132: 0 65 0 0 IR-PCI-MSI 360448-edge mei_me
+ 133: 0 0 0 49 IR-PCI-MSI 1572864-edge iwlwifi
+ 134: 1177 0 0 0 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ NMI: 424 425 432 418 Non-maskable interrupts
+ LOC: 24598937 23717971 23109726 22494636 Local timer interrupts
SPU: 0 0 0 0 Spurious interrupts
- PMI: 852 841 852 825 Performance monitoring interrupts
- IWI: 305001 284107 5538326 310156 IRQ work interrupts
+ PMI: 424 425 432 418 Performance monitoring interrupts
+ IWI: 189009 176188 4015457 194495 IRQ work interrupts
RTR: 6 0 0 0 APIC ICR read retries
- RES: 5411760 5256548 5121036 5309127 Rescheduling interrupts
- CAL: 5095709 4864789 4783243 4801450 Function call interrupts
- TLB: 3285771 3215624 3242410 3283556 TLB shootdowns
+ RES: 3033153 3055181 3073781 3068125 Rescheduling interrupts
+ CAL: 2007718 1887098 1843366 1823517 Function call interrupts
+ TLB: 834931 821547 882594 886405 TLB shootdowns
TRM: 0 0 0 0 Thermal event interrupts
THR: 0 0 0 0 Threshold APIC interrupts
DFR: 0 0 0 0 Deferred Error APIC interrupts
MCE: 0 0 0 0 Machine check exceptions
- MCP: 154 155 155 155 Machine check polls
+ MCP: 126 127 127 127 Machine check polls
ERR: 0
MIS: 0
PIN: 0 0 0 0 Posted-interrupt notification event
NPI: 0 0 0 0 Nested posted-interrupt event
PIW: 0 0 0 0 Posted-interrupt wakeup event
-MemTotal: 16240472 kB
-MemFree: 5764424 kB
-MemAvailable: 11599400 kB
-Buffers: 1121024 kB
-Cached: 5417236 kB
-SwapCached: 196 kB
-Active: 4165748 kB
-Inactive: 5218356 kB
-Active(anon): 324236 kB
-Inactive(anon): 3375760 kB
-Active(file): 3841512 kB
-Inactive(file): 1842596 kB
-Unevictable: 180276 kB
-Mlocked: 80 kB
+MemTotal: 16241860 kB
+MemFree: 5393212 kB
+MemAvailable: 11215144 kB
+Buffers: 644888 kB
+Cached: 6128956 kB
+SwapCached: 88 kB
+Active: 3326596 kB
+Inactive: 6439360 kB
+Active(anon): 234820 kB
+Inactive(anon): 3722180 kB
+Active(file): 3091776 kB
+Inactive(file): 2717180 kB
+Unevictable: 343224 kB
+Mlocked: 184 kB
SwapTotal: 16601080 kB
-SwapFree: 16598008 kB
+SwapFree: 16599032 kB
Zswap: 0 kB
Zswapped: 0 kB
-Dirty: 688 kB
+Dirty: 588 kB
Writeback: 0 kB
-AnonPages: 3026156 kB
-Mapped: 803132 kB
-Shmem: 854148 kB
-KReclaimable: 488452 kB
-Slab: 677268 kB
-SReclaimable: 488452 kB
-SUnreclaim: 188816 kB
-KernelStack: 19728 kB
-PageTables: 46964 kB
+AnonPages: 3335288 kB
+Mapped: 875004 kB
+Shmem: 964876 kB
+KReclaimable: 350568 kB
+Slab: 508532 kB
+SReclaimable: 350568 kB
+SUnreclaim: 157964 kB
+KernelStack: 19800 kB
+PageTables: 47172 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 24721316 kB
-Committed_AS: 10893068 kB
+CommitLimit: 24722008 kB
+Committed_AS: 11211996 kB
VmallocTotal: 34359738367 kB
-VmallocUsed: 85828 kB
+VmallocUsed: 82888 kB
VmallocChunk: 0 kB
-Percpu: 7712 kB
+Percpu: 7616 kB
HardwareCorrupted: 0 kB
AnonHugePages: 0 kB
ShmemHugePages: 0 kB
@@ -199,13 +199,13 @@ HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
Hugetlb: 0 kB
-DirectMap4k: 316904 kB
-DirectMap2M: 13176832 kB
-DirectMap1G: 4194304 kB
+DirectMap4k: 380392 kB
+DirectMap2M: 11016192 kB
+DirectMap1G: 6291456 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
- lo: 203398319 414266 0 0 0 0 0 0 203398319 414266 0 0 0 0 0 0
-enp0s31f6: 5122054605 4199231 4 121766 0 2 0 0 1451864214 3008089 0 0 0 0 0 0
+ lo: 307129 2471 0 0 0 0 0 0 307129 2471 0 0 0 0 0 0
+enp0s31f6: 672645613 686128 0 0 0 0 0 0 60881926 523382 0 0 0 0 0 0
wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
virbr0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-virbr2: 177806558086 17365569 0 0 0 0 0 57 943922498 11257216 0 0 0 0 0 0
+virbr2: 131939979990 12949352 0 0 0 0 0 82 724135061 8643862 0 0 0 0 0 0
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 682643d10..0efd8b8b6 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-----
-MIICGzCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTIzOTAyWhcN
-MzgwMTAxMTIzOTAyWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTI0MDEzWhcN
+MzgwMTAxMTI0MDEzWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQBTtoPOj6CUL54/jDfKjvAqXxX+YWEWdks79gLOw///3rSCtYmwO/b/Ci7ZDwC
-mKiFjY4x1EBe9vl6dTDnATa5zb8BcI7XabmMKkLz3V4WDenCjxXbC33iegxRSYqO
-1oUDSjnV9oV3y5sOv42hnbA9bAM+mxpeeNpk1VIyLD1gy9kY32OjPjA8MA4GA1Ud
+AAQB55ZsSUntx19atRYnsd1AH08EZSORSLk6NVW9d6TSl4mRMGAQVSE4FnuN4GBW
+ZuxiqtizQCJ/cMaHCqUYtg2klQUAOVe/mnV4OlxsoaK+uDTzxst9sfO2TY+Q9POr
+Vs3IF6jb+k6LQxkcYEftBrpUBMMYZ/+YLu2BHXZ4gSqZ08b9J1GjPjA8MA4GA1Ud
DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GKADCBhgJBYoCsO3dlM2opKA1tNbb3o9Scdyjt
-NIZV30x7kxtfjMqQPQmV6yDTZetm8To5PL6ZQYs4ODCKBxCa8cYqHRRAh9ECQXum
-1F+GXwOtq4hOKEFJ8PIkPx8Xqxe6nDX0NZWa6+SmsWjphTJCc8bAkVomWDm4ehz+
-4Wa52QIWgzdrcw2wfqD5
+Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJBca4Zqtw9OxMwjhWL96RXZYH9c6XU
+Jv65GbUpUrG5bZpdGqTVl/yaQfQZkZE4aGjnINQ9kGZNkSzTbp3TR3Z+0ZUCQgGl
+Utny0JiKf70htpjYMaKfsI8JjTItvldX2k0PK9mTDyqYaa4rQyqumePtPLSFJttR
+w9um7wzOaa1xltQsue7Jdg==
-----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+jCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTIzOTAxWhcN
-MzgwMTAxMTIzOTAxWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABADEa/sb8sDc
-tmjQBgJ5sPgLu14kC4tdzsqnJTkTSPo0mZJsc1ttimG5QF7lDgf+h359ap8El1sA
-Pg4dOmsBxR5CxwAR6foTHLsxz869uZfTLrMLFwrCxz1EaM73ExztBQJSp5svNVNW
-7nltA/QxoBIx70aKErXwBVggZKWClqIMj4LyuqMmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBt35ls/ex
-s+gqF79F7LLmscjOSFtA1n6gFsggJNVtOhf+cILt0OOuVsqjIjfSFTA4o3p1H630
-v3iv5bIgxa/sEWsCQR2YoA6jXctt/VzkQHoSTr8c+lJa+hTgSyuGXYm0n8CYYQoo
-K7TEYA21yAE5aR5yLKOJwXEe29BVw8p45EcbvlDL
+MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTI0MDEzWhcN
+MzgwMTAxMTI0MDEzWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAHFlfkV5ujJ
+2IZi3BPbrJro3l5tSbUK435+/uDT3inABK3dLqXqhm88jZJeghutsbqBRXK7bKRF
+/KPFImDwJoJrNwBo2yc2QaQ0f7GF/4szibwk68IWWXyTAWIxBQYU7aHznUXi4ERD
+Xs6Leo2a6Gm5tQPEZSrqDsLPrme0gLuHbBA/e6MmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIAz0It57ge
+UKe0J1liZexOkw3d84diDBlwkoh4yfSRSKocq0se/hFqpAGk+2ksGecIibKE+8j1
+q79Rg5rIlsQ9QJgCQgEdAYZ2ZsESXmHrjryj+NWfHLRneFU/snODu6itzM/DtiT2
+Fs7QzDEGA4Ld1mw2wdjyYFPtfhy9N96Z8s+G6zW4NA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert9.db b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert9.db
index 802c5dbb8..2a5b8e7b9 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert9.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert9.db
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 6296bf859..b32cd8c4b 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: E1 0C 7A 3A D1 3A 64 53 18 94 5B E0 0D 01 6B 2B 03 3E AD 68
+ localKeyID: 7A D7 2E 59 67 F4 AA AD 1E EA 72 43 0C A6 FD A1 D4 0A 97 18
subject=CN = server1.example_ec.com
issuer=O = example_ec.com, CN = clica Signing Cert ec
-----BEGIN CERTIFICATE-----
-MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
+MIIDADCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xOTEx
-MDExMjM5MDNaFw00NDEyMDExMjM5MDNaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGr0YuyDfHxwxQF
-JymOOP50Q7HnbFkTMiVUJEgJQAlfGB7ZB+lRWEjweE5dRklwaJLlhGGRnarw41Rh
-fHBbjkAUDwGj8VgBlugQcUXyY23k/k9lOoE7xv6OEvyGg/XBH9j4XtxfHO9DgMJX
-F2lJjCCTXkFlroOombh24O6Ti98LXnv58KOCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjQwMTRaFw00NDEyMDExMjQwMTRaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAAp2Fn0tqJFjrhh
+KXx2ekF8vmkzPv/a9BCxp0ebRr08/Ut1MIrXo3CuNwhCIgmMi6F5MvI07g/E/Ese
+PhTOQVi//QAmnmP1o/8A4mw8UqzckahkPK0x4UsrssbhOgLbmME9xnohOw9LmkYG
+1/fGv33lKTWjmS2vxPXlbf3PcRt6LqTfR6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4ITc2VydmVyMS5leGFtcGxlLmNvbYIWc2VydmVyMS5leGFtcGxl
-X2VjLmNvbYIJKi50ZXN0LmV4giJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1w
-bGUuY29tgiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkIApp+qEIvmILoixle50P8mDu8sYGA68hr2BXFZuhweiLw0
-fEs9Q3VxvMchPIbjP+ht/RyKP6xYLk5Duu94jiwasKQCQTljGooqxXwstLw/g2bp
-jLTSB0QTzIc/q7K0C097spPKz4ld1D5KkxG/ge9r77KwzvH5KE2UNrnLLHHFepBd
-+pae
+BgNVHREEgYEwf4ITc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIu
+c2VydmVyMS5leGFtcGxlLmNvbYIhYWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1w
+bGUuY29tggkqLnRlc3QuZXiCFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
+zj0EAwIDgYwAMIGIAkIBjI2ulgwPDAidA3Oj959em9k1Y49IZIB7Wro1cn6cFTev
+9W+AWol+cQ7L3/7P9LL/4TNtXdf90UhGyMUFS4nXNfUCQgGAQn5ZL0Ohoer9J30T
+hBnaMPsi3QYTC3TsAeWYsPKPHAZnR0VvBSmGAs0CcOn1qE1UGHcdWI4ckO119u3t
+y9ng+w==
-----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-----
-MIICGzCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTIzOTAyWhcN
-MzgwMTAxMTIzOTAyWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTI0MDEzWhcN
+MzgwMTAxMTI0MDEzWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQBTtoPOj6CUL54/jDfKjvAqXxX+YWEWdks79gLOw///3rSCtYmwO/b/Ci7ZDwC
-mKiFjY4x1EBe9vl6dTDnATa5zb8BcI7XabmMKkLz3V4WDenCjxXbC33iegxRSYqO
-1oUDSjnV9oV3y5sOv42hnbA9bAM+mxpeeNpk1VIyLD1gy9kY32OjPjA8MA4GA1Ud
+AAQB55ZsSUntx19atRYnsd1AH08EZSORSLk6NVW9d6TSl4mRMGAQVSE4FnuN4GBW
+ZuxiqtizQCJ/cMaHCqUYtg2klQUAOVe/mnV4OlxsoaK+uDTzxst9sfO2TY+Q9POr
+Vs3IF6jb+k6LQxkcYEftBrpUBMMYZ/+YLu2BHXZ4gSqZ08b9J1GjPjA8MA4GA1Ud
DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GKADCBhgJBYoCsO3dlM2opKA1tNbb3o9Scdyjt
-NIZV30x7kxtfjMqQPQmV6yDTZetm8To5PL6ZQYs4ODCKBxCa8cYqHRRAh9ECQXum
-1F+GXwOtq4hOKEFJ8PIkPx8Xqxe6nDX0NZWa6+SmsWjphTJCc8bAkVomWDm4ehz+
-4Wa52QIWgzdrcw2wfqD5
+Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJBca4Zqtw9OxMwjhWL96RXZYH9c6XU
+Jv65GbUpUrG5bZpdGqTVl/yaQfQZkZE4aGjnINQ9kGZNkSzTbp3TR3Z+0ZUCQgGl
+Utny0JiKf70htpjYMaKfsI8JjTItvldX2k0PK9mTDyqYaa4rQyqumePtPLSFJttR
+w9um7wzOaa1xltQsue7Jdg==
-----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+jCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTIzOTAxWhcN
-MzgwMTAxMTIzOTAxWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABADEa/sb8sDc
-tmjQBgJ5sPgLu14kC4tdzsqnJTkTSPo0mZJsc1ttimG5QF7lDgf+h359ap8El1sA
-Pg4dOmsBxR5CxwAR6foTHLsxz869uZfTLrMLFwrCxz1EaM73ExztBQJSp5svNVNW
-7nltA/QxoBIx70aKErXwBVggZKWClqIMj4LyuqMmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBt35ls/ex
-s+gqF79F7LLmscjOSFtA1n6gFsggJNVtOhf+cILt0OOuVsqjIjfSFTA4o3p1H630
-v3iv5bIgxa/sEWsCQR2YoA6jXctt/VzkQHoSTr8c+lJa+hTgSyuGXYm0n8CYYQoo
-K7TEYA21yAE5aR5yLKOJwXEe29BVw8p45EcbvlDL
+MIIB+zCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTI0MDEzWhcN
+MzgwMTAxMTI0MDEzWjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAHFlfkV5ujJ
+2IZi3BPbrJro3l5tSbUK435+/uDT3inABK3dLqXqhm88jZJeghutsbqBRXK7bKRF
+/KPFImDwJoJrNwBo2yc2QaQ0f7GF/4szibwk68IWWXyTAWIxBQYU7aHznUXi4ERD
+Xs6Leo2a6Gm5tQPEZSrqDsLPrme0gLuHbBA/e6MmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYwAMIGIAkIAz0It57ge
+UKe0J1liZexOkw3d84diDBlwkoh4yfSRSKocq0se/hFqpAGk+2ksGecIibKE+8j1
+q79Rg5rIlsQ9QJgCQgEdAYZ2ZsESXmHrjryj+NWfHLRneFU/snODu6itzM/DtiT2
+Fs7QzDEGA4Ld1mw2wdjyYFPtfhy9N96Z8s+G6zW4NA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key4.db b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key4.db
index b334630f0..b20f1001e 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key4.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key4.db
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 cfb592a0f..525609e35 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: E1 0C 7A 3A D1 3A 64 53 18 94 5B E0 0D 01 6B 2B 03 3E AD 68
+ localKeyID: 7A D7 2E 59 67 F4 AA AD 1E EA 72 43 0C A6 FD A1 D4 0A 97 18
subject=CN = server1.example_ec.com
issuer=O = example_ec.com, CN = clica Signing Cert ec
-----BEGIN CERTIFICATE-----
-MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
+MIIDADCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xOTEx
-MDExMjM5MDNaFw00NDEyMDExMjM5MDNaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGr0YuyDfHxwxQF
-JymOOP50Q7HnbFkTMiVUJEgJQAlfGB7ZB+lRWEjweE5dRklwaJLlhGGRnarw41Rh
-fHBbjkAUDwGj8VgBlugQcUXyY23k/k9lOoE7xv6OEvyGg/XBH9j4XtxfHO9DgMJX
-F2lJjCCTXkFlroOombh24O6Ti98LXnv58KOCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjQwMTRaFw00NDEyMDExMjQwMTRaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAAp2Fn0tqJFjrhh
+KXx2ekF8vmkzPv/a9BCxp0ebRr08/Ut1MIrXo3CuNwhCIgmMi6F5MvI07g/E/Ese
+PhTOQVi//QAmnmP1o/8A4mw8UqzckahkPK0x4UsrssbhOgLbmME9xnohOw9LmkYG
+1/fGv33lKTWjmS2vxPXlbf3PcRt6LqTfR6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4ITc2VydmVyMS5leGFtcGxlLmNvbYIWc2VydmVyMS5leGFtcGxl
-X2VjLmNvbYIJKi50ZXN0LmV4giJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1w
-bGUuY29tgiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkIApp+qEIvmILoixle50P8mDu8sYGA68hr2BXFZuhweiLw0
-fEs9Q3VxvMchPIbjP+ht/RyKP6xYLk5Duu94jiwasKQCQTljGooqxXwstLw/g2bp
-jLTSB0QTzIc/q7K0C097spPKz4ld1D5KkxG/ge9r77KwzvH5KE2UNrnLLHHFepBd
-+pae
+BgNVHREEgYEwf4ITc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIu
+c2VydmVyMS5leGFtcGxlLmNvbYIhYWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1w
+bGUuY29tggkqLnRlc3QuZXiCFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
+zj0EAwIDgYwAMIGIAkIBjI2ulgwPDAidA3Oj959em9k1Y49IZIB7Wro1cn6cFTev
+9W+AWol+cQ7L3/7P9LL/4TNtXdf90UhGyMUFS4nXNfUCQgGAQn5ZL0Ohoer9J30T
+hBnaMPsi3QYTC3TsAeWYsPKPHAZnR0VvBSmGAs0CcOn1qE1UGHcdWI4ckO119u3t
+y9ng+w==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICGzCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTIzOTAyWhcN
-MzgwMTAxMTIzOTAyWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTkxMTAxMTI0MDEzWhcN
+MzgwMTAxMTI0MDEzWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQBTtoPOj6CUL54/jDfKjvAqXxX+YWEWdks79gLOw///3rSCtYmwO/b/Ci7ZDwC
-mKiFjY4x1EBe9vl6dTDnATa5zb8BcI7XabmMKkLz3V4WDenCjxXbC33iegxRSYqO
-1oUDSjnV9oV3y5sOv42hnbA9bAM+mxpeeNpk1VIyLD1gy9kY32OjPjA8MA4GA1Ud
+AAQB55ZsSUntx19atRYnsd1AH08EZSORSLk6NVW9d6TSl4mRMGAQVSE4FnuN4GBW
+ZuxiqtizQCJ/cMaHCqUYtg2klQUAOVe/mnV4OlxsoaK+uDTzxst9sfO2TY+Q9POr
+Vs3IF6jb+k6LQxkcYEftBrpUBMMYZ/+YLu2BHXZ4gSqZ08b9J1GjPjA8MA4GA1Ud
DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GKADCBhgJBYoCsO3dlM2opKA1tNbb3o9Scdyjt
-NIZV30x7kxtfjMqQPQmV6yDTZetm8To5PL6ZQYs4ODCKBxCa8cYqHRRAh9ECQXum
-1F+GXwOtq4hOKEFJ8PIkPx8Xqxe6nDX0NZWa6+SmsWjphTJCc8bAkVomWDm4ehz+
-4Wa52QIWgzdrcw2wfqD5
+Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJBca4Zqtw9OxMwjhWL96RXZYH9c6XU
+Jv65GbUpUrG5bZpdGqTVl/yaQfQZkZE4aGjnINQ9kGZNkSzTbp3TR3Z+0ZUCQgGl
+Utny0JiKf70htpjYMaKfsI8JjTItvldX2k0PK9mTDyqYaa4rQyqumePtPLSFJttR
+w9um7wzOaa1xltQsue7Jdg==
-----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 387d78dfd..052258803 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,14 +1,14 @@
Bag Attributes
friendlyName: server1.example_ec.com
- localKeyID: E1 0C 7A 3A D1 3A 64 53 18 94 5B E0 0D 01 6B 2B 03 3E AD 68
+ localKeyID: 7A D7 2E 59 67 F4 AA AD 1E EA 72 43 0C A6 FD A1 D4 0A 97 18
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBXTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIYEhrKHra/nUCAggA
-MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDRgNRiG46AkZlSFmjnDOOhBIIB
-AARQURyl3nWlyWGe+ENUS+gYvr3i4n3GKH+s4W9OyKqhOUIIV/AtShTMZgKFIcE7
-dtM4d/MoYo19WNHumInnPaBttl71dD3Wvu9Mh4W8KMmeHxuY/kcfObx1AdpkbU/m
-3tdlGKaYO8k6593rhz3SG1pJX0IknLESZUbUnfIJLFd7/hfLyU2gU1kCYEawPJCK
-hVUzsrrmhjP0+UV3yhlotZIBljHbwyG611Cto4stJy7zjMjkty/RcvrbeZbc0liw
-969t3qE7Q4pfv2A3d88WAsDBr/Y57Vh7DhazTCwpa4rwRANtuQr7FDY5lzHD/zml
-sih5siooXSdewO/UD6YMZtk=
+MIIBXTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIOsvjj8RdWTwCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBAeElJ0L6MNkSHAiFjknlKrBIIB
+AM7KS7G77PbGFPWJd8UZId0djwjh9OzcSS4D4B9NwbkpqZYbC0oKMXhDo9hj9hft
+91sR+PPRI5kla34rL+HeAgpyQZffpbNTaSUrEh+bvEKMpbyyyvcf7Elhx2boFabw
+udXVJI7rFD7nQohUC9m9XBSauRLG36uJRV0f3ept9Q2aeQOGwDs6SrKGoTOjOTMM
+87/vQTQcuW96MaROZbc1MA5OWDYT7ZykKkqyZAv5i+IZ9ur/9bwh6a6w0saVlzK2
+A1RtaEAxeSoD874q864FLdoCW7MxtjQkrEpi40u08fgJLA7gafrteJE3m97fvB05
+2iQpPQyuDhykSIVXoJmGM3A=
-----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 1d8121db4..4b9e326d0 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 f2265c047..4ee80dd08 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 4e2988189..baff6e816 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 0819f14cd..0f314bbe3 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: E1 0C 7A 3A D1 3A 64 53 18 94 5B E0 0D 01 6B 2B 03 3E AD 68
+ localKeyID: 7A D7 2E 59 67 F4 AA AD 1E EA 72 43 0C A6 FD A1 D4 0A 97 18
subject=CN = server1.example_ec.com
issuer=O = example_ec.com, CN = clica Signing Cert ec
-----BEGIN CERTIFICATE-----
-MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
+MIIDADCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xOTEx
-MDExMjM5MDNaFw00NDEyMDExMjM5MDNaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAGr0YuyDfHxwxQF
-JymOOP50Q7HnbFkTMiVUJEgJQAlfGB7ZB+lRWEjweE5dRklwaJLlhGGRnarw41Rh
-fHBbjkAUDwGj8VgBlugQcUXyY23k/k9lOoE7xv6OEvyGg/XBH9j4XtxfHO9DgMJX
-F2lJjCCTXkFlroOombh24O6Ti98LXnv58KOCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjQwMTRaFw00NDEyMDExMjQwMTRaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAAp2Fn0tqJFjrhh
+KXx2ekF8vmkzPv/a9BCxp0ebRr08/Ut1MIrXo3CuNwhCIgmMi6F5MvI07g/E/Ese
+PhTOQVi//QAmnmP1o/8A4mw8UqzckahkPK0x4UsrssbhOgLbmME9xnohOw9LmkYG
+1/fGv33lKTWjmS2vxPXlbf3PcRt6LqTfR6OCASwwggEoMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4ITc2VydmVyMS5leGFtcGxlLmNvbYIWc2VydmVyMS5leGFtcGxl
-X2VjLmNvbYIJKi50ZXN0LmV4giJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1w
-bGUuY29tgiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkIApp+qEIvmILoixle50P8mDu8sYGA68hr2BXFZuhweiLw0
-fEs9Q3VxvMchPIbjP+ht/RyKP6xYLk5Duu94jiwasKQCQTljGooqxXwstLw/g2bp
-jLTSB0QTzIc/q7K0C097spPKz4ld1D5KkxG/ge9r77KwzvH5KE2UNrnLLHHFepBd
-+pae
+BgNVHREEgYEwf4ITc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIu
+c2VydmVyMS5leGFtcGxlLmNvbYIhYWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1w
+bGUuY29tggkqLnRlc3QuZXiCFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
+zj0EAwIDgYwAMIGIAkIBjI2ulgwPDAidA3Oj959em9k1Y49IZIB7Wro1cn6cFTev
+9W+AWol+cQ7L3/7P9LL/4TNtXdf90UhGyMUFS4nXNfUCQgGAQn5ZL0Ohoer9J30T
+hBnaMPsi3QYTC3TsAeWYsPKPHAZnR0VvBSmGAs0CcOn1qE1UGHcdWI4ckO119u3t
+y9ng+w==
-----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 63c3957ce..1e8c89b0b 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-----
-MIHcAgEBBEIBSm06UNf+RfxUUOYfazGSrVEiUaJ2mRuIECfJhk+bYWoDec90oQ4f
-Osl7QXkKMRwqrsT991+xqNnwEU3eO7027kOgBwYFK4EEACOhgYkDgYYABAGr0Yuy
-DfHxwxQFJymOOP50Q7HnbFkTMiVUJEgJQAlfGB7ZB+lRWEjweE5dRklwaJLlhGGR
-narw41RhfHBbjkAUDwGj8VgBlugQcUXyY23k/k9lOoE7xv6OEvyGg/XBH9j4Xtxf
-HO9DgMJXF2lJjCCTXkFlroOombh24O6Ti98LXnv58A==
+MIHcAgEBBEIA0CTxQx1KIq6O6lpTDBQkI/EhxzsnPnOpUgtGOG2bYtkxmqL32zjJ
+PIol/y6cYO7OiCAlGbtC8HgwREzOJI8TSsKgBwYFK4EEACOhgYkDgYYABAAp2Fn0
+tqJFjrhhKXx2ekF8vmkzPv/a9BCxp0ebRr08/Ut1MIrXo3CuNwhCIgmMi6F5MvI0
+7g/E/EsePhTOQVi//QAmnmP1o/8A4mw8UqzckahkPK0x4UsrssbhOgLbmME9xnoh
+Ow9LmkYG1/fGv33lKTWjmS2vxPXlbf3PcRt6LqTfRw==
-----END EC PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/genall b/test/aux-fixed/exim-ca/genall
index abcaf6f95..1b4e7e277 100755
--- a/test/aux-fixed/exim-ca/genall
+++ b/test/aux-fixed/exim-ca/genall
@@ -130,12 +130,13 @@ EOF
for server in server1 revoked1 expired1 server2 revoked2 expired2
do
SPFX=$idir/$server.$iname/$server.$iname
- openssl ocsp -issuer $CADIR/Signer.pem -sha256 -cert $SPFX.pem -no_nonce -reqout $SPFX.ocsp.req
+ openssl ocsp -issuer $CADIR/Signer.pem -cert $SPFX.pem -no_nonce -reqout $SPFX.ocsp.req
REQIN="-reqin $SPFX.ocsp.req"
# These ones get used by the "traditional" testcases. OCSP resp signed by a cert which is
# signed by the signer of the leaf-cert being attested to.
- OGENCOMMON="-rsigner $CADIR/OCSP.pem -rkey $CADIR/OCSP.key -CA $CADIR/Signer.pem -noverify"
+ OGENCOMMON="-rsigner $CADIR/OCSP.pem -rkey $CADIR/OCSP.key -CA $CADIR/Signer.pem -rother $CADIR/OCSP.pem -noverify"
+
openssl ocsp $IVALID $OGENCOMMON -ndays 3652 $REQIN -respout $SPFX.ocsp.good.resp
openssl ocsp $IVALID $OGENCOMMON -ndays 30 $REQIN -respout $SPFX.ocsp.dated.resp
openssl ocsp $IREVOKED $OGENCOMMON -ndays 3652 $REQIN -respout $SPFX.ocsp.revoked.resp
diff --git a/test/dnszones-src/db.example.com b/test/dnszones-src/db.example.com
index d48df86d6..749df4f21 100644
--- a/test/dnszones-src/db.example.com
+++ b/test/dnszones-src/db.example.com
@@ -53,7 +53,7 @@ alternatename.server1 CNAME server1
;
;
DNSSEC danebroken7 A 127.0.0.1
-DNSSEC _1225._tcp.danebroken7 TLSA 2 0 1 ee3cf2db99af62ae64e1fceb104ab9a7a0323f2e53febd8c9ca7f0fd3135c8ca
+DNSSEC _1225._tcp.danebroken7 TLSA 2 0 1 68932e8eed228ff72a53c832aed4db07cecb099fe8bdf48952237f20724a1ab4
; the same, EE-mode
;
@@ -62,6 +62,6 @@ DNSSEC _1225._tcp.danebroken7 TLSA 2 0 1 ee3cf2db99af62ae64e1fceb104ab9a7a0323f2
; | openssl pkey -pubin -outform DER | openssl dgst -sha256 | awk '{print $2}'
;
DNSSEC danebroken8 A 127.0.0.1
-DNSSEC _1225._tcp.danebroken8 TLSA 3 1 1 b3ecd8caa41549f7895c01b28172623aa7c2a35191c12aca82f8b8669de12528
+DNSSEC _1225._tcp.danebroken8 TLSA 3 1 1 61e0bb2042c975bc018a47b5961ac1ce8e84f162f2147e97f56736177bb8fc8e
; End
diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex
index 25e98ea85..09907f729 100644
--- a/test/dnszones-src/db.test.ex
+++ b/test/dnszones-src/db.test.ex
@@ -448,7 +448,7 @@ mxnondane512ee MX 1 dane512ee
DNSSEC dane512ee A HOSTIPV4
DNSSEC nodane A HOSTIPV4
-DNSSEC _1225._tcp.dane512ee TLSA 3 1 2 fba36695c09a0a75b046eb97dd1df248935e15b864a6cfcbd8b2f85bc5275d77ad57525873f98da55e2bf931ff9ee92af0e5c026c16177f8c4cb541e20ab55b5
+DNSSEC _1225._tcp.dane512ee TLSA 3 1 2 e76baa2132a3a7b0ac755835748c9eee9a2335621157e87218926c15c28a3ecac31d29340879e4599f2c5d666f64ecf20fa42b39e917239eb3ac653dfb45be2e
# mx of mxdane owns a secure A and TLSA record
# used in 5802
@@ -472,7 +472,7 @@ daneinsecchain CNAME dane512ee
; | awk '{print $2}'
;
DNSSEC dane256ee A HOSTIPV4
-DNSSEC _1225._tcp.dane256ee TLSA 3 1 1 4629462b420b9de88b75370004fbc274cc7742077edb65c9be95d53f2c6fd15f
+DNSSEC _1225._tcp.dane256ee TLSA 3 1 1 513e1b8805dd64d99510a09da0ed21eab2c60b4e0c8e848571e3de09401fcab9
; full MX, sha256, TA-mode
;
@@ -482,7 +482,7 @@ DNSSEC _1225._tcp.dane256ee TLSA 3 1 1 4629462b420b9de88b75370004fbc274cc7742077
;
DNSSEC mxdane256ta MX 1 dane256ta
DNSSEC dane256ta A HOSTIPV4
-DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 de0905e04d3bfee78802a2e8469374f2c522847d1a53fbdd2a4203e3e0b26073
+DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 3d107e4462e4812ac94467063cc658eea8aeabaf69f022babae5c8343cf92743
; full MX, sha256, TA-mode, cert-key-only
@@ -500,7 +500,7 @@ DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 de0905e04d3bfee78802a2e8469374f2c522847d1
;
DNSSEC mxdane256tak MX 1 dane256tak
DNSSEC dane256tak A HOSTIPV4
-DNSSEC _1225._tcp.dane256tak TLSA 2 1 1 7f471513e93887748b565b392e8b38c78379a30eb9e1c6b5f587b84168ad3bb7
+DNSSEC _1225._tcp.dane256tak TLSA 2 1 1 7971d74e280ba3a0f60fb3fc303c890ca653a44b2cf4d3b461b7a42959f90d56
@@ -537,14 +537,9 @@ DNSSEC _1225._tcp.danebroken2 TLSA 2 0 1 cb0fa6000000000000000000000000000000000
; | awk '{print $2}'
; 3 for dane-requested, 4 for dane-required
DNSSEC danebroken3 A 127.0.0.1
-_1225._tcp.danebroken3 TLSA 2 0 1 7f471513e93887748b565b392e8b38c78379a30eb9e1c6b5f587b84168ad3bb7
-; TLSA_AUTOGEN
-; openssl x509 -in aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem -noout -pubkey \
-; | openssl pkey -pubin -outform DER \
-; | openssl dgst -sha256 \
-; | awk '{print $2}'
+_1225._tcp.danebroken3 TLSA 2 0 1 349b136f84d8a95023e1e793eb0538002f8ce8d90472bf80a786400369528136
DNSSEC danebroken4 A HOSTIPV4
-_1225._tcp.danebroken4 TLSA 2 0 1 7f471513e93887748b565b392e8b38c78379a30eb9e1c6b5f587b84168ad3bb7
+_1225._tcp.danebroken4 TLSA 2 0 1 349b136f84d8a95023e1e793eb0538002f8ce8d90472bf80a786400369528136
; a broken dane config (or under attack) where the address record is correct but not DNSSEC-assured
; (TLSA record copied from dane256ee above)
@@ -555,14 +550,9 @@ _1225._tcp.danebroken4 TLSA 2 0 1 7f471513e93887748b565b392e8b38c78379a30eb9e1c6
; | openssl dgst -sha256 \
; | awk '{print $2}'
danebroken5 A 127.0.0.1
-DNSSEC _1225._tcp.danebroken5 TLSA 2 0 1 7f471513e93887748b565b392e8b38c78379a30eb9e1c6b5f587b84168ad3bb7
-; TLSA_AUTOGEN
-; openssl x509 -in aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem -noout -pubkey \
-; | openssl pkey -pubin -outform DER \
-; | openssl dgst -sha256 \
-; | awk '{print $2}'
+DNSSEC _1225._tcp.danebroken5 TLSA 2 0 1 349b136f84d8a95023e1e793eb0538002f8ce8d90472bf80a786400369528136
danebroken6 A HOSTIPV4
-DNSSEC _1225._tcp.danebroken6 TLSA 2 0 1 7f471513e93887748b565b392e8b38c78379a30eb9e1c6b5f587b84168ad3bb7
+DNSSEC _1225._tcp.danebroken6 TLSA 2 0 1 349b136f84d8a95023e1e793eb0538002f8ce8d90472bf80a786400369528136
; a good dns config saying there is no dane support, by securely returning NOXDOMAIN for TLSA lookups
; 3 for dane-required, 4 for merely requested
@@ -575,7 +565,7 @@ DNSSEC NXDOMAIN _1225._tcp.dane.no.4 TLSA 2 0 1 eec923139018c540a344c5191660ecba
; a mixed-usage set of TLSA records, EE one failing. TA one coped from dane256ta.
DNSSEC danemixed A 127.0.0.1
-DNSSEC _1225._tcp.danemixed TLSA 2 0 1 0d41f0b28cf41f19f6f5fe116300e2cc8c60764547271f5de37f6323478d6e50
+DNSSEC _1225._tcp.danemixed TLSA 2 0 1 3d107e4462e4812ac94467063cc658eea8aeabaf69f022babae5c8343cf92743
DNSSEC TLSA 3 1 1 8276000000000000000000000000000000000000000000000000000000000000
; ------- Testing delays ------------
diff --git a/test/log/2102.openssl_1_1_1 b/test/log/2102.openssl_1_1_1
index 6abb39c88..5e0cf77bc 100644
--- a/test/log/2102.openssl_1_1_1
+++ b/test/log/2102.openssl_1_1_1
@@ -25,20 +25,20 @@
1999-03-02 09:44:33 SN <CN=server2.example.com>
1999-03-02 09:44:33 IN <CN=clica Signing Cert rsa,O=example.com>
1999-03-02 09:44:33 IN/O <example.com>
-1999-03-02 09:44:33 NB/r <Nov 1 12:34:59 2019 GMT>
-1999-03-02 09:44:33 NB <Nov 1 12:34:59 2019 +0000>
-1999-03-02 09:44:33 NB/i <1572611699>
-1999-03-02 09:44:33 NA/i <2364208499>
-1999-03-02 09:44:33 NA <Dec 1 12:34:59 2044 +0000>
+1999-03-02 09:44:33 NB/r <Nov 1 12:35:12 2012 GMT>
+1999-03-02 09:44:33 NB <Nov 1 12:35:12 2012 +0000>
+1999-03-02 09:44:33 NB/i <1351773312>
+1999-03-02 09:44:33 NA/i <2143283712>
+1999-03-02 09:44:33 NA <Dec 1 12:35:12 2037 +0000>
1999-03-02 09:44:33 SA <sha256WithRSAEncryption>
-1999-03-02 09:44:33 SG <22:c5:bd:e3:a2:44:64:bb:03:4b:65:a6:80:75:ea:1b:f9:2b:23:6e:d6:9a:87:1e:8b:1a:a6:3a:ac:0e:cd:76:7b:ee:cb:a4:d5:c1:38:10:7b:62:47:20:e5:ee:19:ed:7b:fe:e5:53:e8:86:de:ce:f8:2b:31:84:40:02:78:0c:f9:8b:1f:6a:27:49:53:89:b5:16:ba:9e:39:87:55:a2:05:bf:e9:30:c5:fa:4b:c1:90:da:28:08:61:7f:b5:25:09:1e:17:ff:ec:86:a4:42:fe:fb:c6:9a:5c:c9:75:b9:61:6a:51:fc:de:72:c0:0f:fe:4c:49:e0:24:7b:0b:fc:fd:4c:f3:fa:4b:6e:15:1e:ba:0f:50:6d:d0:6f:d1:51:82:be:3e:f6:97:7c:ec:3b:eb:c5:bb:e1:86:d8:d5:6f:8a:48:10:67:4d:da:d9:af:7c:61:84:9c:48:a4:a0:6d:99:8f:b7:ff:c9:1a:2a:8b:d3:43:d8:9c:47:42:da:80:df:11:e4:c4:da:27:d9:26:48:e1:99:b4:97:f0:14:66:65:30:6c:5c:92:19:65:cc:ea:ed:b9:c4:f1:38:9e:c8:6e:e8:69:ef:5a:55:e6:a0:b3:2f:7c:a0:a4:d7:a7:20:b4:01:c5:09:73:0a:d5:d5:4f:be:d4:f0:9d:c3:bd:d8>
-1999-03-02 09:44:33 SAN <DNS=*.test.ex\nDNS=server2.example.com>
+1999-03-02 09:44:33 SG <a1:d2:89:bd:71:59:a5:cd:d4:dc:b6:a6:83:40:3a:48:57:0e:6b:34:ea:dc:6d:2d:4f:4e:65:4f:3d:28:bf:45:1d:b1:a5:da:e0:08:b4:24:4b:88:3f:9f:14:83:df:8e:12:4d:82:bc:ae:1f:42:66:95:fe:d8:7a:72:b2:7b:e3:36:bb:6e:70:13:41:51:79:1b:48:6a:bf:62:c6:a5:d3:8a:f8:dd:62:4e:f5:94:63:8f:10:83:86:aa:8c:1a:d8:0d:29:57:61:73:11:74:e1:6c:f6:86:0b:e9:e3:8e:0a:58:b4:cf:be:63:d4:81:10:6b:c8:2e:ca:5c:19:c1:55:e7:e0:fb:b6:cb:48:da:30:72:be:e7:8c:35:49:90:20:18:b4:79:69:19:87:13:cc:a7:76:96:6b:7b:bf:f9:11:2f:95:c3:6c:89:dc:43:a7:84:87:5c:15:69:7e:69:8f:ad:07:c2:26:94:e8:9a:6b:55:44:4d:24:55:18:ec:3a:0b:02:1f:bb:4d:4c:62:05:2b:e4:1d:49:28:63:c8:3e:7c:63:c8:ee:f8:9b:91:41:d4:c5:36:a3:c2:69:ec:fd:91:ad:bc:49:aa:bc:28:d3:2c:40:8c:75:8d:8c:c2:c5:5e:71:f3:e6:9c:58:12:ca:c9:2c:cd:74:7b:3d:4e:fe>
+1999-03-02 09:44:33 SAN <DNS=server2.example.com\nDNS=*.test.ex>
1999-03-02 09:44:33 OCU <http://oscp.example.com/>
1999-03-02 09:44:33 (no CRU)
-1999-03-02 09:44:33 md5 fingerprint 6B8F196770874B1886011CA6704E447B
-1999-03-02 09:44:33 sha1 fingerprint 8E08ED63E310E0F6870896486319A0312B36E11F
-1999-03-02 09:44:33 sha256 fingerprint 819914707048EB61EA2705F662CF16932B70E6ABB2D1EE54AB08B52FF18731EB
-1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkxMTAxMTIzNDU5WhcNNDQxMjAxMTIzNDU5WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3AYwvYOEPfSwR4ggAFZcQboIXsYwoAT+OdOiIjIh/t0ICB9rVS5yvOrg+q6AXYVZpxCrs/MSwjsgLvfEcQY+0UPE/Jx2USSfVvRF1Ff2fXdbPmiJzrRS+LyAvnj8TyZmEpnkRrTBGWLlSDB6P1VdPG8INYdQTUZdxZaCPVAeo3PISHNEUXK7uLIjABS4VtAdX/AHa6PWkJw+1QAr6IhY7fx8vaD2dRrPC+HG5xmZMosEl8BxEYh0uEAhSfqoW00QwQmTqep1TUy6kWKFkY1AYslbTw7XcJxbb1YSInJ4ZCNKaiAkj9MSfFLvN03QtDUe4rqJKDOTnphxOPBK3iBmQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBACLFveOiRGS7A0tlpoB16hv5KyNu1pqHHosapjqsDs12e+7LpNXBOBB7Ykcg5e4Z7Xv+5VPoht7O+CsxhEACeAz5ix9qJ0lTibUWup45h1WiBb/pMMX6S8GQ2igIYX+1JQkeF//shqRC/vvGmlzJdblhalH83nLAD/5MSeAkewv8/Uzz+ktuFR66D1Bt0G/RUYK+PvaXfOw768W74YbY1W+KSBBnTdrZr3xhhJxIpKBtmY+3/8kaKovTQ9icR0LagN8R5MTaJ9kmSOGZtJfwFGZlMGxckhllzOrtucTxOJ7Ibuhp71pV5qCzL3ygpNenILQBxQlzCtXVT77U8J3Dvdg=
+1999-03-02 09:44:33 md5 fingerprint B5B541ECA7A66FC7F1B1AB34D8317E21
+1999-03-02 09:44:33 sha1 fingerprint 0C7D0ADCB4EDED464A6060B5C3C8BB3A4354CD27
+1999-03-02 09:44:33 sha256 fingerprint D2CDB81A829E370B823EEDA58F38A4B4A4C2A2FCAA5F67049AFCADE7C0CF72D3
+1999-03-02 09:44:33 der_b64 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIxMTAxMTIzNTEyWhcNMzcxMjAxMTIzNTEyWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2m+DyjEFdeXcBs2qsmUM3al4xV0K2NxbAT0no0wI5g+4ceAQqySOFdS0jn2Sl6d4Vpiq+rUce6ZpiySkUj277kcwYXYoH+4sdUXSc+GC9n4NeQCLTxsNaFihgWYj9jweRXZdkBdwJIkbUMJvexWN0gQldRu2pbLFzbKBZWCJ337dEhv8QkVW5KMblzO09pfLPeLiQlId+JF7iizsfBmKOHM+lU5Mz5WJje9kCNcNaXOQMW51wnMpbac1DjL30bfRqeconcO315hb5olIlhqr9Jqlyn9iKY0FVNq9EyqVWRNuRW52TxSXh//Hzd+5jj9Q3G1ygeVFmwE317MoIzH3qwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAKHSib1xWaXN1Ny2poNAOkhXDms06txtLU9OZU89KL9FHbGl2uAItCRLiD+fFIPfjhJNgryuH0Jmlf7YenKye+M2u25wE0FReRtIar9ixqXTivjdYk71lGOPEIOGqowa2A0pV2FzEXThbPaGC+njjgpYtM++Y9SBEGvILspcGcFV5+D7tstI2jByvueMNUmQIBi0eWkZhxPMp3aWa3u/+REvlcNsidxDp4SHXBVpfmmPrQfCJpTommtVRE0kVRjsOgsCH7tNTGIFK+QdSShjyD58Y8ju+JuRQdTFNqPCaez9ka28Saq8KNMsQIx1jYzCxV5x8+acWBLKySzNdHs9Tv4=
1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
1999-03-02 09:44:33 ver: TLS1.x
diff --git a/test/log/5720 b/test/log/5720
index 4f1c4a986..1c5a4e763 100644
--- a/test/log/5720
+++ b/test/log/5720
@@ -13,10 +13,10 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 SN; <CN=clica CA rsa;O=example.com>
1999-03-02 09:44:33 10HmaX-0005vi-00 SNO <example.com>
1999-03-02 09:44:33 10HmaX-0005vi-00 IN <CN=clica CA rsa,O=example.com>
-1999-03-02 09:44:33 10HmaX-0005vi-00 NB <Nov 1 12:34:16 2019 +0000>
-1999-03-02 09:44:33 10HmaX-0005vi-00 NA <Jan 1 12:34:16 2038 +0000>
+1999-03-02 09:44:33 10HmaX-0005vi-00 NB <Nov 1 12:35:12 2019 +0000>
+1999-03-02 09:44:33 10HmaX-0005vi-00 NA <Jan 1 12:35:12 2038 +0000>
1999-03-02 09:44:33 10HmaX-0005vi-00 SA <sha256WithRSAEncryption>
-1999-03-02 09:44:33 10HmaX-0005vi-00 SG <a6:40:84:f2:fb:b7:cd:94:43:3a:d6:03:fd:21:17:92:2c:3e:b8:9c:6e:f6:1b:19:ea:55:cb:c7:89:1c:7c:a6:0d:9a:ce:d5:f0:8e:01:1e:c7:72:8d:f5:fb:4d:d2:7c:50:c3:46:27:7b:c9:eb:b4:ba:d5:d2:56:fb:3a:60:7b:3d:b0:6e:80:ac:cf:ff:cc:fe:26:50:dd:78:b8:e9:52:51:70:5b:17:53:74:7e:2f:7f:13:ae:2a:f4:55:e3:0b:5b:f2:92:87:33:f7:82:e9:ee:af:a9:6f:dd:2c:32:bf:be:50:28:d6:c8:78:00:1f:fb:24:74:cb:d8:52:cf:8d:ea:ca:48:39:bd:b0:ce:6e:95:5d:c3:d2:41:9f:2b:14:2e:d6:3f:66:c8:2a:9c:51:db:16:cc:5d:16:fd:a9:cb:36:4e:b1:c9:8b:30:7c:27:9a:f0:ec:bd:48:20:08:f2:89:88:83:54:b3:d7:f7:c4:ca:8a:9c:96:82:2e:5f:50:a5:80:1e:fd:30:9e:cc:07:93:e1:3a:0f:2b:d1:c4:41:a1:38:b0:44:d4:e6:ff:d1:af:b2:b8:49:be:25:fe:b5:7b:1b:97:fe:ef:f2:8e:5f:04:79:9a:39:f1:9b:7c:25:4d:da:98:1c:a7:4e:28:06:62:6a:cd:59:3f:7f:37:78>
+1999-03-02 09:44:33 10HmaX-0005vi-00 SG <ae:93:45:1a:27:1e:bd:d7:f3:1a:e0:23:46:11:b9:27:35:c5:51:1f:51:4c:0b:ca:6d:4c:12:a0:39:21:99:75:43:2c:1c:e0:5b:0e:64:ab:62:aa:58:bb:be:d8:ce:07:a6:70:d2:19:f7:51:53:47:59:eb:2b:f1:4b:28:a0:84:ef:2b:9b:ca:a0:db:f3:7f:09:ac:97:0c:1a:5f:65:83:a2:71:a0:8e:05:38:e7:de:b1:b9:59:d4:90:32:6a:76:6c:e3:5d:51:30:87:98:e2:8c:85:86:f8:13:b0:a2:78:4b:1d:f3:6a:59:fe:6c:83:85:0c:12:34:6a:46:28:44:ec:7b:cf:92:39:95:77:00:43:a4:c5:31:00:74:ce:46:3b:eb:15:74:c2:9e:b4:d0:4f:9a:9b:53:1b:c9:b2:ee:da:a4:32:45:c7:b4:0e:51:a2:fa:db:55:95:2f:9e:02:61:6a:09:ae:6f:7e:61:14:b9:34:a3:3e:b0:14:48:1d:ce:fc:fb:9b:0b:91:8f:a1:93:65:88:e3:f4:23:57:09:82:36:4d:37:27:51:b0:03:ae:68:3a:8d:cc:cc:cb:d0:20:81:2c:2f:85:3c:13:52:3a:6c:a9:f0:2b:82:86:26:d2:be:30:70:4c:56:48:32:44:ed:8f:e4:68:d8:0a:7c>
1999-03-02 09:44:33 10HmaX-0005vi-00 (no SAN)
1999-03-02 09:44:33 10HmaX-0005vi-00 (no OCU)
1999-03-02 09:44:33 10HmaX-0005vi-00 (no CRU)
@@ -49,15 +49,15 @@
1999-03-02 09:44:33 10HmaY-0005vi-00 SN; <CN=server1.example.com>
1999-03-02 09:44:33 10HmaY-0005vi-00 SNO <>
1999-03-02 09:44:33 10HmaY-0005vi-00 IN <CN=clica Signing Cert rsa,O=example.com>
-1999-03-02 09:44:33 10HmaY-0005vi-00 NB <Nov 1 12:34:22 2019 +0000>
-1999-03-02 09:44:33 10HmaY-0005vi-00 NA <Dec 1 12:34:22 2044 +0000>
+1999-03-02 09:44:33 10HmaY-0005vi-00 NB <Nov 1 12:35:18 2019 +0000>
+1999-03-02 09:44:33 10HmaY-0005vi-00 NA <Dec 1 12:35:18 2044 +0000>
1999-03-02 09:44:33 10HmaY-0005vi-00 SA <sha256WithRSAEncryption>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SG <6b:b3:67:6f:1b:37:83:8d:96:6f:76:a0:71:46:6e:f3:13:46:77:24:01:a6:91:47:7e:8f:70:2a:12:e1:bf:c2:70:6b:ba:30:54:94:88:9d:cf:a0:da:b4:ae:f8:80:d9:4d:58:b5:3f:23:78:dc:55:8e:c9:ca:7a:38:b2:a8:e8:4d:44:d9:b2:6f:80:41:a5:13:9d:03:c9:ac:88:36:46:d5:b0:54:79:48:2d:8a:53:ec:7a:75:f9:e4:cf:88:66:29:cd:ca:e8:01:22:56:8c:b5:05:62:ed:5a:9b:5e:b7:af:a5:3a:d5:57:72:ab:47:65:0e:b3:81:6f:dc:16:28:92:5f:63:a1:83:f1:ea:3b:2a:c4:f7:fa:e8:17:32:cb:b6:78:f8:7d:bc:a4:d6:26:4e:6f:b4:0d:d1:63:27:af:f8:89:cf:7b:1e:69:d2:5b:3d:d3:00:0a:4e:40:b7:ea:7f:94:23:40:8a:e0:e8:01:93:f3:dc:35:28:8e:da:92:c4:3d:ff:18:b5:93:14:7e:c2:c4:72:59:ca:a9:b9:cb:c1:17:8a:c6:b4:53:68:a0:08:2f:4b:fe:a9:88:db:15:94:f3:d2:04:99:a8:a1:8d:7d:f4:05:c7:19:db:d0:ef:a0:e8:70:a1:5b:11:db:d5:02:88:a8:8f:b3:32:3b:14>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <DNS=alternatename.server1.example.com;DNS=alternatename2.server1.example.com;DNS=server1.example.com;DNS=*.test.ex>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SG <18:6f:dc:d4:7c:5c:b1:4d:99:52:88:47:a4:bb:1d:12:7d:70:cc:2d:c4:3c:d3:ad:5d:17:83:06:89:01:dd:0a:49:34:5d:e4:fd:b9:ed:17:e8:12:90:d5:d3:d5:18:52:6e:d5:04:b3:1a:d0:b6:08:56:6b:65:ac:0c:7a:17:70:ed:96:7f:9b:43:fe:cf:79:90:ba:c4:c0:66:31:fa:3b:d3:d5:ef:ea:66:8c:a1:c5:57:8d:68:22:f8:80:17:8e:ad:21:98:71:c0:ca:09:c3:bb:ee:39:f1:12:e9:b9:b9:dc:4c:b2:3d:0f:a5:4b:a6:79:21:97:68:95:d4:e5:79:00:7f:dd:1e:e7:06:f8:bc:d8:8b:da:62:24:58:1a:db:a3:dd:3f:a1:5b:6f:7b:84:6c:77:34:1a:9c:9d:95:19:50:0a:83:41:06:be:86:a0:bb:1d:36:23:1b:87:8d:8d:7b:a0:a8:95:d5:8d:bb:db:9d:e1:c9:f5:ff:a1:8a:56:f0:e8:74:d3:f5:f4:fc:70:59:f6:cb:e6:c7:9a:b7:33:52:a1:68:3e:a7:71:fc:54:fb:92:7e:e4:38:27:ce:4e:77:b0:db:6a:e6:55:a2:d2:43:5e:5b:7e:51:38:57:60:bb:67:f3:5b:e5:26:b9:1b:16:f5:3f:41:20:38:67:6f>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <DNS=alternatename2.server1.example.com;DNS=server1.example.com;DNS=*.test.ex;DNS=alternatename.server1.example.com>
1999-03-02 09:44:33 10HmaY-0005vi-00 OCU <http://oscp.example.com/>
1999-03-02 09:44:33 10HmaY-0005vi-00 CRU <http://crl.example.com/latest.crl>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <alternatename.server1.example.com:alternatename2.server1.example.com:server1.example.com:*.test.ex>
-1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <alternatename.server1.example.com:alternatename2.server1.example.com:server1.example.com:*.test.ex>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <alternatename2.server1.example.com:server1.example.com:*.test.ex:alternatename.server1.example.com>
+1999-03-02 09:44:33 10HmaY-0005vi-00 SAN <alternatename2.server1.example.com:server1.example.com:*.test.ex:alternatename.server1.example.com>
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=p1234 -qf
diff --git a/test/stdout/5800 b/test/stdout/5800
index 71884c244..aea797077 100644
--- a/test/stdout/5800
+++ b/test/stdout/5800
@@ -1,4 +1,4 @@
>
-> dnslookup tlsa: 3 1 2 fba36695c09a0a75b046eb97dd1df248935e15b864a6cfcbd8b2f85bc5275d77ad57525873f98da55e2bf931ff9ee92af0e5c026c16177f8c4cb541e20ab55b5
+> dnslookup tlsa: 3 1 2 e76baa2132a3a7b0ac755835748c9eee9a2335621157e87218926c15c28a3ecac31d29340879e4599f2c5d666f64ecf20fa42b39e917239eb3ac653dfb45be2e
>
>