summaryrefslogtreecommitdiff
path: root/test/aux-fixed/exim-ca/example.net
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-10-29 19:25:23 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2022-11-22 18:44:26 +0000
commit96461acedffb1e2427e3c102a409e8705ded1fda (patch)
tree8852e816b37c9816499f6d2f6d490640e4429c08 /test/aux-fixed/exim-ca/example.net
parent3b46b0914f7161a1011a642d3b90923b15ad85b8 (diff)
Lose duplicated cert in ocsp response
Diffstat (limited to 'test/aux-fixed/exim-ca/example.net')
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/CA.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/CA.key54
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/CA.p12bin2689 -> 2689 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/CA.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.key54
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.p12bin4445 -> 4445 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.pem26
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.key54
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.respbin510 -> 510 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem26
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.respbin533 -> 533 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.p12bin3567 -> 3567 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.pem28
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/ca.conf18
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/cert9.dbbin49152 -> 49152 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.Signerbin364 -> 364 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem14
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem30
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.emptybin374 -> 374 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem14
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2bin422 -> 422 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt6
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/key4.dbbin94208 -> 94208 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/noise.file118
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.respbin2078 -> 1288 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.respbin2078 -> 1288 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.reqbin68 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.respbin2100 -> 1310 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.respbin1300 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.respbin1300 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.respbin1322 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.respbin491 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.respbin491 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.respbin513 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.respbin2079 -> 1289 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.respbin2079 -> 1289 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.reqbin69 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.respbin2079 -> 1289 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.respbin1301 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.respbin1301 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.respbin1301 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.respbin492 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.respbin492 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.respbin492 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.respbin2078 -> 1288 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.respbin2078 -> 1288 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.reqbin68 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.respbin2100 -> 1310 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.respbin1300 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.respbin1300 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.respbin1322 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.respbin491 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.respbin491 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.respbin513 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.respbin2079 -> 1289 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.respbin2079 -> 1289 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.reqbin69 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.respbin2079 -> 1289 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.respbin1301 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.respbin1301 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.respbin1301 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.respbin492 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.respbin492 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.respbin492 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12bin4599 -> 4599 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.reqbin282 -> 282 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.respbin768 -> 768 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem46
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem94
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem64
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.respbin2078 -> 1288 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.respbin2078 -> 1288 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.reqbin68 -> 68 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.respbin2100 -> 1310 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.respbin1300 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.respbin1300 -> 1300 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.respbin1322 -> 1322 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.respbin491 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.respbin491 -> 491 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem26
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.respbin513 -> 513 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12bin4677 -> 4677 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key52
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.dbbin28672 -> 28672 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem90
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/key4.dbbin36864 -> 36864 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key58
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.respbin2079 -> 1289 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.respbin2079 -> 1289 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.reqbin69 -> 69 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.respbin2079 -> 1289 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.respbin1301 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.respbin1301 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.respbin1301 -> 1301 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.respbin492 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.respbin492 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.respbin492 -> 492 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12bin4629 -> 4629 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem32
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key52
146 files changed, 1201 insertions, 1201 deletions
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
index 17454092c..62fc8c2ff 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
index d2fdf9653..1913868af 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db b/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db
index c35c4c5fc..5b005d8c1 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/key4.db b/test/aux-fixed/exim-ca/example.net/BLANK/key4.db
index da40ee72c..25c999e6e 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.key b/test/aux-fixed/exim-ca/example.net/CA/CA.key
index 8cc35c173..cb9a3ab9b 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: Certificate Authority rsa
- localKeyID: 3B 13 82 D1 F7 80 5D 36 EF 95 6E 38 81 11 52 06 FF 0F 04 48
+ localKeyID: 3E 95 A4 06 A0 3F 71 DE 6E C4 F3 21 16 47 8A 6A 24 25 3E D8
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD6DnWH7nqx53FQ
-M3XWMRc6SQwt5LfCB56HOy9+AwOxWAgt7vSfaELBJYuLr3HOplsaBvEhco5kss6Y
-3zkEyNwTTtCmHV7TOFLETH5VA9/y9ivxiaAtmw1NXV9JoIXPgC3OKG7dy3NeYS3H
-05S/RtamlTxvF+M51wYBRK33ThoSuYPMTYJVctvhw+w5NN/dWi5jzioa3beaPOUy
-zNGPlUxNG5pdklbFYD+bTtZ16or3Q+7tGi5EVqJY79UBaQixPLo+rFiuBwuquQRo
-h2YOqVo5N+ZpIkNBT0FHb7kAFcytWwoDYLfbmbW4yx6g4J1pBymEQ+rtwGBjPAPb
-erP6TiAPAgMBAAECggEAAjSScMp3po4F/9EUXvk73TW7t8Pmov1yNnsdJh1csPm3
-yL/sxGMlA5MTMf4wIMRy1T3ubn8WJmk1TT/avuIOntT5Hh3wMiizAiwyiQlptjjZ
-ll3CXeSaL259YqbZx0S4IrNUlvwuXky5HKQPEcjMJ9f1Gn25cU8mLGiwqBe2PygD
-PQ1FMF1zJOObCL9dTSEKIHVtf5+hzJDpqvRUclHkiFtbVTXZ/Asa2Od4SZt9zfpp
-qdtyCN3x8otbSWW9UKCCyvM3+ZEpWr64veLP9G42EgXEMszfTuzoXVSUAXd2Kold
-7w7x+LugfJdoGsVZ3bJCPkJM2sNvZkjD4N6yTVu0IQKBgQD+A/mhRauSqxaGYFt1
-u9BO9raIgqhJzHIfxvo6Xu/0IesFgw+ebTaBgh+Gmeq6fLrMakpZwgZaTMfle3mQ
-BfEe0njKciNP0rdOQ/IFgUqDRsMFMXpUKEBdHVHB6stomupJ9CSlyjs0BIPWPFbV
-IecOTBRo3ICN1wJZahiHkAEg2QKBgQD8ApDkxDOSlgNbD5fXwNV/GEBlx4q5AqAm
-CJzSQHC0LsgxZCxEWXPBozsvfjNztARr6fX3zZ3fTgOxLqvVhGWNfQba86KpSHij
-RY5cdWFGdL5N6+M8QNL4bsr+JltiTRxjvx9Es6aaaQgU79ob91jTPUKAteHapPSA
-FePecH+3JwKBgQCjLv6RYmakpJCl5wUaj3t1Hv2ImRdvwY2XaIacNR1F4vxO4DGK
-f3LCpEuIdxzajQKcC7SUERdvr1/Dxx0DLy4FtQSwWb7hqubjuraiXrr1tuHWVkDW
-C729k/ZP83yVSOA2fkeE0nRSKIxhdwX5ifwbrTh3XSCg/n2d35C+lf6DkQKBgQCX
-57QPMXUk1ugO68dLdiE7CxNGRpGIE90VD/v3gIBvHAPwQcGtMX5lKk9ywU+iXtCL
-e+uYA4k2IYB4PPm3KqdMMiD/ufxCrjyJrlOxx89q+NP9hELk/u4schxKNjS/fFuw
-hHQEpYW3bbhBZpLCaMZSDosXqosJkIUQ8CD65DUX4QKBgAF+JVPtAiXquE4rQqLS
-4H0oclryS6490RelJwCI/mdd8eOXmJn+HtdJ98guw+yngHswS3CLJJtUV5j3khuY
-RltbPTnZDwzhRV2NWeQnNyt2Efnvy4LiOWK9s3a3Qdvjaih2YuW4m3AsCFLQt5po
-me7MV5BI6pVp16WUQCvv7NQh
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDaIUTvUMyTxe51
+1zmQ3AE1BQ6VgzgTLlkSX5DRXLATeyxGb9cjZh4dnmVcOMYpSbUO+b434q2Ow4sC
+qEgqmpPZPzoZdU2KVLHOgbqMpxV+etMHheLYIh5QX5gbKMjLkSKh+d6vNwk18ZPg
+YydQlKX76g6NNNcdsfWYkMQBVfVLQx0eDbMmnsm7IiajWyII3wj5HNKiDbnslN0v
+C8YcdolAyAPsJKIl/bCkdHEGXdBn9G/HUObtygLXHqqarLtye68cCYC+u4lg1Tih
+xw14d/fupYwwE1W6ZdL4GPe3gzENX/gzVpkSfnzq4Q2f5o+lTK8FflljR0/Su1yZ
+p3CC5fuLAgMBAAECggEAEGAJNK2l2TDo0856XL5ML7N3YrcAMyrUEGKKblH24yEb
+wK/ts5OB23eQ8WlO5KBkmyd/5a8hMcOXptvrCwCIUxNOV8UfTJN+HUKBtpEzT/rr
+5urHDeWsM+lxQEmBnwwzg67MtLrWq+BWWYG03MJEBOAPacwkaAjJJxDOSuSULqsx
+xGfPqXOMzQOG9HKZfb2aMxRVILAFpaC6VT/jo+FfC99myL39nUD4/KGIfGtBDcBS
+PaJc2iJvl6LaKRqu1w0AP/err6OUx0ikhh1V82jIDU6PHat/4ZJDqtOIqPUDL8Qs
+TbOUClt2M4Eb5WoIFp0U72MTd2NfREDoou4+VRQcQQKBgQDsajOCrEBmKaus/BnL
+K5xp5Vn97zrjl6k/o5XtC3ZaNUJlc8rqUtuM85+cRdAJu7mq61e7/Bsr8Mn47b+g
+IfVxMrPAc2wV9XVnJMW6RNAs4U4i5yrBrzQLrvp0dxqgEbgPxALldZC+sXyPbP/2
+m9aBuPvvE3jW0EitqbD6Uph/wQKBgQDsM0ny40c3NiMfzurngVE2+CfT4WwZr8Rh
+AT9iiRaihqrV74Y22MeZT/2ai3DoxSUA9drJOvkPCktMBQ7zxcD/hQddb2G5YWH7
+hfOsVpF7skGPqctShkm06b3YblhbCSUk2ODF2qfv3bF4rpvx8cMLKp07CTCUQ28a
+nRRaCDwOSwKBgB0xvCyt0sIK8U1KUHEbcJRPIz7NdQs35kmajOAZ40KegxV+KBep
+pb0RNKuan2ckTHhD2bC4IC7b7EUWLuy6ZNHWvgXM+xL3Hclf7B7lcoOoSvraaxhB
+535t3DXXo20S4xTnUqg9TWOPDV+0ySMN+X5Jdqr+T5TPYbo4U0eGPZjBAoGBAIHd
+nT33KlO350341XzdxAqGHFfJrEbfNgjjx7bkitZnVoxzuoZzYCLyMQyEuFqy8ip6
+AoX7b66OSWINse/j/b4/pRIBSGjFmzrQpm5N1oV9N8DGaW0BOotGrMPPv7Kl7483
+0zXVh9pBOO+SiVlYRJXiIzqvTc9m2DJ4xRTPTD3LAoGAXE2E2oIQdTN5IiXn2bow
+aElB0nAQn7lVv7cU0ZW0mH9iWRWHxB+4owMOlBF/BZH6iNCXSt3EnkLKkPdAdxyZ
+hezqQ+u2aaYALLyIXUlv6Z37lzcXC1SBZANsH3QnXFg3eNrswFRpoTyh5hVH5CuB
+NTJxKXYxmyDGXmz4ywh622k=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.p12 b/test/aux-fixed/exim-ca/example.net/CA/CA.p12
index 6d2d11791..0d74212f8 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.pem b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
index 17454092c..62fc8c2ff 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
index 3de4b8a27..e79373954 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: AE 50 8E 2E 85 66 34 C9 C5 F6 99 E3 D7 9C 5F BA A5 92 9D E8
+ localKeyID: ED 4A 15 72 3B 75 16 84 7C B6 A5 31 6A 3F C4 74 3C FA AC 6E
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDT2+lHIgrKkcDB
-OzKaaOfOpby/fXc0nvMkYTOTGpuUV2cqdwlCcPznXMv+dynrCYIpSXA5Rcu6YbzT
-WfRe7yrE8xgki6U/8ylAoWS6OKvBGMcS/jVaOxYbKTI2PpXeQompXq2/BSY/lNnc
-rcV00y3fIXPFiAKKQmjo+N68ylNS/5euk4T6v+V9NJQLHW0wSNSOtdrU66YaMqFd
-sQeu6xSZJb9IyP/hKkCoMIqs8kI3pTVwegJyvZSDhXmcgG8J/IyS0z5FGQ+bUk9H
-hRl40Of0ozU0VTMwmsAsOMiJWnIJWSp1yDE52sfDzatFC2LOUkfsQN4BWhL8CKjr
-rP9jY5cjAgMBAAECggEAZTR5ZMSrWQd1iBlKXB7fFYVw/BzodBe2WNuiMpSUW7HB
-E7UXlEi7V56pyF6OhLvfFPADDyj7YIbOGDyxkyQ3Tyw9jT+0ai8ztq8imh72VWEL
-wFP1kqwFLGZqmSUenLU2Y9VZtJW2Jstpo5TTbbJwCFZHosYNSJTe3uP8Kz2PvmaC
-L31GR277MncnsvNNlJULV2bTyDKw4i0xPaJlQeTTfe2ArSxsBnyGZn7cIGuDqIqh
-k01tKOhxTL0UZVX0xIk4ouomleEi1JC6OGrQRzaume608mEMNMy7zWvvuL0vV2qz
-tgRVOCREY8Cgq8knjgNwiKpQNIRQc3lz1IF3HXZ7YQKBgQDvIybwgrjYIw7TP7Vh
-VKhOpAxhX8U1f3rX2S40GN68d7Yjdb8eWmhj671VbA1RJ8nvXbYEHnskqgLS+tIg
-PeUKZaJ/lkyf5OncWJY7ToL44VF6UwiwnnFoih+8TSwXJyzuIRmeG+nnfBfjznPL
-32+zjBMFMPyx9Y2M0C5uXNK7kQKBgQDizFaX+q3LS0Ml/DDfBh5FXPOltCBObvQb
-Ks+3bhgkAPLOGYhOJLOLi7I1FnEau15X4BeZsv6Kdu632V9Eap7+Qz7pYh/UI0PV
-bu3ABCA96fUAumBAvyTlsUKioXR9PRoEHZnJXjeN8eQ0hpzLrIlIBoCTV8G2TDUr
-L7B7h1eFcwKBgHyEtEj1+GPq1VRgTwTQPRc9yoiFgr2ZlJCCMNHFxW0jdH7AV/Tp
-JIQrAxpQuhpw+nAePqGkcYCk2fWbzwAk2ndwdo2y6FE1tCQdKJTXC9GmGXP1eofk
-6K6DhYTaNkQUDQwtxhYS+NelQRdIr/kPbi1ymZDRcjMD5mHVIOgsgzpRAoGBANLA
-V2d7Bqz3DzrpEvDsWozSR4cfzzWTXTsxmTw3Di/GwdpLV6Jl8IIoGj3C0O+qVY0L
-LGMjNe2tfz9Qu3p0KbLVAk0VZcZXzt0y67OXIe7mzUkT6AXCmaLoCafeqMUIVnik
-mRfKeY1pzkoRHPsXJarMgAZrchLY1j9/XVws9GOJAoGBAJ4dNAFmPf7EErg9889Z
-bRQttSe/GlrPT4nzcXqQs3lGDBW1tqCmYjh8MGc1QQNxfh7aMoXsRzYMi617rzSB
-v+uLzL9wojGLSTUVw1ma5Ew6Z/M5KeyPEtfViP0bihwL1knNtXjUidXLfT/Fu2IL
-QBU/O5kTGKwbbZgwTs0sA2NN
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC5FU25T2ZxChiN
+7WS7O3c3lpVuKcRnHG/8BYXcKa5WuOHHji6+NklpZ/1pqTkyGQb4CAYzo70Y2yOH
+lT977ot4wVou1ADBFSGb84rEQdsVQmPq6HpgNxep7qtKOh2jycyiosJjjrS+mPgj
+jpQ8/Ph0yOziXzaDjCmAH7qjiRq5Dy9itdrBxfhNuUd305/W2lct9QitIUqUrH74
+W1puchlWYOP7kiQs7R/su2L3g4ysFHqJ6i89JTRFPQCLYHs7Vp5G6we4AJQpOilw
+IVAuKNCcZItuJeMLikXNdKpZ6VXTxHNVhetP4wdYHXCK9OT4WekFDFOG6afn95yg
+IOoZf6JNAgMBAAECggEAE2/Xzj626OchBgKowfrwPa+8OKn9PMDhR8vCr4jXDLd0
+ypK1ePdVhVLM66RAY/D56OFa2WB4MtyMoif710WJcyCHGoTcIWrZMToF2C98VQK4
+YIqSk3klrIxqg6yPwUwnh+rk1DS/6YZCBOXrzm3Yn9cb/Xf3TyBQmWp7nMIAwu9V
++y7hORA8OEsFvFyO+p4W2twfM8UeuIPNzaZhE5Wn/7FAJ2WXdOzp93cd8jJBOB2z
+Y4N52rQ211tCOXy2Wl141AvzdwS74cxa7AOomEctd+VAkGC3L9/GA6RZ/YIOG7Vs
+OrxICkE9VbMEoB1+ErMgdbo9I1RwGlHXOZmTYoA8VwKBgQDpe74IObHvZ5by2MNl
+8BQWiI1WUs8Ygm+kUiN7IqQICNgEKC0JKO4WN6o2QP01TiGA2U8TwudxMIjfKA9S
+ZpzkmpJIcapsuV0p4tNw8k+PubeQtEiX3Xlp1mN+eJx6HqEnkOdIodgHTMVe0ony
+ZCUU764+FZXxnJAPxevuBUe1qwKBgQDK7qd24hy6YKqm69yaty4MY08bo7cIoU91
+cPc3sXiR6bXjDmpfyjxqPB8zZYYCePAJZalSL5FzbGhXS0p4XwtmaOZ7NSUKbE1g
+i3qFgFWlRi9Qn/c8PhSCMjtiOnTzcoAez6EUhCZtwWxBI9p43f7QcZZKphFbeLFF
+RXMoc2Ef5wKBgQCGmIMQEtJ0hG8MR9E8ro2l/8oafVpNcsQRIhi6H1oYF6EPpGlx
+4lp+DFDfPc+6LvQ5ZwyjA7SQF76PhnRuuCCx2DmD8aKhUqpWPyBM+CLNY+5iSMug
+YFhhnul0OutZqtaUDICH6mSysJsG8q/7P6fwzcrQl3j885hIv3wmlnykSQKBgHPt
+mE9q5px2YqbO8QyVfsHm7adNhF9yv5DIwwHW6Zj5mUWn0477Wj4aMHzND5xT+FR1
+9h+UOxRkJstPoLBZI4sSfDCAcLOeoSl5JLolUUgEaz001SleEZs7FP+Ng4gbriNr
+24p73/QtXilsUP9hWpM7gG8OpbXKogJ/pUTDfQWbAoGBALeFAbASOu/e3hmteubm
+Yc8melH776LgDtw+s5lAnGWPmva0IM7fyhCZbEruWCSIjMmLnZwfJh1+2Xdvg5v/
+TIkm/9H4aXpdxcwWhviD9asNogYXVjXU27IBXT6OEcIbgShyU+T0tTEajxx0QECZ
+LuRcB7YJkRbHB4Ygdw1TkzqU
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
index 1e9d5415d..bce8f3aac 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
index e50e70f72..6c712402f 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDEjCCAfqgAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM4MjhaFw0zODAxMDExMjM4MjhaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
+MDExMjM3MTdaFw0zODAxMDExMjM3MTdaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDT2+lHIgrKkcDBOzKaaOfOpby/fXc0nvMkYTOTGpuU
-V2cqdwlCcPznXMv+dynrCYIpSXA5Rcu6YbzTWfRe7yrE8xgki6U/8ylAoWS6OKvB
-GMcS/jVaOxYbKTI2PpXeQompXq2/BSY/lNncrcV00y3fIXPFiAKKQmjo+N68ylNS
-/5euk4T6v+V9NJQLHW0wSNSOtdrU66YaMqFdsQeu6xSZJb9IyP/hKkCoMIqs8kI3
-pTVwegJyvZSDhXmcgG8J/IyS0z5FGQ+bUk9HhRl40Of0ozU0VTMwmsAsOMiJWnIJ
-WSp1yDE52sfDzatFC2LOUkfsQN4BWhL8CKjrrP9jY5cjAgMBAAGjKjAoMA4GA1Ud
+AQUAA4IBDwAwggEKAoIBAQC5FU25T2ZxChiN7WS7O3c3lpVuKcRnHG/8BYXcKa5W
+uOHHji6+NklpZ/1pqTkyGQb4CAYzo70Y2yOHlT977ot4wVou1ADBFSGb84rEQdsV
+QmPq6HpgNxep7qtKOh2jycyiosJjjrS+mPgjjpQ8/Ph0yOziXzaDjCmAH7qjiRq5
+Dy9itdrBxfhNuUd305/W2lct9QitIUqUrH74W1puchlWYOP7kiQs7R/su2L3g4ys
+FHqJ6i89JTRFPQCLYHs7Vp5G6we4AJQpOilwIVAuKNCcZItuJeMLikXNdKpZ6VXT
+xHNVhetP4wdYHXCK9OT4WekFDFOG6afn95ygIOoZf6JNAgMBAAGjKjAoMA4GA1Ud
DwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTANBgkqhkiG9w0BAQsF
-AAOCAQEAMJcf1de50VnQQdXOb8rUkWSdkFM8c3vz34FE+HrDq0z3tIMje2R8i4/5
-kkvKrdiaXuKfrOxF+DYZnit28VoRwPzD2gGWvq7OopV2/kb5I0LGWP7BcSP5nKfA
-u5B9YeHnzx0Cx+CeeQCFEnFY0hpCtuIPVjqNNvROLATxArgAuIgg196QrvXCCrqO
-X27qej7Dc8v/3PK8om9V+26MaCjClZG3/f3fzyolG3jhU63IFapEEfMPJ4kCEN/t
-j2s2LUR02Tk//uKBDDgI7uni5gPHnldZhNeeNbBgPCth72Vm4i7EHkq/qDcdXACi
-46HRN87z16TPXopPQR9qmViUz5o6iw==
+AAOCAQEAnFLDcEudcSN3MlNn7gWu6oHp0Bm2b17QBeSDjRDU6yhZ35h6EtbbZ4Sh
+dUx5HrZnyKO24Jc158N+RRYvAXrbQ4AQq951jU/eYZGNW3DNDDFv95AxpdnHIPlM
+JiAV7sq+AmavhoSVk203isukB8eQN5t3MA+hfoJlvBmSNpsmuI3WTcAuhxrjuZXC
+j9Gue1gK/VJWm8C07/GuBgY5KCq1FusDfM2PTXJus20CruMlkJLwSAv/XCZHTIxv
+cIhyvpUxqnMLH4qxf/yE406b1EQ4A5fX7QzdOtB4TWvJwDZVWq1IZ1ijwASThcuI
+9kkiEEJFu8duqP8+J0JZyadkWJfp4A==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.key b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
index d2699a9ab..61de52534 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
@@ -1,32 +1,32 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: 8A 6A 51 3F 1C C9 C9 B9 A5 F5 29 29 B7 39 EB AF 7B 06 AB 43
+ localKeyID: FA B8 A6 CD EA 26 1D 22 3B 9E 87 DE 67 F5 F6 33 13 4B 70 12
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCkL0Gw+jw7XFj1
-EoIVMrNa519vJeAad+wYVplDS9vB/WgWfCIgLhN8sLy6DKa/bwPMliUXDjGLisXd
-5jh1d36uFeeCN9R2fvlNgHiZslZmkEuPngBfPvjEUDN3avu96Dyi3EIJlP2sxoGU
-utvG6gNlTnUCLUldJeZNzXoLhTZdpFMf7k03h+OunjNdmDIxMChMP474DqThP9sA
-2bUdhVzWGhR/fa8Sbb/Q7Zcr1tb1i+siwpxoYGt2LeGbMKsF9uZdGgoxJ8i1rpLv
-f+CrBnDFJZzpNC1+LjGWwKH08srpY0a2eCex7tfgHUCi6JSx08j04uWSpo0W1/BJ
-+AvycNaNAgMBAAECggEAAvltL/rUiQHDBcuMSjyFJcYvwyh1Px2BjC5Tb/XpmQHR
-dyjQCHO1PCrKfHdatPiaocPtj5Wc/alprLutNamQxLAWZdRDl9L0irwjUyt5J7oA
-+GzVFmSiZpIKYKUyQs44fP3O/3PwxYbCFbLt5NRb8+OgOIYgAF09pxasGZXT9o3K
-Wh/ANq5guMZwSMU/wQJ7lOMVmBdhvQ41CunFa5uYg4E2SFY/GhADfAsmdFuU+6gR
-mrWCettrh8uqcOBfnuXhvy43BfCPBYjTEhPghcKYM0MEjyBZxIJ+4jYrpcNpLbzc
-HPOwXdW+vnOH0sqzRn9K4ICYFPeYiNcLS3l0oDfuSQKBgQDTwmDX/5eammWxlSm2
-KbntKOzh5sNmgRJLth4nnQj3+lSmZfwpJ46HePildxNua6s6ylXR9JrM5CsOnO+U
-INjRmHrpeCDNwSXhl5u2TgM13/OujcGU3rE4sG4vRW1naurpYZIxM872z0Wza8l2
-7f0Egk6Of8+lw/DmUfag3BcchQKBgQDGfGsnm8DC365+nH2uRIpRe7Fybwqza1km
-CpIUuXYPjrDUdOyl0TARrjs89RC+d6Vxl71yj2S4c+OdkCoEq4uWSnqJGwLIsdTW
-4hBYzQEVFY5BxdLlMyJTQWljcck3CxpUo7KhJ3kvPb2QRbmYvHBtRZL5bO6fNhmF
-FhXF73jUaQKBgBIZ0XFlNa5PeFXfrDsYAf6VuvnsYdOHQOsb3CQCtluMGGRI328d
-JH/MBWUPcqfDqFVUKlXSFNFix5NuMsR0slPoNslyLUupMPXBodvJe1jFlezbzSpO
-htOTsTd1Nc7bQs1EO9zc0toiCZE2q3fxC+mwwcpIfpVq1FK7utsxNQCJAoGAUQof
-ng5jx60YS62NSwfFCbvdGYHo9pSP045hUoDeiT+TR0tuC827OJzQpvTQH1QugpCX
-0xxk3ULD3mMsJLf9yCEkorIakuK4qfum/PrGxFsGuCgTEW2tSBze8LFWnFi2KXSk
-zFOXkQg+S5eMTaYyqQrNFXW6f9rQ1JvNzAEYbnECgYByFBsRkrKuYnozXcMwLvlK
-5nIQnrwEPzwcl6gy22G1WESUwfHveAk3t6gC4okimodiu8rKfc/oXQ4y2ryj1ZOO
-ExqntOhbCOB/ilU3qhaEybqiSNF8s9QyBGWVeBJ/3oCNlp219i0/OC3o+V3QvBaS
-GC5wqBcuhLkpa5M17M6qHA==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC01HTvSPWMun4k
+/Zb0oSHz1J5VjdiR5HmEuJc91YQYuOJ+mt74dJqwDTkQGILVMw076e2PhyAWqqQD
+dAQvp1EzhA6cJByx4qqSus+Ew9t0qAlCpkRtuD3UMi2sOPhrBeGEs2scsv+dd08o
+BhbXo6j6yem7PXfLzky55dduiyP/UsNw946NlXeDec18pGGWZwOTVbf41MgJT+FM
+40HTbacH39ISnhFZmc8wsXV+77UlYGi5/ltvzfv0ajymK1OVN++hSBnWbzGpP0XB
+FxZk4N8QqiNcQc/KLjsm4jvrqMrPJVU/7MXqf6qfwFh4qvynAYy52tvQdUUybx0E
+gq2LeylrAgMBAAECggEAKgj7N8aTgge2HB4w8aPlUxt5RPUIw31DfEU2ryKLpv2P
+dRPGQiZE8SjZu3KfMzU/Xc6WsRcdr/cx0jWtZXB1EU8g4E4Kt5UzxpETfU7UHG2V
+XX9uB71c7g9OC6tgn+xJjMHyY8T+Y5ng9jJYK/943/eA1ExJJUDLGCmkJyfEEe1E
+M/bf/g2z5bTgsdQ9/RzerX610DzMIM8BWmpUMppRQl7ZNVfoEWu5OyWsguNGywUP
+r2chxbBksm4FdWQmp8WwLpOZtYMg9xpeYrQW5b5SWABPZsrT+mQksZ/cbD5ooBDu
+JbiAFF0AxLYz1JbcWnV5XOqK2d9xO5KQtDBFOdWgeQKBgQDvcPY0t4Xw4D4JbcCA
+jWMtl3YZ3tbTQ9Fej9GTm5zFG92bWVgPevQd6nP9dAbuWaX8B65f13KQHXZM3+8T
+5xHAdXsI18kRHvMZZjfr0YXzQStDNbyP7SuZH1Pvn2W0aZ4eAq8jsic8FpG/YLMk
+t9hyKFGln9uho7BNxtTrg9qomQKBgQDBVdjWWKqLF5rNZc9J8d6xuSNxDQ0U+54V
+Jx/NaEdAf/c7Jfn0PHefMgsYq7F0cWjLv67dCkbdDzEsEYYPM75JPxQvMq0+dK6a
+SQjlsu89Z7ha7UpuWQnOielkO78gzpxgdPGD2410WK+vdG3CBDgFMhl1+IDrIkMp
+TCoIeGJQowKBgHJPw7s3QsLUy8lElHrLBWZmwQNo17bU0cgLcUq/KAESZKId7WS2
+loURwX5nPkfclNnV8PHgsdkLt8bLwiAGWPtBGxQFsQBzfivKGTiENycDHdxgcz1j
+RUU9J51mw+913P8G2QZ5rzGItNxhFiWZf8RAa3pe70QkGa+IFW667FFBAoGBAKq1
+bWgeFEAKkKJqEfUdvt+4NIYe2v07CyNsT1VkjP1zwE4WwzSXq5wCaO/YsjC57qlx
+UCpWZ6nLP0TFGFUWAB/WtbDTE0uBZaZPdK61Jy9WBN8shLsYnWMkPNNHOgTyyfsV
+ZydhVe50XHQU3tEgPoK/8OFMkjCMKTcuzDJ8cXr3AoGAOtKZKKGBHFARHcGIoLzG
+H6wnkVDUNZfBCBmgvz6e6IvhDt2KmYEHLAJ+sViusr6udk8SCcSuXGv7cPjwVLTX
+xDSQaBoRbiBNYNIIT/cFlLNIXg272StLbuLcpTHYtsgNC5K4CuCNUQ/LHg4/JVQM
+RcQZXupUC85tb2DGZUxqYmI=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req
index c3e03ca37..dcde65f89 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp
index cbb8f0ad9..1c1d76b03 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem
index f68ca99c6..845378472 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.good.resp.pem
@@ -3,29 +3,29 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.net
- Produced At: Fri Nov 01 12:40:02 UTC 2019
+ Produced At: Fri Nov 01 12:38:40 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
- Issuer Key Hash: 01089fc170c578818ccc7b96390741ac0d020c89eb3e00f574c8f4d90d14dbf9
+ Issuer Key Hash: 7c4ef0f131dff8eb55557d0e1dfe9a0ac7554ad63496dde8259e12057dca7c8f
Serial Number: 42
Certificate Status: good
- This Update: Fri Nov 01 12:40:02 UTC 2019
- Next Update: Wed Oct 31 12:40:02 UTC 2029
+ This Update: Fri Nov 01 12:38:40 UTC 2019
+ Next Update: Wed Oct 31 12:38:40 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIIB+goBAKCCAfMwggHvBgkrBgEFBQcwAQEEggHgMIIB3DCBxaEvMC0xFDASBgNV
BAoTC2V4YW1wbGUubmV0MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAx
-MTI0MDAyWjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIElG2m+vxvyC/H27ycn9keIR
-r2aAn9jdVIl8+kvdTNbnBCABCJ/BcMV4gYzMe5Y5B0GsDQIMies+APV0yPTZDRTb
-+QIBQoAAGA8yMDE5MTEwMTEyNDAwMlqgERgPMjAyOTEwMzExMjQwMDJaMA0GCSqG
-SIb3DQEBCwUAA4IBAQDFauXmEIyKwNzx1bn4zULuP8nspEB+T2ei8uoGkUgWB14A
-coWBD+lBbXWoRGZaZwwyevSmSxzzlnWSy93FjbYMUo+5aU/A7iZB6eFjp2AcSZE5
-1CaAGTB6RjAFEwVRUiqqX1vRws+TMqHXx68rv0Cf1JvHUSbypKB5MYxDSJcyYfEK
-ieLwScQ7Dg4FNhitlPIrfnzVmMQW7/5L3q/a6nSPGexR2GSIsEVhhLM+CqHtdosZ
-sPFX3aCyzhetYJH12mJrmDDXdP6CbzXCGnCSau2ZuvszR+7p6jvmo3llsRfHzDx6
-OFr+nwK0zK9T1LcOE2/897NoQDxD4OXPrIYKP5Op
+MTIzODQwWjCBgDB+MFYwDQYJYIZIAWUDBAIBBQAEIElG2m+vxvyC/H27ycn9keIR
+r2aAn9jdVIl8+kvdTNbnBCB8TvDxMd/461VVfQ4d/poKx1VK1jSW3eglnhIFfcp8
+jwIBQoAAGA8yMDE5MTEwMTEyMzg0MFqgERgPMjAyOTEwMzExMjM4NDBaMA0GCSqG
+SIb3DQEBCwUAA4IBAQAtYHgFUpnNwqr5k7HvsUBtHha5hwcsvkFm4qeStWJCPw1i
+vqEogN+SIq3MMf1pjGcl3jPIdbqYu89G3+1k3yORqIoraXkNZBUhr6rz/zqDDPVc
+daGslfWIxmvAkuWjZRgz7DZQhiBdZgSXdn09tCc656wmSguMP+pnRCvfOgXXJAyo
+m7wllgDDn4EToS44TXXr/KiGJJVM1MvA0rlls16d+GD/lnr856aw4XZkUb/BtwMv
+UXueN0TE5bi9OGE3CLnqW2DagBPwCwZ8BWNmhxbaAmrqyRLIsUU9ZhZctHGhiLvL
+j5ncQDW5sQVNVfNTrM4tPDYxw5XVsnDjHHjcETe+
-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp
index 38148ef58..463f4c644 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem
index 975b0f148..d21e93c4d 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.ocsp.signernocert.revoked.resp.pem
@@ -3,31 +3,31 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.net
- Produced At: Fri Nov 01 12:40:02 UTC 2019
+ Produced At: Fri Nov 01 12:38:40 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
- Issuer Key Hash: 01089fc170c578818ccc7b96390741ac0d020c89eb3e00f574c8f4d90d14dbf9
+ Issuer Key Hash: 7c4ef0f131dff8eb55557d0e1dfe9a0ac7554ad63496dde8259e12057dca7c8f
Serial Number: 42
Certificate Status: revoked
Revocation time: Mon Feb 01 14:27:09 UTC 2010
- This Update: Fri Nov 01 12:40:02 UTC 2019
- Next Update: Wed Oct 31 12:40:02 UTC 2029
+ This Update: Fri Nov 01 12:38:40 UTC 2019
+ Next Update: Wed Oct 31 12:38:40 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIICEQoBAKCCAgowggIGBgkrBgEFBQcwAQEEggH3MIIB8zCB3KEvMC0xFDASBgNV
BAoTC2V4YW1wbGUubmV0MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAx
-MTI0MDAyWjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCBJRtpvr8b8gvx9u8nJ/ZHi
-Ea9mgJ/Y3VSJfPpL3UzW5wQgAQifwXDFeIGMzHuWOQdBrA0CDInrPgD1dMj02Q0U
-2/kCAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTkxMTAxMTI0MDAyWqAR
-GA8yMDI5MTAzMTEyNDAwMlowDQYJKoZIhvcNAQELBQADggEBAOmNUgeAB6Qrlu/j
-HhfNF3X3VfrwK5hoX8dzvMDcPs5ug34OpqZeFHBFfc8H8qBLcHFEYzlRZ56lwkeN
-gLNyKgyFWVJmUnPS3XCLSJ6GLM/ZU1a3JuaS2Cr2NLQaw57v4tR6RPd+9KEmmL8e
-bFCk7qvHGagt66fn+CnGNQ1pBfRb93hwWJtjz18vjKngaeAf4G1ddk4UIhwxG2Io
-rTGm7dVJWK8DVaLTLY2N6cCquHTmcxMwQnbbOi0YCRNssGJeNVHO0zDIGS+ot7eX
-sQIu6YUL56Crq9MciiT4scsf4UTZYeUu4/Ye+Odecoxi7c9QGhhQqxiVpMZ1JmQB
-cWCOc2g=
+MTIzODQwWjCBlzCBlDBWMA0GCWCGSAFlAwQCAQUABCBJRtpvr8b8gvx9u8nJ/ZHi
+Ea9mgJ/Y3VSJfPpL3UzW5wQgfE7w8THf+OtVVX0OHf6aCsdVStY0lt3oJZ4SBX3K
+fI8CAUKhFhgPMjAxMDAyMDExNDI3MDlaoAMKAQQYDzIwMTkxMTAxMTIzODQwWqAR
+GA8yMDI5MTAzMTEyMzg0MFowDQYJKoZIhvcNAQELBQADggEBACtcTBc2XkKUEzQ6
+mmGxFDXi44FYD1Tpwk6VU4J4PsU66F6odEL0tZ332GsC4jYLkdgssTRvCRuQV5Gl
+jLTFC/tqVa0gIqaU5lMrziyR0ixT5eqP+CDyq4cE8Jc+MDuK9IjWndCs6n7UkyyJ
+yIkwBXylfMRn+J+v4hvSO74SLyR0BlETO1rzv82HfUQGT0gZ7ZQv8l0e6EjIaz0M
+cf/DagzbA9Yf5w7hQmwLkXLZT4n9Pb7EpA0K7l9Ryb0F7fDFUsQTL+etbZVHrRvZ
+rKHYrJx4OpU/CFkoRPdbc8fT8wqRyrO/JaUQGsJtl1r5HiZCo/qCGoOJWNKXTD68
+TAIet0M=
-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
index 2e245da88..8893bb1ca 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
index d2fdf9653..1913868af 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+ggEKAoIBAQC01HTvSPWMun4k/Zb0oSHz1J5VjdiR5HmEuJc91YQYuOJ+mt74dJqw
+DTkQGILVMw076e2PhyAWqqQDdAQvp1EzhA6cJByx4qqSus+Ew9t0qAlCpkRtuD3U
+Mi2sOPhrBeGEs2scsv+dd08oBhbXo6j6yem7PXfLzky55dduiyP/UsNw946NlXeD
+ec18pGGWZwOTVbf41MgJT+FM40HTbacH39ISnhFZmc8wsXV+77UlYGi5/ltvzfv0
+ajymK1OVN++hSBnWbzGpP0XBFxZk4N8QqiNcQc/KLjsm4jvrqMrPJVU/7MXqf6qf
+wFh4qvynAYy52tvQdUUybx0Egq2LeylrAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/ca.conf b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
index 17d47403e..bf42cb41b 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
@@ -1,19 +1,19 @@
; Config::Simple 4.59
-; Fri Nov 1 12:38:23 2019
+; Fri Nov 1 12:37:12 2019
+
+[CA]
+bits=2048
+subject=clica CA
+name=Certificate Authority rsa
+org=example.net
[CLICA]
-level=1
-sighash=SHA256
crl_url=http://crl.example.net/latest.crl
signer=Signing Cert rsa
+sighash=SHA256
+level=1
ocsp_url=http://oscp.example.net/
ocsp_signer=OCSP Signer rsa
ocsp_url=http://oscp.example.net/
-[CA]
-name=Certificate Authority rsa
-bits=2048
-subject=clica CA
-org=example.net
-
diff --git a/test/aux-fixed/exim-ca/example.net/CA/cert9.db b/test/aux-fixed/exim-ca/example.net/CA/cert9.db
index 0e6e18ca8..4543c573a 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/CA/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer
index f6505cb5f..028abda79 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt
index 4e32a860d..3359b6744 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt
@@ -1 +1 @@
-update=20191101124302Z
+update=20221030095831Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem
index 2cd9846d4..ed4271971 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem
@@ -1,10 +1,10 @@
-----BEGIN X509 CRL-----
MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUubmV0
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAxMTI0MzAyWjANBgkqhkiG
-9w0BAQsFAAOCAQEASWQ5FCPuO8IevQSU//+4Y0NVJseiD2V2PZUJusZueEEsEbFR
-Ve8TLhEvocDDIzpppRRgKslzTbJvpB1PMD/0vb+uTM65ZzeFzdg8/4fGXyyJoKqu
-miSQCEOn6YJGXRNVp5e+gyAYi7nITI+hsJmyB7p/Axi2Ue6ROzFOdoXFRx9PJ+2d
-cc+7raY5gvmwCthVXsodfocZFcZbux+TITIwDGIVOcWDbApV7ZwPtKtxkcsK29kq
-3kfPhKyQDC3Z4tfCIUPnDJrr7RAahZaM7p1DsYN9F9NmydXyMMyTg6gjSTld8Wo8
-DB0uBKZbwnU0L6mnE7y8eODWSDiarfwqHfew3A==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjIxMDMwMDk1ODMxWjANBgkqhkiG
+9w0BAQsFAAOCAQEAbuMcyUmi7eZaBBZy1zRk4q84P3l8mNhqbeqYleCy25yy1dWc
+rNDNkh3fTsWVD/nA/xOTrqpK1Y1q72QyVlKh7gIB+v9WU2v9O56UqOM5VGg5nS5q
+9aoVHjmDC3uzt29TJA4QBZB3RIhlJknSu7ZNayad8YltxGTjqL+jsixsoBLfzeSO
+w4/PMDiPolg0cp5wAV8IUYf3rdb5/R1/8RjFuSG+8VFkSdSUH7i7OHn6Y2jkciIj
+ULgs4ksT5bS4DmzhWoeh9uTvd+/y9Ww7ZtGKgCo/l5sR4TXwkjH3jl/NLmnGZZ6+
+9Iao/LNBcBRHOo2y9vt7Kb+noThmKiiJM9W+ug==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem
index a85c79f72..dfe71ddf5 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.chain.pem
@@ -1,21 +1,21 @@
-----BEGIN X509 CRL-----
MIIBaDBSAgEBMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNVBAoTC2V4YW1wbGUubmV0
-MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMTkxMTAxMTI0MzAyWjANBgkqhkiG
-9w0BAQsFAAOCAQEASWQ5FCPuO8IevQSU//+4Y0NVJseiD2V2PZUJusZueEEsEbFR
-Ve8TLhEvocDDIzpppRRgKslzTbJvpB1PMD/0vb+uTM65ZzeFzdg8/4fGXyyJoKqu
-miSQCEOn6YJGXRNVp5e+gyAYi7nITI+hsJmyB7p/Axi2Ue6ROzFOdoXFRx9PJ+2d
-cc+7raY5gvmwCthVXsodfocZFcZbux+TITIwDGIVOcWDbApV7ZwPtKtxkcsK29kq
-3kfPhKyQDC3Z4tfCIUPnDJrr7RAahZaM7p1DsYN9F9NmydXyMMyTg6gjSTld8Wo8
-DB0uBKZbwnU0L6mnE7y8eODWSDiarfwqHfew3A==
+MRUwEwYDVQQDEwxjbGljYSBDQSByc2EYDzIwMjIxMDMwMDk1ODMxWjANBgkqhkiG
+9w0BAQsFAAOCAQEAbuMcyUmi7eZaBBZy1zRk4q84P3l8mNhqbeqYleCy25yy1dWc
+rNDNkh3fTsWVD/nA/xOTrqpK1Y1q72QyVlKh7gIB+v9WU2v9O56UqOM5VGg5nS5q
+9aoVHjmDC3uzt29TJA4QBZB3RIhlJknSu7ZNayad8YltxGTjqL+jsixsoBLfzeSO
+w4/PMDiPolg0cp5wAV8IUYf3rdb5/R1/8RjFuSG+8VFkSdSUH7i7OHn6Y2jkciIj
+ULgs4ksT5bS4DmzhWoeh9uTvd+/y9Ww7ZtGKgCo/l5sR4TXwkjH3jl/NLmnGZZ6+
+9Iao/LNBcBRHOo2y9vt7Kb+noThmKiiJM9W+ug==
-----END X509 CRL-----
-----BEGIN X509 CRL-----
MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
-dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxOTExMDExMjQz
-MDJaMC0wFAIBZhgPMjAxOTExMDExMjQzMDJaMBUCAgDKGA8yMDE5MTEwMTEyNDMw
-MlowDQYJKoZIhvcNAQELBQADggEBAARzrjOHNj3kd5SSLk384QNWISzL7guRd3g/
-x9hCAmqGnUPVC3fRDsgHmtKKTLON+TAhQbpBqachoMyU0HpnVl2pMiirsxEHAae6
-wNNOPiCYb8SPVuzQb/mjRpli4Q89AxJfQ4V3kydYLQlHH/9b3snCK9s7mIRWPrzb
-aMlYhZrzubl7ghewUbp18nEZT5TU1f+pXTlmqMV6GB25OEsyhPSh0Lml40q6dwU+
-RD6FNEI3t21rG0NNrWWGcjCO3zxcMAFbQR3Km5AyTtldgzsa5Uxzp92tQmWexqHG
-bb3VNyF9OjLZMa2x/TyzYCaKKj3yUWe98jI2t2inkQk9zY1GACg=
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMjEwMzAwOTU4
+MzFaMC0wFAIBZhgPMjAyMjEwMzAwOTU4MzFaMBUCAgDKGA8yMDIyMTAzMDA5NTgz
+MVowDQYJKoZIhvcNAQELBQADggEBAHkUeJPLvvK0haStQYkKzQKGE1NzpiqDK0kS
+U27rWwHcqF9uMhNgskGxe7Ma/6AygCU+TdVFJtt8MM7P0Hnrcdgt9OFxoteylUCF
+4S1KquFjJAKWSlUT3vIGG99UQ3S2+Fhn7FupN+OacUsSdG0+0QRyFb8scH4+t9zu
+STK1FeYLQGbRWrbysfOeSippVBWmzPbP5ynkAVUB1hU+Jna6RBK3YnSv5KpkXymG
+HW/62Y2G7FZqxzjtIbjVEz4UvxHToF8BG/D4hvEfdGa8eCg/7Mg0OGV8wBuWDsG4
+OyeJjEoNE0oKbq9NiCYPloc6IjH0vg3imZUppIhO92UvCi07Z/o=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
index ff02105f1..1fcf3b296 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
index f0012b670..7f1a9b450 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20191101124259Z
+update=20221030095828Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
index 0c6da5cac..98a82e1c5 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
@@ -1,10 +1,10 @@
-----BEGIN X509 CRL-----
MIIBcjBcAgEBMA0GCSqGSIb3DQEBCwUAMDcxFDASBgNVBAoTC2V4YW1wbGUubmV0
-MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDE5MTEwMTEyNDI1
-OVowDQYJKoZIhvcNAQELBQADggEBABr5jxVJ3WQoVTI9fStZ/jI7mNbzoOBWPm5w
-3uMQt9hKShi2t5/RaaSt6hL9oRhAsPfdhImbFIhI2qfgrI8HeysTHulgrXBwgDQE
-/NebB5shGb287CT/11iBHaEeuCIqSp2FR2q/HIQzAGBYsgrud6B/6TgluiofiNlt
-pIC3vHGxGLQ2RD26WcHXvDGUwMrhU1vG392rF5r81PDfhNZEnGgmbG4x5lVYfWY1
-d+xAewFeSJoZ+7tT+vxLWSPe0LzI0K1Wg/OZtvu2hd5adoBWwv09mmJWRHjL3V5L
-EFS1tf0/lQALQsVUpbB4MmyO0u5SN7qESXe4Jj41FD22VrdpWpM=
+MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNhGA8yMDIyMTAzMDA5NTgy
+OFowDQYJKoZIhvcNAQELBQADggEBAG+Aiuq+2Lfm6HdHq65BFHpIrni+fTgRJCbB
+f5gr5gZ2eJpACBF7BEFn5n0LKTl/q+L9HN6Oki6T+GXkxPVHenjX1hodvEMO3fnj
+j25SZ60QfDba7eYoKptDLhph/qh7NA5je08owRJLbg7bHZiJVOrLwTEe1LsdpTtW
+gez/rCbXyYBLKqPTooYUSkVNAc2q3Vn4rmpgmjlP/UU0xPKcE1MtZ5JTwIsfPN+/
+nu79TsGDCixckANzDdzPMmb7wUBSzJ+2udx7dthlmmIAa0hVme2lnM0AqJzsX8+L
+MmJfaCfKi78wWeBTewOthAMHEBRtHFdACyb14046v7XvHyHU9Sw=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2 b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
index d45c44e75..77ea474a8 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
index 9f54f912c..c62968d9f 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20191101124302Z
-addcert 102 20191101124302Z
-addcert 202 20191101124302Z
+update=20221030095831Z
+addcert 102 20221030095831Z
+addcert 202 20221030095831Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
index 2a2462561..36a964491 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
@@ -1,11 +1,11 @@
-----BEGIN X509 CRL-----
MIIBojCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
-dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxOTExMDExMjQz
-MDJaMC0wFAIBZhgPMjAxOTExMDExMjQzMDJaMBUCAgDKGA8yMDE5MTEwMTEyNDMw
-MlowDQYJKoZIhvcNAQELBQADggEBAARzrjOHNj3kd5SSLk384QNWISzL7guRd3g/
-x9hCAmqGnUPVC3fRDsgHmtKKTLON+TAhQbpBqachoMyU0HpnVl2pMiirsxEHAae6
-wNNOPiCYb8SPVuzQb/mjRpli4Q89AxJfQ4V3kydYLQlHH/9b3snCK9s7mIRWPrzb
-aMlYhZrzubl7ghewUbp18nEZT5TU1f+pXTlmqMV6GB25OEsyhPSh0Lml40q6dwU+
-RD6FNEI3t21rG0NNrWWGcjCO3zxcMAFbQR3Km5AyTtldgzsa5Uxzp92tQmWexqHG
-bb3VNyF9OjLZMa2x/TyzYCaKKj3yUWe98jI2t2inkQk9zY1GACg=
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAyMjEwMzAwOTU4
+MzFaMC0wFAIBZhgPMjAyMjEwMzAwOTU4MzFaMBUCAgDKGA8yMDIyMTAzMDA5NTgz
+MVowDQYJKoZIhvcNAQELBQADggEBAHkUeJPLvvK0haStQYkKzQKGE1NzpiqDK0kS
+U27rWwHcqF9uMhNgskGxe7Ma/6AygCU+TdVFJtt8MM7P0Hnrcdgt9OFxoteylUCF
+4S1KquFjJAKWSlUT3vIGG99UQ3S2+Fhn7FupN+OacUsSdG0+0QRyFb8scH4+t9zu
+STK1FeYLQGbRWrbysfOeSippVBWmzPbP5ynkAVUB1hU+Jna6RBK3YnSv5KpkXymG
+HW/62Y2G7FZqxzjtIbjVEz4UvxHToF8BG/D4hvEfdGa8eCg/7Mg0OGV8wBuWDsG4
+OyeJjEoNE0oKbq9NiCYPloc6IjH0vg3imZUppIhO92UvCi07Z/o=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/key4.db b/test/aux-fixed/exim-ca/example.net/CA/key4.db
index 46bd98d96..8175336d2 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/CA/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/noise.file b/test/aux-fixed/exim-ca/example.net/CA/noise.file
index f98cc0439..27667e24d 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.net/CA/noise.file
@@ -5,7 +5,7 @@ model : 94
model name : Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz
stepping : 3
microcode : 0xf0
-cpu MHz : 3201.587
+cpu MHz : 3315.065
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 : 3297.210
+cpu MHz : 3334.696
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 : 3298.538
+cpu MHz : 3277.825
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 : 3292.926
+cpu MHz : 3246.735
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: 38 0 0 0 IR-IO-APIC 2-edge timer
- 1: 0 0 0 973 IR-IO-APIC 1-edge i8042
+ 0: 56 0 0 0 IR-IO-APIC 2-edge timer
+ 1: 0 0 0 2441 IR-IO-APIC 1-edge i8042
8: 1 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 0 138991 0 0 IR-IO-APIC 9-fasteoi acpi
- 12: 0 0 201523 0 IR-IO-APIC 12-edge i8042
- 16: 0 0 3 0 IR-IO-APIC 16-fasteoi i801_smbus
+ 9: 0 7727 0 0 IR-IO-APIC 9-fasteoi acpi
+ 12: 0 0 346915 0 IR-IO-APIC 12-edge i8042
+ 16: 0 3 0 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 682090 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 127: 0 5232 629360 0 IR-PCI-MSI 327680-edge xhci_hcd
- 128: 0 506 0 0 IR-PCI-MSI 2097152-edge rtsx_pci
- 129: 0 0 15 1152157 IR-PCI-MSI 520192-edge enp0s31f6
- 130: 13 0 0 5 IR-PCI-MSI 1048576-edge nvkm
- 131: 629 0 9194221 0 IR-PCI-MSI 32768-edge i915
- 132: 0 65 0 0 IR-PCI-MSI 360448-edge mei_me
- 133: 0 0 0 49 IR-PCI-MSI 1572864-edge iwlwifi
- 134: 1151 0 0 0 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- NMI: 421 422 430 415 Non-maskable interrupts
- LOC: 24553927 23675944 23065181 22449912 Local timer interrupts
+ 126: 0 0 0 73942 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 127: 0 1893 85 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 128: 0 492 0 0 IR-PCI-MSI 2097152-edge rtsx_pci
+ 129: 0 0 24 56990 IR-PCI-MSI 520192-edge enp0s31f6
+ 130: 10 0 0 5 IR-PCI-MSI 1048576-edge nvkm
+ 131: 133 0 293682 0 IR-PCI-MSI 32768-edge i915
+ 132: 0 0 65 0 IR-PCI-MSI 360448-edge mei_me
+ 133: 0 0 0 578 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ 134: 48 0 0 0 IR-PCI-MSI 1572864-edge iwlwifi
+ NMI: 21 18 20 16 Non-maskable interrupts
+ LOC: 790037 689228 777466 679086 Local timer interrupts
SPU: 0 0 0 0 Spurious interrupts
- PMI: 421 422 430 415 Performance monitoring interrupts
- IWI: 188144 175861 4004788 194234 IRQ work interrupts
+ PMI: 21 18 20 16 Performance monitoring interrupts
+ IWI: 6209 6569 132488 6786 IRQ work interrupts
RTR: 6 0 0 0 APIC ICR read retries
- RES: 3031047 3054389 3071151 3064710 Rescheduling interrupts
- CAL: 2005440 1885713 1840937 1822035 Function call interrupts
- TLB: 834647 821497 882555 886390 TLB shootdowns
+ RES: 24466 23533 19966 18032 Rescheduling interrupts
+ CAL: 73148 61715 58711 56943 Function call interrupts
+ TLB: 31633 32339 27582 27384 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: 126 127 127 127 Machine check polls
+ MCP: 7 8 8 8 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: 16241860 kB
-MemFree: 5579284 kB
-MemAvailable: 11233488 kB
-Buffers: 643836 kB
-Cached: 5956172 kB
-SwapCached: 88 kB
-Active: 3268604 kB
-Inactive: 6319564 kB
-Active(anon): 234808 kB
-Inactive(anon): 3711476 kB
-Active(file): 3033796 kB
-Inactive(file): 2608088 kB
-Unevictable: 336688 kB
-Mlocked: 184 kB
+MemFree: 10802836 kB
+MemAvailable: 13179792 kB
+Buffers: 197408 kB
+Cached: 2896460 kB
+SwapCached: 0 kB
+Active: 815256 kB
+Inactive: 3699188 kB
+Active(anon): 3152 kB
+Inactive(anon): 1931464 kB
+Active(file): 812104 kB
+Inactive(file): 1767724 kB
+Unevictable: 495620 kB
+Mlocked: 48 kB
SwapTotal: 16601080 kB
-SwapFree: 16599032 kB
+SwapFree: 16601080 kB
Zswap: 0 kB
Zswapped: 0 kB
-Dirty: 640 kB
+Dirty: 868 kB
Writeback: 0 kB
-AnonPages: 3324800 kB
-Mapped: 841156 kB
-Shmem: 958108 kB
-KReclaimable: 349912 kB
-Slab: 507748 kB
-SReclaimable: 349912 kB
-SUnreclaim: 157836 kB
-KernelStack: 19744 kB
-PageTables: 47124 kB
+AnonPages: 1916256 kB
+Mapped: 563948 kB
+Shmem: 514040 kB
+KReclaimable: 100496 kB
+Slab: 220876 kB
+SReclaimable: 100496 kB
+SUnreclaim: 120380 kB
+KernelStack: 15312 kB
+PageTables: 34104 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
CommitLimit: 24722008 kB
-Committed_AS: 11193284 kB
+Committed_AS: 6727164 kB
VmallocTotal: 34359738367 kB
-VmallocUsed: 82756 kB
+VmallocUsed: 77824 kB
VmallocChunk: 0 kB
-Percpu: 7616 kB
+Percpu: 7648 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: 374248 kB
-DirectMap2M: 11022336 kB
-DirectMap1G: 6291456 kB
+DirectMap4k: 239080 kB
+DirectMap2M: 10108928 kB
+DirectMap1G: 7340032 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
- lo: 307129 2471 0 0 0 0 0 0 307129 2471 0 0 0 0 0 0
-enp0s31f6: 672636085 686092 0 0 0 0 0 0 60877460 523339 0 0 0 0 0 0
+ lo: 157143 576 0 0 0 0 0 0 157143 576 0 0 0 0 0 0
+enp0s31f6: 33132739 33692 0 0 0 0 0 0 3377998 26512 0 0 0 0 0 0
wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+virbr2: 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: 131939979990 12949352 0 0 0 0 0 82 724135061 8643862 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
index dcb99dc5d..1df3bf21f 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.db
index eecd70439..1686cecbb 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
index 49fab0aa6..2ae661508 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
@@ -1,46 +1,46 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: D1 34 52 F9 D5 F8 C2 2F 07 A0 84 D1 BB 3B 8D 6D A6 46 CF 3E
+ localKeyID: 35 5D 7A 9C 18 FF B8 2F FA E4 17 60 5C D0 35 EE 27 32 29 20
subject=CN = expired1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM4NTVaFw0xOTEyMDExMjM4NTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAreN4DiWs
-3l3qn/x6aEoUqGnZTL51E1We5FBmeQp+7TndfjiOaOg0BlViy0PAWrGIbSufmoG7
-DOj2xzBthMYASYayRCyTfZp6OmzlanR31fCj8gfGsdEAttO9ym6SS9Iuh7CMRpsy
-yjPFce/MqBuGQWaA6ubxcWldd+XUk/tCcLc8tQroBoj56czmAtlnRs04AW3Z4Csk
-De3DS2yKEkWCu8ETQb1qrzuDZDNfsiJMG+Um1b820dzEghTLFp9OD4vGfwm10LpC
-790dBq3BDGQyHHcHrUOBAyoYb/PSe6iTIRpPf3BvOuBHIz+bFtwxiv+nLgGiR8QD
-J3RHcMdCB8HkPQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM3NDFaFw0xOTEyMDExMjM3NDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwbUGfHFH
+0eLgWNQM2blGcOjRH7CjJk3e+NId/szvWRwHX05mHVG96dZG1PoKVIuxagIbP9p9
+iqUMDEDwDh8hAVGmpnKO0V7fZHapC7zP/aKyJeJTdmjjCMTKi3WobgrBNaytoy/7
+oyQZzwrm7kkkff1tCffHHrse1NpydBGzcIDcwMbd/M6fifkO5w/pkCm5/A5uSmrY
+CeNOvY7yRUjdJeWlOI679tW/lg/9WUxFkZOgAZ+VKmgQGscPVUAWD91EHAgH7unO
+Ct4ySobs6rXDx3ncc9uwhWvXlQblc7UrkOQ5mWtztMAB3YdAOqx2SOZur29TCpxo
+kAnBswPzRkWJ7wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQCfvJNOEXcHDAuj
-w0W0L6ObZ66OjpwvbJ9rrNff9HR6T6KZn5kfz/YGVAXDD/uLouE13BBFZcwRRawC
-rYSm76gCecolMz2tKGLT72E010JcRfIz0LDCth3v+MNyCHmQnRQzeM0bYo2SMkHI
-UR8d9o2xCgA6r2LetRj+4X9Qb1aKshKiJjcuobGwKVcOSXtNYpmbjJZcf4oJ/8qF
-iyKE/qXUlZCGWuBP0/UGg7Io3H1C10ucG6CjGPPz4kiGEWx+cn08VUFg6r/7TPE6
-VoPp1OilhlqT7LZ0BUk10uSMWKIXiufGfIedSf7ZSsGoQpuz/4KhNhLgCg8kHMm0
-IdsqDGR7
+cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQA2joz4Afke82Rf
+vPLH/S4R6iBPRNk3G4TcOu9uuxRefx8rTRyLTUzgz8z45TZoiGIRXZKwReLGYyX3
+51lQ3S8dqMyBx0FLn3TBJTHYfv8RB7qhMUQxk55DQhDaw8MTmsf3jN2tvLCdmPGk
+lZgdNqAu7CDu1d0dvbDDspYgB5NXX0yynGI8Wh8YH8h+RjIiVW3f5LL0OJD1MBDU
+2yAUfO0YNhAuWEUYyH414VbTeZ4PXECBOFbr+4MhwWxwYfMHawXNJorRIyXmgziV
+nIWsiIHRe6ORx6QjN5l13/xz5wQFaagr4YpAhUSlXNN2zCeyFPKXbhxKdzjQrmkG
+1X7u9v1g
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
index ee8bb01f1..9fe546d67 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
@@ -1,34 +1,34 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: D1 34 52 F9 D5 F8 C2 2F 07 A0 84 D1 BB 3B 8D 6D A6 46 CF 3E
+ localKeyID: 35 5D 7A 9C 18 FF B8 2F FA E4 17 60 5C D0 35 EE 27 32 29 20
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
index cf61710c4..ec7aac9f7 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
index 18bca86a7..59085392a 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
index d9f6d07bd..de27c5111 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
index 468831abc..001306142 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
index 066989a36..62ec491f2 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
index a8e509f9e..956b3b05c 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
index 9f1fdfb43..f56a3cf03 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
index 8a33cae19..986196e6e 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
index 581e259fb..cbb570af1 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
index 33d22574e..2c0121dfd 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
index 38a898c3c..6bfbbb846 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
index 5451a0187..a24c2c9f8 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
@@ -1,27 +1,27 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: D1 34 52 F9 D5 F8 C2 2F 07 A0 84 D1 BB 3B 8D 6D A6 46 CF 3E
+ localKeyID: 35 5D 7A 9C 18 FF B8 2F FA E4 17 60 5C D0 35 EE 27 32 29 20
subject=CN = expired1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM4NTVaFw0xOTEyMDExMjM4NTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAreN4DiWs
-3l3qn/x6aEoUqGnZTL51E1We5FBmeQp+7TndfjiOaOg0BlViy0PAWrGIbSufmoG7
-DOj2xzBthMYASYayRCyTfZp6OmzlanR31fCj8gfGsdEAttO9ym6SS9Iuh7CMRpsy
-yjPFce/MqBuGQWaA6ubxcWldd+XUk/tCcLc8tQroBoj56czmAtlnRs04AW3Z4Csk
-De3DS2yKEkWCu8ETQb1qrzuDZDNfsiJMG+Um1b820dzEghTLFp9OD4vGfwm10LpC
-790dBq3BDGQyHHcHrUOBAyoYb/PSe6iTIRpPf3BvOuBHIz+bFtwxiv+nLgGiR8QD
-J3RHcMdCB8HkPQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM3NDFaFw0xOTEyMDExMjM3NDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwbUGfHFH
+0eLgWNQM2blGcOjRH7CjJk3e+NId/szvWRwHX05mHVG96dZG1PoKVIuxagIbP9p9
+iqUMDEDwDh8hAVGmpnKO0V7fZHapC7zP/aKyJeJTdmjjCMTKi3WobgrBNaytoy/7
+oyQZzwrm7kkkff1tCffHHrse1NpydBGzcIDcwMbd/M6fifkO5w/pkCm5/A5uSmrY
+CeNOvY7yRUjdJeWlOI679tW/lg/9WUxFkZOgAZ+VKmgQGscPVUAWD91EHAgH7unO
+Ct4ySobs6rXDx3ncc9uwhWvXlQblc7UrkOQ5mWtztMAB3YdAOqx2SOZur29TCpxo
+kAnBswPzRkWJ7wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQCfvJNOEXcHDAuj
-w0W0L6ObZ66OjpwvbJ9rrNff9HR6T6KZn5kfz/YGVAXDD/uLouE13BBFZcwRRawC
-rYSm76gCecolMz2tKGLT72E010JcRfIz0LDCth3v+MNyCHmQnRQzeM0bYo2SMkHI
-UR8d9o2xCgA6r2LetRj+4X9Qb1aKshKiJjcuobGwKVcOSXtNYpmbjJZcf4oJ/8qF
-iyKE/qXUlZCGWuBP0/UGg7Io3H1C10ucG6CjGPPz4kiGEWx+cn08VUFg6r/7TPE6
-VoPp1OilhlqT7LZ0BUk10uSMWKIXiufGfIedSf7ZSsGoQpuz/4KhNhLgCg8kHMm0
-IdsqDGR7
+cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQA2joz4Afke82Rf
+vPLH/S4R6iBPRNk3G4TcOu9uuxRefx8rTRyLTUzgz8z45TZoiGIRXZKwReLGYyX3
+51lQ3S8dqMyBx0FLn3TBJTHYfv8RB7qhMUQxk55DQhDaw8MTmsf3jN2tvLCdmPGk
+lZgdNqAu7CDu1d0dvbDDspYgB5NXX0yynGI8Wh8YH8h+RjIiVW3f5LL0OJD1MBDU
+2yAUfO0YNhAuWEUYyH414VbTeZ4PXECBOFbr+4MhwWxwYfMHawXNJorRIyXmgziV
+nIWsiIHRe6ORx6QjN5l13/xz5wQFaagr4YpAhUSlXNN2zCeyFPKXbhxKdzjQrmkG
+1X7u9v1g
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
index 68e3f8925..e4df5dc8c 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCt43gOJazeXeqf
-/HpoShSoadlMvnUTVZ7kUGZ5Cn7tOd1+OI5o6DQGVWLLQ8BasYhtK5+agbsM6PbH
-MG2ExgBJhrJELJN9mno6bOVqdHfV8KPyB8ax0QC2073KbpJL0i6HsIxGmzLKM8Vx
-78yoG4ZBZoDq5vFxaV135dST+0Jwtzy1CugGiPnpzOYC2WdGzTgBbdngKyQN7cNL
-bIoSRYK7wRNBvWqvO4NkM1+yIkwb5SbVvzbR3MSCFMsWn04Pi8Z/CbXQukLv3R0G
-rcEMZDIcdwetQ4EDKhhv89J7qJMhGk9/cG864EcjP5sW3DGK/6cuAaJHxAMndEdw
-x0IHweQ9AgMBAAECggEAIokC1wx0gNV2O8ARL5VG9QvQtIU/C0/99qphL7j97G+J
-pf/liMBVVMywil4yXdDUn5oCYNVTKQU7vePIXI5WkEPIM/IGePOtQt1N0w6+nibk
-6LTSqY4w7h6vmvzK4XQk+Z3+vicktzQBCtftdZXB3EtXX0/us++ROLbUuW81it0F
-yi7/2ZnDxGvc4busaPGAfL7r+6rUIkAynjgFX6Z5MMDJCTIsTWWwSSbX+YtRe6HT
-Y8OUoA8KFnhrLco6Y/9i6nrq5z0MCEV71TKKjTw6ZpuB2LnlGpSQHK+SPNOyC1pt
-WqMwK7Vi8OTYhGV693oAQHVp4olaYyC1us2JpT3RoQKBgQDUoVK8IkCKhmdkqlNl
-qzVE6Ka5ZG6/FcNfwAsdfvaJQpvxCiWUg5cWwLSfGJoAaPa7aKGho4n5i1wkZ2L+
-SiryPa132G6paQoD2AfKkBVlF/l/szTewqPTd5nB9SO3XxcAshLHUyLfp/o5FPdB
-As8KCEMP2vYV9nkmg5nf88CiqwKBgQDRWzeUq+v314Y1FLJp/nJ5MGQkhfyYUj0s
-qYnyzAjIPVCu2C3V3T7TQBIBQsVJM7tNQ3B+7HswL3k1bnXlcNlgaa7mSVQweRsU
-4ZTRMwJWo3MjMV5zRniHB8cgLGaroQo3kqpiibIaGgk/1tI6YvV1IivhacBMS/u9
-uuuGhwjUtwKBgEyMj6afhjDY1lxNXZzamGDoiS1xVNWCVkYgc1/5F3SvAEk05/ah
-sUFFu0ETsE25fCpYLuhsYf3vCAsrFV6LAQ8Y2VyuFJj08eAUZCmu2aT9jptEvyH7
-XNOC2V4UjPk1SKi9czlDWui+Jr1qKOHEyxjHhK0unS2nAFK3SixwKsflAoGAPgE4
-Gu44OvU4KGxy0vWrTb1JS4/rWemxeJLV6nUHfNa8GKyqFpcqTkLBkmIGMEIEDUQW
-A2Fissi8q1iFzmh32Rgz1ryNFLYpkSumebcT0Dkklp2+jYGnnMZu8VZ1KgvODNuB
-XyHM//IKH0Auj2BTtldii6ZYb8BpVK4Rp4xCz00CgYAuSS9hvEizRjEg7yVXsq7M
-QV4kYW0d3ik2I++Evx6uqbgXiPVPYY5nN7XLI2QAo8GuUu+5ZdXvcIt6Lm9SaAVs
-RrCjBC9WlMEZt8g02pIxCzcC7vuVezmd6/tUIqfUz8BeN/4u92+rWJxVYlBibvbi
-NJI3+wCT7FsDOpYh/lwEVw==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDBtQZ8cUfR4uBY
+1AzZuUZw6NEfsKMmTd740h3+zO9ZHAdfTmYdUb3p1kbU+gpUi7FqAhs/2n2KpQwM
+QPAOHyEBUaamco7RXt9kdqkLvM/9orIl4lN2aOMIxMqLdahuCsE1rK2jL/ujJBnP
+CubuSSR9/W0J98ceux7U2nJ0EbNwgNzAxt38zp+J+Q7nD+mQKbn8Dm5KatgJ4069
+jvJFSN0l5aU4jrv21b+WD/1ZTEWRk6ABn5UqaBAaxw9VQBYP3UQcCAfu6c4K3jJK
+huzqtcPHedxz27CFa9eVBuVztSuQ5DmZa3O0wAHdh0A6rHZI5m6vb1MKnGiQCcGz
+A/NGRYnvAgMBAAECggEAMTg6xC8SlTnFULzc4QvLYtA9pwQ+iHKb9/SH66EOJkHR
+e72Tg9qr23l3eRFpw47VTz7mxqRRZwPGGmz7slLlk4y4QC32rSuirsfZ72IUJXoM
+M0UdeQZwvd8nKiWE3SU9b9KHMmJ0WcFID4xRHnYWYC8fYDuF7ICWdnZlQ6nlwu2B
+SYItmScOOzbLzftJMhSc6Me0ZuwDjV8TnGOBjCtE+7so9gu8+niU//ihgMHqblZP
+dSXcDVXin23HeMfDwwQdZEFKGhI/qkYiK1BIacruqE7fAW1nEhqao2fKnzdSVkDK
+hegnDaasa1f7qTBuUuOH3qIeNcYghII/y65181Qp0QKBgQD9pPVLuKVN/77o9TQW
+HtgPz24D7MedVBKKF1XqJOz99FxVrwDZUVHsZ1Y0tAMty7t5HojzzJtIuKmxt26z
+sjFodxpx7WQaSiGN0+45vaSz1csXFWqeeMJ7OFGARFQhEG1B+8IQWpsr1s+7ji+s
+0GRUivcoOIzmvBxEKIfeMq9AnwKBgQDDgZDZXooKOlNAjSASa6Q/v4uXAdioqQAE
+foMpYiKmpMdC3eNISEi3R5MDZznHRJOBskge8DTPHHATBoM2KAVuOntveboBYPss
+WrPqGFyLeH0afCjDaI8feCKc37d5q8a/zQf0xNw4Y/qlCgQJ/ohopnLpfo579Ae+
+L46HKcyksQKBgBWByD7ccD/V4KU2LW12vhFRIF361M41U8Eby3AoI2RBNRca2LKU
+n6Kw/HFJlj9q2AGkIi6x+bTH27Oy/xMDmAbomnhwjZ1hDclN4BRLTUzmYusZKMo5
+KRxzoQ2EPbH0B5+hrknetOuZslGP8+DuZqN4iQ6DBQeHicoJucOQfqW3AoGBALbi
+axeLwmGS8fH+kjPpEbq4eeIGzh/oB6YsmpGJxZRRrDy2yDgDtlIM2E9krr3jPoEi
+vyiB10Su+4AwpWlxwrK8bl93ZTKJAC0bpBWmOFwXmB/AaXlyRABSJz7MYBunPsKJ
+D5o+1SrDC+J7HhAjVINgwTn/M1Zsjxmv7wotZcvhAoGBAMV7zuSwO64nep4566W+
+4UeAIBpUwwbCdx48cI/bGMBLNo6e3YXZbq3wwh9KpxNR1Xl0rytuc0wPFYtIcCHC
+0frr7Hoif0fvSoSVXFqbC7OmpDZQpkmDLR0Mayp3wArsvnvUIHr4DzIelWttQTWA
+lowu9ntedFlyqt3tJfhOpAew
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.db
index 8cd577d52..525d9aff2 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
index dcb99dc5d..1df3bf21f 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.db
index 8d990f1ab..24efe6544 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
index d3988504b..290f30c6e 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
@@ -1,46 +1,46 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: A0 22 8D 08 49 A4 EE D1 D8 48 4B F9 86 A2 93 BB 25 D1 3C 5D
+ localKeyID: CD 64 4A A9 10 3D 6D 1E 59 70 5B 8A 81 6F 53 83 8B 55 8F A2
subject=CN = expired2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzOTMzWhcNMTkxMjAxMTIzOTMzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsZVe6V
-CRBgQuuMIMA0cS33P0z1gc11+fBX7sBjvIndHHj8Vx+Sombl/4WL7WPHE7JlYPZB
-b+6pbStJv8q5Y+nq1F/U0O7Y38HJ+LGoGBSvq/FLJDosrFOJwxvU4U5P5JB2Vm5m
-Ok0XNSq4C8GxuorRwNDFlY+ADnJdMwo1zBjqd3xSnCav006Yf+O00GEsPaNRF34I
-i/aPWmiw+FizLYPX02XNpPJVD+XwFUFB6hWRYiTmAoLaWEfRFebvmj0DhjVUueN/
-MXqddGbAJrvMJFj0Bb+uNd65fqmZPpauP1Hvn8z8ayGjlSWqLyh5dh+8smpICpFF
-mjwqa+zg1pTtyOcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzODE1WhcNMTkxMjAxMTIzODE1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANa7HAhh
+wRTYTwgJ23cA7sungtCsiHvMiHOBNFr/UwbE8ODUJuBpXSBShQZ508ZthIImrG70
+oinsMMmz2TEpq47x1DQJtyHLzsAgGVdeoq3vDI20k8BGuZhOMkcyCzx82L6QWTEn
+Ii9pzyzcJVcjPW38bTXAt5EwwF7L7va1NoFEbTv/+51B1wiTJXquT6AsvnUos9Y3
+/zICwaEBBBVw8LhrIfOmJR81ltbez7N6jpaG8GjqBOWiBiiqIbj+D+THm+UGjGJf
+ynKSPrNkbBzxkms6S2XLkemBp6YLVmmuzlujFB6m5e9D16TDA1Mdd9H/7ZOh7QND
+TlZ6up9BGO8x45sCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAJ8LWFwlP5gE+
-AHDcAHSjFy/R/BxN3KBQ9knr7EfSiKfvpzNxCsePIohpmi9pZK+dTEvk4x13DjBH
-TxN4MwmFvSmYFRA6lmeZwcm7NlUDNBR94K/5Mp2LvCXSsso0iYfvzRkwwpaadjxg
-mt4XgCdVBxfxyDcPMDchiIdd6nrWi9ms9Sa85P0WYwoad5XbNUdOKJCbN01pjKpA
-lSbYgJ6hFraa2uNOnVw4JdygqON+w1k7LHk0JsHUz1RrIpUGOZqcE+aiDzhTcc3h
-ISBcR451z4FB9HbPZw8EL7dgsSGHbim7bRI+U3vk78Rhf6UK91IhqoLGjmZYmApb
-oUAgc1ucZQ==
+eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAd/xdCBJjzKXR
+0/FgvxeF5kRIAvLc1i0lq6XRHCIpX1PVYdfELuTYx7aYAVcQa8RgO91lW3DETvow
+hDXvz6J29RxuAx3ZqnH+Un5i7ORO8wMpzg4ZmiTKFNTQgVeV3WYN/R1NZ/bxQnQB
+VYvoIqGZmQMmcC7ZfJtNBlIL3ODolvDfUl5Elvqn8P2EFH07Pv+TvTLU7CxZ6ibs
+b2Op3HAWnu4lfEAi286/mXnEWKgMevx4HGuCiqd1EI/FFEYVpMSMmGzQMuiKOJ47
+TAmYEeURuTp06JxVGAHQoivVD9Hb7pXSlZlcu3He8xVzXMW83wNvgBm/eGbla5X0
+OCGJx3qafw==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
index 15995ee75..97b46ca28 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
@@ -1,34 +1,34 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: A0 22 8D 08 49 A4 EE D1 D8 48 4B F9 86 A2 93 BB 25 D1 3C 5D
+ localKeyID: CD 64 4A A9 10 3D 6D 1E 59 70 5B 8A 81 6F 53 83 8B 55 8F A2
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
index 62e71557c..bc2a54804 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
index 95903bdc3..2875c6e83 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
index 1ec9429c8..3d03d8fe6 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
index 95903bdc3..2875c6e83 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
index 29ece6470..44d5fe287 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
index 6b2e2e547..bcb561019 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
index 6b2e2e547..bcb561019 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
index de515f0fb..de701f681 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
index d24ebd0b5..f42bf1635 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
index d24ebd0b5..f42bf1635 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
index 41d5224a5..a92c5021b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
index de854f4c5..3dd6357c6 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
@@ -1,27 +1,27 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: A0 22 8D 08 49 A4 EE D1 D8 48 4B F9 86 A2 93 BB 25 D1 3C 5D
+ localKeyID: CD 64 4A A9 10 3D 6D 1E 59 70 5B 8A 81 6F 53 83 8B 55 8F A2
subject=CN = expired2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzOTMzWhcNMTkxMjAxMTIzOTMzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsZVe6V
-CRBgQuuMIMA0cS33P0z1gc11+fBX7sBjvIndHHj8Vx+Sombl/4WL7WPHE7JlYPZB
-b+6pbStJv8q5Y+nq1F/U0O7Y38HJ+LGoGBSvq/FLJDosrFOJwxvU4U5P5JB2Vm5m
-Ok0XNSq4C8GxuorRwNDFlY+ADnJdMwo1zBjqd3xSnCav006Yf+O00GEsPaNRF34I
-i/aPWmiw+FizLYPX02XNpPJVD+XwFUFB6hWRYiTmAoLaWEfRFebvmj0DhjVUueN/
-MXqddGbAJrvMJFj0Bb+uNd65fqmZPpauP1Hvn8z8ayGjlSWqLyh5dh+8smpICpFF
-mjwqa+zg1pTtyOcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzODE1WhcNMTkxMjAxMTIzODE1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANa7HAhh
+wRTYTwgJ23cA7sungtCsiHvMiHOBNFr/UwbE8ODUJuBpXSBShQZ508ZthIImrG70
+oinsMMmz2TEpq47x1DQJtyHLzsAgGVdeoq3vDI20k8BGuZhOMkcyCzx82L6QWTEn
+Ii9pzyzcJVcjPW38bTXAt5EwwF7L7va1NoFEbTv/+51B1wiTJXquT6AsvnUos9Y3
+/zICwaEBBBVw8LhrIfOmJR81ltbez7N6jpaG8GjqBOWiBiiqIbj+D+THm+UGjGJf
+ynKSPrNkbBzxkms6S2XLkemBp6YLVmmuzlujFB6m5e9D16TDA1Mdd9H/7ZOh7QND
+TlZ6up9BGO8x45sCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAJ8LWFwlP5gE+
-AHDcAHSjFy/R/BxN3KBQ9knr7EfSiKfvpzNxCsePIohpmi9pZK+dTEvk4x13DjBH
-TxN4MwmFvSmYFRA6lmeZwcm7NlUDNBR94K/5Mp2LvCXSsso0iYfvzRkwwpaadjxg
-mt4XgCdVBxfxyDcPMDchiIdd6nrWi9ms9Sa85P0WYwoad5XbNUdOKJCbN01pjKpA
-lSbYgJ6hFraa2uNOnVw4JdygqON+w1k7LHk0JsHUz1RrIpUGOZqcE+aiDzhTcc3h
-ISBcR451z4FB9HbPZw8EL7dgsSGHbim7bRI+U3vk78Rhf6UK91IhqoLGjmZYmApb
-oUAgc1ucZQ==
+eHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAd/xdCBJjzKXR
+0/FgvxeF5kRIAvLc1i0lq6XRHCIpX1PVYdfELuTYx7aYAVcQa8RgO91lW3DETvow
+hDXvz6J29RxuAx3ZqnH+Un5i7ORO8wMpzg4ZmiTKFNTQgVeV3WYN/R1NZ/bxQnQB
+VYvoIqGZmQMmcC7ZfJtNBlIL3ODolvDfUl5Elvqn8P2EFH07Pv+TvTLU7CxZ6ibs
+b2Op3HAWnu4lfEAi286/mXnEWKgMevx4HGuCiqd1EI/FFEYVpMSMmGzQMuiKOJ47
+TAmYEeURuTp06JxVGAHQoivVD9Hb7pXSlZlcu3He8xVzXMW83wNvgBm/eGbla5X0
+OCGJx3qafw==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
index 17fe7f420..247b60428 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDLGVXulQkQYELr
-jCDANHEt9z9M9YHNdfnwV+7AY7yJ3Rx4/FcfkqJm5f+Fi+1jxxOyZWD2QW/uqW0r
-Sb/KuWPp6tRf1NDu2N/ByfixqBgUr6vxSyQ6LKxTicMb1OFOT+SQdlZuZjpNFzUq
-uAvBsbqK0cDQxZWPgA5yXTMKNcwY6nd8Upwmr9NOmH/jtNBhLD2jURd+CIv2j1po
-sPhYsy2D19NlzaTyVQ/l8BVBQeoVkWIk5gKC2lhH0RXm75o9A4Y1VLnjfzF6nXRm
-wCa7zCRY9AW/rjXeuX6pmT6Wrj9R75/M/Gsho5Ulqi8oeXYfvLJqSAqRRZo8Kmvs
-4NaU7cjnAgMBAAECggEAOsL6T1yUckX/pqn04ddqdZunF2ui4iDDr0upusVAi/zK
-26Bazro8vZvG+csZ5Hf5VXCqhKU7LuibOt6MHKnV5Bx61L08tBZQav+2MiSJzxZi
-n54XfbNmKoddyYQmqeNIpJlweWGfdaWEzvbQA/sZl0eHy3+XPZ0V0PXxKf+VrRFJ
-JSYSPuHRcKZoO7NYLPM8mXQ5Xnvn5xm7L2xeRzp89VFOkoVnTfEpczgFL18QSN4k
-10zSuhLAYlKuNH9YPiZh62FtuQxYYQi3hQ4MV007pZQxZ7moZ7wQRS2JqPvUiAua
-mSn3ztD2Yr8r/k8gIAMkAKL77ZYx/hhcZ0HzEBzYsQKBgQD2rDjymrTIKrS3QEb8
-iVeB/k6HwFD6MaIt3o0rtPWxJ2Y1QSk1oacfJMqwxbdafZ10TQv4X1QdUlIn/xsw
-iR61tm47MMnhja7XXllerolJcIk4EewPy+XuHvq5xYtx3QFV5HMq2/TLh2sVqvdE
-J13GoH9C4GAM6KtoS1CXOWxRFwKBgQDSx1JXUb/x8ps14XAxHii6otvlmtqJ5Cw9
-gGelaTkbBW7Kb4T5Fq+pzSYduZ9X+hmBo8vWDZsOZdSSotosssWC5tOh76Tvubip
-mvmBY64pfkR178OeWxPiLdRDC9veLfJ/xGLeNBuFsQvAemiSNCnOyMPg161Aa5j0
-2kUTfCcIsQKBgCUpItchiVSSYnEs5MTMp/s0ZX478bcPXSBN47SO6WiLx/ED5QJo
-XPXrJAHnd0zRmbPYm5IKQnC8YxYVb3IrZg338rlGC1PIdWuKkioaXyJKKtHgmVBz
-5iquThVIdk5r/fSDmvn88u7qcq5r+B4zVARFT4ayqKWpM5Fdr0Fo7DF3AoGAPSBs
-8sHUhpgzBvcwEC6M5UNhvj6gbijr45IffMr9MqbqsG6TA6Heo8HI8gno+hyf1Qbp
-kFQ1yYEimrv7xca6nPHQIkBbduJHeXhmL233DjV+KS21b3E+XPOpgSApTU/J6d/M
-RGCcMrNbkyBsvym9jiiPFd+2cN5DZ479RV9V+qECgYAJhzqZodQVYgsFMWswB9+j
-ZAcFpNR7XPJMnpk1XnKvxyoxQaQz4S15mfKj9QULsh5s8WPX5HrzIJ/72VM5+6IP
-HV5EGarVXC9NIxd1ZjMKikKZLDTPhdaLOxB5k/6lMkEB8LiRbohB9fmRK/c0qvQ5
-8Wz8zaVaxfnxuaZzcPsDPg==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDWuxwIYcEU2E8I
+Cdt3AO7Lp4LQrIh7zIhzgTRa/1MGxPDg1CbgaV0gUoUGedPGbYSCJqxu9KIp7DDJ
+s9kxKauO8dQ0Cbchy87AIBlXXqKt7wyNtJPARrmYTjJHMgs8fNi+kFkxJyIvac8s
+3CVXIz1t/G01wLeRMMBey+72tTaBRG07//udQdcIkyV6rk+gLL51KLPWN/8yAsGh
+AQQVcPC4ayHzpiUfNZbW3s+zeo6WhvBo6gTlogYoqiG4/g/kx5vlBoxiX8pykj6z
+ZGwc8ZJrOktly5HpgaemC1Zprs5boxQepuXvQ9ekwwNTHXfR/+2Toe0DQ05Werqf
+QRjvMeObAgMBAAECggEAJ4unAn4qRnH9wA+8rMJtt/DeHRshOZd167u4TifmfQEp
+EWbQ0BRnc6vu1r35+/mwZR3FNNv1v33BkGwATFcNwtITkA/X+6/ioCxpLld940V6
+jOBcM5Vy2bNQ/B6hxh6B9jp0SqKX355/apYShGU3i3lpDXSz+de+Hdc155aA9rYy
+cJvWAA/FYVRkh9Ski4eTa1l5O6Uo0IVYpKv5SUoAt9hW3SNS1LSzPUaYryd7dvQj
+SXGokhhs6SpbEuX2EM9Y86wtgtfM0Hx3Nh/8q+AdA7iC0I3plNF1xegr6fDsGaas
+6ZBeMHRDBMtZQ6s8lLko9axAKH28iIPNOuJ964I2lQKBgQDz76VOVYgw0SBzjQil
+dtPODJuofMZh0ezkcNNF2pXreANfC6dusSs+BB5MUwSh4USgyRKssCKBYpHkl9ND
+/yD/Z8TeRYpEaYKaljo9T1M/+uuxRKrSESmP1N+xlkLLgKw2FXNgwjwSzSOCp+yV
+c6h1GkrJVEYHT4QZk1HoFVVBBQKBgQDhWbYBxjq6GWs18ApM7VnaK7i3CQFb7TIE
+eDpth24NLUsfbUcYFRKGV2qfRh0aawJw7wgeJoYKbgXoaNN5QVh6Fd+3MLZZ9uuR
+hWDYuS0U4PdMh4m3nEvc/hsoEDmqzGXBIa7NAk2H4dP/UPC3m+kegKy85yrmk+kc
+4U6hriI0HwKBgQDWOejv4XfIf3BDamFkhvW96B6vmlzSvXyQpnE00KGG+I/lYaO6
+N4elYBKHrwTLcb1Ggy+OTuUOwdUkbx2Pgrik9KnVFjc2m36iajpda5POBXwF4yst
+bvsUILwPBspEVA1pNe9s00fUryl3bif8nGUd6mgxZXxWoUN+/n0ZF9sWTQKBgQDS
+aBf3iiW1MxyWLP0BHLBDc4UxaTgao9qKr9MmB0hrBzpYKokx5CL6yk4kTqvHydhq
+p9R1ilSnEllzycSCN9ArlZbfjZ0FXPZQVi+5yxRbpT1h+D9O76EpwxyKCLQ/VD9B
+13hFtHu9fs6ZWfKYDPvZ3hzq+BBnX/1NWNU5QsRu0wKBgGOQQtG3IJBbLz7ikE2J
+KIi4qxGqXV8VP8/s56VB1ISPqrjdygDb7AkhXD63IVeCPYpjG9QG0wbGgClDC3tK
+IWwT1UPyA2A0Af5cWAThNRuZ4HEZlqXGdbq4Jx2SeI0ZfDuc/W6Dk/rQsjw1KDzs
+NLHpny0q0gK6H3gjRWjxbFvJ
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.db
index b1676e421..e31938801 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
index dcb99dc5d..1df3bf21f 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzgyNFoX
-DTM4MDEwMTEyMzgyNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPoO
-dYfuerHncVAzddYxFzpJDC3kt8IHnoc7L34DA7FYCC3u9J9oQsEli4uvcc6mWxoG
-8SFyjmSyzpjfOQTI3BNO0KYdXtM4UsRMflUD3/L2K/GJoC2bDU1dX0mghc+ALc4o
-bt3Lc15hLcfTlL9G1qaVPG8X4znXBgFErfdOGhK5g8xNglVy2+HD7Dk0391aLmPO
-Khrdt5o85TLM0Y+VTE0bml2SVsVgP5tO1nXqivdD7u0aLkRWoljv1QFpCLE8uj6s
-WK4HC6q5BGiHZg6pWjk35mkiQ0FPQUdvuQAVzK1bCgNgt9uZtbjLHqDgnWkHKYRD
-6u3AYGM8A9t6s/pOIA8CAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBACGAEW4Auicr4zfZKoivMIjQ
-JB5m5n6O+/z0WtW8FX7rZHCIleHEDrhokshqJO1+3nchDhHiB0ef4fvAuASomVex
-kMpUokXuqeECbO78e9AasZ4RBRRtctjeTahC7NJi7tZAMgYe5EI4pd1rP6eZ9RM3
-ihoULUMtGnECZSicIspfnvP+mki0Gu3ZQMs6GZEoBsMRpEkIT4ApI4OGXNm7yRYi
-scgGp3lz4Hab6SYUd6Iak2G3FUB0Wp2MGvtPGsBJ2SWqAUo5nFOvrolHaWRalHTx
-W1EKfPKRsUjhvTVX1rB3If8W6C+/fPnfaS1yLGmrjwHvURZOPGqyGIODBMTBR7c=
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.db
index cd02cfb07..c3a303ee6 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db
index dc2106cd2..7036d0510 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
index 4f9204948..2d2a2ea3b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
@@ -1,46 +1,46 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 45 DC F8 48 9A D5 9A 7E 05 05 8D 02 E7 B2 39 6B AE 97 EC 1D
+ localKeyID: 14 05 4C B4 4D 32 EF DA 0C 64 08 69 F9 92 F7 B0 26 74 58 CB
subject=CN = revoked1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM4NDNaFw00NDEyMDExMjM4NDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzPKVc14I
-tKfr2eVRRclnGURtl9xObM4JWKwLOA29NuWQ5U5U0ARQO5vveZQ/wnj2Q87fKbZB
-3YwEeuqh0Vjf263H5BBrksbzJiR+yUTLxSCAcRug4QGquQt9r/Ph5w8xqj0t201A
-rdIrocKutZZ6EB+IpwfD72BNgphNlDQs8rcfJ9Hjd/kz+fwUiOHYNHoAc4DNpGGL
-I/SaBPFwmwYOKBt6V4vsvOiLdTGfJhW3KFUk+JIFsUzRz9E5t6+3ih1YZFvXF+if
-wgsMNGjJgVKCiMYxbZOXWTxbFUC9c9+CZGqP8V/ORJkVwuRmMEAuoGeuZKaCEA7S
-5DNPg0+mp3M0qwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM3MzBaFw00NDEyMDExMjM3MzBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyYQZ6yJl
+Y6aTGQps7dpk5rd8tHUktvnK5MMEsYilIVIeeKdXs2ARnd8vUujqQJdGwM8DkRaM
+wPDQMiKM6YdM/562WvYMeFChI6EmZUL2ILv6f5Vh8vQGc58hhr1K1W2mW8Nr0sQw
+9ZyNsProFhVyITRsK1rsLsv05rojowhu/5M2cz3EzszFRARCkvYWox8uP4MWAj9H
+BK+7jxVEpcO08MaAfdVCGM1PsQUoJ2nTRB2+PVSohZ2fU1cdswKujizWAF7sybNh
+g0q9gPVKW0LLBYIIH46/2nImN/Vm88I5CL2ROdrxZZhSAW9Ln2vKzv91IUU3GLmC
+MJ0cEu9CqHZQJQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQBRUgzkfh3O9YbG
-zBomba0Uoxr3uQ8K3ZCQ4pc09yHNVJ+k2x8BEmHbwF9qwqEtK29syEv6NhSZfFyF
-LMNp4AyzvaZJcsfW1np3hK5aT3IpeAruX3NEKHIme6dZ+r5+DL5h+5PCz4Yz/EFX
-PqtuFofRDDCGZ54qhmRZFSN+OM5eIMtK+Ry6lwN6BEyT7zLlEAN9ydP3oBuZo4Dk
-exrQYb0TSM1EU3/REcKs8Wbs1kvstG5C7JfwWpfmF+BjhSw+oglCbDD8497fCHpT
-AvRIfJdS3XRhwhm1/nqc548uxiAKq8mdZSYvjJtrjCNmi10n2q8CwZ6TehLN5Aaa
-lBCgEQn/
+dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQB/UrwbbJ42LdQA
+oxhcs17BN/XlEeQB1O57I2UYC5ZVijW4V2RySQHdvvO5BiS8A/OcH9dmfJud2dMw
+Q6wZKGv18zeL7IcrppF3HLkhEmA1XsnLKEp+0iaRDfOoxpHAD/C1amD4SF5ERasx
+AX3phKP7TweIXk6PvGQVNenhUtAwJ7Iu3qCxEOrF7qzMYlfKnm2RgmJ8NoC4siXO
+GAcpVSsUqRD9/gXq0tw8PtEAA+cWCS1Ey+ywhC5y9XdRxrHyfzKJoWcFvcqt5YI7
+sTCzKgao1Axv1Cq4+aCqixxbbkJQtaLArxut5Ipc4OhDLyANMVkwBR5tSYmVcgCt
+ZWl9KwfP
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
index 2c34e3607..2b0bf117e 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
@@ -1,34 +1,34 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 45 DC F8 48 9A D5 9A 7E 05 05 8D 02 E7 B2 39 6B AE 97 EC 1D
+ localKeyID: 14 05 4C B4 4D 32 EF DA 0C 64 08 69 F9 92 F7 B0 26 74 58 CB
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
index 532dbf510..32a3fb41a 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
index e2849c304..a0e8591eb 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
index 5c5011117..15ebe1b6e 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
index f5b9a45a0..7bbc5b17c 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
index f0c5ffba7..f14ff7753 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
index 177509670..31c588582 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
index b4e879b96..1b9643382 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
index 35ab2047d..7bf065756 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
index 8b05c2b55..3cc1723fb 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
index 209dd80e3..2d5a71e47 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
index e95308479..5b6fd4fb6 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
index 4e49bdb4b..3d39deb26 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
@@ -1,27 +1,27 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 45 DC F8 48 9A D5 9A 7E 05 05 8D 02 E7 B2 39 6B AE 97 EC 1D
+ localKeyID: 14 05 4C B4 4D 32 EF DA 0C 64 08 69 F9 92 F7 B0 26 74 58 CB
subject=CN = revoked1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkjCCAnqgAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM4NDNaFw00NDEyMDExMjM4NDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzPKVc14I
-tKfr2eVRRclnGURtl9xObM4JWKwLOA29NuWQ5U5U0ARQO5vveZQ/wnj2Q87fKbZB
-3YwEeuqh0Vjf263H5BBrksbzJiR+yUTLxSCAcRug4QGquQt9r/Ph5w8xqj0t201A
-rdIrocKutZZ6EB+IpwfD72BNgphNlDQs8rcfJ9Hjd/kz+fwUiOHYNHoAc4DNpGGL
-I/SaBPFwmwYOKBt6V4vsvOiLdTGfJhW3KFUk+JIFsUzRz9E5t6+3ih1YZFvXF+if
-wgsMNGjJgVKCiMYxbZOXWTxbFUC9c9+CZGqP8V/ORJkVwuRmMEAuoGeuZKaCEA7S
-5DNPg0+mp3M0qwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM3MzBaFw00NDEyMDExMjM3MzBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyYQZ6yJl
+Y6aTGQps7dpk5rd8tHUktvnK5MMEsYilIVIeeKdXs2ARnd8vUujqQJdGwM8DkRaM
+wPDQMiKM6YdM/562WvYMeFChI6EmZUL2ILv6f5Vh8vQGc58hhr1K1W2mW8Nr0sQw
+9ZyNsProFhVyITRsK1rsLsv05rojowhu/5M2cz3EzszFRARCkvYWox8uP4MWAj9H
+BK+7jxVEpcO08MaAfdVCGM1PsQUoJ2nTRB2+PVSohZ2fU1cdswKujizWAF7sybNh
+g0q9gPVKW0LLBYIIH46/2nImN/Vm88I5CL2ROdrxZZhSAW9Ln2vKzv91IUU3GLmC
+MJ0cEu9CqHZQJQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
L2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8GA1UdEQQYMBaCFHJl
-dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQBRUgzkfh3O9YbG
-zBomba0Uoxr3uQ8K3ZCQ4pc09yHNVJ+k2x8BEmHbwF9qwqEtK29syEv6NhSZfFyF
-LMNp4AyzvaZJcsfW1np3hK5aT3IpeAruX3NEKHIme6dZ+r5+DL5h+5PCz4Yz/EFX
-PqtuFofRDDCGZ54qhmRZFSN+OM5eIMtK+Ry6lwN6BEyT7zLlEAN9ydP3oBuZo4Dk
-exrQYb0TSM1EU3/REcKs8Wbs1kvstG5C7JfwWpfmF+BjhSw+oglCbDD8497fCHpT
-AvRIfJdS3XRhwhm1/nqc548uxiAKq8mdZSYvjJtrjCNmi10n2q8CwZ6TehLN5Aaa
-lBCgEQn/
+dm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4IBAQB/UrwbbJ42LdQA
+oxhcs17BN/XlEeQB1O57I2UYC5ZVijW4V2RySQHdvvO5BiS8A/OcH9dmfJud2dMw
+Q6wZKGv18zeL7IcrppF3HLkhEmA1XsnLKEp+0iaRDfOoxpHAD/C1amD4SF5ERasx
+AX3phKP7TweIXk6PvGQVNenhUtAwJ7Iu3qCxEOrF7qzMYlfKnm2RgmJ8NoC4siXO
+GAcpVSsUqRD9/gXq0tw8PtEAA+cWCS1Ey+ywhC5y9XdRxrHyfzKJoWcFvcqt5YI7
+sTCzKgao1Axv1Cq4+aCqixxbbkJQtaLArxut5Ipc4OhDLyANMVkwBR5tSYmVcgCt
+ZWl9KwfP
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
index a01a07674..d1173b916 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDM8pVzXgi0p+vZ
-5VFFyWcZRG2X3E5szglYrAs4Db025ZDlTlTQBFA7m+95lD/CePZDzt8ptkHdjAR6
-6qHRWN/brcfkEGuSxvMmJH7JRMvFIIBxG6DhAaq5C32v8+HnDzGqPS3bTUCt0iuh
-wq61lnoQH4inB8PvYE2CmE2UNCzytx8n0eN3+TP5/BSI4dg0egBzgM2kYYsj9JoE
-8XCbBg4oG3pXi+y86It1MZ8mFbcoVST4kgWxTNHP0Tm3r7eKHVhkW9cX6J/CCww0
-aMmBUoKIxjFtk5dZPFsVQL1z34Jkao/xX85EmRXC5GYwQC6gZ65kpoIQDtLkM0+D
-T6anczSrAgMBAAECggEAG04gmj/HgiYzNpMmWllkeonS3h40dquWtDErx3qRIIzC
-WsKuaw6AEAkNBVI6knLiQJOByQFm0hkTCbtT9tvT62VCUgDcDDCkeYr4N2GKkodr
-hWZMb130/HVq9/PSv6GXGNrQzryCpwXu2TziYQAc4CQLZVGUCcL3YLRg9aNj76w3
-xXd1Ffe7RsY3Ma+n2bqt0zSdZ9FtJa8Hm2ryfnlu8R65tGLW94EtE3OT/qsygkAS
-2iGfUKZk5nLusCWEk3sfJ2R28lSxOp6bVfkLZtMTYhkMosYeBtafX75NpF74dSEr
-2vJLvKVHQB5zRfUL0Y3/6b0s4eM2fmwargNgluaOVQKBgQD+I7OYawz2u5F1RuQ1
-GhdE+EDjV/lFWsZcimm5bRmqTo4MR2wdw6rSJ95Nikd/bucSwuVZfKx7tEIu8jzN
-ygTmYPbYZHsZC2YmZU50OyfP/6INqsSrlJ41wq5Gv7YXUmyBO0CZfI2mWQV5NQDY
-ILpLBxHICR/w1reSlLu/eC729QKBgQDOcrBQyNlhP16d6XdPeT8yKy5OSxfHJz7x
-iyrKiEW+F7CAMY+5U3Ou7xqaPVGqMBFCJ7RmXAKr12WNLjM5tCRjkrt2Ni/lSa80
-ZYc2n/FQU4D4zIjpqIpR4Hx2iZKMCWXrwnI3ydFqauufwe8N1Axl0kS9kqaSI7CR
-bv5uXfP5HwKBgHGXqZWt+6xo6DpARo6Jq+7y+6XiU5OxYEpKv7jW0Ar0c79/SQ8A
-v2CR22ZTMWP/QR98p6DY/guI5bAwLAdbjdcfbhYIy5DFLJJq46dGLaRlwZxUQPXk
-RtcGvnj3Bb/k4oTc5CH2ryW0UqL7kvYHot0YOtVrZrByeLj26/hIEs3lAoGBAKTB
-prBx+fnAJvSDM7J7ItIY3/WfvDQ1v+folpfXtUEFithjtT3Dudjr/SEGurvFbKCN
-K01dNMyLNAI90qfEeh31JiIrEII+EdMRC52ue1kNqynjoYhH90tsiifXltqnTW2f
-WqPnLndtKOnwTaWNiu9fpXhdJw4N6YXHPMo7tM8lAoGAG0MwVD1P40wvLgexPSYt
-2/gWSbCoBv6dvN5HwPAWuei82GoaecBLcGsEalhKX2TwTfSW8U3KPr9HUZgGB0I+
-GnV+KfPPQuRv28cg7L26xlyKP9B/cKtbILhMZMYFuPMe4qzEndrPjgvTrk5/f21I
-jKt3jYoXthUyPE/5+3JmRWE=
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDJhBnrImVjppMZ
+Cmzt2mTmt3y0dSS2+crkwwSxiKUhUh54p1ezYBGd3y9S6OpAl0bAzwORFozA8NAy
+Iozph0z/nrZa9gx4UKEjoSZlQvYgu/p/lWHy9AZznyGGvUrVbaZbw2vSxDD1nI2w
++ugWFXIhNGwrWuwuy/TmuiOjCG7/kzZzPcTOzMVEBEKS9hajHy4/gxYCP0cEr7uP
+FUSlw7TwxoB91UIYzU+xBSgnadNEHb49VKiFnZ9TVx2zAq6OLNYAXuzJs2GDSr2A
+9UpbQssFgggfjr/aciY39WbzwjkIvZE52vFlmFIBb0ufa8rO/3UhRTcYuYIwnRwS
+70KodlAlAgMBAAECggEAK4+x5qFl13fPvo8BYx1dyH4LqBrWl/NBh9gccKBASgat
+bZmHHNB8nmr7mOmekd3hvpZBiCCexqqH5v6PBYBpBazycJFVusB7RO92FFe4SvU3
+vlK1fMaBiobwwWa0AZUVbCq/aS1eBAoWmxZyCywRotnpNCoQekE+rI26XGjbTcXL
+uFZNk8v83mSHkGeVBj8xrCtynh1tygSnyNIOLPzictDAdeEHssN3sOKjpdKEoY+5
+pETPsOI+F3BpqCHNac0uD9IWp/GgbspOOWPmNt5OH7+u3pVoBbnIcYnvUrNyA8Ww
+zSWruM1653SjtHyfKwpa4uF5YEDx3/YgrRbKktJ2wQKBgQDpcIxF1DKGerscJOEz
+cuSeyeeIeI9LdTL/owl7/3iSUxGQRyRNGfU96GzIXmxnE1Ll1AvFELLmmdY/5QKN
+Z/eRgVSnE/Ks+iufIruY1lBzwQRnRjkdU32OmJoXnCXXwsFIlHVOt/RHNcfhpNTN
+9A5Rn+2LiEhTvXEQDb9rLq4mkQKBgQDc/b3gKJAT6r6WwV1EzncYzdwxljDu3f57
+PYb8eVoW5NhsU4EYxzP3Uo4QhWLuvv+EJnP8j8nVlqMNrkdxTC5Lgeka3XKio32b
+dIovYdhR6vThViiAsotP/I5FMYFMRZyAZT1JgvSWED0M0yxA5UAkjI65rpPNMq36
+XJ61T+BiVQKBgHPcD1LNCbKjEWDbkQYm/P8ueILMS1qJNaGZOqjXV/FP10TDemnl
++0kZpXwhGS5jcd5tytWo/xHiwmp98DFcq4wFI421IdnmZGYcJ/2oSM/auaPEP66l
+dIikhr43GrUmjSXHwR0rwcriD22XkKMTgVPTy2NYZYViXc449Itu5LJxAoGBAITi
+T3qq6XgQf+pG+76UKClSIEXw+huogY25waGvluyNT1ZUIBy2LBlcGvD0RDkrwJnG
+RZhpHgTBP+rKEUufc3cT9weggX4qsSz5Nt6nB1y62+Vj2ZcJxZujUilpS0aB1Umf
+lurNRCW4Pf2oPcQIFjnkCy68O0P4ZYVWjFiaX2LBAoGAIO4ohdl8o+UcmOY9/JDm
+t4BQIUEgHPGJyfQybXnPLwi7/2xaPiqYo1SXgRUHmMucb76rqA41tsTmQR80P+Ii
+3brnmIABijYP6fGGCrbZ0XD1RQpILQEajCCZL7jEo2p2eg2m+1ovx0qOa7Q/VRJH
+5m5U1u0/08shAEHmkAPmQrA=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
index dcb99dc5d..1df3bf21f 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.db
index a51932b9b..690c69742 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db
index f3c6bd78b..b2199bde7 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
index 2c1b0f0ee..1e9e568dd 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
@@ -1,46 +1,46 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 9C D6 7F 1F B7 43 4E 33 E4 60 54 AA 64 C4 B5 D9 47 5A 25 AB
+ localKeyID: C1 54 E7 A0 B8 76 5C 18 71 87 05 BB 75 5D 06 7A 9D 59 DF 52
subject=CN = revoked2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzOTIxWhcNNDQxMjAxMTIzOTIxWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3iQ2As
-pBzGEQS3F/gJQ66+eQrCuLneZiNVgBTEm9xoSixZQ+T7Li8AuYIQOTkFdCPCNCY0
-y0F7/IOvqlqb1C9Akwo9kRtHtkiagIQdwgzT1+bQQ8xf1a5EUPMsOcnq0N5y7pVz
-yhGYAkGJf5VBlCQz0keAZuh/oJZfJWHPK7x8OQLRNdLfLVhJqTzi08M4zMwzlmZo
-DVMT5sWq9uir6UMJvzTIpWHhY2qESk+e8ibJy4JkF7LknOMxu2un/HVBljFxjJI6
-wuNCVbv0Tg12jXWp1aL1jXx1AN6ODk4IwmWPof0VsSdHnaK2lPobkZg4g45ARoiB
-le7AkTn9pnpKkvkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzODA0WhcNNDQxMjAxMTIzODA0WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQrNQIb
+Jwikx+WykItXmAkTejpSI5UKD0zhjyGro4V948Flu4fzTVwLKKoTi6qSdHkh1yEK
+Eamf9x+Et8pB1aqQI884F6pfLvpQMeUtS2xEaXFllXU9Wakq0CCpCkIe4Ao7KhFh
+TKKqLwznDAE0dyidPuDevrU3JDesmm87QiG9VA43kxGf19/YxB1+FdDMtDx9DBzk
+7A6MHK0h+6HoMyoltsHZwScEnBJ7rDnqiMR1KmH31HfeeV9cZLxN7zYvb+ldM5Qz
+TILzaNNyr1SffKRMtK/noL4xO1dVenN9XTa/Dqwojlps7/ar1kONEhbwSuMrdDrd
+ROomNwyk/OFCOjkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAhN22N3FGZw5+
-g2P7JO1sCF3sOATTQ5+dMXroMiUpRfkZrBlf1HO7MK2MGL4qvWANpyGtkAuq7gxi
-7lA3I2+mXbUNq94ygl3dsFaQhmVb7pxfSXy5ePgH+GC8q7vOgP0dtfRwWCqHHtwW
-EHL4UvRTkZR49cdPnCShncKJkhNLWvEC/eWL64R3LyzHnt75BXXROUG5EynzD34m
-AS+qUyNmlP5iv7a3k59OY5GIY5kC9QBbtK7H71XAU+HFQz9bdkIe86/YEMlSutID
-pIuICtrCrFJx+lpgF+2V3QkciSUtsr2QfwwLCywjxd/d7ylfI0/+yYVIq6/Jvz1B
-loqC9PJq2g==
+ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAjW2EjL9lUv5f
+9dzkJ68QAbPWmYMn/nwE3dJq6wSoFrcigPzgPmYnp3rQTJK5DL9OH6YFkV/T0rrG
+wSeb25L5dBGz1pIUM4tPkS8sQkUV5AJtpF8WEEKcOcxMgoWsqCMV+L6bi3mlXVYz
+8r6J1rHmpwce78epGMWPkEeWS49M/j8xBrgnQqqAorMbPzb06D+zM9Ieh+VoYDvK
+57KFVDjV0shLoS7qrTsBdZKTJ4jynT86AicxEz3XDqaWKZd5yBC73l+1PsC1rcOp
+5c5W24z2hjzry4rnTJyIUf3IAYZD/AN6b0+b95eilwUH35l7NsvMH3wG34Oj9X8F
+pTOud3+T8w==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
index 5cf39c065..36213ee3d 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
@@ -1,34 +1,34 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 9C D6 7F 1F B7 43 4E 33 E4 60 54 AA 64 C4 B5 D9 47 5A 25 AB
+ localKeyID: C1 54 E7 A0 B8 76 5C 18 71 87 05 BB 75 5D 06 7A 9D 59 DF 52
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
index dc933e07d..b942234a4 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
index b2a5724d8..fb479f83f 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
index 528c0636d..94c49262a 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
index b2a5724d8..fb479f83f 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
index 4f0db530a..75091a0ed 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
index d96a8540a..eb2a7782b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
index d96a8540a..eb2a7782b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
index 558392855..beb75aded 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
index 763f273f0..f04b1e1dd 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
index 763f273f0..f04b1e1dd 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
index 3b94f1a33..fa0f632d6 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
index 032e72938..e1e21ac87 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
@@ -1,27 +1,27 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 9C D6 7F 1F B7 43 4E 33 E4 60 54 AA 64 C4 B5 D9 47 5A 25 AB
+ localKeyID: C1 54 E7 A0 B8 76 5C 18 71 87 05 BB 75 5D 06 7A 9D 59 DF 52
subject=CN = revoked2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDkzCCAnugAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzOTIxWhcNNDQxMjAxMTIzOTIxWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3iQ2As
-pBzGEQS3F/gJQ66+eQrCuLneZiNVgBTEm9xoSixZQ+T7Li8AuYIQOTkFdCPCNCY0
-y0F7/IOvqlqb1C9Akwo9kRtHtkiagIQdwgzT1+bQQ8xf1a5EUPMsOcnq0N5y7pVz
-yhGYAkGJf5VBlCQz0keAZuh/oJZfJWHPK7x8OQLRNdLfLVhJqTzi08M4zMwzlmZo
-DVMT5sWq9uir6UMJvzTIpWHhY2qESk+e8ibJy4JkF7LknOMxu2un/HVBljFxjJI6
-wuNCVbv0Tg12jXWp1aL1jXx1AN6ODk4IwmWPof0VsSdHnaK2lPobkZg4g45ARoiB
-le7AkTn9pnpKkvkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MTAxMTIzODA0WhcNNDQxMjAxMTIzODA0WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQrNQIb
+Jwikx+WykItXmAkTejpSI5UKD0zhjyGro4V948Flu4fzTVwLKKoTi6qSdHkh1yEK
+Eamf9x+Et8pB1aqQI884F6pfLvpQMeUtS2xEaXFllXU9Wakq0CCpCkIe4Ao7KhFh
+TKKqLwznDAE0dyidPuDevrU3JDesmm87QiG9VA43kxGf19/YxB1+FdDMtDx9DBzk
+7A6MHK0h+6HoMyoltsHZwScEnBJ7rDnqiMR1KmH31HfeeV9cZLxN7zYvb+ldM5Qz
+TILzaNNyr1SffKRMtK/noL4xO1dVenN9XTa/Dqwojlps7/ar1kONEhbwSuMrdDrd
+ROomNwyk/OFCOjkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAfBgNVHREEGDAWghRy
-ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAhN22N3FGZw5+
-g2P7JO1sCF3sOATTQ5+dMXroMiUpRfkZrBlf1HO7MK2MGL4qvWANpyGtkAuq7gxi
-7lA3I2+mXbUNq94ygl3dsFaQhmVb7pxfSXy5ePgH+GC8q7vOgP0dtfRwWCqHHtwW
-EHL4UvRTkZR49cdPnCShncKJkhNLWvEC/eWL64R3LyzHnt75BXXROUG5EynzD34m
-AS+qUyNmlP5iv7a3k59OY5GIY5kC9QBbtK7H71XAU+HFQz9bdkIe86/YEMlSutID
-pIuICtrCrFJx+lpgF+2V3QkciSUtsr2QfwwLCywjxd/d7ylfI0/+yYVIq6/Jvz1B
-loqC9PJq2g==
+ZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAjW2EjL9lUv5f
+9dzkJ68QAbPWmYMn/nwE3dJq6wSoFrcigPzgPmYnp3rQTJK5DL9OH6YFkV/T0rrG
+wSeb25L5dBGz1pIUM4tPkS8sQkUV5AJtpF8WEEKcOcxMgoWsqCMV+L6bi3mlXVYz
+8r6J1rHmpwce78epGMWPkEeWS49M/j8xBrgnQqqAorMbPzb06D+zM9Ieh+VoYDvK
+57KFVDjV0shLoS7qrTsBdZKTJ4jynT86AicxEz3XDqaWKZd5yBC73l+1PsC1rcOp
+5c5W24z2hjzry4rnTJyIUf3IAYZD/AN6b0+b95eilwUH35l7NsvMH3wG34Oj9X8F
+pTOud3+T8w==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
index 926f121f1..3bc9bd9b4 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC94kNgLKQcxhEE
-txf4CUOuvnkKwri53mYjVYAUxJvcaEosWUPk+y4vALmCEDk5BXQjwjQmNMtBe/yD
-r6pam9QvQJMKPZEbR7ZImoCEHcIM09fm0EPMX9WuRFDzLDnJ6tDecu6Vc8oRmAJB
-iX+VQZQkM9JHgGbof6CWXyVhzyu8fDkC0TXS3y1YSak84tPDOMzMM5ZmaA1TE+bF
-qvboq+lDCb80yKVh4WNqhEpPnvImycuCZBey5JzjMbtrp/x1QZYxcYySOsLjQlW7
-9E4Ndo11qdWi9Y18dQDejg5OCMJlj6H9FbEnR52itpT6G5GYOIOOQEaIgZXuwJE5
-/aZ6SpL5AgMBAAECggEAAZv3CmEzzoWe3ngcb87zn/m/xgen7/VSpBvaTx1qcmf/
-hu2GaIdOGSULrW6XRDndBdzkZcApSn0ImGdxor0dg31WhwNGD/c1NDDRBC2fYnic
-z2Pg9eIIX3wh5n8FCgZ02N8cUVpu8jlkUtYIOtrYgfpeyW8tEBfdeSDFzOon+qaG
-yEduw1QlZsR/jf7FBoovc/cZr7Yyi87+180Ln744OcvX2fqpyyDvsdEMuKYISwBu
-IMnaaR5KgFk96MwUvhCpUkGjjz+cUJqZndwwtfyZ7foNAzQHuU5JhOWQyQH4trPM
-exOjwMom/jpVhAuFCmm6cMOpE0rWN3uv6M5pV9RX7QKBgQDtFpTtKF1jMeGizNFH
-QN0QwX+M1Yyr1GVEBcF8s2Fa1aT423M79wxzjSIOr4UMvUtzBCRcmKtu4tq7wG5r
-Zl9dy1x7NdZbOBBL5FRldVNDrmxYlpDE2v8q00IpfHKCk6xHnHUcuxG0YvI+4NaG
-MPgCjhjy7UDXak6jSWBtqsQjNQKBgQDNB8C9O+QM8hmst0i74Rgs5YlfCXpub6UU
-JtzgDX6AIbHo9gm8BF1B3jFll7AQ8+8iHp4gcKrRI64H/Fmye+ViQ8MvwaNn6mFL
-u6y0ZBBt4sAf3WYpYh4mnpi+kT9rGqsm90qBZ3P3SRCe5vmlOfVTuBbOuyKM0k6k
-Y3bvfapFNQKBgQDa5wSuS5yeH8ozJGT+Ivd5pw77m5h8dmjhe2cAmicDVUsysnwd
-G6cVcXPGl2yDLKvjECn6jMOMaEyJGc1ZwHXBBijnYff+1S7Gw5Tg8Ijmbr9+s9YK
-zCDZC6GE6HBZ+7sPi3feBSL9qHX+dF3eHIyA325NrZ02x+K/hNpRp1/dGQKBgQC+
-q64XjaHoVCGCWLTgXFXSMuiMpFDicRtQ4U9ZYdM5r5w3LNAitOBRSCQh+W34ZhIG
-Zfjh7EU+13KZ5Jk5/jR1LNVRDUA8fGBdQLw8yi3pMw0+1POUGrY1bhpYZtVWcmem
-hiUYsK/M0XsOe3jAqmS2paU4PhnEYjRWdlV+JRx63QKBgQCBLiWDXy+TNHU+Gkt9
-Q/MLNRnIP29tMpLUgZNN11jLTW5gQNWrcXb66HWs7qitwGLsQQ3foQohkQd4J/Fu
-Jhg/zuibiZo70WbjiAPxCEucM4x/11sniQUfv4r4VSb9vGeYZNVkoi0Qab3du5Wx
-uYItwcUOYP5VJboBMKLcs7so+g==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDkKzUCGycIpMfl
+spCLV5gJE3o6UiOVCg9M4Y8hq6OFfePBZbuH801cCyiqE4uqknR5IdchChGpn/cf
+hLfKQdWqkCPPOBeqXy76UDHlLUtsRGlxZZV1PVmpKtAgqQpCHuAKOyoRYUyiqi8M
+5wwBNHconT7g3r61NyQ3rJpvO0IhvVQON5MRn9ff2MQdfhXQzLQ8fQwc5OwOjByt
+Ifuh6DMqJbbB2cEnBJwSe6w56ojEdSph99R33nlfXGS8Te82L2/pXTOUM0yC82jT
+cq9Un3ykTLSv56C+MTtXVXpzfV02vw6sKI5abO/2q9ZDjRIW8ErjK3Q63UTqJjcM
+pPzhQjo5AgMBAAECggEABMJd9bBJTSXawZDK8Q0fr7jHSOYjtd0i2pCt4p7o50Tr
+9kG/+qL5jxzweTO1Kxao9UneaeMC4U3j4rVq+/4Jjeg5xv29iKE5oqD/mW8rbpOy
+u1nKF0rzTtMEylmcTCrGs4/uXbRw28e++X7sQi4s+hzljd03jyIaUEr6Ya2TwI5f
+VULgJFyY26Ieb+oqk6bFWLyLWm6McNS7ayZn2sEB0/XBdzXmyBwOW+9MrzzUr5nl
+c3CTiMFZrnZCllNPYEJo5WlcgYoQo28FPZjLIUaeUA6kY+yKIHkKBQcizh1qtZdt
+Jm4NUEWK2xdBaQeS5sKDTA07z7t8CEyox+g188Re7QKBgQD90jvSVVrEPxUwBvqY
+0tBjIf8xeidiyRCDFaoP4XPtO0S/RlbMEAaNpoiIxhLiolsU4o3cpYEH0ECf/K6B
+A8nN1ojXU43oRutZdWAld6UT9RhoAXEoKZTgelfFLyO7BnrgFePPD1tq3uSMwUcn
+bwITquzfIJP7mTfBV1AZETfJDwKBgQDmIJpL1Wm9oJS/V2I/ydvrUfHCG4x+to/3
+P9u8V5utsAiWq2JfpSlqX6ddZ/KhXtsmqetgobIyG/KPRDrr78S84wbwZx32Bokm
+qSlv0cn7kN/xj8NuF0uMekUW+cZIq9cNF6KeRdoQTeEJaJ6yOYzS7HzIO/CQVRvz
+ossVoYl4NwKBgQCCjJtQN66TuY6AQVarO+MK2fWT0Sxo1tmzUnVB7cfegNl/OAJ0
+utlkCf+3uYkFIFSQjWZB0q5nAmn639Axc21cfbesaMFYcwGh5YkqPDuf5DRFalh1
+O83jF4oFVZWfIFoa36doXJG8iiArdU3Prnz2+LcUnIEAq3HN88ay3fQ/aQKBgDkR
+RLIhjkNUGw8IIHkpGbxVadp08nZJ15G86ETghN6hlL+oaJDHaGnUprBnIqgZ2cbQ
+xGoGLyZ1/8S/as0vfF5K/mGHcMqd/Ez2DiyIncogtyg0OoaGiFmhyJhWAHHtCztX
+7R/KurToWzH2G8SeuOllc9xD4Pgp4vCcIjiPAoQpAoGAW6Ze4/LnMdCNHUcG07a5
+5P4KpJdddfBFjY4xau1MAE7IZdP4IlpI8hbUGpaRlneWNS9c1U/REu2QEWtm5yy3
+itsq+QRAXEKrF/LYULQ2M0Mylz1pPtLa48hc4Y8XXHRcqAOUqLNqan1pWz+9DcTs
+KunNoFRsBuz2hWfLe0M4sKU=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
index dcb99dc5d..1df3bf21f 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.db
index 389d85920..6958e05e2 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req
index e4bb66abd..5966fab67 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp
index 8bf7a10f9..492c8502d 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem
index f82606f71..180ed063f 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.ocsp.resp.pem
@@ -3,50 +3,50 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica CA rsa,O=example.net
- Produced At: Fri Nov 01 12:40:02 UTC 2019
+ Produced At: Fri Nov 01 12:38:40 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 43f5e376b0d5e4b6726b036ad3f86cdb598e6554030274971b10c13035d140a3
- Issuer Key Hash: 6b211a64620ca16f9a76e153ed34f54ba9810aa03de274f6b27452c4f2d07cce
+ Issuer Key Hash: 434293b2e1ba21e3a5d514b95264eba8e6c707fb40f85f9645e1dd9998c6abee
Serial Number: 65
Certificate Status: good
- This Update: Fri Nov 01 12:40:02 UTC 2019
- Next Update: Wed Oct 31 12:40:02 UTC 2029
+ This Update: Fri Nov 01 12:38:40 UTC 2019
+ Next Update: Wed Oct 31 12:38:40 UTC 2029
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
- Issuer Key Hash: 01089fc170c578818ccc7b96390741ac0d020c89eb3e00f574c8f4d90d14dbf9
+ Issuer Key Hash: 7c4ef0f131dff8eb55557d0e1dfe9a0ac7554ad63496dde8259e12057dca7c8f
Serial Number: 42
Certificate Status: good
- This Update: Fri Nov 01 12:40:02 UTC 2019
- Next Update: Wed Oct 31 12:40:02 UTC 2029
+ This Update: Fri Nov 01 12:38:40 UTC 2019
+ Next Update: Wed Oct 31 12:38:40 UTC 2029
Certificate ID:
Hash Algorithm: SHA256
Issuer Name Hash: 4946da6fafc6fc82fc7dbbc9c9fd91e211af66809fd8dd54897cfa4bdd4cd6e7
- Issuer Key Hash: 01089fc170c578818ccc7b96390741ac0d020c89eb3e00f574c8f4d90d14dbf9
+ Issuer Key Hash: 7c4ef0f131dff8eb55557d0e1dfe9a0ac7554ad63496dde8259e12057dca7c8f
Serial Number: 41
Certificate Status: good
- This Update: Fri Nov 01 12:40:02 UTC 2019
- Next Update: Wed Oct 31 12:40:02 UTC 2029
+ This Update: Fri Nov 01 12:38:40 UTC 2019
+ Next Update: Wed Oct 31 12:38:40 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIIC/AoBAKCCAvUwggLxBgkrBgEFBQcwAQEEggLiMIIC3jCCAcahLzAtMRQwEgYD
VQQKEwtleGFtcGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhGA8yMDE5MTEw
-MTEyNDAwMlowggGAMH4wVjANBglghkgBZQMEAgEFAAQgQ/XjdrDV5LZyawNq0/hs
-21mOZVQDAnSXGxDBMDXRQKMEIGshGmRiDKFvmnbhU+009UupgQqgPeJ09rJ0UsTy
-0HzOAgFlgAAYDzIwMTkxMTAxMTI0MDAyWqARGA8yMDI5MTAzMTEyNDAwMlowfjBW
+MTEyMzg0MFowggGAMH4wVjANBglghkgBZQMEAgEFAAQgQ/XjdrDV5LZyawNq0/hs
+21mOZVQDAnSXGxDBMDXRQKMEIENCk7LhuiHjpdUUuVJk66jmxwf7QPhflkXh3ZmY
+xqvuAgFlgAAYDzIwMTkxMTAxMTIzODQwWqARGA8yMDI5MTAzMTEyMzg0MFowfjBW
MA0GCWCGSAFlAwQCAQUABCBJRtpvr8b8gvx9u8nJ/ZHiEa9mgJ/Y3VSJfPpL3UzW
-5wQgAQifwXDFeIGMzHuWOQdBrA0CDInrPgD1dMj02Q0U2/kCAUKAABgPMjAxOTEx
-MDExMjQwMDJaoBEYDzIwMjkxMDMxMTI0MDAyWjB+MFYwDQYJYIZIAWUDBAIBBQAE
-IElG2m+vxvyC/H27ycn9keIRr2aAn9jdVIl8+kvdTNbnBCABCJ/BcMV4gYzMe5Y5
-B0GsDQIMies+APV0yPTZDRTb+QIBQYAAGA8yMDE5MTEwMTEyNDAwMlqgERgPMjAy
-OTEwMzExMjQwMDJaMA0GCSqGSIb3DQEBCwUAA4IBAQCtSAFwmbwSL9apNWFXDCVm
-N8/5uIEveeiAk6QVOXOWu3Prejb/5IBrRywRHWrXknY58Dm7Nyzeq5AWB//evKqJ
-k9nV7RNBqdwpF4U4MSTsEkRe0n0+DwrYQUII6UO0Br9q94Kmm4HU4/TcUwIsFib/
-B5vKNyyZ7PPYi85MvOW8s+k50Sc5fiDdCtDOFtN9uuCdMcw63f+VXsoKLE6buuBx
-OVVmAO01NrJxaK9lprGNNsjkIw994ecImw4WuKAaRSaNPtiT4JQ/WtEsieRg4T1o
-5QEaTWQ4t7+Y61sPZeGuxNWVGNBCqvnxYIA0SXzjWRJNN0M/39ca1HI4KmaKlu2H
+5wQgfE7w8THf+OtVVX0OHf6aCsdVStY0lt3oJZ4SBX3KfI8CAUKAABgPMjAxOTEx
+MDExMjM4NDBaoBEYDzIwMjkxMDMxMTIzODQwWjB+MFYwDQYJYIZIAWUDBAIBBQAE
+IElG2m+vxvyC/H27ycn9keIRr2aAn9jdVIl8+kvdTNbnBCB8TvDxMd/461VVfQ4d
+/poKx1VK1jSW3eglnhIFfcp8jwIBQYAAGA8yMDE5MTEwMTEyMzg0MFqgERgPMjAy
+OTEwMzExMjM4NDBaMA0GCSqGSIb3DQEBCwUAA4IBAQAdNxLOa38f9zXC3fBM+cx6
+ndTy/fO13NYn/YQ50nxdVyU1R9Zaaf8+DPfjl4yJUNBxYdljJlVcCMgbbrNCaBZU
+PYHXL0a2UwdRocGdRGoCcuhsKRgwgxPUzOdo4euqZMFRte3hJnV+w6heE2TSOmex
+R6B4wy5HnBXyyQh2eULcV0HkkPUnXFjcGUKJVY/s4aHP7CPpREdjnqiqMHRZKoEX
+qsvfifFi//S80rR9KI6SMGOcSH0yzbGKOqqU5HTQWoCSnzLkHSKGUUu7NdXXxPWb
+wfE6Y2imD4rZkARwr4xrYzf5OwNO/vTXhIC66OAPHqt9tAxIBvCTUfWWeF2cjYKr
-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
index 138cd6d8b..10e74eb24 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
@@ -1,30 +1,30 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 2A 22 8E 09 99 1C 1D 7E 7A F5 09 30 86 37 A2 33 AB 16 0E 14
+ localKeyID: 48 90 1A C5 07 82 C4 01 1A 26 58 29 79 98 C5 84 12 C8 C7 8C
subject=CN = server1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM4MzBaFw00NDEyMDExMjM4MzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDblKcLgb03
-NrBQmR20Lt35rADNqLeuYLKPii9ygVC+TTOAk/wTCIg0phcfBezjDB4URFdOhxJB
-/PdJ7XsNpBGZSUD/gZPD9UvHxtlk1SBF6ETDSF5WcRGg3HTzyE4iJGiepoP8rOcX
-9r4FPB4YpfnhhXoerwcOhW6bcQPm0pY3gH+lliIA7P5tECv1eYM1OWkHPFuEjeUa
-6h81PrucFBTSixOv5nzVpKoYJaiTorP27rDWuWSnixJx+N6Es6Z5IWbbh9QkH0eS
-o4DCcHrD5zvoAgT6j1QocNpd9LaKjLjKcBkZpi1tfkb1NUS9/QmyDLr6px+S61kq
-AbtXCNAHclPfAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM3MTlaFw00NDEyMDExMjM3MTlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD6PrscYHOw
+J2FPnj7Jig458iJgzrxKXJAiNkK0uPF+Isuzh1P1wbxlHA7MlXEEoTza2upV1yjM
+lqj8c1ahOREuOFBAUKMen8uv4VskgYmI0qicGDIC/Na1K8PotUU1Sg0M5aj3kiQR
+IsO6DN9hH8e1C4xUn2aT6ByFrlgyhYGWefZYs7OfUlzqks6+cCoebhxLh1WxMceJ
+DLWIWhYoTvkuavILoGgWe1TDwO8JOyiwBvokOxLpC7pZWhWAGJaVQvbxJ+QQv+Te
+ifgFL+ou8Ol2qnjfMCMJATOfJ+0e9zKjnLWUgoIrlw16J/bWA9YANsyK5gDcjzOh
+lup2RdqilvPxAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCImFsdGVybmF0ZW5hbWUy
-LnNlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
-Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAQcJmqY3/48kV0zZrfzerpWeq6q96xChu
-RjGHyPuYY1+Y8iTxWTCqpVIPukjqdTAiuGjpwYFsqg81oZbrvT2+VmB9BWMwC/Jn
-esU48zDaBqczi6ffvfa7rmIsJkoYPp2EbOI3/61xqbsAbyIreroN19oZC8SDaO6S
-PD9L4DBVV6+Br5fpI94x5F4/fogU/T9YOit4KV9iC9FMxyYpKttxWSKyrcTMcgzK
-7YdsaWZDpgspM91gK7CgfqsnkHafZipEZRdiWlc9IsXKoZgRRCy+NexVz2zf177a
-s0WGyDRAREVflXzz7C0VAegErfBYnseP8O3ycmQ0FhpZ6BGpQ/V2xg==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBnghNz
+ZXJ2ZXIxLmV4YW1wbGUubmV0giFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBs
+ZS5uZXSCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEArOKTZeRzdFG4w3gEx0vsMAvXV80HIM0f
+ddfJMGPXpzyAmOLQSzxClJkMVOWVTe6FiTn8LNgthVAr9fdfpqEKpJNyDG0Ak/rf
+nWNys1mW/7jJi4rI+sOwxaFrrdTqeqMAiQSBZpq/EDTwynhviP91dwiQi7meaFqs
+yxq2H99nhUZQPlciv57eiN+sGopb0K0pj0asB9Ia4gpGfSTVNYdFP895Eiwm1q5Z
+KxiM59g0Syr3+U/aofow/Y1fQWSxb43WO6+KMhFNNcsZc7DdAndC+njakOXLdtmq
+bSlbOEA9JEshUWwumFGZdlgrTfxKiCyHJiitBWesaL0MK7GWl0XGmg==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -32,22 +32,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzcxNVoX
+DTM4MDEwMTEyMzcxNVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -55,19 +55,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db
index ed4131e99..c305d4b8a 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
index dfcc36ba1..0c43f353a 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
@@ -1,47 +1,47 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 2A 22 8E 09 99 1C 1D 7E 7A F5 09 30 86 37 A2 33 AB 16 0E 14
+ localKeyID: 48 90 1A C5 07 82 C4 01 1A 26 58 29 79 98 C5 84 12 C8 C7 8C
subject=CN = server1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM4MzBaFw00NDEyMDExMjM4MzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDblKcLgb03
-NrBQmR20Lt35rADNqLeuYLKPii9ygVC+TTOAk/wTCIg0phcfBezjDB4URFdOhxJB
-/PdJ7XsNpBGZSUD/gZPD9UvHxtlk1SBF6ETDSF5WcRGg3HTzyE4iJGiepoP8rOcX
-9r4FPB4YpfnhhXoerwcOhW6bcQPm0pY3gH+lliIA7P5tECv1eYM1OWkHPFuEjeUa
-6h81PrucFBTSixOv5nzVpKoYJaiTorP27rDWuWSnixJx+N6Es6Z5IWbbh9QkH0eS
-o4DCcHrD5zvoAgT6j1QocNpd9LaKjLjKcBkZpi1tfkb1NUS9/QmyDLr6px+S61kq
-AbtXCNAHclPfAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM3MTlaFw00NDEyMDExMjM3MTlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD6PrscYHOw
+J2FPnj7Jig458iJgzrxKXJAiNkK0uPF+Isuzh1P1wbxlHA7MlXEEoTza2upV1yjM
+lqj8c1ahOREuOFBAUKMen8uv4VskgYmI0qicGDIC/Na1K8PotUU1Sg0M5aj3kiQR
+IsO6DN9hH8e1C4xUn2aT6ByFrlgyhYGWefZYs7OfUlzqks6+cCoebhxLh1WxMceJ
+DLWIWhYoTvkuavILoGgWe1TDwO8JOyiwBvokOxLpC7pZWhWAGJaVQvbxJ+QQv+Te
+ifgFL+ou8Ol2qnjfMCMJATOfJ+0e9zKjnLWUgoIrlw16J/bWA9YANsyK5gDcjzOh
+lup2RdqilvPxAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCImFsdGVybmF0ZW5hbWUy
-LnNlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
-Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAQcJmqY3/48kV0zZrfzerpWeq6q96xChu
-RjGHyPuYY1+Y8iTxWTCqpVIPukjqdTAiuGjpwYFsqg81oZbrvT2+VmB9BWMwC/Jn
-esU48zDaBqczi6ffvfa7rmIsJkoYPp2EbOI3/61xqbsAbyIreroN19oZC8SDaO6S
-PD9L4DBVV6+Br5fpI94x5F4/fogU/T9YOit4KV9iC9FMxyYpKttxWSKyrcTMcgzK
-7YdsaWZDpgspM91gK7CgfqsnkHafZipEZRdiWlc9IsXKoZgRRCy+NexVz2zf177a
-s0WGyDRAREVflXzz7C0VAegErfBYnseP8O3ycmQ0FhpZ6BGpQ/V2xg==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBnghNz
+ZXJ2ZXIxLmV4YW1wbGUubmV0giFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBs
+ZS5uZXSCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEArOKTZeRzdFG4w3gEx0vsMAvXV80HIM0f
+ddfJMGPXpzyAmOLQSzxClJkMVOWVTe6FiTn8LNgthVAr9fdfpqEKpJNyDG0Ak/rf
+nWNys1mW/7jJi4rI+sOwxaFrrdTqeqMAiQSBZpq/EDTwynhviP91dwiQi7meaFqs
+yxq2H99nhUZQPlciv57eiN+sGopb0K0pj0asB9Ia4gpGfSTVNYdFP895Eiwm1q5Z
+KxiM59g0Syr3+U/aofow/Y1fQWSxb43WO6+KMhFNNcsZc7DdAndC+njakOXLdtmq
+bSlbOEA9JEshUWwumFGZdlgrTfxKiCyHJiitBWesaL0MK7GWl0XGmg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
-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
+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
-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
+CSqGSIb3DQEBCwUAA4IBAQA+o14bBzlKYIGiy1OQRS2UF2ibmZ2gLlZN0X2Z2WIJ
+TO+DJ8AsjbitgMTZE3mpgpT3UrT7gzXEsNIfpmqOgsr458Bv+/VH6mLKyY3G6fPL
+ucpye9F/8RYUGoEsMtjhMEGRPQMyOaW6lem9rPKw52oztzL0T84zHpON995INce5
+zypADaUdwnKSm+OCmJXn7Ah9iJakn/ERZ9EQCXcpgMVzBsegeVfNz5VAh28aqdDj
+TfjT0AU80podslVYrlJwINL1NkFoFl3HsR0Op5IQ+hj6Qr7hHmVD7iXK+6WUHBzU
+MY/tu6XAAGKixPg6RLLTax4nrnq3m6Bxzc3RaI7xYVX0
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
index 4ae7ebe49..51ce85f97 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
@@ -1,34 +1,34 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 2A 22 8E 09 99 1C 1D 7E 7A F5 09 30 86 37 A2 33 AB 16 0E 14
+ localKeyID: 48 90 1A C5 07 82 C4 01 1A 26 58 29 79 98 C5 84 12 C8 C7 8C
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQI1pa0C67V3VMCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBChR7z028izHUtFbVXdSjD/BIIE
+0GLx9t0tOhf7NhxH2rfu1AEoA1MBN645BzLN2+B3vVAT/pZe00w2OrhMONwyNQys
+bs4ynotIKTo1VErk3TZX8/mV5TCmZdh/X7LUlbLPmTChidjMkwN3WbBYJlsr4FrS
+jXqexnKo+bbwwodSGVi8alhbsnPs/WoEMeO45FJwJ+QSSOfCjPdbute/qhFHi/2b
+Guj3vuFyoW7xSC7Cy+eDHl5uxV/WhsSH61PFREil/+eZnNhMU9TjcVObS9gqgjoo
+UWeLbc1yiwZOGO7ZNSSnMr3/9jAMYcgYpfOGiMw9/rM3FCmVskfNpLkv/Txo6uMF
+eUCF3vFk8n3yKRBQ1bDvq2lSADBvj89+VJcNqlCJ/eQ4aTV6+NcLWH9sMHWytAG9
+KKZXM8yjarR0LQhPPH4h1Qr8d8XQiR03oBA9grZMRNlirkAf04FOsQr5wYQE55ue
+Mvb1WECQ5uyqqoS4TzBIrlgJWDt771Th98MPDTruqoWGmCQgh6zcevU7GKwCLKmk
+QSNYX2Rl6+aaHU1s1m8V6WXDgfUwzDGwbjX+N8NXJF1zKPtGHAmVUjFdod85Qu5b
+mVZuISYppzUrw4m3uDn9RzDqYOz/dTJchDldsPD/GrPSFwqV+Jfs90AWcgXqSd+1
+Drwhro6i0Z3dcjlxeA1kLhX6C4GThiS1Cfrt7pwexKrKxCR0F07+zr06Y43olwVU
+Jzn6Yu5+5Qg0s3nkz4a4MSdnTEnCbKdQjohxFutjXW545eJasjKm4o0cwZcVbGqz
+ft4/jKzucQITHP2oKcJagphiM2arGdymboCLieapM+B6TqSV+2sZ/UYZDJYIxYWI
+4mN4CXDrvBGmbnKWSnUZ6Ml5zgJqIItmTDtWuzbx9ANLHvS4jZyzFJ5ty8ktF9yS
+qomRHANXJ8QVeYTG14JH64rEAWhwcav7OVJT/nx2P8n06Q2yBzfxVV8upMd2dI0K
+pyZLNLwqRC7Q9hMiijQ+AsdsJUj8UWHyGY7H6rKfrNfQ7/8Y44JDksOQiH74hB37
+HZYg47BPR1/DxGIfa1ZBWITdXcxUOuvi9pjaFNc3ueP1+ujkoFCMBu2H3sQNZ2Kh
+1kC05fpClgikSSOjzAJw5zuFnHvuiLe0e/BtoiLGWOY4EZTjk5ull1boW62WmxjG
+pDxUyMJcL48V9oCceADOJs2TNUFZede7w30t8hj1SiLHWyvsW+3fZTgZd6yUaRsA
+fN9M9+6p4JS9PF+b6OLgtyfyuZtLleFt7pes148ai9NYIVJwBrVU+BX7CXyqY/6l
+pd0PuNCd+5wpqZNhby1ZfX4VtYBwaz4wHwi1kwFia5cruUgzjuept8olUigOttiK
+uDxJKZxif3gSVsHh5H018vAPqqpygXRDD9tox7suhlup/w9KhEaYJWOkZPfWRHG1
+ZfPsV8Fz0MgXV5KdHNqx0r2ZHcYwBLcjFyb0ZI2l7fU7KaYJtoi+8XygPSFGotP1
++jBItrxzl62voj7fEStzkziLwNYzdzZUTnCrVCbCzB8eU7Rw5zP4dRjPhwb/B1DD
+chNFSVdQeGIw5Xu1lmVVoxb3q9nRyk+bari8K3H4UXWOXgv/+VOP6widy2Ui1RTh
+KpzWvoMxHeLnOk44iOuXTJAmOoKT2QIZEmxtJACGEWDm
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
index df178d528..289d7794c 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
index 4f15f85ab..7897f6458 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
index 6a0ff4b61..92d973919 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
index 23e0ba36b..0ddd2ee87 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
index 3fc9dff44..01faec8d7 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
index 20e8d3854..8dbd9e170 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
index d6f035f4d..e230bbe60 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
index 1c0edb14a..dfd9fdc5c 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
index 145803613..e0ce285ae 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem
index b48d067eb..628f38cf9 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp.pem
@@ -3,29 +3,29 @@ OCSP Response Information:
Response Type: Basic OCSP Response
Version: 1
Responder ID: CN=clica Signing Cert rsa,O=example.net
- Produced At: Fri Nov 01 12:40:01 UTC 2019
+ Produced At: Fri Nov 01 12:38:40 UTC 2019
Responses:
Certificate ID:
Hash Algorithm: SHA1
Issuer Name Hash: 72b2200a81655f043d43c56b3c0b4b4d664abb5b
- Issuer Key Hash: dcfe0078faedf0c2d99caffc76a7e19e8f1b759f
+ Issuer Key Hash: 62b511e968c1b38be645b4ce3597403ab3989850
Serial Number: 65
Certificate Status: good
- This Update: Fri Nov 01 12:40:01 UTC 2019
- Next Update: Wed Oct 31 12:40:01 UTC 2029
+ This Update: Fri Nov 01 12:38:40 UTC 2019
+ Next Update: Wed Oct 31 12:38:40 UTC 2029
Extensions:
Signature Algorithm: RSA-SHA256
-----BEGIN OCSP RESPONSE-----
MIIB5woBAKCCAeAwggHcBgkrBgEFBQcwAQEEggHNMIIByTCBsqE5MDcxFDASBgNV
BAoTC2V4YW1wbGUubmV0MR8wHQYDVQQDExZjbGljYSBTaWduaW5nIENlcnQgcnNh
-GA8yMDE5MTEwMTEyNDAwMVowZDBiMDowCQYFKw4DAhoFAAQUcrIgCoFlXwQ9Q8Vr
-PAtLTWZKu1sEFNz+AHj67fDC2Zyv/Han4Z6PG3WfAgFlgAAYDzIwMTkxMTAxMTI0
-MDAxWqARGA8yMDI5MTAzMTEyNDAwMVowDQYJKoZIhvcNAQELBQADggEBAIw398Fl
-kORUURZoaUoa567qTv2ZJcz0j5ROM9Z5LuZAlrsNuxIgHBgi/9CfGNE9OMupuBBS
-tDuEyhoGSIKzwjTm9P/PVNBsiZWikh0E/td6AZ9/WyvYzQ61ae85yo7pcpoVlsLI
-bpYP+qD4DbDQ5ck7C6fkqVZR3ZwWXeAih59jmw44L65PgJwgu2xgwKb/PgYv/Knm
-AibNl2pXLcIf3mXcyXHOwXDwGhTn2mVUMQ/S5PWLc2w0b9o+A5azsOXmjB64iutl
-wBc6MP2q7wZvVE0DCN9P8IZUoe3u70nbQZ9uic/L7WpB4LOnro6FwWqJGPElVQUt
-9y1ed9CUxl2BCow=
+GA8yMDE5MTEwMTEyMzg0MFowZDBiMDowCQYFKw4DAhoFAAQUcrIgCoFlXwQ9Q8Vr
+PAtLTWZKu1sEFGK1EelowbOL5kW0zjWXQDqzmJhQAgFlgAAYDzIwMTkxMTAxMTIz
+ODQwWqARGA8yMDI5MTAzMTEyMzg0MFowDQYJKoZIhvcNAQELBQADggEBAAcEC1ax
+LtRo5GxGh29HZR7DFq3xXowJVC05DfHrSJkwamQlTSlGCijKiO7jw0V6Nl8J5rPC
+XsMXvbH7lgJAVkrQbM1WoWH+yURvPLOsyioskNPFB8YeiOKr1ezomu5hEen4IBHW
+wE+wr8W56KCu9k99wFUvAmlOetq50H3FQjbYo8dj7i1rw4W3hJTpbzdRO+HRPIn+
+0/L0vR0A+3Qj4dJHsK1ref5aq3g8b0TGdnduxaDN92Q6zjZxy9houLL2h8m/CVMV
+cdNjCTpHH3oZKdyMnVXoFIwUVQFUow/YvBuZEuLofIutbZpikHIPEl3fOlC6zkLd
+a4l7SEToENl5vTI=
-----END OCSP RESPONSE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
index 4aba3ca33..29c93d9c7 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
index 4f878eebc..6a61c24e9 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
index 69121c4eb..160b3f3cc 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
@@ -1,28 +1,28 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 2A 22 8E 09 99 1C 1D 7E 7A F5 09 30 86 37 A2 33 AB 16 0E 14
+ localKeyID: 48 90 1A C5 07 82 C4 01 1A 26 58 29 79 98 C5 84 12 C8 C7 8C
subject=CN = server1.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIID5DCCAsygAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM4MzBaFw00NDEyMDExMjM4MzBaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDblKcLgb03
-NrBQmR20Lt35rADNqLeuYLKPii9ygVC+TTOAk/wTCIg0phcfBezjDB4URFdOhxJB
-/PdJ7XsNpBGZSUD/gZPD9UvHxtlk1SBF6ETDSF5WcRGg3HTzyE4iJGiepoP8rOcX
-9r4FPB4YpfnhhXoerwcOhW6bcQPm0pY3gH+lliIA7P5tECv1eYM1OWkHPFuEjeUa
-6h81PrucFBTSixOv5nzVpKoYJaiTorP27rDWuWSnixJx+N6Es6Z5IWbbh9QkH0eS
-o4DCcHrD5zvoAgT6j1QocNpd9LaKjLjKcBkZpi1tfkb1NUS9/QmyDLr6px+S61kq
-AbtXCNAHclPfAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+MDExMjM3MTlaFw00NDEyMDExMjM3MTlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD6PrscYHOw
+J2FPnj7Jig458iJgzrxKXJAiNkK0uPF+Isuzh1P1wbxlHA7MlXEEoTza2upV1yjM
+lqj8c1ahOREuOFBAUKMen8uv4VskgYmI0qicGDIC/Na1K8PotUU1Sg0M5aj3kiQR
+IsO6DN9hH8e1C4xUn2aT6ByFrlgyhYGWefZYs7OfUlzqks6+cCoebhxLh1WxMceJ
+DLWIWhYoTvkuavILoGgWe1TDwO8JOyiwBvokOxLpC7pZWhWAGJaVQvbxJ+QQv+Te
+ifgFL+ou8Ol2qnjfMCMJATOfJ+0e9zKjnLWUgoIrlw16J/bWA9YANsyK5gDcjzOh
+lup2RdqilvPxAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBngiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCImFsdGVybmF0ZW5hbWUy
-LnNlcnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIITc2VydmVyMS5leGFtcGxl
-Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEAQcJmqY3/48kV0zZrfzerpWeq6q96xChu
-RjGHyPuYY1+Y8iTxWTCqpVIPukjqdTAiuGjpwYFsqg81oZbrvT2+VmB9BWMwC/Jn
-esU48zDaBqczi6ffvfa7rmIsJkoYPp2EbOI3/61xqbsAbyIreroN19oZC8SDaO6S
-PD9L4DBVV6+Br5fpI94x5F4/fogU/T9YOit4KV9iC9FMxyYpKttxWSKyrcTMcgzK
-7YdsaWZDpgspM91gK7CgfqsnkHafZipEZRdiWlc9IsXKoZgRRCy+NexVz2zf177a
-s0WGyDRAREVflXzz7C0VAegErfBYnseP8O3ycmQ0FhpZ6BGpQ/V2xg==
+KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBwBgNVHREEaTBnghNz
+ZXJ2ZXIxLmV4YW1wbGUubmV0giFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBs
+ZS5uZXSCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxl
+Lm5ldDANBgkqhkiG9w0BAQsFAAOCAQEArOKTZeRzdFG4w3gEx0vsMAvXV80HIM0f
+ddfJMGPXpzyAmOLQSzxClJkMVOWVTe6FiTn8LNgthVAr9fdfpqEKpJNyDG0Ak/rf
+nWNys1mW/7jJi4rI+sOwxaFrrdTqeqMAiQSBZpq/EDTwynhviP91dwiQi7meaFqs
+yxq2H99nhUZQPlciv57eiN+sGopb0K0pj0asB9Ia4gpGfSTVNYdFP895Eiwm1q5Z
+KxiM59g0Syr3+U/aofow/Y1fQWSxb43WO6+KMhFNNcsZc7DdAndC+njakOXLdtmq
+bSlbOEA9JEshUWwumFGZdlgrTfxKiCyHJiitBWesaL0MK7GWl0XGmg==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
index f25e57d60..9adc83aba 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDblKcLgb03NrBQ
-mR20Lt35rADNqLeuYLKPii9ygVC+TTOAk/wTCIg0phcfBezjDB4URFdOhxJB/PdJ
-7XsNpBGZSUD/gZPD9UvHxtlk1SBF6ETDSF5WcRGg3HTzyE4iJGiepoP8rOcX9r4F
-PB4YpfnhhXoerwcOhW6bcQPm0pY3gH+lliIA7P5tECv1eYM1OWkHPFuEjeUa6h81
-PrucFBTSixOv5nzVpKoYJaiTorP27rDWuWSnixJx+N6Es6Z5IWbbh9QkH0eSo4DC
-cHrD5zvoAgT6j1QocNpd9LaKjLjKcBkZpi1tfkb1NUS9/QmyDLr6px+S61kqAbtX
-CNAHclPfAgMBAAECggEAHUE3ZkGRT5diM0LLIdPysA56Bux5GGr6r0QWYTeYZdpM
-R8+vkGudFgKg5vm3n2JgaYvXY/d79723xqo0sFMRIy6O0dvWL4/xWjsEgLoidB3n
-d2sfYn3q/tcQX+BqhIL8S1LdF9+DZH5zv6fMTLVkTuclJ4xjMMyXOW97uReKevdN
-CzxSbFSESKyop3cuzf7In850Atn323YSSecITPEzB/TTNnYKZYsSLlKzNQZqyLtu
-jIUEOcRZSa26lxvg1wICBo572pTYVNgr5TNntQKLPD+RWz2u/zZZ3J8BIyZl4V5q
-PivnSrZ1MXNbapognSx7y8llUIxvM6CWKMzZy+kEuQKBgQD4iOEUvKbp/7dcwxEb
-LDD380t68tS5Q39U0RfzAem7sj2XwQtlq0s9oR2Uj/Ku3AcxsiS7T6bU7Q5BbzB8
-xT/8+rkMSdsukwlCyCRPRAsHu7wE3hZGFHUntuiuNZXPuvP9GdhGIAguwpum3UJ/
-19Kb64SfIFBMY3ag9GK4ue43mQKBgQDiLSE/2jarU70DNJUNL0q2z5ECTn7C7M67
-cHEDgU2EaUv/oE1ss5fWaapfk+8ezIclT3zCW+B033fWAwrPMqVwuOd0kdeIDcN4
-8TbmzqXiBt41J7cwnnoApGmGD/193KbD84tsaHT370RnkLrpzh2JOv2WA3bVXE/L
-9cHaePyyNwKBgGZVriAkwbGuKmkWpO+EVbFyy0yXukGCamaZJfxYeE5hyPy4byHw
-0y1QLubiErIvRQMQcBF0baRU677DsrpdWcin0BQgQRC/WFvYHyNISCZqBbQXYiJ+
-//JXXR2GUOZU+2vm/Wd6fwQJ+59MkbokOsMayePfoVCiz9Dcb93SKSVZAoGAbUpJ
-asVS7W7FQqtB6uETRUr/UxIDBsXPD5vBwGPWxUjsRFV9lC0kDaN5hD3DqipCk7DZ
-JEGpMFBbY7qMmppqfxGaJiXi9AdSkTpdwSHR3mpbLWxHhOLPKUhJBVLstsjMfJtO
-n8/J1ZR0hWbWKuxCMXGj371EysyUcoYKajtUP/kCgYACjSGVemvN37HHHpn0t001
-b9hB/LREZ/LvtbCaAVFERJ5idWREi9nKCAfIJ6IYq0Tc6DVHW/qDVo6WReGWIEYm
-8WSnmcD7MZGtjJ1IeNv1yj20duMURg+0swVuu5R4+F2qR1HOKB13ytnLQ7/Yytv1
-Tq46ebTltGgo0C/qcUF06w==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD6PrscYHOwJ2FP
+nj7Jig458iJgzrxKXJAiNkK0uPF+Isuzh1P1wbxlHA7MlXEEoTza2upV1yjMlqj8
+c1ahOREuOFBAUKMen8uv4VskgYmI0qicGDIC/Na1K8PotUU1Sg0M5aj3kiQRIsO6
+DN9hH8e1C4xUn2aT6ByFrlgyhYGWefZYs7OfUlzqks6+cCoebhxLh1WxMceJDLWI
+WhYoTvkuavILoGgWe1TDwO8JOyiwBvokOxLpC7pZWhWAGJaVQvbxJ+QQv+TeifgF
+L+ou8Ol2qnjfMCMJATOfJ+0e9zKjnLWUgoIrlw16J/bWA9YANsyK5gDcjzOhlup2
+RdqilvPxAgMBAAECggEAD+D0IYBTRu2wxIsPg91ROscM/GSR2QwXjzwvLmV/2Vee
+4lTndHQnHqlRnRSsd7U9dcunS+wbqCO1NFOjPxauaubi3LnhJ9vO4mmjzWS00+w+
+C62TWtItU5Cj3TvHWPLKcjOObaslw7qXfdI8SF7qXqgNbv8wVJlJWggui4IiL2iM
+pKR57//QmIk5UL/eNwEnRU6uDXGVap+6UV66UDTf9bFXP1O2aX/Aw94yir30sowZ
+unhero6bA0Qi8gI4BQwRz5UAEMSWxR2bbGY2fb1YlEiGfYVuD8kLlhexG+CGijDX
+K+63OfI4lAchLtondnMOIkNHa5vz+UC+5dpFd7/uiwKBgQD9hMb0CJEuGHRscmBc
+RV8oGm3/O6o2hzpKXmMGNz/0KREB5akcsl6IPi6tbpMevsXFrxsjdu4hHVBmq35p
+xIiTGTQNgA7w/eOtK6kq7/SiYsG4mjs6GS4hGEHXJbZsi+OMgpvSECHXObEFVhtn
+PzMvb+7hJTJCVgnGGW5uJIMopwKBgQD8scBT1BWTorKCEGXt/YqM/N4n4X+iOzfn
+qhHsFisM3aBOO8LMn+iUR1X2kL7KCtCX72iwz/J4laFTGJ3d8JSJ+JddbZeWWrN+
+pxGqWV/NNeJc2JWEPbkSJit7quinozojc3tQ/G89MV6VSGvIoEskXYSMWNBNWK5Y
+QJMiIDv5pwKBgGnHif/uxyzVlVZejuhRJbgk9vqFGatw1xiKs4S3bt7gd7Ez81D+
+98SfNXi153rvnLO0MX2ltQxqH88HBVL6ZwYBgR+U7CcPuHzb99TrlEZhMHVnHQlL
+0lyKs4YivTAjWkmZgYyvoH8eGkeguwRkcWX8rU6R55uYLLHUkKgyYeuHAoGBAMrX
+5Qtls+xPLfw6LZhdblq+oZZh7ZLM9pOAceKR6Pzq60PhtP2NX6WnndnPV1fYVpmg
+FOnaA0nI0zdhC1idRp96bgcRch2/sVZ5xjR4ie6w0oS1V1BQO7/V5BHhn+DxpjnO
++a6I9MKqXsJ24A6snaUTbNM8d/metlUhgPpj5cEBAoGBAI/T4D8cBO6f2Ohp5BNg
+X9hx8G/stJfknUMEN6b9Sf/GmYjMzDWaq7ZAyhegO+b4aCzkISOv11d2U5Ab3his
+wnYFA4cGRwGX3IsPUqFrJlVSPsWMtU6g/J5x2+2SIY2Q9OJi1ssWvv2XCtwFYm1q
+udphI1BiXfDVnXN/shVvt59C
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
index dcb99dc5d..1df3bf21f 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
@@ -4,22 +4,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db
index 2846d2c0e..3c37d0a50 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
index 0f447f483..c91a87081 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
@@ -1,29 +1,29 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: 43 70 54 6D 39 D9 D3 36 A6 3E AC 1A A7 DE F2 89 55 2D 19 7F
+ localKeyID: 67 7F 07 01 A7 F1 D7 B0 98 55 B9 E8 9D D6 29 50 CA F4 4F 52
subject=CN = server2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzOTA4WhcNNDQxMjAxMTIzOTA4WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6ZfmDuVL
-2Ascbs0E7iEwaEa5c0utuotkKWbREWT35gxV6kKPCa76hI5M94iKi/B5PpHoe3pn
-3v+Gfi6Nb+mQI/gwGEUjHq4vzVVrEciQTV0NX9POXIFbPAAinH93blh4DG4pwfIq
-jYe9VbcifpXOEbA20UYcdwqIjs+Lqqhqs60UMRLPW/rPyKtD9MoMgGu5bsSpzouV
-O8pnoWMUWv+IbELCU9ayFKmtBiesvk4BgGUu7M583FvvFXMUpoYzIHlLuq+Mdox/
-QqMD1PMhPLNKcsZted4FXlvEVNxq9xXrZmodRAgczxaifpwIciTcwglMu8UHoOTk
-RA6NiAgTF/COcwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNzUyWhcNNDQxMjAxMTIzNzUyWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt6oOjeP1
+Avi2ooftlZ5cCuaNcG/gaiMk6BdgzmXUyfCLDvdM2DoCcw3PQ0xTwdXQdkMUuGH6
+pCeD+8braaPPizjczCI7cytxgK1iOWyISQ8AtGBgkhR8+KY5a4M7jC06prIQYb0t
+FqxlgQg2uSIsdOp/COSe7d/WnqjKJKZe3WedkRhvwGgxGGrAgHQ2CdiaEc2EnKVw
+btwXKWQ4uprcrIVCldQD65OpkWzZblW3+gcIH6zj75GKTmGri9zl5M0x44QaLGhE
+LJUB198ycF8ME7NhrE5EX8d1qWkstT+c1AL3PvlD7U4qzEqxSSU0BKPOrLhThUkX
+618tj3vgU0lA9wIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
-LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAFZjze2kLYk3ikCG1t+DruNDTWTN
-MpNh0wXZXsbR9hpIE0IVscuh7sOmltDh3Jeg6penWXZxcG4j1XZyjhuFe38htwOs
-w/4JR/iBsDSz4WyXzr9dTxUYP3OLIMqalpAFj26QPaNv9hLmDV4NX1dB1UdQhgxT
-ec2NI4QQQuudoZakeIW2Rjo1gPZ5+XwjZHVcHm66eoIdjOHqQKfumQaGC58hKctX
-sECunPnvFYVnLJRrReH2i0Xbdcc+r2WXlHWpqE/clM6vM/ymq98ZM7Lxg2FUlLoY
-JWgSeL7T/X59a3CK6C2yw5PVy1al72hJUyYu3Zq2Bv2nUB7wb8bNWW5DW1c=
+LmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
+bXBsZS5uZXQwDQYJKoZIhvcNAQELBQADggEBAILS8cOfkyoSvTH6+H44/Z7kYK4j
+UG+DuuctuC7EXi8dFNdgrGa7mMrYnZkFB/WcqJ8dzaCGWeWW2XJDBYAssX3Vd9HP
+MfgxOjY6ZY3uy6E8XL/mWmoSxua5wfQJZwrXjivjSLPyihmzSUeqAULqfV1gvyyW
+UdlukwT/LFaBPt1FnzXJnOgNEgScfE6+S4PSeMn7CkDWLZNmLBoUmNdesaXxNqUE
+etPXEwCVjmeshiBsOxIby4r4ShnZdzm5EAMklC7DS8aBQYzGFL4oqVyE/02TFB3A
+4YFhH0aRL57p1SniV0y0PVTccqHGZVaQO4P/7oord3kXB2PlGcxhHvq3Vzk=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -31,22 +31,22 @@ subject=O = example.net, CN = clica Signing Cert rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzgyNloX
-DTM4MDEwMTEyMzgyNlowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -54,19 +54,19 @@ subject=O = example.net, CN = clica CA rsa
issuer=O = example.net, CN = clica CA rsa
-----BEGIN CERTIFICATE-----
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
-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
+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
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db
index fe27adbc2..5d757271b 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
index 5ca72a712..3983637db 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
@@ -1,46 +1,46 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: 43 70 54 6D 39 D9 D3 36 A6 3E AC 1A A7 DE F2 89 55 2D 19 7F
+ localKeyID: 67 7F 07 01 A7 F1 D7 B0 98 55 B9 E8 9D D6 29 50 CA F4 4F 52
subject=CN = server2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzOTA4WhcNNDQxMjAxMTIzOTA4WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6ZfmDuVL
-2Ascbs0E7iEwaEa5c0utuotkKWbREWT35gxV6kKPCa76hI5M94iKi/B5PpHoe3pn
-3v+Gfi6Nb+mQI/gwGEUjHq4vzVVrEciQTV0NX9POXIFbPAAinH93blh4DG4pwfIq
-jYe9VbcifpXOEbA20UYcdwqIjs+Lqqhqs60UMRLPW/rPyKtD9MoMgGu5bsSpzouV
-O8pnoWMUWv+IbELCU9ayFKmtBiesvk4BgGUu7M583FvvFXMUpoYzIHlLuq+Mdox/
-QqMD1PMhPLNKcsZted4FXlvEVNxq9xXrZmodRAgczxaifpwIciTcwglMu8UHoOTk
-RA6NiAgTF/COcwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNzUyWhcNNDQxMjAxMTIzNzUyWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt6oOjeP1
+Avi2ooftlZ5cCuaNcG/gaiMk6BdgzmXUyfCLDvdM2DoCcw3PQ0xTwdXQdkMUuGH6
+pCeD+8braaPPizjczCI7cytxgK1iOWyISQ8AtGBgkhR8+KY5a4M7jC06prIQYb0t
+FqxlgQg2uSIsdOp/COSe7d/WnqjKJKZe3WedkRhvwGgxGGrAgHQ2CdiaEc2EnKVw
+btwXKWQ4uprcrIVCldQD65OpkWzZblW3+gcIH6zj75GKTmGri9zl5M0x44QaLGhE
+LJUB198ycF8ME7NhrE5EX8d1qWkstT+c1AL3PvlD7U4qzEqxSSU0BKPOrLhThUkX
+618tj3vgU0lA9wIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
-LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAFZjze2kLYk3ikCG1t+DruNDTWTN
-MpNh0wXZXsbR9hpIE0IVscuh7sOmltDh3Jeg6penWXZxcG4j1XZyjhuFe38htwOs
-w/4JR/iBsDSz4WyXzr9dTxUYP3OLIMqalpAFj26QPaNv9hLmDV4NX1dB1UdQhgxT
-ec2NI4QQQuudoZakeIW2Rjo1gPZ5+XwjZHVcHm66eoIdjOHqQKfumQaGC58hKctX
-sECunPnvFYVnLJRrReH2i0Xbdcc+r2WXlHWpqE/clM6vM/ymq98ZM7Lxg2FUlLoY
-JWgSeL7T/X59a3CK6C2yw5PVy1al72hJUyYu3Zq2Bv2nUB7wb8bNWW5DW1c=
+LmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
+bXBsZS5uZXQwDQYJKoZIhvcNAQELBQADggEBAILS8cOfkyoSvTH6+H44/Z7kYK4j
+UG+DuuctuC7EXi8dFNdgrGa7mMrYnZkFB/WcqJ8dzaCGWeWW2XJDBYAssX3Vd9HP
+MfgxOjY6ZY3uy6E8XL/mWmoSxua5wfQJZwrXjivjSLPyihmzSUeqAULqfV1gvyyW
+UdlukwT/LFaBPt1FnzXJnOgNEgScfE6+S4PSeMn7CkDWLZNmLBoUmNdesaXxNqUE
+etPXEwCVjmeshiBsOxIby4r4ShnZdzm5EAMklC7DS8aBQYzGFL4oqVyE/02TFB3A
+4YFhH0aRL57p1SniV0y0PVTccqHGZVaQO4P/7oord3kXB2PlGcxhHvq3Vzk=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
-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
+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
-ggEKAoIBAQCkL0Gw+jw7XFj1EoIVMrNa519vJeAad+wYVplDS9vB/WgWfCIgLhN8
-sLy6DKa/bwPMliUXDjGLisXd5jh1d36uFeeCN9R2fvlNgHiZslZmkEuPngBfPvjE
-UDN3avu96Dyi3EIJlP2sxoGUutvG6gNlTnUCLUldJeZNzXoLhTZdpFMf7k03h+Ou
-njNdmDIxMChMP474DqThP9sA2bUdhVzWGhR/fa8Sbb/Q7Zcr1tb1i+siwpxoYGt2
-LeGbMKsF9uZdGgoxJ8i1rpLvf+CrBnDFJZzpNC1+LjGWwKH08srpY0a2eCex7tfg
-HUCi6JSx08j04uWSpo0W1/BJ+AvycNaNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+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
-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
+CSqGSIb3DQEBCwUAA4IBAQA+o14bBzlKYIGiy1OQRS2UF2ibmZ2gLlZN0X2Z2WIJ
+TO+DJ8AsjbitgMTZE3mpgpT3UrT7gzXEsNIfpmqOgsr458Bv+/VH6mLKyY3G6fPL
+ucpye9F/8RYUGoEsMtjhMEGRPQMyOaW6lem9rPKw52oztzL0T84zHpON995INce5
+zypADaUdwnKSm+OCmJXn7Ah9iJakn/ERZ9EQCXcpgMVzBsegeVfNz5VAh28aqdDj
+TfjT0AU80podslVYrlJwINL1NkFoFl3HsR0Op5IQ+hj6Qr7hHmVD7iXK+6WUHBzU
+MY/tu6XAAGKixPg6RLLTax4nrnq3m6Bxzc3RaI7xYVX0
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
index c90baaf1a..396ca40e9 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
@@ -1,34 +1,34 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: 43 70 54 6D 39 D9 D3 36 A6 3E AC 1A A7 DE F2 89 55 2D 19 7F
+ localKeyID: 67 7F 07 01 A7 F1 D7 B0 98 55 B9 E8 9D D6 29 50 CA F4 4F 52
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
index 6ee5e7696..f793b7131 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
index adb3a83dc..347217c16 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
index 5295976de..57336c01f 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
index adb3a83dc..347217c16 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
index f9da09a35..5dcebe9d4 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
index e4542c2c9..50069f6cd 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
index e4542c2c9..50069f6cd 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
index 1d3c7640f..9733d074d 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
index 9250e9792..ed07980ea 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
index 9250e9792..ed07980ea 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
index 216a52ff9..d17c3c8ee 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
index 4f18e05d0..7cca18670 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
@@ -1,27 +1,27 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: 43 70 54 6D 39 D9 D3 36 A6 3E AC 1A A7 DE F2 89 55 2D 19 7F
+ localKeyID: 67 7F 07 01 A7 F1 D7 B0 98 55 B9 E8 9D D6 29 50 CA F4 4F 52
subject=CN = server2.example.net
issuer=O = example.net, CN = clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
-MTAxMTIzOTA4WhcNNDQxMjAxMTIzOTA4WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6ZfmDuVL
-2Ascbs0E7iEwaEa5c0utuotkKWbREWT35gxV6kKPCa76hI5M94iKi/B5PpHoe3pn
-3v+Gfi6Nb+mQI/gwGEUjHq4vzVVrEciQTV0NX9POXIFbPAAinH93blh4DG4pwfIq
-jYe9VbcifpXOEbA20UYcdwqIjs+Lqqhqs60UMRLPW/rPyKtD9MoMgGu5bsSpzouV
-O8pnoWMUWv+IbELCU9ayFKmtBiesvk4BgGUu7M583FvvFXMUpoYzIHlLuq+Mdox/
-QqMD1PMhPLNKcsZted4FXlvEVNxq9xXrZmodRAgczxaifpwIciTcwglMu8UHoOTk
-RA6NiAgTF/COcwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MTAxMTIzNzUyWhcNNDQxMjAxMTIzNzUyWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt6oOjeP1
+Avi2ooftlZ5cCuaNcG/gaiMk6BdgzmXUyfCLDvdM2DoCcw3PQ0xTwdXQdkMUuGH6
+pCeD+8braaPPizjczCI7cytxgK1iOWyISQ8AtGBgkhR8+KY5a4M7jC06prIQYb0t
+FqxlgQg2uSIsdOp/COSe7d/WnqjKJKZe3WedkRhvwGgxGGrAgHQ2CdiaEc2EnKVw
+btwXKWQ4uprcrIVCldQD65OpkWzZblW3+gcIH6zj75GKTmGri9zl5M0x44QaLGhE
+LJUB198ycF8ME7NhrE5EX8d1qWkstT+c1AL3PvlD7U4qzEqxSSU0BKPOrLhThUkX
+618tj3vgU0lA9wIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
-LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAFZjze2kLYk3ikCG1t+DruNDTWTN
-MpNh0wXZXsbR9hpIE0IVscuh7sOmltDh3Jeg6penWXZxcG4j1XZyjhuFe38htwOs
-w/4JR/iBsDSz4WyXzr9dTxUYP3OLIMqalpAFj26QPaNv9hLmDV4NX1dB1UdQhgxT
-ec2NI4QQQuudoZakeIW2Rjo1gPZ5+XwjZHVcHm66eoIdjOHqQKfumQaGC58hKctX
-sECunPnvFYVnLJRrReH2i0Xbdcc+r2WXlHWpqE/clM6vM/ymq98ZM7Lxg2FUlLoY
-JWgSeL7T/X59a3CK6C2yw5PVy1al72hJUyYu3Zq2Bv2nUB7wb8bNWW5DW1c=
+LmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiCE3NlcnZlcjIuZXhh
+bXBsZS5uZXQwDQYJKoZIhvcNAQELBQADggEBAILS8cOfkyoSvTH6+H44/Z7kYK4j
+UG+DuuctuC7EXi8dFNdgrGa7mMrYnZkFB/WcqJ8dzaCGWeWW2XJDBYAssX3Vd9HP
+MfgxOjY6ZY3uy6E8XL/mWmoSxua5wfQJZwrXjivjSLPyihmzSUeqAULqfV1gvyyW
+UdlukwT/LFaBPt1FnzXJnOgNEgScfE6+S4PSeMn7CkDWLZNmLBoUmNdesaXxNqUE
+etPXEwCVjmeshiBsOxIby4r4ShnZdzm5EAMklC7DS8aBQYzGFL4oqVyE/02TFB3A
+4YFhH0aRL57p1SniV0y0PVTccqHGZVaQO4P/7oord3kXB2PlGcxhHvq3Vzk=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
index edbf0fb80..50fc3e49c 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDpl+YO5UvYCxxu
-zQTuITBoRrlzS626i2QpZtERZPfmDFXqQo8JrvqEjkz3iIqL8Hk+keh7emfe/4Z+
-Lo1v6ZAj+DAYRSMeri/NVWsRyJBNXQ1f085cgVs8ACKcf3duWHgMbinB8iqNh71V
-tyJ+lc4RsDbRRhx3CoiOz4uqqGqzrRQxEs9b+s/Iq0P0ygyAa7luxKnOi5U7ymeh
-YxRa/4hsQsJT1rIUqa0GJ6y+TgGAZS7sznzcW+8VcxSmhjMgeUu6r4x2jH9CowPU
-8yE8s0pyxm153gVeW8RU3Gr3Fetmah1ECBzPFqJ+nAhyJNzCCUy7xQeg5OREDo2I
-CBMX8I5zAgMBAAECggEAJZKyxROZ0vrajHH6yIjbHfK+Uq7KF3bjWgt5NniMrVqv
-mRoyosab8iVneOtkCaVZAzj58Z6bRZHJYtN/GZCyiC6cIdNBFmbDNp52NeqSV3dP
-tum9SEDgWXLWHmEcZ0ngqXMw0UrwEErUqAxohn73If47mwbRfk5Z78qvdvhXDWZL
-bWQZ0MLQWgLpxTn4i3uy2CuPm5H9sd2OqtI5g+aIPJPKW6sqlgHnK6KXI/XEdE9a
-fSYhTKb0y8xFU0eAfzsZEMq74F8Dq2Z28lrgrW8Au4xlt2kyztbHnhVmKXCjBNVl
-Qnkd6eJ3UtVMxfWLJzXsisIwmhc/6/FCiP82MgwlDQKBgQD1CY8tzXk6D37gjxcs
-bgW9elPKb/lnb/dj+YW4LzVxW1D5rj91mv7KKwRcuJKSYBYDmbaEsXvfHKn+FiIq
-z6KX/v0WslHY9k5k8lepOtr2wWgQ8dX40inO9K1IOHTIEWvrzzhPFkWZq3qyTOJj
-2Blh1uR1HfADODemR66FN8IgPQKBgQD0C0UkDigwbD6L7Ox4/tS3OCyKP1aQo7Ym
-mtBrjXNEnChK/1XUpAI16OB8XZK48EEEF5eyjDo71iEU7G9azmClSUulQNNmrHJ7
-lEfIMEkgZtjWFRGG6BNAT3Bxtgyyd+R8O5+mNdOK/CHkeTSBd9UWsx+0WIjJUK7V
-a4Km3uwkbwKBgCnNE6vQnZmWAyLzxhRCQKBuOdUS/Qz0QNPBQVqGUyufVFUDsLez
-VTvP0tKuefKWiarbkhNY47TQAv/hbrq26Rnc2fgBO40zl3QJE4M/ExN9Mu+REdt8
-nr07aEQlvWZT8oErvINhXUY1xpycGRLHTq0uJ5MDJGqoMHYhTFhVhrxRAoGBAN7b
-F9V4FB08C9XtknhfhVKXOp04f81vopwYTfGZZ0SlMWpjRzb6WoZuVelb7etygnzB
-KqdCxL71qJoZ2wpaYgkuKKUM0L/3BEhzvSVDatPq92JwNOQ0M7hLksxUSb4EHCOS
-sxSuHLLT0gN454i/LFkhU/d1zdvBERcVqWbHNW+DAoGAdtSkOAEhoZLTLENHFSwM
-hmxlShwWG3S4ayiEBESduxtAKp6ootu5RZC1f7ZrXsg7cQkOi/YwSeqigxtXASqE
-OCOxAn9BoB+l3Q3HLAFbJgMjFic7ghHtQuwr+vn1saV8IkTpgDNV7MI5QLn55Pco
-kuAbgMdvPg2yee2ElDEZBWo=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC3qg6N4/UC+Lai
+h+2VnlwK5o1wb+BqIyToF2DOZdTJ8IsO90zYOgJzDc9DTFPB1dB2QxS4YfqkJ4P7
+xutpo8+LONzMIjtzK3GArWI5bIhJDwC0YGCSFHz4pjlrgzuMLTqmshBhvS0WrGWB
+CDa5Iix06n8I5J7t39aeqMokpl7dZ52RGG/AaDEYasCAdDYJ2JoRzYScpXBu3Bcp
+ZDi6mtyshUKV1APrk6mRbNluVbf6BwgfrOPvkYpOYauL3OXkzTHjhBosaEQslQHX
+3zJwXwwTs2GsTkRfx3WpaSy1P5zUAvc++UPtTirMSrFJJTQEo86suFOFSRfrXy2P
+e+BTSUD3AgMBAAECggEAQKZWuzF7xFECENIiGmGE6r1fGi33Y8T9L8lS5TRJI9BN
+UrZQUWiSBifdRkYu0XNPDuHsAD9U98WFGvJZWXU1ED+y0RRXsuGe8XmWsrn2eykR
+yWyHccROfUQdwC+QnXYqSBUz2QO7RFjo3fOjN6XE2l7U2q+HFhqNtImbpiz+BZbj
+4bMWU1iTMtfHXHVf7Rrhf3EsEY3DLjkDb7oypvXHuvf5NNGELvwFgg5N28F0hfwH
+btGMCA3W89fKyrFXKgnaaKGkwHCt2gGFPKMEf4D10NxEOTXP82R5ztMgYGFPL8L2
+0fB0t7MHbPiAIx7ZUBJ3qc65RQbtEzwo8J8QG2g8EQKBgQDayxxoXgh1TRdEVWYf
+iuk0L3d+pd5P9WRpUAPUZpZpMltNj7b3QnCk7+tR68jNqMphRQ/MNVPYA6xWmYZK
+eZm2eIXseCxFw0Bq6pRSWEvk1J4HIwUElXWV0qmheYmS8/eUs1NThiuxQxS4LpD9
+iPUVZ/crrwuznqMzoLGT4XWfGQKBgQDW5aUdoRXD23NU4bSyNKRUiSQO7CM2wfld
+NYUp443b/i3FySBsR3rKgNDdH665psdW2GIinkQ7i3ld7hB/N3okzKLVbOLTM+Ho
+szULuOO4dzNkh4341Tk8ioL2XASzLvoOTAwi8AJ4HZSY4nupQCvE7bn2vBqXC5G6
+P6qKpmayjwKBgAubnQ04d/BpP6PDeCCSSR8YqZlRiYLqfQJNWXaqXq6EGm36AvYJ
+U1qc0/pLrSKkIuCYPmdSKPmb8EfD62kGHI6exFQwaADnhAJoIahgwN4KHbw5Mmn0
+2AEz5QYJIbBnOyprfS9APg8whOfkqJKa8o3JL0blCZTlBLmXe/RhkND5AoGAJ1kl
+QqecNKCaHZC2ZWr+K/xwfcr/J6ec4VRLbcAc2YtRFkYdibYM5cdwdwy2EYhYN66n
+SW9xTvXa4zgUDTc7RkGyDyJA5is50kH+FIdmKwCoiF/JvyZLtKooELQIqEaRwsxp
+7HvF9/hynQvbWMJHQWfGBUesFrwnktLVh02wwEECgYBAQ1GneXtGJNfAb3QOF87a
+lLYGgc4PkTp+xbRQ6h62AzmA+OgUuah9XJPKK8UKA5eExJX7VpcawXBB/fR5asKD
+s0n7k8CGVq5M96WRcoVWE9tIyLH+DBCF2tXrwvdrI3XTCNJKZWpUmd/cPFYKN62D
+tk3ig295977ObIFzvIptvA==
-----END PRIVATE KEY-----