summaryrefslogtreecommitdiff
path: root/test/aux-fixed/exim-ca/example.com
diff options
context:
space:
mode:
Diffstat (limited to 'test/aux-fixed/exim-ca/example.com')
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/CA.pem20
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/CA.pem20
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.key30
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.p12bin2941 -> 2941 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.key30
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.p12bin2319 -> 2319 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/ca.conf22
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.emptybin244 -> 244 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem10
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.v2bin293 -> 293 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt6
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem12
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/key3.dbbin32768 -> 24576 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/noise.file119
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key34
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.respbin950 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.respbin962 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.respbin414 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12bin3087 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key34
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12bin3087 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key34
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.respbin950 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.respbin962 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.respbin414 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12bin3087 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key34
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12bin3087 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem40
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key34
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.respbin950 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.respbin962 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.respbin414 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12bin3165 -> 3165 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem22
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem40
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key16
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12bin2730 -> 2730 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem22
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key10
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key34
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12bin3117 -> 3117 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem20
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key26
139 files changed, 746 insertions, 733 deletions
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
index 08b225b7d..c61f0a873 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
@@ -1,13 +1,13 @@
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
index b0b33020c..e29a8fa73 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
index 888d67249..a3fc6acdb 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/key3.db b/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
index 5acb883c5..92bfe0306 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/CA.pem b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
index 08b225b7d..c61f0a873 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
@@ -1,13 +1,13 @@
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
index be678766c..85facb4bc 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
@@ -1,20 +1,20 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: 9D B9 DC 07 39 38 CE 97 63 85 2A BD BC 4B 89 44 F3 8E 51 2F
+ localKeyID: DF 3B 91 55 C9 03 92 D8 CE AC 64 2C 3E 70 97 9D DE F5 53 2F
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOg80b5o3UgoQfGv
-VMvpQMeZQkxcwWiXjP1LXkUuD7VotQab3zWIysbLJjfCkfAFj9KyYpHYjDMZrRUE
-DOqNqB+eFXq22AJHRpfL4f8seMjfeuw6n0b8CiwXWsztyZy9LHOx05RR/LoYikDC
-dk6jhl54WvrM8cuxJPL5Vg4TzwCTAgMBAAECgYBN+T2i5KqHM50QfIHIBQTO/1IX
-OX1mlJut38RDDfgQPJurIGKNIuSSYlruldFR+UwUvfgCZ+aKsbA/QiDkD7PGZh2C
-lQusUqdjK7jhK0u+rt3JXcIDmOustLpnXdtUS1H2hyucBqv5LjdTkvvZsn1/qlAN
-S9/RLhex9qJ8RDYqgQJBAPRRJcy4dVTipAqPzgSXQ2AVyOcq0kgVFogKjArC9YBQ
-jr89VCgjkV9BavEziSVJWLEuismC7jFWWe6IYHoWXJECQQDzV8yf3tkluV9zvkl+
-GnWw85XECPx2uSAqYpaDCQxU8FletsoSlGz30wd991+kmB3u045zD/bLDBKR2Ttp
-8izjAkEAm80X3tqOsEgrtjSIe7L+m0qpKInNOXyBNtYLAl3bcy1sKpZwkXxFG0q7
-aP+laOrCLZNxnBnrzfi0NwIvDAwwkQJATtXzBRg9YWtc8TKEvMX1uw4vRwNiR1RS
-h2jJOkqEJEB5s6WkccCETQWhN74czkY57FW9oKlbWwzeN0IZbYl34QJAcVcT5+KV
-p6WL5pDk+Qlu9AS9kLV5T1MRNFLIOum3cQHLbMarkyUCLbPi+a6GGuu6uBCF53Ps
-NU+q/tBQcjNWDg==
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALKfGMF0qs9/epeA
+ylHhb2RK7i9Xxoa+jJLH/haqgP8rSOiWeIF9o6rA1iXwK37EVBa+wMA+qM8eMKUL
+51w319bJgJKMrNE0iFgjyQzVkzA4gdMbb/Bhar1gtRO+5VDRhs4BQlnKmSa7lO6G
+Wz4tl5HPIVQDLGM5f6ks3Y5qVnaVAgMBAAECgYABYFp3eyepy6itLC/i66LJGg61
+zK5Z8XPx2ZqqoAu4a6P3Ltmk3cv6D9xWlIAxTN/9AOFJWfJBDlF/pBTXUBLYsIyp
+Ay0zCCYe4F+ggjdZfg8V3GOuipqdbWYMvQIiQHb/PuSwPz3QY++DBQcdzSD295Nb
+PMsjB+iMshK1kdIybQJBAObjOhyuG/0bVO1ImEhjn4N/2l5tXIHTl3hLZqpPRnUQ
+iLPq4pCSQkdrArG2GefdQFtrCzL1YddSa7nHVCdB8pMCQQDGDJXb3SUSV7Vm6XMc
+Nk2VysG/xst9rGxdRZ1WC4Q6XxlBNW4jLyBmBPAelob/49aAOKkN3uNzoAHSsQXH
+geM3AkEAw5gVX7yDi2z/CjDoiNKUjFLgTAQ7TORSOh8uLvMPjhZeqIRAQRcWPOhD
+lQbedVUysv9Asn+7zixNhEl/We59LwJAclOBjtIyPEx1Y1sQIBEY6IeLIPHZNkr6
+oz00fh9XzXpoUcRON/FUepAPLRkoBT+463vJ2z/3fR+47a9S7sCEMQJAXZvvvCTy
+EdqRRFW3137xSTC/MXgo+cpkhYsGR1QAzOr9y9SdQ5l2WcxG3i2pS/ASocWiPhqd
+yMmb3q+SLS2FEg==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
index b8528d0e2..78f1fed0b 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
index 054f81a96..563800185 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDFaFw0zODAxMDExMjM0MDFaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t
+MDExMjM0MDJaFw0zODAxMDExMjM0MDJaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t
MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAOg80b5o3UgoQfGvVMvpQMeZQkxcwWiXjP1LXkUuD7VotQab
-3zWIysbLJjfCkfAFj9KyYpHYjDMZrRUEDOqNqB+eFXq22AJHRpfL4f8seMjfeuw6
-n0b8CiwXWsztyZy9LHOx05RR/LoYikDCdk6jhl54WvrM8cuxJPL5Vg4TzwCTAgMB
+BQADgY0AMIGJAoGBALKfGMF0qs9/epeAylHhb2RK7i9Xxoa+jJLH/haqgP8rSOiW
+eIF9o6rA1iXwK37EVBa+wMA+qM8eMKUL51w319bJgJKMrNE0iFgjyQzVkzA4gdMb
+b/Bhar1gtRO+5VDRhs4BQlnKmSa7lO6GWz4tl5HPIVQDLGM5f6ks3Y5qVnaVAgMB
AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQAgKpH+d3LGfaVfh4F2MmEEHwsQLswpgKjElBxKw9zk
-dKaIBL1W0ioLZgw4fdHdYa1W2RuHbSLTC8vFQ9m8JsFdwZafqnL84/R2cKjBc19X
-lyYZ3/1ewJWz4KtT0Q+LCQiNkSkGZcuSZ65uftq0wiosELoK0KwMhpDA6R3Urg6T
-Kg==
+BgkqhkiG9w0BAQsFAAOBgQBk2XcYM1PNgjFFHo9/iQz2sTbCYEZYdqop7BAJwye/
+RxS0oYR+2gdMJmmYX8i+a0sx96p8T0SlxP6R9knoKC/Mik0UZ55GHKDBdVbcNC99
+koM7V4ZpTXVKFU6eC3gfninMVtA60OTYVhJ/h6tJZbZ9fiZjzkS17HznqDnCBX2G
+Cw==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.key b/test/aux-fixed/exim-ca/example.com/CA/Signer.key
index e7650a518..7f200a309 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.key
@@ -1,20 +1,20 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: 23 A9 CD F5 7B DB 40 BE 50 90 50 06 38 F6 03 19 60 4C 85 E6
+ localKeyID: 95 31 34 2C 0D 37 D8 46 7B 8D A6 54 EE ED 0B D0 41 AB 50 96
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKT1/n//U4ydUw51
-j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGPj6USuvXTnlbr0zS57GmF
-1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTVViWCJSZ+8P1iGO93uFFy
-A97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAECgYAA9q0S5iZGhBaQBbIj+2pjsCq5
-a6TZPgxTXwznYEjOzkM8INeGNs9lf18xOiz/Q8J4ugrn6uSMqx1bxp7QaIWQYp5O
-rTzJv7mszZ1rX78ZI8rfx+rOqvWEt49N1tlHYO0HMVQqBlZD697fTyftp5tH1REi
-g5u9zShGDVIpNZawIQJBAM/7n9gAfn0O2/LReyXY/FHCCMYArnhFxZvrFHh8QKzu
-ZIFEI2FuWvJLfCq59w1SXUza2N4Z+Rb5rHWrXPsEKJECQQDLC6YW/0Izvk3fiPF5
-lp/3HuLmU8FNyhDoSX0aYtSV9c/qxee18J+dwj+1WQxVOh+NCwtqP4CqO6T6mZYY
-qGYDAkEAx491oQlgVNiEHOn5Uqhv+nbGek4/GfJAmMmoe68lU4jucMYTeLItm5zo
-SArlzSeBlHPMcNfVFMF+Q+2oKsajsQJAacspAASCFvnKE3WD9AlSUe1K5h2vs3tc
-cduQjoX+JCCO89GoGHlGgWlrzm6WaXW+aLvfd72cqZYoMNaDiVd8xwJARUinlpxr
-tCgnxupjcFX4eLdofst1y3YobKk2k7TtGHAifMUmy6zAoelmRz1OFy/jNvdLEfGg
-B18UhH2toSUa9w==
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANyxIVDJpsgkZguC
+YBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype4sm628Hh5oUruvbXGzVj
+rp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWlhkgVecG8RDoYpjK8ymJp
+GHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAECgYAuzPltsnXF98IUKr/KTSt0M39a
+WWzsatb9LjW2zEWpYxcWu0Ch1ou8cMn9+EVL1m6H/Snvj8iEVDWW6t66zZZxT671
+DRJnmg9EKc/XoYOSjask8ktNaCoUeBtSh3vhsjQ42Pf+IhwdpzjAiVqpQZnJBt7g
+MgMR4CRh4JjxD4NsYQJBAPwUWiMIKadKi2D1f9luim/0mSAD6u870PVj0d3p9uCi
+Rur1v+2wTB/Msi45S2bF+1fhkop53bo0QW8GaPInRJ0CQQDgH88nXbe1Q3k9BOXH
+G1qLQsO5TvfeVz2CAd9OEYUTSDokSo1JKiTigBGrW8z6n5U4rU1JWPT9mP7ZCSGa
+fwUFAkEA8mH/ab/njVw4OLrWfBO2OYBP3GDn/bDec5XPrjnRkJ1442P5cGscR1dj
+3N5qih/EVfQoG86iTPECGedn8a+gYQJAV3/TrjjGafwHryzkUFF7jfbo1sXfu2wv
+1TvJ5H6uh5KhMF3yvue3Mr5xJ4dVhVscNN5j2AjkzMUYab9I4TpJyQJBAN4187c+
+G2URrWH5q4lyUS7fXjAnApaUrXJRFZn1kkD/eFd1bb++drkuDQmo4m6fpUJFAVbQ
+8IPh2p+4TAkx0xc=
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
index 0316d7307..5ea575259 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
index b0b33020c..e29a8fa73 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/ca.conf b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
index 8cf1c3ca4..4714ac9d0 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
@@ -1,18 +1,18 @@
; Config::Simple 4.59
-; Thu Nov 1 12:34:01 2012
-
-[CA]
-subject=clica CA
-bits=1024
-name=Certificate Authority rsa
-org=example.com
+; Thu Nov 1 12:34:02 2012
[CLICA]
-signer=Signing Cert rsa
+ocsp_url=http://oscp.example.com/
+sighash=SHA256
crl_url=http://crl.example.com/latest.crl
-level=1
ocsp_signer=OCSP Signer rsa
-sighash=SHA256
-ocsp_url=http://oscp.example.com/
+signer=Signing Cert rsa
+level=1
+
+[CA]
+org=example.com
+bits=1024
+subject=clica CA
+name=Certificate Authority rsa
diff --git a/test/aux-fixed/exim-ca/example.com/CA/cert8.db b/test/aux-fixed/exim-ca/example.com/CA/cert8.db
index 3201cd679..b8bd19e69 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/CA/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty b/test/aux-fixed/exim-ca/example.com/CA/crl.empty
index 80325b15a..c8ef20944 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
index b1f47aeed..b76bfd547 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171216011707Z
+update=20171216204807Z
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
index 0999d7486..10cd31eef 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
@@ -1,8 +1,8 @@
-----BEGIN X509 CRL-----
MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20x
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MDExNzA3
-WjANBgkqhkiG9w0BAQsFAAOBgQBEpFlJHql9ydgBqK9/keokpRs3Lj92Z/rcB0pz
-P6tYYp/KfV5rZfVwqmkHQGniZJCIY9QzAnTnYzzG/oH5Hso6dI3AzUUBdku0ry6T
-0nlGKfE7vADr3k7T54pKdoS0eO0BjtmYy3C7J+I+W+jB1uHlvcP44rHlVRNXdg6I
-jdU/YA==
+HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MjA0ODA3
+WjANBgkqhkiG9w0BAQsFAAOBgQBTbxmeT+nrX3IfCUxXg/bFXePgbbzm4LQDgYkq
+ZHjUik8ApIdPemifTEd5uQNY/ZCc6rOpxdHrgGnu/Xs7ddVyrcmV79Wcld62yK5M
+iEYGqb3t2u6zlePtYjVZe4uK2gmkhQ1p6Py1BByzWtuUjP9rqgBOqjTVX1uvspqw
+fJ62JQ==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2 b/test/aux-fixed/exim-ca/example.com/CA/crl.v2
index 625362a57..ee154f5cb 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
index 1c243fdfe..9c5883f64 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20171216011709Z
-addcert 102 20171216011709Z
-addcert 202 20171216011709Z
+update=20171216204809Z
+addcert 102 20171216204809Z
+addcert 202 20171216204809Z
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
index 00048985d..f55983a04 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
@@ -1,9 +1,9 @@
-----BEGIN X509 CRL-----
MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
-bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYwMTE3
-MDlaMC0wFAIBZhgPMjAxNzEyMTYwMTE3MDlaMBUCAgDKGA8yMDE3MTIxNjAxMTcw
-OVowDQYJKoZIhvcNAQELBQADgYEAg1GFKMUGJNkmmzjkIunSVFANV9+V6gdx+Nyv
-8pCP8U3Lo5ly1HvISuITVlIvvFmKpXbs+FHsBmCWrJbug20ook8OF1mloDSijTBu
-i4pUuupwnX3QbKzXWgQPc2INk+w1+8+p5OJwgLARrQlF2FRB4mIWRV+db7Px9heu
-RKJnHx0=
+bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYyMDQ4
+MDlaMC0wFAIBZhgPMjAxNzEyMTYyMDQ4MDlaMBUCAgDKGA8yMDE3MTIxNjIwNDgw
+OVowDQYJKoZIhvcNAQELBQADgYEAMV/oPx+JnEiEgVET3bHRDTTV6+DW3iV4Xx7V
+QIwo7s19nwDDyboB+mKzJdiuD997/o/c+aFxk5MD8uqFr5qGTpdbOA6eVT2vtzzr
+yYX/KUS7REOJ5y3i7t5tAKiYRGB9jOkWEhoE01AvYT06/LY7R/T5ZaFfblADwMsa
+Zdwr97U=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/key3.db b/test/aux-fixed/exim-ca/example.com/CA/key3.db
index e6994fa90..dddce8748 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/CA/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/noise.file b/test/aux-fixed/exim-ca/example.com/CA/noise.file
index 935c0e00a..c59fde484 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.com/CA/noise.file
@@ -216,36 +216,36 @@ power management:
CPU0 CPU1 CPU2 CPU3 CPU4 CPU5 CPU6 CPU7
0: 75 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
- 1: 36954 740 73 30 667 400 99 40 IR-IO-APIC 1-edge i8042
- 8: 0 1 0 0 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 78513 9414 672 193 3930 3366 890 185 IR-IO-APIC 9-fasteoi acpi
- 12: 2901234 64831 5457 2075 45248 28156 6890 2620 IR-IO-APIC 12-edge i8042
+ 1: 28375 2779 1798 1410 3672 2918 1756 1165 IR-IO-APIC 1-edge i8042
+ 8: 1 0 0 0 0 0 0 0 IR-IO-APIC 8-edge rtc0
+ 9: 26824 10583 8549 6845 19392 10669 7595 4844 IR-IO-APIC 9-fasteoi acpi
+ 12: 1652948 206933 138126 121080 313548 214279 144993 102413 IR-IO-APIC 12-edge i8042
16: 1 0 0 0 0 0 0 0 IR-IO-APIC 16-fasteoi i801_smbus
120: 0 0 0 0 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 0 0 0 0 DMAR-MSI 1-edge dmar1
- 122: 6192 2656 1995 638987 3343 2724 2207 1782 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 123: 28 1 7 1 2 3 0 3 IR-PCI-MSI 327680-edge xhci_hcd
- 124: 260 59 40 24 12 13 7 1 IR-PCI-MSI 2097152-edge rtsx_pci
- 125: 4 0 0 1 0 141147 0 0 IR-PCI-MSI 520192-edge enp0s31f6
- 126: 0 6 1 1 0 0 12 0 IR-PCI-MSI 1048576-edge
- 127: 388 49 69 20 1294229 24 72 40 IR-PCI-MSI 32768-edge i915
- 128: 13 8 1 0 4 13 10 0 IR-PCI-MSI 360448-edge mei_me
- 129: 31 2 0 4 4 1 1 0 IR-PCI-MSI 1572864-edge iwlwifi
- 130: 472 177 79 17 234 80 20 64 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- NMI: 517 910 1871 1480 2860 2449 1488 1879 Non-maskable interrupts
- LOC: 6823662 10427827 18565212 16014399 28149496 24505820 16317964 18890424 Local timer interrupts
+ 122: 5099 2645 2048 2133111 3083 2651 2210 2042 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 123: 17 3 7 1 9 3 5 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 124: 75 17 21 9 93 164 15 42 IR-PCI-MSI 2097152-edge rtsx_pci
+ 125: 18 3 8 1 11 307592 2 0 IR-PCI-MSI 520192-edge enp0s31f6
+ 126: 2 0 3 0 1 2 16 0 IR-PCI-MSI 1048576-edge
+ 127: 339 56 54 23 1528642 37 26 18 IR-PCI-MSI 32768-edge i915
+ 128: 14 0 0 1 5 1 0 27 IR-PCI-MSI 360448-edge mei_me
+ 129: 18 2 0 4 8 0 4 7 IR-PCI-MSI 1572864-edge iwlwifi
+ 130: 216 116 11 70 193 65 78 49 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ NMI: 368 382 366 323 340 333 336 355 Non-maskable interrupts
+ LOC: 6161920 6212526 6081033 5762738 6023262 5960201 5962068 6075752 Local timer interrupts
SPU: 0 0 0 0 0 0 0 0 Spurious interrupts
- PMI: 517 910 1871 1480 2860 2449 1488 1879 Performance monitoring interrupts
- IWI: 58 3 1 1 16 2 1 0 IRQ work interrupts
+ PMI: 368 382 366 323 340 333 336 355 Performance monitoring interrupts
+ IWI: 0 2 1 1 4 2 1 0 IRQ work interrupts
RTR: 6 0 0 0 0 0 0 0 APIC ICR read retries
- RES: 12075155 1391873 533941 177453 288321 72324 62935 48758 Rescheduling interrupts
- CAL: 180655 143208 98859 104850 41110 73752 113286 111989 Function call interrupts
- TLB: 53363 51506 31574 33734 16525 24424 38918 42710 TLB shootdowns
- TRM: 3946042 3946042 3946042 3946042 3946042 3946042 3946042 3946042 Thermal event interrupts
+ RES: 2767495 1298498 589870 442469 433571 428645 274117 316937 Rescheduling interrupts
+ CAL: 346261 329432 331889 336862 344974 333357 332847 336503 Function call interrupts
+ TLB: 99587 89304 89373 92699 93692 88842 83748 88761 TLB shootdowns
+ TRM: 3458 3458 3458 3458 3458 3458 3458 3458 Thermal event interrupts
THR: 0 0 0 0 0 0 0 0 Threshold APIC interrupts
DFR: 0 0 0 0 0 0 0 0 Deferred Error APIC interrupts
MCE: 0 0 0 0 0 0 0 0 Machine check exceptions
- MCP: 91 91 91 91 91 91 91 91 Machine check polls
+ MCP: 87 87 87 87 87 87 87 87 Machine check polls
HYP: 0 0 0 0 0 0 0 0 Hypervisor callback interrupts
ERR: 0
MIS: 0
@@ -253,41 +253,41 @@ power management:
NPI: 0 0 0 0 0 0 0 0 Nested posted-interrupt event
PIW: 0 0 0 0 0 0 0 0 Posted-interrupt wakeup event
MemTotal: 16293504 kB
-MemFree: 9526140 kB
-MemAvailable: 13822508 kB
-Buffers: 437988 kB
-Cached: 3580108 kB
-SwapCached: 0 kB
-Active: 3759780 kB
-Inactive: 2483068 kB
-Active(anon): 1520104 kB
-Inactive(anon): 326648 kB
-Active(file): 2239676 kB
-Inactive(file): 2156420 kB
+MemFree: 171892 kB
+MemAvailable: 1950708 kB
+Buffers: 25332 kB
+Cached: 1901368 kB
+SwapCached: 9076 kB
+Active: 9043816 kB
+Inactive: 6504992 kB
+Active(anon): 8606972 kB
+Inactive(anon): 4972924 kB
+Active(file): 436844 kB
+Inactive(file): 1532068 kB
Unevictable: 48 kB
Mlocked: 48 kB
SwapTotal: 8212476 kB
-SwapFree: 8212476 kB
-Dirty: 11660 kB
+SwapFree: 7958012 kB
+Dirty: 11804 kB
Writeback: 0 kB
-AnonPages: 2224852 kB
-Mapped: 671936 kB
-Shmem: 327736 kB
-Slab: 326440 kB
-SReclaimable: 238592 kB
-SUnreclaim: 87848 kB
-KernelStack: 12416 kB
-PageTables: 54140 kB
+AnonPages: 13614364 kB
+Mapped: 390544 kB
+Shmem: 322816 kB
+Slab: 237008 kB
+SReclaimable: 127500 kB
+SUnreclaim: 109508 kB
+KernelStack: 14304 kB
+PageTables: 94668 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
CommitLimit: 16359228 kB
-Committed_AS: 7099712 kB
+Committed_AS: 29520640 kB
VmallocTotal: 34359738367 kB
VmallocUsed: 0 kB
VmallocChunk: 0 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 0 kB
+AnonHugePages: 8423424 kB
ShmemHugePages: 0 kB
ShmemPmdMapped: 0 kB
CmaTotal: 0 kB
@@ -297,14 +297,27 @@ HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 247272 kB
-DirectMap2M: 10100736 kB
-DirectMap1G: 7340032 kB
+DirectMap4k: 427496 kB
+DirectMap2M: 16211968 kB
+DirectMap1G: 1048576 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
-virbr0-nic: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- tun0: 13292850 17711 0 0 0 0 0 0 9359951 16745 0 0 0 0 0 0
-virbr0: 60189 494 0 0 0 0 0 0 548231 726 0 0 0 0 0 0
-enp0s31f6: 66808197 75170 0 0 0 0 0 3746 18376885 63295 0 0 0 0 0 0
+ vnet0: 46917 481 0 0 0 0 0 0 325097 3671 0 0 0 0 0 0
+ vnet7: 502731 3695 0 0 0 0 0 0 2163888 8497 0 0 0 0 0 0
+ vnet3: 32162 252 0 0 0 0 0 0 291837 3410 0 0 0 0 0 0
+enp0s31f6: 191749422 170921 0 0 0 0 0 3922 42698749 129945 0 0 0 0 0 0
+vnet11: 7303439 6454 0 0 0 0 0 0 2343040 11288 0 0 0 0 0 0
wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- lo: 2832452 10497 0 0 0 0 0 0 2832452 10497 0 0 0 0 0 0
+ lo: 2455626 14797 0 0 0 0 0 0 2455626 14797 0 0 0 0 0 0
+virbr0-nic: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ vnet6: 256893 1947 0 0 0 0 0 0 1206381 5925 0 0 0 0 0 0
+ tun0: 112501735 104283 0 0 0 0 0 0 30579473 80458 0 0 0 0 0 0
+ vnet2: 8030 34 0 0 0 0 0 0 42770 387 0 1712 0 0 0 0
+ vnet9: 126854 1141 0 0 0 0 0 0 686477 4612 0 0 0 0 0 0
+ vnet5: 139304 988 0 0 0 0 0 0 787497 4718 0 0 0 0 0 0
+vnet12: 133857 1141 0 0 0 0 0 0 815494 4633 0 0 0 0 0 0
+ vnet1: 71961 671 0 0 0 0 0 0 421240 3847 0 0 0 0 0 0
+vnet10: 85763 802 0 0 0 0 0 0 485974 4056 0 0 0 0 0 0
+ vnet8: 445523 6298 0 0 0 0 0 0 15036777 14092 0 0 0 0 0 0
+virbr0: 31724349 82897 0 0 0 0 0 0 119520165 124442 0 0 0 0 0 0
+ vnet4: 329164 2446 0 0 0 0 0 0 1592232 7002 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
index e92a5e210..a8952403d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
index 9eadfc635..c64c3925d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 3C 2F 34 1C 37 30 74 2E 1D A0 19 C4 9A 5C FD 83 83 9A 0B 2C
+ localKeyID: AD F4 6B 62 35 0C FE 8E E9 30 CA B0 EC C1 3C F1 43 84 2F 8F
subject=/CN=expired1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
MDExMjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbljWa9bDzYPhQ
-CwpvoYRJooGwY2iAmHIJFMfwlfcaSwGPQ1J9LcssEt7qSRWv7+eDSu9gsbjjKyEx
-nUbZLONVyqjPHJva9ZboLk9hjF3jX8+IuJ6I+hnHVNytcwBWHvxpOtF0Q4W01ChR
-4hfFM4FLCcYVlGB+qw6iMcYEvqF57wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDnaQ26HUDEQ88c
+DPS4+dms4X+6ImuFtndy7sppq+5wjXLHgwpsA1oqkKOUOB7jwxq+yw8bifZnH43F
+TTogmOLlKdVMr6gAH/oXMpKt5HOplAAYvfCx/r0OseA5OiHTCkpPz/fJoAkIhHop
+CZC2aGMbDq94g2vxZJjYlyOUpRVqWQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AAYNczj7Onk9/UhfTTTrbqsxXSaAYYLeLFBAKJL647RBph1gYeZNS5mPOS3oC8/s
-IdCytpThCFQFRtk4XNRUaGFAY0A8EYjf4V0EZ2uOn5CcO0hvpIHBgjPaUQwt0+1W
-YkCHHbxtWzSCsxv23eac+Wfbt/nYIrpEslqpiQmQOSQ9
+ABpmRoV6fqW6E7RVQAJS3uE/ZWBdJUe9ZK6iauMGgFNvJmMVDEie2ty4/mlht4Aa
+Hqtendwy1UZ7VBvli/yzieoYv3ufaslcRuw7fOe0b4ES6EBRmjlXMtE4ZQj8q4Hf
+IQz7iD3gDkVR9TAnL0YgzTk7IojNHbqe5F4bDdLw/WnK
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
index a4cffb882..e2eb3369c 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 3C 2F 34 1C 37 30 74 2E 1D A0 19 C4 9A 5C FD 83 83 9A 0B 2C
+ localKeyID: AD F4 6B 62 35 0C FE 8E E9 30 CA B0 EC C1 3C F1 43 84 2F 8F
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIPsRO/2Sha3YCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECByeXO36+nRMBIICgH2QuCe5OW2F
-LR964e0swiW9/O5ysKTf+jZKdmB5cVOoSOF9MpXPFaqsOp4PaX/eLaljaW1VCKU1
-PyjEc01oX1qq3VdA6wvN99Sgwh0K15UOOz/TI58FOinuW7JZH/d3DFUYQ3EiZjqT
-/IwK3lixVUESnI2hbR/Z0wV5uEaTpIB6JPMOPhkCQasl3o3rKVmNpLOyMvYMHGUW
-p2UUZbiR/K0SjEaSWD/FduOoSKCky3wRmfjkqOHzVUjUPgUwjW+Ta7p7Hr/r0Gzg
-SBkTm7DYzlKEnUMx2UsTZ+6CQYAzSf0WbjopMcsug8M3Rx5T617TuoZe4zccorwX
-m/rcTGLeXed6CjAe0vJvA/+42p6NI4i5EiZceLSIAq9NvR9wdB2grI2v8VFChxCJ
-h184sXodLrBf8WhetxOeGUrXGwNXbMtfRHrragToXMokD+2qsQvnWASIQNpHK6Ww
-Gc2o0w1VPuJPF52+jQ8JXeqRof4wJNy/LQDGXrXm50F6rZdg9XMEXIDjFiH7Jgcv
-+a3BEeeobh5p+QAS+CUJK/M5ApJMTgwi+lcGfOaOinQs5zATO0gtkYqR6eyLQh4w
-vmzCCIjf08KUzfOseNM1K1QYb3Z3hVUxyusQZWy+tk+Amue58opdE2O1bzjkgbOV
-X8HqJBwGueb1pnkgoGzqq7VPiOwT/ZsuAMT4NWrIHAwzTsRomk6201V7GPnWn7Zm
-2svPUM2Nlu1iWFhYx+9NslFBQ7agmb0dNXO5aS4aZBR3VylEm+3ch3VYces7r1Iw
-KDfumSDXRNIxpR7mLNOGGVCOa4qaAmanSf//m7kmsri1/zSffG9MeG7ngeWWXZzw
-qFsEMtkMiJw=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIHz/E+ZQWUDwCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIuDF3aUa8FxBIICgE5pLTn269gs
+FVitYmlCIimgsakralzc3xMQBDFDSiBdsz9NbNYsC9wtxBP65Zu8lJC/h5oBFjAM
+lF5brGIbmbU+zi1Cmrm4nEzGHKOG51aR4zGcN5UvUKHUA566zfHpJRm0tERvsMbJ
+m+FzxmszxuCp6hNHlIQppc48ndf00cpZXIxCfng6AyG5Ukv3QnfJldEoCusfW5Jz
+TOxoshU7CKtAjbQGgpYcr3HY/OfqaLhmtTVeleXXYwSguOTyr+F7nD6x1m3r0y2B
+nNegjonvq2Sy8+MQdugbRAyKCfE/1ZV/GhyD3/BVz/5rPYq5brkSdh0Daudv8pAC
+cTtQEBCaD77nacJuTw1aB3AwmkZpg59q2R4VlsXak963ay8KnWzCiReDJ8EznDV+
+kkKdCfYzo/TlnYdmUc15Xuiq4lZI4IMJ7d2+gGhWyVEJ4ZlGpfXntt8WcJCadLpM
+kXJRiXhkBkELjo4zu70nStxtRm5L6S8Ha7+ayPAzN3Q58M8HFqUFWSu+dZDCwkAG
+dgU3b5EbJUWbBwuVr0qXVqTTfNrgmphfzyVnUCq15jeLhTf2Ixt1UGlKSttRv5ME
+rhjJPKciCAGEqY0e34OX202OhiD/5UaHyFz46mGUo9uF1UrneeFHb2e5E2M82A4l
+d6L5E5YIWxAqeSpsiHpWiIGT4YwNre42vXE7QFyAagPgfCxFxGijEo3b5VPzbY+q
+evawq7KoqYeL5nOm3KP3DMx3lvB51nCk4R+JqjJUNLHwfcIdevEa0UekdJnS3qma
+wnTTkCoOqVj4Df3Nha/whbAqysQZ8yjrNS54SBcS9KQKT6Jd4AH2LZp8WCCFlNiO
+vA/svNspt1o=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
index 681ec081f..e47dc9a6d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
index 251b7b2ef..7ad2d9dc2 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
index 6c23b0b93..3fa180b26 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
index de039bde5..fee9d2b96 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
index a4a9cbe2b..011600550 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
index 9a3f2fb30..d0e8d009d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
index 0042694ae..7e74bbafc 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
index 95cd82a46..53205d953 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
index 67254bbce..5419108f8 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
index 5455ca1f9..3a564eb2d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
index 8a06a10b7..2beab07f6 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
index f11c00f17..04ae39886 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 3C 2F 34 1C 37 30 74 2E 1D A0 19 C4 9A 5C FD 83 83 9A 0B 2C
+ localKeyID: AD F4 6B 62 35 0C FE 8E E9 30 CA B0 EC C1 3C F1 43 84 2F 8F
subject=/CN=expired1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
MDExMjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbljWa9bDzYPhQ
-CwpvoYRJooGwY2iAmHIJFMfwlfcaSwGPQ1J9LcssEt7qSRWv7+eDSu9gsbjjKyEx
-nUbZLONVyqjPHJva9ZboLk9hjF3jX8+IuJ6I+hnHVNytcwBWHvxpOtF0Q4W01ChR
-4hfFM4FLCcYVlGB+qw6iMcYEvqF57wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDnaQ26HUDEQ88c
+DPS4+dms4X+6ImuFtndy7sppq+5wjXLHgwpsA1oqkKOUOB7jwxq+yw8bifZnH43F
+TTogmOLlKdVMr6gAH/oXMpKt5HOplAAYvfCx/r0OseA5OiHTCkpPz/fJoAkIhHop
+CZC2aGMbDq94g2vxZJjYlyOUpRVqWQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AAYNczj7Onk9/UhfTTTrbqsxXSaAYYLeLFBAKJL647RBph1gYeZNS5mPOS3oC8/s
-IdCytpThCFQFRtk4XNRUaGFAY0A8EYjf4V0EZ2uOn5CcO0hvpIHBgjPaUQwt0+1W
-YkCHHbxtWzSCsxv23eac+Wfbt/nYIrpEslqpiQmQOSQ9
+ABpmRoV6fqW6E7RVQAJS3uE/ZWBdJUe9ZK6iauMGgFNvJmMVDEie2ty4/mlht4Aa
+Hqtendwy1UZ7VBvli/yzieoYv3ufaslcRuw7fOe0b4ES6EBRmjlXMtE4ZQj8q4Hf
+IQz7iD3gDkVR9TAnL0YgzTk7IojNHbqe5F4bDdLw/WnK
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
index 0d1a69838..170ef172b 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDbljWa9bDzYPhQCwpvoYRJooGwY2iAmHIJFMfwlfcaSwGPQ1J9
-LcssEt7qSRWv7+eDSu9gsbjjKyExnUbZLONVyqjPHJva9ZboLk9hjF3jX8+IuJ6I
-+hnHVNytcwBWHvxpOtF0Q4W01ChR4hfFM4FLCcYVlGB+qw6iMcYEvqF57wIDAQAB
-AoGAAQ1VMGrg8CmUxv1mjWZeteObb3bqd0NDuJtq4dI2HuAhH8iYypS/lnR4sPKs
-se0aVNy1DOeNFTmNrSktv7ihVjOd+6/J5ImIQdk1/ZJkqQqb11rajJbZFoapIq7o
-/m+WlskAQ4GbvlfgsrZ16qCj2jvt9+3rMz4P8YOfMNE/rqECQQD5kooyrIJtkXZB
-ZlpvvtNtEKR5CUXZci/YdijoIBnmFAv7RTDD+xOl/x9Ks5lgtonm8BfpBD0vCRaa
-UgzEjUmZAkEA4T34doHU7HgXDAW9bFSEUJlrBPXrkW1mxg1fAIpZGRdYsNU50a6K
-qTxIeYcoG8bH1ginV0e+AmR2v6SHG+nkxwJBANwGd1Qphmt2nJ0X0Y9G2zsCOx6C
-MFR+OPRLZ9ENzAdtkQqbe1yslCv6eenv4L7E71rsPQgvtokrKAQxZhQ6w7ECQQDL
-hybDVs/imSUiLPGcOMaS2f51Lg4di8CpR53HrDuUS59Nsm6bhN8wyxMmFTXt23Hp
-ekpTuLT+Dm+q/e1EENYzAkAEP4mueYCQfr587d/FLNJUVdn3Gniv8wRv7DycGvE1
-GkcAl/IVc0JqkUecyReS7Js+wY8EJBRDjtPhm9tBMObf
+MIICXQIBAAKBgQDnaQ26HUDEQ88cDPS4+dms4X+6ImuFtndy7sppq+5wjXLHgwps
+A1oqkKOUOB7jwxq+yw8bifZnH43FTTogmOLlKdVMr6gAH/oXMpKt5HOplAAYvfCx
+/r0OseA5OiHTCkpPz/fJoAkIhHopCZC2aGMbDq94g2vxZJjYlyOUpRVqWQIDAQAB
+AoGAD4U8vfRTUTaJEAUQbs2XG2C+a9H+KygrR8KbQc4dvl/GSHpR+x+Ybw1nYzwG
+WllOFGjTGRI+O/liTU7aLLCEWyCt5Ig9v8eqs6UUp/geR7bO8NQUIpbmfXvwyeI6
+3pOVpKetIqGpeKB7BdLuSVf98XOsOxbhvpRWgI0QD/5thL8CQQD+sm+k4Ljs/tGq
+rl8VxCRInRicSzTMF6t266RmK/olKhWkEZZuOqz5Qzw0CR3ggpanrxHsHzG0cg/y
+/kyVq6GjAkEA6JgewnwHbgKe+R/qPNWttXbhyVrI4WUJoUUF35gIGjM6pd5vmkj/
+Q112k+KcciLi81LTfu96Ov6ELLcOblEb0wJBAIQaeN3D0SbbZFRq7NaVTVx8Xu9x
+8oiJHl4oCrUTykLMeT0IAkZaGK2QugEjWWPBV/LRUzJtW5KENtGKJJ7czpECQFZL
+kiYAFFWZfVfaonJdqOxJpi2plBwj+3WtASfa5S6rURgXNfrdGG/q7kKh8f9auC8k
+zLksqoHWyj040Y7WYucCQQCY7EzjAZi2R9EAYbzsDjSbOz6SVb3gCFipoGmPjmRU
+MCGIZFOVpC0TboveTvfo8TRWMJBUI7jJ8y+Hn4XDHY+1
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
index 2cf2fe369..fd5fd172d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
index 4de477317..8de4b60b5 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
index 0e9a65c83..6606b9091 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 13 D1 1B 1E C4 8B 1F 00 8D 23 B0 BC C6 9C A3 DE E8 54 52 4B
+ localKeyID: A2 4F F9 05 E7 72 D3 FD 80 22 C6 85 C4 29 1F 6F 1E 07 10 45
subject=/CN=expired2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA2WhcNMTIxMjAxMTIzNDA2WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/p1KbCGmXvd3
-2CREQzw5ICHJFqRf7TeGu4U8lnG1aDpag6CnC5ni8lKDDQq6B6TsWMqdsN9hU0mm
-R4YsHRCoHwBvqmG3Oq/9IHVuJ3YJXIE0BaLOzWeyatgPfGgJx3CT+vitKIofY69K
-bGWpWCIDdyCmSc/ShmUCPb/pPKwCyckCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA1WhcNMTIxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtEiZCx/bGg/3
+SXMnj0a3qxH99wydD4UETBIbXfxLHebuRqYdCSbsiL+BBhvu6r+dC6GU/v6hc1XI
+Oi20JtAaBBBh1upsh/bHE+VUn30LL7Z2MXiXqYcwViIWrSsEIsnKHq0Z9QMpGFCm
+IcoMoxb1yc/mV67uKsfEOd99/NUkMp0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQChwUeDpqBL4BF4lviDt4Y2sFXti5lGLMODt7p2MQvXpcWMwKRsgnFvoNsyWkxI
-xOyp3X584xuq71OUl/UnKOjyKNZfHuYsGGq59CYtYqk6PHXBBL42lrdLX137HPEm
-IHJTA8Ktv1Ap1KaQ2z5PIMQmgIsXHjRHWj6FyuygrHrHig==
+gQCfKqCaO2IhuzTt2Cswu9ehHV21Qss8Jda5WDD1HGghNWxPns+5yYKbcmiG/weN
+SRj6CedFALiRZ9M6wH6mr9Rq3U/W6HkbkoGdLLtWI26VKL0EdqF2oIqLe5SmD8tJ
+lEVFgrI7biJegSMqVlV+x+cOSydJmsYZE/7St7XrjQG/OQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
index 0bdbc616f..d64d64573 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 13 D1 1B 1E C4 8B 1F 00 8D 23 B0 BC C6 9C A3 DE E8 54 52 4B
+ localKeyID: A2 4F F9 05 E7 72 D3 FD 80 22 C6 85 C4 29 1F 6F 1E 07 10 45
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqNmMZNmbK0wCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLYtdzXd+xBxBIICgEU6YBe7vPwh
-3zXWczIjyiE8oOZrYa0jOgJkLhP2pMCFsd6FoGqL8+uzSKyGkb+I0QFQgxZ+7x/D
-q2+cDZwGT4c4YYUf5WinvCvB5QL52ICxvY+iShtHoOXUc82Q4EHbvbksH1CPC7Tt
-39hHoPI5fVdOC2W1NV7a+p2lWFElA6xoNHlgIh7SUU979Vv9+JPIdo9h74NwQ2//
-y0FD/FvTsq3APAjGqU4SpEE3niD0JUmFAtvNpaLXKojbBbwBz43NXVZsEz/IF8OY
-EQ9wI0lhyAIHTKmi1gV1ZcW+ltmrYUbVybkd6DD1vyKxZFHnpf3sB2CHCLtFtxEJ
-149zcBCqFtM1Qp/IRGtIc2025tJWEVUQ+J17wRwgV3F/le4qLdqc2pkPdetJZjQE
-7XaJmvPu0u2rADczofmSF166lzIlNmvugYV0FaLnAcJxFs/uI7BUROLu7AQXQCVB
-GPkQUBZOwLxFyHChG09s1c/M/3rsClniFcWHaH2iIYeK2C4uRHUGCk+F2lQKCkld
-UAgXNtGK0rOSkLKSQQOkZOacCqBJufxGDFwkZC3WJvO8ixUyOBDF9iOrcnOwA/jB
-zdsdIhsCeMtt8lPwM210fuM+CXh8S1j3QULLhk7Z/+FninRSQH4bBKduE1TEHT3m
-X/fwXXQZgE+HeGJwKwQQnYoDX48w3Y/rfAPQUlWnZnNLMRT6Ukh3o+BqjG12WrfC
-zAFUo1xsBotkTW9Atvt2sU9J5VpNNih+Eu8Qcx9LDnlmRP7nyOXukz2sb4Jt9BID
-bAh/Dq8YpPkPZ76nFTjwGt4mLiIOEVhjEA/6lFYm1h8HD+d5XFFPfRFO3QeERRxa
-f8a9QA4M/cg=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQILhsbSE8C8IgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAKs9izKzbcyBIICgC+m3lJkJ5K2
+wj3tw0GbIbSRMxv0jCyOGI0NTWAeLUoeSOgUmiFe52AkD/H//MPIBMJInqAyQgZ7
+9jK8/lkv52hhySxtBIj6Al+xi+SUMpGGZh8ap9N1uNLDazqF2lHTkcNpDOFY4aSZ
+IWVH01z2ArbuO8ZRCW22F5SmGd5pK8W8ChX9VWSQ2dL4tB1HWj+yx1DW8ogA4g6p
+iFpyZg/Xjh3ngCgd9jE8uByvHB3ahvzB4Rg4VdfRPdVHBRg2ECFGx/hXxuoE748i
+wxeKyUWHlPWOayBapYZU+AsgTlUIPSxnYTGPU2K0rJH97eHQlaA5db40/j1BMxjH
+Z2Qj1DWDEa/kaFomBbzThES0iS3iVPETLC22Hu4ywXsIUR+7nSXSIJ1H34pdRitN
+okzzjf4EZl+UgBtgLsQ6IlkNUZh/oYvL2CUEXq7ntazDDbd0o9/6oOK3TTiYfuDf
+f8yb10MEftq6wH+NpjlKF3yMRnEDAn4nJkZWKvrcUja5+6IfQcDNnptJQMnvjCGh
+nJe6Dv0idST1FLEO1qnNGfz8Ba58cZDScALTi2v5vLSpGTaXtZK5m1NzITXlOHRW
+QeVvrLJS4fwL2qw13d8f6+kPSknPX1Fe+FLdxVZr/CVEVqx617v9+/kLL9RZ5Mnx
+LZbQpCgtFblv6JLuOBFXqFcfBRfPwP9z4y3vqWWgKRmYLgih3nW3gkOcR+4fhHhC
+LKstjLWox4cqxVPYPkOBktzARbqJCx9Sl6TRLmq8oOO+N5Gn6FquuKLYdwAERRe0
+dAMix0STFYw4daxpKrMfvh5TzItlO3Bi1JiffLwTLHqkmV9ORfC6G9QI6aNY8kGC
+KnCFrjVaOoE=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
index 82e0adff3..3cd9154bf 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
index ff4b0edee..ad0fb6bee 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
index f470c4b28..22ff01bde 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
index ff4b0edee..ad0fb6bee 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
index 26926e913..6c18969cc 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
index 0da2cffc8..e39a591d2 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
index 0da2cffc8..e39a591d2 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
index 04cf310e0..1daf7b555 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
index 21d2ff3c6..6b6ad20fa 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
index 21d2ff3c6..6b6ad20fa 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
index 2ee1350bb..91f205686 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
index a0264a069..5b75df462 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: 13 D1 1B 1E C4 8B 1F 00 8D 23 B0 BC C6 9C A3 DE E8 54 52 4B
+ localKeyID: A2 4F F9 05 E7 72 D3 FD 80 22 C6 85 C4 29 1F 6F 1E 07 10 45
subject=/CN=expired2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA2WhcNMTIxMjAxMTIzNDA2WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/p1KbCGmXvd3
-2CREQzw5ICHJFqRf7TeGu4U8lnG1aDpag6CnC5ni8lKDDQq6B6TsWMqdsN9hU0mm
-R4YsHRCoHwBvqmG3Oq/9IHVuJ3YJXIE0BaLOzWeyatgPfGgJx3CT+vitKIofY69K
-bGWpWCIDdyCmSc/ShmUCPb/pPKwCyckCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA1WhcNMTIxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtEiZCx/bGg/3
+SXMnj0a3qxH99wydD4UETBIbXfxLHebuRqYdCSbsiL+BBhvu6r+dC6GU/v6hc1XI
+Oi20JtAaBBBh1upsh/bHE+VUn30LL7Z2MXiXqYcwViIWrSsEIsnKHq0Z9QMpGFCm
+IcoMoxb1yc/mV67uKsfEOd99/NUkMp0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQChwUeDpqBL4BF4lviDt4Y2sFXti5lGLMODt7p2MQvXpcWMwKRsgnFvoNsyWkxI
-xOyp3X584xuq71OUl/UnKOjyKNZfHuYsGGq59CYtYqk6PHXBBL42lrdLX137HPEm
-IHJTA8Ktv1Ap1KaQ2z5PIMQmgIsXHjRHWj6FyuygrHrHig==
+gQCfKqCaO2IhuzTt2Cswu9ehHV21Qss8Jda5WDD1HGghNWxPns+5yYKbcmiG/weN
+SRj6CedFALiRZ9M6wH6mr9Rq3U/W6HkbkoGdLLtWI26VKL0EdqF2oIqLe5SmD8tJ
+lEVFgrI7biJegSMqVlV+x+cOSydJmsYZE/7St7XrjQG/OQ==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
index 81e842218..95b5bc4c6 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQD+nUpsIaZe93fYJERDPDkgIckWpF/tN4a7hTyWcbVoOlqDoKcL
-meLyUoMNCroHpOxYyp2w32FTSaZHhiwdEKgfAG+qYbc6r/0gdW4ndglcgTQFos7N
-Z7Jq2A98aAnHcJP6+K0oih9jr0psZalYIgN3IKZJz9KGZQI9v+k8rALJyQIDAQAB
-AoGAN45ims2M29PrloHzUyhk3poAoqwjMkOXZntgCQOurZtt/KKlUGa3mmBesA3T
-Ia/e0lEDr4BOYDoFyj2AiqcDx7CKLY0yw5Q9bPJk+uotxLwxKqjozKZ12MukgW4O
-F5c1VUCs82nGVOUL+RG1O+VuKR5HD6ZEfmzo8128h1+RXsECQQD/XalrSHVY97LM
-60Xua+Nj3bG1wskfYMdWHKKqzisFJrHGr2twnTocrL6+5VWC1Qww6BUzmXidBMzi
-Mb6Aw3QlAkEA/z8mth9qM0VII3/+QoA0aDSe7zRykpqMo0t7hz+pyYD4UD34RV+H
-Grpa/DmQACyCoYsdPfvQ9ebzboLE6pJb1QJBAJ8tL9S6xsLdK2vGX8HdKFFwuDw3
-HYzck4RetxrHBlPgqcHSSKNargV/vCpb43B5Am9dyxFt4ZvmiRuZrEixDK0CQQCf
-tbUUOf3qjMxBokHG/I9OMLbN9+RExT2Ao6dsjjI/6ln1Y4Eob0iLOdXagm4PHcqz
-J+epNBqg8tyY5mwuVlvtAkEAgj/L2N9aHS/5xT+PTYsWpbKD13a85gvmrzZZVQnw
-obQMq5awOD9y4u3xqNSr8i/Hhx9biSDteQdYl2JZimHosg==
+MIICXAIBAAKBgQC0SJkLH9saD/dJcyePRrerEf33DJ0PhQRMEhtd/Esd5u5Gph0J
+JuyIv4EGG+7qv50LoZT+/qFzVcg6LbQm0BoEEGHW6myH9scT5VSffQsvtnYxeJep
+hzBWIhatKwQiycoerRn1AykYUKYhygyjFvXJz+ZXru4qx8Q533381SQynQIDAQAB
+AoGADU5/d1X8WM3dYX89qAJe+6I6FdJJRHQ7tzat7O+6hqQ9KZtIsNx94HEMH6yP
+o6WNfKaKRhD6zzXBb+PgNG4vQUY90hZ/j78a0rTD99j2vidsB2ifUdTWKbis953e
+CdseIpj0iKTZxNQpXXoYU/hm6mlo9yOR9in2L8+eFz3pYuECQQDmwDMIXsxAW+9U
+vec3RrfYE4c42kFDeQvSaCWcSbL+BxN7zVdstoxnmXa+R5OUJ/8xRwkuSXAzn94S
+rTjFGkB9AkEAyAK1lP2KCS+TP2+XPTqZOkoDFbhvXHHCliNkyGtArF2y34bgzjgj
+DD76HU+K3IbpVlLAYHzW1+rX/k2oUV10oQJAfvqFGrYP79qneRqHggOIZ39XihGQ
+mHCj8MUe7UIhHWkHb7kvwsMxwFDS5yK8M2tPIu7UPoRrGf1/Vwe7lbs8gQJADsJE
+a+4ZlXvxPakaW+ZLEEYN3Dhz3zp1xWZvNWrUpuNzI5NsW0tBKtIq2qbX9FXwOfJ5
+R6VupRgrQBSy6u4egQJBANS8nesnNZRXIf2dEr1iZKGtpY8SxeHfZQ08rF2MIpP3
+pOZWoAXgpbocfanxzhHovc72kNLOYzQR2ANvHDlNpVM=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
index 24cc6078f..edbed3495 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
index 43d488100..8fa5aa8ee 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
index 1a803eb2e..c286669a4 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
index 720780a6e..7998daf24 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 8A 34 51 BB 11 BE 62 85 03 82 CA 26 7E C9 12 A5 8B 49 59 5E
+ localKeyID: 85 0D 82 74 34 7F 88 F1 44 08 3C 66 B3 E3 F1 F5 6A DC A4 A1
subject=/CN=revoked1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDIJRW1rC3Ox7eq
-hhuz8jjMATaEQl9sbQ+fOBRPLkQDrlGfYfZnfv95oIAIbep73y+K60+iFekBscQv
-55T5TpHtryJf/nAzG1uaB5/knqT+25D5x/qZaZxDP7UF+S7OFq+7hLs4G+IY5np1
-aCBFozLcegFpCcr6/I7vE6krlX5fzQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4nO1XVJJxn0ds
+Cwl5r8NnrTCCJXZPU+YW8L7XqT0WwRbZJzpISpmeuNvvSEI5kzzDZrY39+kZxiz6
+lFRKN06WFJjagD6uJX9dBsbmCoDh3b5oIb6MynCg6ai7TugSCF2hDj+Mwy8ddtAH
+oEmPe0Pgjbu5Px/hBDB8S4wafn3VgwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AKNP1gs2Y0HWDH+b1/LpJ2JuCkhB/hylW/iBfMRfHbFyezuADJP7K49dp1SB91x7
-d3D6XELyDLSwgr2Gdnr22Nu1QY09QTGTgcSDESsteSBhUzrcYOnZA7e7/5nfw3nM
-t4UJSYRLh9nrYbwVAXrYvBx28NwAUjoUXSvA203Wl5+e
+AMY6qxBlHqWITeZeakbOrhhY3SuuY8AUiY6HRUCdfX28cjK8HRE+F653N+LkEVJA
+rnYnMSuieO2eH3G/IkE8FqZZ0nZjxgwslr9fA7QpPm+8GK0xGW5JAXDUnBkPvw9s
+ORhPlSQWj9PNPzRdf2fL+O7vTPoaKXw7jhUeT22/5jut
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
index e4ab068cf..e69e24253 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 8A 34 51 BB 11 BE 62 85 03 82 CA 26 7E C9 12 A5 8B 49 59 5E
+ localKeyID: 85 0D 82 74 34 7F 88 F1 44 08 3C 66 B3 E3 F1 F5 6A DC A4 A1
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyoXRU6cOk3MCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGu7EV66JExqBIICgDlNDQVVwRJZ
-/8ah743MkJPD2gWSTNdDnwCKuyaCYPwC3CcwcYkzHS8xeHrd05eRGfDoerNryyB5
-eU/OeGdUtkmFOZV0V4WsXgCucNRD9g5OLBnOlbd7GbQUaRq1C+1+OWerXYH0lLgc
-o1eiL+ar30tHVnk8u4i5iuf1xdSVrcApHsZLCC5LDAzTgWs7sK+VpBW6MEHkb8Yt
-FslDfiWWzJYJAu0+laRDPPhNnMhuKWGP+CFFDaVYRQNfmtUwB5tvUXJSWz8+qzQn
-VLSk/UoOfTpJ6XvdAmVl//4WlHz3js4QZSGgIqUk37aYItLmospPWJm4S8qiubLm
-Z7R0EncIXqUt+9KwxqFyzT7t2hrN8UV4pDUu6NNfOgNDEt0uHE9olmj2g4zsvhaV
-5LAnMGB/2DeipER1MZdMkm8OuLkMjUfNe4ltO+4uu9P8mb0iOS/9fJXKI/IPRs+t
-E70bLFh1lazqgf1hZT7cCvrxIvW4MphyGl70ar/y/A4AwPfbRW0aP+Bjw2wybXUu
-hKfa6jgt5PGZNFDkYZVeHwnFcjddOre4dmOIoMOIWiflzt+oZfDHBC+Kf+pSBDWx
-ThI+4OfVSQnA0uL52VV6RzFNICf/Gn5jRxG+UYKLmGTxHMwrm9mscm38zi+R2IOy
-1ascmUuoi6Qq11lc8fBzU8qsr6P73W+6eezw+VbUATz6eeVn20/idOMmI6KBGiHI
-1beSvx25KdcUcrp8nrgEPQT2L5JFIsAMpJ+1i2fCSAY/Tu75Z7zSu0Q7Z09ODuq1
-d4JgD7Cs5FHktoyKA6mlvrhm7i51zKXitzZ5a3jy3LbhG9hIOVT5D1flMs0iPzI9
-mYRFt5y30ao=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInLsSpU2Xj+UCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECA5GDv2oPJteBIICgJVtnMuDMFK1
+Y3nSohYbrUOtRaqI9WnSPgneNXZjiLIcbqiGhsvcNKKBWqgVWJi4F3GaWpkwAkzn
+0QmmYali9iUBqmFwa3Aw8HIztZ02Uos8uON4eCdwaW4BsL82Mp3vrvcLulWE63/H
+Vrqg3I7Wk3wuEDc/G6K3JkwiuPzaTCwASvLtedeNOuR/xNd85PbcmNnFnpbOCiS+
+mO9szSwsiKFs4f1iynOscVRau7Syd1g+Q9VWKX+TVq9pWq7BltYSOsIJCSf7ECPW
+OMiwNO/obv2ADBzNStdAlvzXdFdQATglam39UKVK6/M8x204sVQ7rNmwLln54nhh
+wpGG3OlS0NNQu1iY3uJlCZUnIfFVv60nsOwRrjxLq6GnHExkQMVXcdiFp7P6zepT
+DEDp/wnnRfEMx5KltrTLQydPqGb9RW6dVMajep05tA9F0Rui6+6WU4SQ5WBExJKG
+5qhlWaPFwfXq6M2vekK5hpU+r11RurbqWDbXIt6WgwfJU1+OB8tttWgvlQMR+gyv
+825J9H8/6mdYRDE841G2Bb0Z5EjEEcSwVmtJ15/OKG0Z3/hBffMg2WlDLnl+/U3F
+OqVuoTlWNVj2S6lJneWUCVJp+pgrjVpKwSWp7CA9i6k40bmwzUmloLRHtvQ/Wr9X
+SahoYHHg0AnPiXzZ2+cylCixuIv/n7Z3T1DnGawIsqkd/wu1llZiYVKJ+1xp/vV1
+mVqy+PkzW0UxPXwHMGkCVVGhLbu1c4KHuTgGa7okvimIuJskgDfWArlFjIvrmtfy
+gwW+yT8XZAMT4QOMEe6kllV5qI2Nyh/InrBY5X13jC+foYBXyM3yvf9sZDoI+8cL
+lw5Pl++GU2I=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
index 6c212d796..2536bdc9d 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
index 7dd1d63cb..fcb27a1e0 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
index 0f771de74..eb31be9eb 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
index e46b04bc1..76ab2b378 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
index 835a82518..3fcede254 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
index 6285022a1..d2d117a3c 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
index f5587ed9e..f3a7d8409 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
index 85d605abf..5726bf5e6 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
index b36d86296..de05f022b 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
index 6f1090b9b..49e9f19c6 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
index b3ddaf548..8cdb2787a 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
index 61c555066..9e5570c71 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 8A 34 51 BB 11 BE 62 85 03 82 CA 26 7E C9 12 A5 8B 49 59 5E
+ localKeyID: 85 0D 82 74 34 7F 88 F1 44 08 3C 66 B3 E3 F1 F5 6A DC A4 A1
subject=/CN=revoked1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDIJRW1rC3Ox7eq
-hhuz8jjMATaEQl9sbQ+fOBRPLkQDrlGfYfZnfv95oIAIbep73y+K60+iFekBscQv
-55T5TpHtryJf/nAzG1uaB5/knqT+25D5x/qZaZxDP7UF+S7OFq+7hLs4G+IY5np1
-aCBFozLcegFpCcr6/I7vE6krlX5fzQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4nO1XVJJxn0ds
+Cwl5r8NnrTCCJXZPU+YW8L7XqT0WwRbZJzpISpmeuNvvSEI5kzzDZrY39+kZxiz6
+lFRKN06WFJjagD6uJX9dBsbmCoDh3b5oIb6MynCg6ai7TugSCF2hDj+Mwy8ddtAH
+oEmPe0Pgjbu5Px/hBDB8S4wafn3VgwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AKNP1gs2Y0HWDH+b1/LpJ2JuCkhB/hylW/iBfMRfHbFyezuADJP7K49dp1SB91x7
-d3D6XELyDLSwgr2Gdnr22Nu1QY09QTGTgcSDESsteSBhUzrcYOnZA7e7/5nfw3nM
-t4UJSYRLh9nrYbwVAXrYvBx28NwAUjoUXSvA203Wl5+e
+AMY6qxBlHqWITeZeakbOrhhY3SuuY8AUiY6HRUCdfX28cjK8HRE+F653N+LkEVJA
+rnYnMSuieO2eH3G/IkE8FqZZ0nZjxgwslr9fA7QpPm+8GK0xGW5JAXDUnBkPvw9s
+ORhPlSQWj9PNPzRdf2fL+O7vTPoaKXw7jhUeT22/5jut
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
index 133a96488..498c63892 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDIJRW1rC3Ox7eqhhuz8jjMATaEQl9sbQ+fOBRPLkQDrlGfYfZn
-fv95oIAIbep73y+K60+iFekBscQv55T5TpHtryJf/nAzG1uaB5/knqT+25D5x/qZ
-aZxDP7UF+S7OFq+7hLs4G+IY5np1aCBFozLcegFpCcr6/I7vE6krlX5fzQIDAQAB
-AoGAD+lULgLCYNzjfvTgG/CxpOpNxWWqGhUbjQATgUNU2JQRsiGYH3HrE+YiIkls
-FFf8esdVUotPtbjxDLvqTd2ktS7WFIFjR+l5irXL7eGzdzTeza4rYv/VwUjiJGAn
-ikc6mJ+8qUTGZcTU4WiepIWiPNdYeF5lQ9bagaTP3IJiuhMCQQDruZTuBkinbFpT
-SicpbyRljtTG7VdspbsaHNYVkELM3C/LO/OyY7ZHM3jhbVIV3ZxqgWfs54yOA1fk
-DLP6LYajAkEA2VwRIbxsPvpR06KT9yNiHRL2ZrMzsgc9bCwBGSwOK4ZMAU07QGiu
-krt/YUv7jj7g+P08+URxyq4wkaJ6hrmWzwJABRM6zKEgAVLI4xAupaq56uHXXO0R
-O8qZq6dBSLeRaJ24/bQtvAJ/kyrdiGT1Jnld+8ELfsNBeHFD/Cn12gYO5wJAJKAJ
-1vhr+PSvAw07B4KzzphaYpXBmTb1F5wWl0pAHP9lITcFS+YXvGvRm/B0s9ROjkYF
-ly78SZ2uW2vYX4k4KwJAaG7SKONSuyz2sHAqcU4CMZBX7792a29kQrfVQTkiNbVS
-9EI27wI+gzgHVVc7y2PlTOBcVXnLVjk3bhZEyaK5qQ==
+MIICXAIBAAKBgQC4nO1XVJJxn0dsCwl5r8NnrTCCJXZPU+YW8L7XqT0WwRbZJzpI
+SpmeuNvvSEI5kzzDZrY39+kZxiz6lFRKN06WFJjagD6uJX9dBsbmCoDh3b5oIb6M
+ynCg6ai7TugSCF2hDj+Mwy8ddtAHoEmPe0Pgjbu5Px/hBDB8S4wafn3VgwIDAQAB
+AoGALT4gGD/cp8XOHhdSWiUN8VGLSsndhbFc+RBE5NtP4kytycgIS4EkxrYtCCYg
+PLXttUFttKen064yhbJmOc32Dv0r1sajVnSYVwmPcsVkwgXQed+kkbA6EuKtCFex
+WLnalhh0xOVw9woYCwSJlORbEgua6ZihEOL2bDgCImqkraECQQDbi/DPFikMcruN
+INDqxXPF9fyXixjKJnIxdKqUnBo0aNTLOGsqJD11Dzp7zKjAqkZtf3F9DUutSdM2
+WhogIOrTAkEA10QYZv3A4xEBBDuOK0ODOB2as79cx+qgAO92bKVRFZ7zM2CwK7/X
+ZhLGaCwZNZ6d1DjRevkar8XzReZlF5dckQJBALTJnOf6uJyukfDaGA9rvzVBpdno
+yeYVGK3PA3TSwuVreedKszyFkTIm8yLk2gWlcc9TRdITM8Ej7NByC9dvI88CQAXn
+Cxg/2vse6z03eNV822s9fJFzLNMaftqntkKSYd/K5PZCr3Hzp69X0nLmyqYqvD8m
+c7AAhpfNQLdo8tqrvtECQEudSCAJ5S8FWqIPxgtCZoBYStMfHxif98Wm3gM6Muui
+dnRB4kiANzdWKvkDsFZiW0EYwy92EjONTvWTHkwEr6I=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
index 91b218906..f516d77b7 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
index 6cf4e0527..c66b8bcfa 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
index 7e8dae8b3..f447ebc47 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 1E 26 24 64 59 2B B0 1A 1F 01 FF 7F 7D 52 77 D1 05 2B 32 39
+ localKeyID: BA 27 4E 78 82 C9 F3 4C BD 33 51 9B AF 9B 94 C0 5D 91 EC 6D
subject=/CN=revoked2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
MTAxMTIzNDA1WhcNMzcxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz03DdRFm1crB
-Bss+6xEmZjh1YoqwLaz7MIk/dRkjr3XyC0Veikt29a8d1MJxtJJoG+hviqh2+jiu
-3Q8U60F9UT50WVStjjGRMqCf1Wygs9ZV96j/0cY6MF9DGMOJHl0/22M8Bq7liO4f
-ItJInoIPgYPG+i6VkNZyqRdFsqb+2XECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2xIP+NrPGCWl
+/68YfwY3aL801Jj7lww+6s9R/8SQ4ol1r4zhENWGJSFh2GNjm+5aiaow5l286XFM
+58zcGQd80cpv8S9c8tS5AH2X9oYXqivpuqoQap2NgfiDduOQhJEErrb/eWM12Dva
+bn9ZB8f/rUpfJ+VOL49tT3s0jiSKqTcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQALBranFij7NmbXdmW95Iro+91d20r8ZBFKlVnFNC5wTJBse/8P9yHZX0mEXcJc
-Vw45CDlqOW5LA1Ee9ppdhqnEUpzyAXCm0YTvVe/MA60LmyS42gPZEuO3mJuO7vK5
-MxNaUqW3LEvoYAZtFJEjxoIabDSkzFAqVs4SDydrA+hwhQ==
+gQBISb0ax1uir1EWMzng835JZUlHOHfZHQBf2t1kwkj2PuRY9f4oUjU4LtDlBa5c
+TIp81tUEe1eVo2ke7gX4bpmmcbPVh9MKzGCjW6jqXWzoshB9koVFQV6aYxJD8Yif
+Zi7RqhgGYEDxVcbL/Q+813Qcmuouqd1DEmgCZj1UMVKGZA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
index 4b147a9f2..cfa249803 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 1E 26 24 64 59 2B B0 1A 1F 01 FF 7F 7D 52 77 D1 05 2B 32 39
+ localKeyID: BA 27 4E 78 82 C9 F3 4C BD 33 51 9B AF 9B 94 C0 5D 91 EC 6D
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsuPEGYdb66ACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECP4Poeo/NVszBIICgP9fLkSfURP8
-5M2EDj5ldAyzlsDOyXnz6NzF/Rlvau+87++wuY8kxorWNZW7onOw0jHmf9358uV5
-qpDprlGSYEzwJaW9zFXYO+sVHxCa/DrZWgwgFNniTpiowQJXtJ2gtV5/dHDlRDKV
-Q5j6sc5gRYh/A6MxouMdJRz8gcFYJ6JidGvESqN3bXWHdrfTNtGpEg3yS8nk0cas
-nItj5LKgrnApM7h84Pcd1wRxzTe1EDGHcMKcJexallUIwzmTk8/G4/PVqi2oNxvC
-SiIT8rOenQMiMLdJh/5Jxfxfhd3pEA+5nJdjVry9kZP2LHXkmPvW22N+w0QTOd3k
-NWt0cl7L/yspsxOI1ywk7Ug4EUb/pwA/cOXPh0oMx3sTVXNFvm4QlY+4nPphHwrZ
-UqOoE/kOpthpc+qm49VGu2F5q/zBXCb+f8mJts0g8c+Z6TRR9mnzpEwy9ybCPRDj
-rv3Em2TcRdyitryld/NVgl4i/GE2Q/qtZxzrWkqL+GZ49PesGy+gdzJfFM85vqzD
-uc6rhhQbtpDcm0cyH3Af/8j4SYzdbsXmHdrVGHWbiq2xXPgBJdsT2lB3PuPfk1OD
-lmtHDpjVtDBsldd9q5nZARJi6RglMFxjEgTS7KQiVQ6k1rJMPQResziOuACwgYJQ
-JL6s0q1ZzwnX1GfuzuNKqmA0MLCT5sPCVAjoIeEAa/PGOQGh/Q29J1wJQLiGbYNl
-Fl0MmrxntdlfpAtWmrVLkVsNmowP0VqXkfWknhj4jQ9oCKKk+hGXCoPPTSHrke8R
-/t7z4Eyi9bJr4n1avJAV4fQzNj8YsLOyB6EPbBTrBrfDRfbGliyMZxis1GXr5m3y
-jfZrE6L1DAE=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsKlWIybFEskCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMPAmEGlhE+aBIICgPfn7Dngph+T
+uFyT3yWkawts/mPHbtn/IiZm6ys6mErCVFPXsQx6gCHwr/9UBf4RpeYjcxRRqYsF
+Y+vVFV035AYJv70vh6hscBSrb/xPEMHRFOLKnB1amF/SjieARj+iA8VjOaUs12f+
+Q/QeT3wLvQbY5Me0AIRm7pt/kxHo3wpqLQKWkyPiZaGgXP8eiRB0Me3N6s7IrKU/
+ogmaggZw+8j9XxrDzUlPoi7jIzzCCf0OtvmyL9j1EVMBtKJPBOCuawODeivHsxE7
+BmLgZjLXik3ckcA7Hs7Vy6kBSTvGrHgHAf1MZ3oNC+tzaakZYhd6SWwnTePsjVU6
+I7PTVIhMRaPZsF0gtIAgGP5i8CtQnqPn9V9FvJiDHiwUhsE45KuONjuIsSJvkvfW
+M7aKFNAV+Vg4hko1ZywdMsrKa913q2VJ4HU8zaYdaAQGAt0HWIUxl15gdgSW8KkQ
+aG5DfX/KtLoPsAOTW0mV+YsLLj/O5B0AwxUD9YGPaK/HSlJ3QhU5wFeO44U5acZ0
+zPLxD1RAPA2zO8SSpyiDyfMAsdsIp7wf0dQcONvsHkQA9esXYKeYYs/Wh6QEIUll
+dftAWi7EvlzuGqZuTfEeqHG6UE+1ixx4U8tSayUYogA6IPddt3+BMuUX+zzoBQO5
+2D2pbF8ctXzxg43q3bgjiXz6miNHrT6OuYuXGyZRiy0MF5yBJ8UmGKN4RmEd6VMl
+QQREio67aiD5P0LOdj0X3qd2lcMmcxQ2SpejkmpZiafJ2WU4K3QHp8Xksgi0nkim
+0zUIkL5CCgsAaEztGPgNlHDKboI6miP4KhzDM4cTv8RYerrllv3DMN+tV1+w2fCB
+VWBlIfzZL2o=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
index 2eca41023..97f86aa29 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
index 368d3fbde..46464d0e5 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
index 4301dc38a..a5ccc39bd 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
index 368d3fbde..46464d0e5 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
index ae6195745..83323f388 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
index 25d7a3a37..7e3d7c1e4 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
index 25d7a3a37..7e3d7c1e4 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
index 4d855d1e1..b985962c7 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
index fc29e866a..41d1b4278 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
index fc29e866a..41d1b4278 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
index bea62e2c8..178da41bb 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
index 1350b3807..9b77e6597 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 1E 26 24 64 59 2B B0 1A 1F 01 FF 7F 7D 52 77 D1 05 2B 32 39
+ localKeyID: BA 27 4E 78 82 C9 F3 4C BD 33 51 9B AF 9B 94 C0 5D 91 EC 6D
subject=/CN=revoked2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
MTAxMTIzNDA1WhcNMzcxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz03DdRFm1crB
-Bss+6xEmZjh1YoqwLaz7MIk/dRkjr3XyC0Veikt29a8d1MJxtJJoG+hviqh2+jiu
-3Q8U60F9UT50WVStjjGRMqCf1Wygs9ZV96j/0cY6MF9DGMOJHl0/22M8Bq7liO4f
-ItJInoIPgYPG+i6VkNZyqRdFsqb+2XECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2xIP+NrPGCWl
+/68YfwY3aL801Jj7lww+6s9R/8SQ4ol1r4zhENWGJSFh2GNjm+5aiaow5l286XFM
+58zcGQd80cpv8S9c8tS5AH2X9oYXqivpuqoQap2NgfiDduOQhJEErrb/eWM12Dva
+bn9ZB8f/rUpfJ+VOL49tT3s0jiSKqTcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQALBranFij7NmbXdmW95Iro+91d20r8ZBFKlVnFNC5wTJBse/8P9yHZX0mEXcJc
-Vw45CDlqOW5LA1Ee9ppdhqnEUpzyAXCm0YTvVe/MA60LmyS42gPZEuO3mJuO7vK5
-MxNaUqW3LEvoYAZtFJEjxoIabDSkzFAqVs4SDydrA+hwhQ==
+gQBISb0ax1uir1EWMzng835JZUlHOHfZHQBf2t1kwkj2PuRY9f4oUjU4LtDlBa5c
+TIp81tUEe1eVo2ke7gX4bpmmcbPVh9MKzGCjW6jqXWzoshB9koVFQV6aYxJD8Yif
+Zi7RqhgGYEDxVcbL/Q+813Qcmuouqd1DEmgCZj1UMVKGZA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
index 037d74032..8f88e937b 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDPTcN1EWbVysEGyz7rESZmOHViirAtrPswiT91GSOvdfILRV6K
-S3b1rx3UwnG0kmgb6G+KqHb6OK7dDxTrQX1RPnRZVK2OMZEyoJ/VbKCz1lX3qP/R
-xjowX0MYw4keXT/bYzwGruWI7h8i0kiegg+Bg8b6LpWQ1nKpF0Wypv7ZcQIDAQAB
-AoGAEZHbL4heiV8qVfuS5RRqhz5gwI3VmcFv9rCjNrb/PcdG0Oq7tQfpWLBTXG1w
-eqfv9/GOxpc5okJ8m5LEKJ4/0yRjYDmQA+r+ilIi0YacBs85uA2+UQwZwqp3MOme
-IIOvcl8bDlXFSjsDNAIfrL6fTuVWQMC8qUh6GSqKOLClZ5kCQQDrZVqg8WyKeKu/
-6wF/7e1JSdjFPoich2Gu56AqHyGWgmX654YnmUibfK148JM/N2g8EIAA1GF3D6LJ
-UpFf0/gNAkEA4XLu5X/q2k1mMVUMRXxlA/pi/M9r8M+N8mLT7tZzgnYcUMg16zZn
-tvkO5tP1rYmEPtV3wnDf3PYKic0YnpIJ9QJBAJuUMnEa/6UJmmJO/X/DDkiZETdU
-XFAwPkSufDI6vyVN6/8H1KgJbG6v2auMPZXTlgXU1fU2aXCamfm7o6+VVmUCQQCg
-5nszlgDSPo0hxjYU3Xvmw+ujzJGX8zm2dOwWuD0GLi91Q/6fWVvaDZSiD0J20P9u
-LMHlJtPOilbpFFRuz4GFAkEAsjDnEH7r1waxjphF/Oy66EIe0Nz5ixCQhWsaTvKI
-zcO5soZU+pjqac9MS8i/wcq/JEb6utlM0eT/mi/EFUluLg==
+MIICXQIBAAKBgQDbEg/42s8YJaX/rxh/BjdovzTUmPuXDD7qz1H/xJDiiXWvjOEQ
+1YYlIWHYY2Ob7lqJqjDmXbzpcUznzNwZB3zRym/xL1zy1LkAfZf2hheqK+m6qhBq
+nY2B+IN245CEkQSutv95YzXYO9puf1kHx/+tSl8n5U4vj21PezSOJIqpNwIDAQAB
+AoGAIwkP+d4l9GLXr1JgSgxYoeLBKbuvskKt8J1TLA2n7ZBLUdXnjBWCByqAEfx5
+3+RuTAmmbr6QvwrfivYrQGt/TWg2DVWXDdjzE++PEfU+qX4aGK16YIQr9llZwpyA
+O+l9fkyAJcuX8Gq3GnN4/Y11jEUGsLjbpOEs74UiMELAARUCQQDvTs9PCUc4iOvW
+7Vij/BCV8EQ49Rx31Bc6toadXwd1LOBGeflcU/5fRN0Vmw3WwikkiwcGohosoaMG
+vNq4UZG1AkEA6lni34oyMtdxItmW1k7Gt2KnPZ0lvljVMn3CLJmVyNVsCEYaPCBm
+BPZC942+tZ7+cNR0xZIlk2fHnRSzpeySuwJAHDnddeMQRXjQ6G7iT6VBh43pXhZ7
+Hx8jBkfVJOa6iHWclnN4mA1IKZCDyzKYtUX9eFP1pjCkibMe+YJ5AdiNKQJBAKC7
+N6yj5xwRwanqXNbtvsNGaXgL0ThFSyxPLp9SU3YkUu01z4aPngknMfUCBdwhiVev
+j8t2GkmIc1McQL67jEMCQQC6xJb7eWqWMfmGzF2znmrk5+YG4ucq30jG+ERvFa9j
+3kh0/TIRU366INx1dcqd0HhffK0hTe6QYsEyIl8pGlGn
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
index c179979a2..5ea3c97f7 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
index 1bfb0d19b..50f14fcdc 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
@@ -1,25 +1,25 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: F0 BE 4B C1 8A 44 3A 96 44 D5 9F D2 9E 96 32 4D 15 88 0B EF
+ localKeyID: 3A EB 23 91 8C 35 F8 BD 33 31 FA E8 A8 A8 A7 04 EA E4 56 9F
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALxfj7W1l2EagOuo
-g4o3BzywHX3yqQkv7X6VvnbrzC1MkU8niDxU7mcg5NltphGd7BYAUxilscnZPO0s
-QorQPDz/rTwkjFdlHtTLXJohbgGc3r3448Nai1w/3yXzSH5yOLYqwgb9P2vwsdPU
-lEwdnwVy3JslZMF8x9dAVE6qYCuBAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMkDLKjP/CG/5xc3
+duWy5WydT/dH1Ni82VWzrf2WArI0zjDV5+SR5R+Qqmd5Cm9Ax37QRtu7X1y0vJfZ
+7likFn+NX7bN0NxgmvUFj5XB9BQq689nGrjmulIcm2pJY1jbGVs/sBzqzNMH1Ojy
+Vl4Wk9FAXO8Odv4wRwQCk0W+gW4hAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tgiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2Vy
-dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQATmJl3ofl3Lfgl2Gja
-/KWpuQ6EZQYD+JEhRN4uYuuScnET7qDsXfJqxgabO0d4JMotM29b6TOl5Pg6riqd
-5lx0hbFpKRTJSg5IJ9TfqkUrZ68HfKNs95hLrtQGkpG+m0rDHDPk0Fr9Ah372/1t
-x5tr+n5KK/sMOjHanfj55Efqdw==
+BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tggkq
+LnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQA04ipCJtqmqI7nfDzK
+NwN7afFMOOqOBS0bgU6QYR0v1OnNGbi8G1vGWgWa5Zw7dyXiLoPv0AKVKphg3qu0
+BJfuPiRj4ph00mUw2QqckqjPZsYOUPIJ2uwJ2AdEx0vu9B08V9/XSK/HSuRupk4u
+Lvd6D9ouxF0t7t8BsCxs3mswqg==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -27,17 +27,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -45,14 +45,14 @@ subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
index 5b19cbabb..7804f2268 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
index a0b3319c9..e512c1bc8 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
@@ -1,37 +1,37 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: F0 BE 4B C1 8A 44 3A 96 44 D5 9F D2 9E 96 32 4D 15 88 0B EF
+ localKeyID: 3A EB 23 91 8C 35 F8 BD 33 31 FA E8 A8 A8 A7 04 EA E4 56 9F
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALxfj7W1l2EagOuo
-g4o3BzywHX3yqQkv7X6VvnbrzC1MkU8niDxU7mcg5NltphGd7BYAUxilscnZPO0s
-QorQPDz/rTwkjFdlHtTLXJohbgGc3r3448Nai1w/3yXzSH5yOLYqwgb9P2vwsdPU
-lEwdnwVy3JslZMF8x9dAVE6qYCuBAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMkDLKjP/CG/5xc3
+duWy5WydT/dH1Ni82VWzrf2WArI0zjDV5+SR5R+Qqmd5Cm9Ax37QRtu7X1y0vJfZ
+7likFn+NX7bN0NxgmvUFj5XB9BQq689nGrjmulIcm2pJY1jbGVs/sBzqzNMH1Ojy
+Vl4Wk9FAXO8Odv4wRwQCk0W+gW4hAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tgiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2Vy
-dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQATmJl3ofl3Lfgl2Gja
-/KWpuQ6EZQYD+JEhRN4uYuuScnET7qDsXfJqxgabO0d4JMotM29b6TOl5Pg6riqd
-5lx0hbFpKRTJSg5IJ9TfqkUrZ68HfKNs95hLrtQGkpG+m0rDHDPk0Fr9Ah372/1t
-x5tr+n5KK/sMOjHanfj55Efqdw==
+BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tggkq
+LnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQA04ipCJtqmqI7nfDzK
+NwN7afFMOOqOBS0bgU6QYR0v1OnNGbi8G1vGWgWa5Zw7dyXiLoPv0AKVKphg3qu0
+BJfuPiRj4ph00mUw2QqckqjPZsYOUPIJ2uwJ2AdEx0vu9B08V9/XSK/HSuRupk4u
+Lvd6D9ouxF0t7t8BsCxs3mswqg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
index 9b06670c3..1b01bce89 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: F0 BE 4B C1 8A 44 3A 96 44 D5 9F D2 9E 96 32 4D 15 88 0B EF
+ localKeyID: 3A EB 23 91 8C 35 F8 BD 33 31 FA E8 A8 A8 A7 04 EA E4 56 9F
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhc6jbTmwP4ECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLXK+PTUw/IEBIICgPok+EzDiDQR
-p7t3S4fGARGCaKzAPILrc1QiqjE1O155PfNa+EUab42WiVo8cQ1vYX1VSxAEgroY
-qdoGwurmQYAj2Xi+oaeUOjGFDe+u4hOW85k4A9n4CKDefFVZfFAOYUl6bl71Inn0
-+BnbooJxBITZoYEtK5EPLBL5pwPfuoaNEweP08SrEIp9JR4XvrmDpKn86xYlePN4
-Fj8LINTf5sRSwlHswzC1VaMoG8NO8uvT0MFVLn0NVH2IK0eCwnSzt0NSvwNV7ne+
-3JCl1A1M9jcogl1HMkQJK21XQe3CDQ1IazA4AW4w5BYXIn/1l/LD5+0GfPaMja+t
-2Uk1rv75+WOdAylFZrLhFUGULUmgRRvZ6eSil9fJIDYbqh/8OyIG49p3gVw2T4Fh
-AM1UBp8HINXLqttxCz9/1KRIHWbNQWqA9YiHPADSZfPTicTVjIieH5d7SVtC8RQY
-1YxgIbYJERYla3iiLlZZ+SEMBpu+pmEj3Le2x9CtlSUrLj/6m/ENjoyEZwAjOAB0
-czsGcJnKprN7nM5GACLOtdKkzbUN0xbl7dKrpmt1S/qLZQ7qZRfJ4D2D+WrDqByE
-2mukG5SjGu2uylXlwT1dyxs04Cvp4a7Ux6T7t4SJQKAn6+5YBuleoQejESe+gMJI
-kqsQbwg3CCBDm4bazn6DQaQmMiPGUIeis+b/13qY5mIUJenHysR85+UWH/CcbeY8
-IRc2a72ae/dVv4TLCwb1zmSCFHOn34uVqfVU7qXOSiLeRqyqvjxWhTGUnU0EfZyG
-HdV4CtIbvK7uZxCWBg1B3msnWzI1/q3SmXRqJFwYOhqdrYlBEGjrmXb+ZXjFE22x
-e7pw7NZvLeA=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIMsmnIfnit9MCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEVhcDlQmgeiBIICgNorYUpIkQFT
+nouaASv6pd2ZUfXuYE82ZTQUlbgBMNS5/orrYUXE+D4tSY5+7w2I9268p32nzW2D
+FKSjP4RUgwplSco3QEZQX/nVrmztMFiq7OwIsd0M0PscwH6+ZpOGz4P1Zd+3EacL
+x5y2pXsURLKZgL2MqkoE8k50kRwP3bjwv2CFrsVOJ5FqK0ca/5iAHLNf2LwTMmoD
+L9bsAVODpUoaDzgseHLDCMBAnPPx3sVST5jCAIfbu3BPjhiI6kGCIzDgKzvOGnWj
+usnjvGRpCt/g4KjfVZkRPPr5ieVmDNzKoCC+jzckpwALaptp2/oSltYkGQB7dOvk
+sSwjpkGNELVGhl1CvyzD7oM5/Znm/2mmPcCQcHXd94IITbpQO9z6ZSeHph/9j8PM
+UlO4+JwUU6kk7jYdUbv9lA671wkOdErfF4PfPY8jCQBS1GzCes+j3VE/rpNUqukB
+Byuk/v7Q1pYgbJTydaCZ7u79pbgTInonKmkFs5jip9QcAN1Kw6U0jodZxPsA2i0g
+4A0pxte8pJcr/MEXJqXWquBOT3Hd8IBIfx7MQE2ll1fY6pSvz83ulJh7kTlQ/fW4
+hqTjvCsBAxzLllu8KJpXvC1frxJb6uZ2vgqIxuOSn3K2VdCt5DUhQkcWSqsAfRBv
+IQIAvBF7MLZH4LQRKSl+aRvzT4+YRmYXRnwTU8BrSAQH2CTyZbpUDKkzGwtIjy8t
+lVrDKkQ50URtZsk9uacfJYtl1UT5I8hLDZm0KQi1xAmy8y0bN7iMjCwI10imZXdS
+jx7htfE5XaAenO8ooASXBAP38sUwVkEcAD0ZN2FkozztWgVp2FZB8n7+r3qHOQDC
+kGU294YEM6c=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
index b6842717b..6a51f98a3 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
index 41587219a..5b3eb3fbb 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
index 4d1fdd6af..cbaab9e73 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
index cd0da3568..90c4d15b3 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
index b7795bd1a..8522187dc 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
index 0d678b166..635a23bf9 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
index 3c89e43c6..794ce3034 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
index 44f857ff2..bd860a1a8 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
index 0613678a3..ae3d253e1 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
index 21ad5d764..23c9a35cc 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
index 5df1643c5..087154fa6 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
index 0f51f061f..7db25a776 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
@@ -1,23 +1,23 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: F0 BE 4B C1 8A 44 3A 96 44 D5 9F D2 9E 96 32 4D 15 88 0B EF
+ localKeyID: 3A EB 23 91 8C 35 F8 BD 33 31 FA E8 A8 A8 A7 04 EA E4 56 9F
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALxfj7W1l2EagOuo
-g4o3BzywHX3yqQkv7X6VvnbrzC1MkU8niDxU7mcg5NltphGd7BYAUxilscnZPO0s
-QorQPDz/rTwkjFdlHtTLXJohbgGc3r3448Nai1w/3yXzSH5yOLYqwgb9P2vwsdPU
-lEwdnwVy3JslZMF8x9dAVE6qYCuBAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMkDLKjP/CG/5xc3
+duWy5WydT/dH1Ni82VWzrf2WArI0zjDV5+SR5R+Qqmd5Cm9Ax37QRtu7X1y0vJfZ
+7likFn+NX7bN0NxgmvUFj5XB9BQq689nGrjmulIcm2pJY1jbGVs/sBzqzNMH1Ojy
+Vl4Wk9FAXO8Odv4wRwQCk0W+gW4hAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tgiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2Vy
-dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQATmJl3ofl3Lfgl2Gja
-/KWpuQ6EZQYD+JEhRN4uYuuScnET7qDsXfJqxgabO0d4JMotM29b6TOl5Pg6riqd
-5lx0hbFpKRTJSg5IJ9TfqkUrZ68HfKNs95hLrtQGkpG+m0rDHDPk0Fr9Ah372/1t
-x5tr+n5KK/sMOjHanfj55Efqdw==
+BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tggkq
+LnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQA04ipCJtqmqI7nfDzK
+NwN7afFMOOqOBS0bgU6QYR0v1OnNGbi8G1vGWgWa5Zw7dyXiLoPv0AKVKphg3qu0
+BJfuPiRj4ph00mUw2QqckqjPZsYOUPIJ2uwJ2AdEx0vu9B08V9/XSK/HSuRupk4u
+Lvd6D9ouxF0t7t8BsCxs3mswqg==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
index 938902f40..7efd7258c 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC8X4+1tZdhGoDrqIOKNwc8sB198qkJL+1+lb5268wtTJFPJ4g8
-VO5nIOTZbaYRnewWAFMYpbHJ2TztLEKK0Dw8/608JIxXZR7Uy1yaIW4BnN69+OPD
-WotcP98l80h+cji2KsIG/T9r8LHT1JRMHZ8FctybJWTBfMfXQFROqmArgQIDAQAB
-AoGAA2QGS94Ild3f7jNVUs/qGG85yKztMADQhJPLdDaLBqcMgovn9DYPKIS7ZH0z
-HQ67qNW5U9s/rQN1CPaKqBcBeTZexOUHXHo1xfO0XsESuAgCZCftFMXneqbl5X4z
-9YbvG4qyCYlzDQHhmuMe/LS9uzQKLYChW9rnQbnTtbzpjxUCQQDipKW1BUfMz8so
-BeY33tpGK4d0M/g2AgjYSb86V/U/wC04FyMX9GkbfdtPMK8hT1uagQkto//eoPNB
-za/gOajDAkEA1MXob+f0asEmZZDDFEepiBY0ySNhdjjpRum7xNlyXKZwG1cAXPSK
-sjQqa6obWDqNnHPUfKpxjm45C06nVcS2awJAVRRtyEiVLYOLxhiA1dRoqBLLJIol
-0VBuNZNpn+NJA4eG8hltaR6tHk7etxmVhLGft55c7a807EQLTVaDgW7jtQJBAKm5
-GHkziJcjbXJ07/ecVlI0jHSpYVQBf6tORLZ4Ua4wIZrdYm/DrWMLE4+ASIGva0iS
-aLvs5doceCpZ2kcjO/MCQBOaq44ykvTeHuVX+3CtBRi0Dl8HkD7QIRChVIqxYghC
-7Q2XKeVNxLCgF/QGNSpOBBCrOJEC3zO024WHzTN33qU=
+MIICXAIBAAKBgQDJAyyoz/whv+cXN3blsuVsnU/3R9TYvNlVs639lgKyNM4w1efk
+keUfkKpneQpvQMd+0Ebbu19ctLyX2e5YpBZ/jV+2zdDcYJr1BY+VwfQUKuvPZxq4
+5rpSHJtqSWNY2xlbP7Ac6szTB9To8lZeFpPRQFzvDnb+MEcEApNFvoFuIQIDAQAB
+AoGAA/kNtslD5SmzxZi9aePiZtud7x1ICrUX0WVvhskCWmHoDIfLxqUaC34f2hNG
+u8/CqaIFm9XtGB9ZMLdNqkpASLczHcV1PyTEjXFayOvtQ+dyVYrmFy+605tteL4/
+9vGHE/l9MNTmIp9es2UHoSj/sJ/gF5ctx3RbC8A0fZvtFzkCQQDvVLpjs3u8bdxF
+Ww4mrSGwL4jE4TdM1u0JPLJhW6asK48z4/rah4GXVRZ7gMH8Zo2YEU36ewl4yKQQ
+H/bBFtiZAkEA1wM55gGOZFEGfNCTr8L/vsh/rB8WkNXhbDFu/dHiMdLHGZ/IOA1Z
+YH4XBAro93aSeksXql0eVZR5DAnBuCEOyQJBAM9zSuj2/89SDveTOM3vjl7wpQW7
+DjstpWM3WIupbOyaCVP6Tkuz33G0kHtXHU7R+fQRM91lXs1yZTuQ6UtvqSkCQEc6
+o2CmHVTwXrTUqEhu0iiS5XDQ77nVkRM1oS5m7IdS63B6tWqUSYqk2t0U/C6W0lm/
+LLzckmMJh7xMMyfbk7kCQB7/tRxJtj78FK41apNIzxoIxMX47BFuEJcEbh1Zb0OO
+B68wY20vIElirF5Rbgjf5XUbDZGhZRET+vzB0oLEOas=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
index faddc9e5b..29739e012 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
index 4442cd207..4578b0108 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
index 0ec09fe68..243b37d47 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
@@ -1,36 +1,36 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: 76 B4 09 FA A3 38 20 94 4C 34 2B 5F 3F 13 63 1C 42 9E A5 77
+ localKeyID: ED 1E 94 FD D1 BF 35 60 F1 9D 89 B1 A4 AE 50 41 A1 DC CD 03
subject=/CN=server1_ec.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICrjCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE5WhcNMzcxMjAxMTIzNDE5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQART6623V/zdlL
-bwD25893JfE7Eu92Ap4dKDTE0sM8klkdlgErS/Rzy8GNe/FWS+voPwK7vsEVcLNV
-5DTchlNmIEsBAKHLqbJjqcu0U6WLFvnCJDIOMWdl1kZgSWsxI8hBux6Y4Lb0SI77
-ftDduQtti6447za5iy6P09WgtYEokkgtYg+jgeIwgd8wDgYDVR0PAQH/BAQDAgTw
+MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
+LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAp0rsXgXX/hc4
+lpacoHTUXhZOYDLGm2w4TmzMAW7LY+VDcn/VOFGudCv47W5Q2ahCBCYnNpgQkCii
+xsf8jkJi00kAQgvKfOgCLglhNGvEDmS0Irm9bixpKwk7jPS3ck9qlx8lxJQOglAP
+HKlePmvt6VMLa1daShYZOR/izjy6mDBuBymjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
-VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYITc2VydmVyMS5leGFtcGxl
-LmNvbYIJKi50ZXN0LmV4MA0GCSqGSIb3DQEBCwUAA4GBAJYP6/iBZA8yD68fy8iP
-gn5LR9VftBDDZzrlE4sX96xIUOqt7lyd5Rix1J6sO3v4ZD+owf8WUZ3YZGYKj+mk
-/xIOBd/qzBN4h79LvZSkTI1PPgzX2LnJRT0c8aFdVOdZYhdhi+jl/tIV7YKNXgt0
-TgEyGxkCb5edTo85ZhFXFpVP
+VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYIJKi50ZXN0LmV4ghNzZXJ2
+ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBAAXNrY+W+xG+MySOWEKw
+vHredlA7bbezGflMaeUuPk+dRY0vOQq/ejF2LipxgeSz8uFn3vG3yStJ7+S5ojQT
+WbJu8GRWNRCiwy9amOL1pykKcsuCtC5xOVw5eXrKWeWJNfGluITKd6P7F+cLprIf
+GL0spZJce8FqLW2scekcN4JE
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
index 15054a8f1..941aee598 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
@@ -1,13 +1,13 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: 76 B4 09 FA A3 38 20 94 4C 34 2B 5F 3F 13 63 1C 42 9E A5 77
+ localKeyID: ED 1E 94 FD D1 BF 35 60 F1 9D 89 B1 A4 AE 50 41 A1 DC CD 03
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsVsZHUzbyPwCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIt8e08ZsMCTBIH4h9K/QeDbES9q
-WfQGGNpLsyExg1axcZkdCjQQksmRQlETTIrcn3VHeBP0J1szRnnYSd+BAeZ8mKWM
-LHtqo9MCDJGE+hrT1M77y/og73oy42lrIgh5vwE342uQn9xEZ2FUjps5It7M/DeD
-qM5Rejx9f6vI9CDiwUeZyDBIwkLa1cTmihEXS+qaQ0kPSBQcpqxV5zf6LqSjih1p
-UQtmI0zynfRM7/xgpG6Q0VrS1HFU6PzUe3/iapP+dNkeE2aAy0sb3Ql2oabO5Nf/
-3Ssza3sytT407p6IGtG8kwJIWhxWfWap3Migb2Au3q1FmJUbNwDCdIWOth8G+Zk=
+MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQINBx7NUtEdCMCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMt4C/rM4q7UBIH4z1ia6kUtQ9ok
+cJ8KK40T4vUbvY4VQha+vG1YUNVhaT07eYLCt6mVVdE8QFbvjd7mj0pIquM+H+t0
+Ysk7CzuD4Dx80rVU+Xtk/l3OzCWHr/AL/qrPaVZn1oGxXYNn8VXY75OL4vScBBj+
+Zxf0Z153z620ZpCdLsxmGiH9lMgf7PiGFWT1DCAr7rjwcsHJ83izyOaYgk2F6R80
+dZasjBKZd2Ax6JGktFVCTjTkpmKYoJrXcYMN2zei6pWaNN6zX2FtXFbVz2ZzR+dN
+yc5Y5tWVOFTCJichs7ed9B94AvUT/lgAWTmiaJtO4EruQY5/csV92IenygDpPMU=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
index 170d6d8a7..05249677a 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
index ef5267fef..8dee32b70 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: 76 B4 09 FA A3 38 20 94 4C 34 2B 5F 3F 13 63 1C 42 9E A5 77
+ localKeyID: ED 1E 94 FD D1 BF 35 60 F1 9D 89 B1 A4 AE 50 41 A1 DC CD 03
subject=/CN=server1_ec.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICrjCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE5WhcNMzcxMjAxMTIzNDE5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQART6623V/zdlL
-bwD25893JfE7Eu92Ap4dKDTE0sM8klkdlgErS/Rzy8GNe/FWS+voPwK7vsEVcLNV
-5DTchlNmIEsBAKHLqbJjqcu0U6WLFvnCJDIOMWdl1kZgSWsxI8hBux6Y4Lb0SI77
-ftDduQtti6447za5iy6P09WgtYEokkgtYg+jgeIwgd8wDgYDVR0PAQH/BAQDAgTw
+MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
+LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAp0rsXgXX/hc4
+lpacoHTUXhZOYDLGm2w4TmzMAW7LY+VDcn/VOFGudCv47W5Q2ahCBCYnNpgQkCii
+xsf8jkJi00kAQgvKfOgCLglhNGvEDmS0Irm9bixpKwk7jPS3ck9qlx8lxJQOglAP
+HKlePmvt6VMLa1daShYZOR/izjy6mDBuBymjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
-VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYITc2VydmVyMS5leGFtcGxl
-LmNvbYIJKi50ZXN0LmV4MA0GCSqGSIb3DQEBCwUAA4GBAJYP6/iBZA8yD68fy8iP
-gn5LR9VftBDDZzrlE4sX96xIUOqt7lyd5Rix1J6sO3v4ZD+owf8WUZ3YZGYKj+mk
-/xIOBd/qzBN4h79LvZSkTI1PPgzX2LnJRT0c8aFdVOdZYhdhi+jl/tIV7YKNXgt0
-TgEyGxkCb5edTo85ZhFXFpVP
+VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYIJKi50ZXN0LmV4ghNzZXJ2
+ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBAAXNrY+W+xG+MySOWEKw
+vHredlA7bbezGflMaeUuPk+dRY0vOQq/ejF2LipxgeSz8uFn3vG3yStJ7+S5ojQT
+WbJu8GRWNRCiwy9amOL1pykKcsuCtC5xOVw5eXrKWeWJNfGluITKd6P7F+cLprIf
+GL0spZJce8FqLW2scekcN4JE
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
index 19566485e..ff14f20a3 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
@@ -1,7 +1,7 @@
-----BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIAcFmmaladXE/SIAVtW5nBlHwPoVGyb5MfYZZejaptIo4YJh5gEv40
-oU0XTjlTFO9DVBN7Im3Ck0JMHsfX3vxx1SmgBwYFK4EEACOhgYkDgYYABABFPrrb
-dX/N2UtvAPbnz3cl8TsS73YCnh0oNMTSwzySWR2WAStL9HPLwY178VZL6+g/Aru+
-wRVws1XkNNyGU2YgSwEAocupsmOpy7RTpYsW+cIkMg4xZ2XWRmBJazEjyEG7Hpjg
-tvRIjvt+0N25C22LrjjvNrmLLo/T1aC1gSiSSC1iDw==
+MIHcAgEBBEIBl/zZfhr8aog4fQuPVmm8uPwkFCYPdVEYJtA4cVjpaLIURb9OuTbU
+OfS2cs12RbG5m8xyks8EX90Wxv6Rhr/P56mgBwYFK4EEACOhgYkDgYYABACnSuxe
+Bdf+FziWlpygdNReFk5gMsabbDhObMwBbstj5UNyf9U4Ua50K/jtblDZqEIEJic2
+mBCQKKLGx/yOQmLTSQBCC8p86AIuCWE0a8QOZLQiub1uLGkrCTuM9LdyT2qXHyXE
+lA6CUA8cqV4+a+3pUwtrV1pKFhk5H+LOPLqYMG4HKQ==
-----END EC PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
index be15a3904..2ce093743 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
index 01225fa25..934284c55 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
@@ -1,24 +1,24 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 54 AB 24 D7 17 24 35 C3 70 17 8C 26 6E 6D FA DC E1 3D B4 3E
+ localKeyID: 7C 00 CE 8D B0 88 62 F0 99 9F 2C EB BC 55 93 08 1E 5A 68 12
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDsYoP8ERKZ5qk6
-6VaxcN9j+gMpWrTWvb8pCeXYBu1kExGJt0Q3JhaQ1ZdpCsvP7RnVbCUOdAA6dJdl
-p2Dr4kIhkI61Zi4UQibH3+d+ACWhWvLW67dAQXxLKCMs2DGIJIV7DautDGieWQdG
-CLh9zHxbzMGu9ONsE0qbDKwCvKCdVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4eiW0/mMuTie8
+2SGTxGUgJzk6g4i+lBTH32/keXRs32I6ZGnjkiadxlHY1zBUrQknkRT1RtFYULKa
+/TlutUGYo8RRjyOQGYNFl2fm3iRg1+QryqxVjTs+/6LIa6LNFskOyShNDnvJWvet
+MRMyesL+YBbSWhs4qucdCe5ePhrJ2QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEAoPX7ejjfYyI4
-gc8WA8+Roe49y8t36ARgkdKrbaSUxmKl2g+fbL4vGohVR0nRu7HWx6XprJZhzEHc
-7gU4ouoWsILKXVEScYStuhFVJhvGBjAsqIc2/X63J4KK+9KWK2NvGmnQIx7KVSz9
-Z9nZjwzTr2KmXkJmQTtxsLcT8xu8TfM=
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEANFJm83U5YcMW
+cE8GUb69Ns6b8aM83db/xXNIlIRp2dignWGMwS+uVHj2RadakeoLltwnuht/6X2C
+UnVXEyNAEfUv0tchc0GFY2u2jH/8IRNb6L0JInIlsk6GohuzTJ7K0f1L2RWKVmzM
+K0fWhbJovbkZ03cylUtKAQd5C/XOR+8=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -26,17 +26,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -44,14 +44,14 @@ subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
index 3807aacac..94b86b974 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
index f13ec24e0..e27202b94 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
@@ -1,36 +1,36 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 54 AB 24 D7 17 24 35 C3 70 17 8C 26 6E 6D FA DC E1 3D B4 3E
+ localKeyID: 7C 00 CE 8D B0 88 62 F0 99 9F 2C EB BC 55 93 08 1E 5A 68 12
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDsYoP8ERKZ5qk6
-6VaxcN9j+gMpWrTWvb8pCeXYBu1kExGJt0Q3JhaQ1ZdpCsvP7RnVbCUOdAA6dJdl
-p2Dr4kIhkI61Zi4UQibH3+d+ACWhWvLW67dAQXxLKCMs2DGIJIV7DautDGieWQdG
-CLh9zHxbzMGu9ONsE0qbDKwCvKCdVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4eiW0/mMuTie8
+2SGTxGUgJzk6g4i+lBTH32/keXRs32I6ZGnjkiadxlHY1zBUrQknkRT1RtFYULKa
+/TlutUGYo8RRjyOQGYNFl2fm3iRg1+QryqxVjTs+/6LIa6LNFskOyShNDnvJWvet
+MRMyesL+YBbSWhs4qucdCe5ePhrJ2QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEAoPX7ejjfYyI4
-gc8WA8+Roe49y8t36ARgkdKrbaSUxmKl2g+fbL4vGohVR0nRu7HWx6XprJZhzEHc
-7gU4ouoWsILKXVEScYStuhFVJhvGBjAsqIc2/X63J4KK+9KWK2NvGmnQIx7KVSz9
-Z9nZjwzTr2KmXkJmQTtxsLcT8xu8TfM=
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEANFJm83U5YcMW
+cE8GUb69Ns6b8aM83db/xXNIlIRp2dignWGMwS+uVHj2RadakeoLltwnuht/6X2C
+UnVXEyNAEfUv0tchc0GFY2u2jH/8IRNb6L0JInIlsk6GohuzTJ7K0f1L2RWKVmzM
+K0fWhbJovbkZ03cylUtKAQd5C/XOR+8=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
index 94d6ea92a..2f7ad66f6 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 54 AB 24 D7 17 24 35 C3 70 17 8C 26 6E 6D FA DC E1 3D B4 3E
+ localKeyID: 7C 00 CE 8D B0 88 62 F0 99 9F 2C EB BC 55 93 08 1E 5A 68 12
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI40010BUifWsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDqKW0SC4xirBIICgDqh+8Fo2XKp
-VvZ6XNhceWefUKoO1tteaWXOj6ERkcLs0f0lzqTiRuNvP61XEJX6qggj/M1zXzSC
-2gFKyPj1gPyg5etPsUQNJcp4rIY13WxY/0B0e2B5X63Bbbojh4H0b/B1MTdl8KU2
-OAfQtTE2HiXtAbvckWpScAA+mcn1DPJBavHD1nyWUU1JfJguVP+vRoGBIlIQGyNw
-03XJHUNBeu5+wdSgysI5Im8JKDKgUFMRrHjvLPEgy3+fE4NRh7VyhLg0laHNvpvP
-LTwKeMTAo8UdDKynUMOIioK7nwcoqcbE69lYDuk1ZmyQhGHsKlhqsDXnrI1TxNaz
-sdRI3G8GhK2OhxZTdqRW8lRWoKCBk2+MpdUg1tcnQ5YBLEeo4iNvzU6Vdcgm8nNK
-8W3aDtx44mEYOdfu0ujxMrZ3Bk1PzTSUzNQeo8oqzZzmtYCHshPwCfDTSWGb0fV5
-EBtJGgzG0dYrIZIrXNPnay38En6spPbu1kp3eHRkcacBQYvvmTJSloIGDvpql0q4
-2cDuAglLxA/C1iE7f065PzBM17rsIWa2cwVKF7f2t3NSC4GRsj4XWcWSRh3WhSbA
-7bMRYp5KEX6CWRh1XPFUZmK/2I9lMMFvLYoxZIG8xoG9pxfLrqG9loxxZt21Hduw
-QXJmt2uFso41B5qBdsvT1Rat4D2/RRR8yWD7TeuPEubEhIkMnwZEz50Ylr6bw33g
-qf1So8BFDCs4LvyXaN/6S3SZqSgmv99bYVYbeeLUWh4GC54jbOwes2ftlPeYqAvA
-ve85Atjw6tcCYGZBRSu9x+8vNY/+3vUXnTiJKuT14xljMreU0A9DtH4veswWxAAB
-xaDgBFTXRaQ=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI3J+3s+e9z+gCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECG8s78a38VBCBIICgDbjWmwPBL8k
+MHO6+ZVHOwWO6KB0/PeTHby5geW3rKsJm2wZtv7/BoR+nTCZ/rqPhezJpuZNVVkU
+sM35U3roLhxBzF3oTGQX0Chs3KluQyrwJY4+t6mM8zzomHrMOWcYWGf4XKFjnyPr
+7sEXcTgc/DqMXQaQZufuRbQRv+QBn9cb51+gUCKfDKKMx07w+/UNOFAxCbKEOk3D
+4YRzVESZHldZSq66oR6TiPP9vZXZ89o4GS1RCFqJbLMMIvVysFloYIDsY0PMmjxh
+jDVPiAjzyqRY1G5E8bIVDSNPYhuRqR8LeH/LJa0dNEELqQFhRJrZzupl1P12Gm8b
+BOx0lXDKrnQIW3IgbjA5UsQ8+xfQXa4k7qM7y9ZDHVB4KmrSqhhwwYaIgsjzQt4Q
+q/FyRoj/4uYxm1SPl2fJ0TwvwCeSJvyaZwgfV19hzaihnCV3MHQNfTPppP7AnpcB
+xKLObc6JZsUTYF9W5V+H0zIVFmYYIQLCaeDnaYWAITX4SXlYErl1vOnAryNhq3c3
+hrD429QX98vq5NRqhQ9n2aprHXoU/ZM1VH2ux5SCWR/hHkkcK+7Um8q02gTLYTxe
+GDgBm1hFCoEBRD2jG9ubfqEI3Q8GKKkk0Z6dCmBhKPmzs/Vm9zfgXM9ZX1hkRQsX
+QezAasEHvrppqC1hKlaqeZ6MATALKypInuSS3H0E8DDVebV9Qb9m4XJsPKPEblBV
+pRR7kfzgMxJUZ6ieXFEVrerfQpwNpKrBP98hbhmt4zMg/qs3BIdzK52KPoUAN86d
+ldEX+xwFYAchoUm832oqfQY1DeATx+JuETwpqT+brg/6JfH5s234Q/CiY98Ky927
+S/h4f2j2lA0=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
index 5275bbdb5..e103841f8 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
index 988af29ee..71dfe2dcd 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
index cc589d7f9..833f4ca5d 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
index 988af29ee..71dfe2dcd 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
index aa24f11dc..fe57e201a 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
index 30dd1a6ea..7989c46dd 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
index 30dd1a6ea..7989c46dd 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
index 6b3f07498..0b6491f3e 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
index 5a713fa9e..e6a05717d 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
index 5a713fa9e..e6a05717d 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
index 655da115f..177b3c8fa 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
index b57630cee..8c523d285 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 54 AB 24 D7 17 24 35 C3 70 17 8C 26 6E 6D FA DC E1 3D B4 3E
+ localKeyID: 7C 00 CE 8D B0 88 62 F0 99 9F 2C EB BC 55 93 08 1E 5A 68 12
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDsYoP8ERKZ5qk6
-6VaxcN9j+gMpWrTWvb8pCeXYBu1kExGJt0Q3JhaQ1ZdpCsvP7RnVbCUOdAA6dJdl
-p2Dr4kIhkI61Zi4UQibH3+d+ACWhWvLW67dAQXxLKCMs2DGIJIV7DautDGieWQdG
-CLh9zHxbzMGu9ONsE0qbDKwCvKCdVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4eiW0/mMuTie8
+2SGTxGUgJzk6g4i+lBTH32/keXRs32I6ZGnjkiadxlHY1zBUrQknkRT1RtFYULKa
+/TlutUGYo8RRjyOQGYNFl2fm3iRg1+QryqxVjTs+/6LIa6LNFskOyShNDnvJWvet
+MRMyesL+YBbSWhs4qucdCe5ePhrJ2QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEAoPX7ejjfYyI4
-gc8WA8+Roe49y8t36ARgkdKrbaSUxmKl2g+fbL4vGohVR0nRu7HWx6XprJZhzEHc
-7gU4ouoWsILKXVEScYStuhFVJhvGBjAsqIc2/X63J4KK+9KWK2NvGmnQIx7KVSz9
-Z9nZjwzTr2KmXkJmQTtxsLcT8xu8TfM=
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEANFJm83U5YcMW
+cE8GUb69Ns6b8aM83db/xXNIlIRp2dignWGMwS+uVHj2RadakeoLltwnuht/6X2C
+UnVXEyNAEfUv0tchc0GFY2u2jH/8IRNb6L0JInIlsk6GohuzTJ7K0f1L2RWKVmzM
+K0fWhbJovbkZ03cylUtKAQd5C/XOR+8=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
index eba0cb74a..2129c7664 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDsYoP8ERKZ5qk66VaxcN9j+gMpWrTWvb8pCeXYBu1kExGJt0Q3
-JhaQ1ZdpCsvP7RnVbCUOdAA6dJdlp2Dr4kIhkI61Zi4UQibH3+d+ACWhWvLW67dA
-QXxLKCMs2DGIJIV7DautDGieWQdGCLh9zHxbzMGu9ONsE0qbDKwCvKCdVwIDAQAB
-AoGAH0Ua+5XQlZ5PRbVHXBq32nRgxbAzmvKn3ohqKM0lyybAm6ysL/VwZ8FxkZo1
-gvB1CegP8N0EiLcSrgZZymp4X9IvRmNKmuBekSL/6NCnChq/P4F9IJSEziCm7dTK
-8B8da3y6TWZk8ic0WNiIn1AUJSS470f7xxXhmkfjTXGNk5UCQQD97R4WjyF9dRm8
-DqwnV7odWSUCeqFeEb0tpPB6lHZ2vud6mJr/3OBeIjaufpUG1Z3kSFIDCfq9so/F
-jEiIwWq9AkEA7lC5ajJwk5qlyApf4O3Uwwuf2OOALI/+KOGWAjL9RdkLMPxrCwPR
-0ahkPIz6dDKGTyxHK23HVRJVNBcUlG4zowJAZoo3aUK5cnE0SDXgnS6W8L0L7flZ
-aqRdMa52kfmb8Q3caixwAzzNuhW04TgqtAzVatctjx6bi7ksx8iDjf4VPQJBAJzw
-7logY4DhDCIDqwZ+uWnFQvxbPfKa1R7pCJfkKmUQPU2CPaAgYNH4WiKCGQHisA59
-s1THU8kTbKcEOBpTxI8CQC7/PeKUYnOtGS+dq+0D9w7Fbncjs/Z99lI5vHmuHpQe
-a1BzvuZSh3KdQTHGoGRrDFfE3jt5n/xXc6+PcSyEZ54=
+MIICXAIBAAKBgQC4eiW0/mMuTie82SGTxGUgJzk6g4i+lBTH32/keXRs32I6ZGnj
+kiadxlHY1zBUrQknkRT1RtFYULKa/TlutUGYo8RRjyOQGYNFl2fm3iRg1+QryqxV
+jTs+/6LIa6LNFskOyShNDnvJWvetMRMyesL+YBbSWhs4qucdCe5ePhrJ2QIDAQAB
+AoGALI1XWPBM3KyEXU/lE45NS+gdIpwMpNYXdLPqDngknXyPeQGyLwMnb1grgR5r
+LjAB83vO33OkcFtA3zyDp9B/kCe9djaSVf72THqda1Ok41C73mL2r1EayD/8VzDT
+3jrhrBJxdvknDCa6Fxs1foTsptoF4/kd14zsrSZGNn+3yd8CQQDsCuZztof/Nt/J
+No1zIkwx+8lNBjnvK5rd5hkKpvLFggYBK3QYNJlf0FcGNEY03QVIYyBn4lJauZAZ
+iwyi1hTjAkEAyBMfTBoWnUo7NBnhls4MX3chOMkIK8/PsXHodq5HkDSatnIrcxAm
+MO34AON46y56ccHIdfcwRCgdYITiYF1fEwJAAdnsCMhLtMK3apqU7Ww9cL7qy0Hb
+Pnb3FfpyA9VfXhEw/t1aYb433bqClDfgvRVmrzSn0mjCAJgn+ytOBBDtxQJANjTY
+GepHjj36ZFdOw2j3+TVxjs0IpbYb81uFPAJj6TIXaK7uDrKlZkRTGQqITE+/ZOq3
+wR5DuXOU4f2ex7UEeQJBAJT/Mctxaugf/WRHkdVudztANceRgmqlbsbA4w9yQsCX
+tORhqutv5/KInqix8N7MSAWWvVfOJR/3JPvdvCY0OQk=
-----END RSA PRIVATE KEY-----