summaryrefslogtreecommitdiff
path: root/test/aux-fixed/exim-ca/example.com
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 /test/aux-fixed/exim-ca/example.com
parent6d38582bcea0a891244cf24b0b39d5bb310464e9 (diff)
Testsuite: regenerate OCSP proofs with proof-signer certs
Diffstat (limited to 'test/aux-fixed/exim-ca/example.com')
-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
154 files changed, 1305 insertions, 1263 deletions
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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
+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
-----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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
+CSqGSIb3DQEBCwUAA4IBAQAl3CIA5jpJ7zASR1YmaGydYNkcVlSFX4ZzO9Bs+d4x
+xuzNuzyY3p1tL3IdyLe5i9+J7FS9hMqf3TIYYsKfJPdAGLLUX2UkAu9MGEgDqwe+
+o1voSrd8/ltkJGgyadFyiNSrk69pzSqIG7VCHTo9gsFIcEhrXl99RR1cyYt3Yewx
+ZaycDUX59R41eCxxVoo2L7BgzL234jxyzdW5YjJ9WD0sQGmqXtt/snixMOuTiEbb
+JDeSzkms1MBVSlWHWOjahGEhd4eg2+RbkO7oMy34fL8/8Ve9AcMl8Me79jXk52BV
+CxW/L1Qe4g4cj2DCgbE85lxvvkB/cnPRqTzeYg7gMxyX
-----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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
+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/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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
-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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/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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
+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/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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
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzQxOFoX
-DTM4MDEwMTEyMzQxOFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+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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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
-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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/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-----
MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzQxOFoX
-DTM4MDEwMTEyMzQxOFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+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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
-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
+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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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
-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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/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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
+CSqGSIb3DQEBCwUAA4IBAQAl3CIA5jpJ7zASR1YmaGydYNkcVlSFX4ZzO9Bs+d4x
+xuzNuzyY3p1tL3IdyLe5i9+J7FS9hMqf3TIYYsKfJPdAGLLUX2UkAu9MGEgDqwe+
+o1voSrd8/ltkJGgyadFyiNSrk69pzSqIG7VCHTo9gsFIcEhrXl99RR1cyYt3Yewx
+ZaycDUX59R41eCxxVoo2L7BgzL234jxyzdW5YjJ9WD0sQGmqXtt/snixMOuTiEbb
+JDeSzkms1MBVSlWHWOjahGEhd4eg2+RbkO7oMy34fL8/8Ve9AcMl8Me79jXk52BV
+CxW/L1Qe4g4cj2DCgbE85lxvvkB/cnPRqTzeYg7gMxyX
-----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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
-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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/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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
-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-----
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_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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
-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
+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
-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
+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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
-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-----
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
-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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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
+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
-----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-----