summaryrefslogtreecommitdiff
path: root/test/aux-fixed/exim-ca/example.net
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2017-12-18 15:38:54 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2017-12-18 16:23:07 +0000
commitdc9c8f8b52cbf2e8424f5e98f63d29aa7fb81fe7 (patch)
treea76e6042d7fb65130815dd36ddae949fcf7a0a97 /test/aux-fixed/exim-ca/example.net
parent242583694aff4f43c3dbf7581b1100a68b3e0c11 (diff)
Testsuite: move CRL testcases away from using SHA1-signed certs
Diffstat (limited to 'test/aux-fixed/exim-ca/example.net')
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/CA.pem20
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/CA.pem20
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.key30
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.p12bin2941 -> 2941 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.key30
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.p12bin2319 -> 2319 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/ca.conf20
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.Signerbin0 -> 234 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt1
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem7
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.emptybin244 -> 244 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem10
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2bin293 -> 293 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt6
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem12
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/key3.dbbin24576 -> 24576 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/noise.file125
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.respbin950 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.respbin962 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.respbin414 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12bin3087 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12bin3087 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.respbin950 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.respbin962 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.respbin414 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12bin3087 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12bin3087 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem62
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem42
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.respbin950 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.respbin939 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.respbin962 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.respbin414 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12bin3165 -> 3165 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem24
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem58
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem38
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.respbin940 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12bin3117 -> 3117 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem20
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key26
134 files changed, 689 insertions, 694 deletions
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
index 8c96a754c..8b2c0a5da 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
@@ -1,13 +1,13 @@
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
index 6eff4f448..6513c9044 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
index 718cb4bac..d93fbfc5a 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/key3.db b/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
index bc0e01a58..78fa4ffbf 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.pem b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
index 8c96a754c..8b2c0a5da 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
@@ -1,13 +1,13 @@
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
index d36c42abd..2d9720449 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
@@ -1,20 +1,20 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: 8F 0F D1 D5 09 5C 4F 25 B2 F7 87 F9 41 6F EE A3 F4 3F 73 3E
+ localKeyID: 62 C4 3D B8 CA D1 AA 6D 04 AB 53 AC 8C A3 27 B1 3F D5 40 55
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKPP31MJNhuRdxqi
-9tLgMo/B7yj3v5elVjw54P8igL0joDp4fM2U5dDQlArRVm59hDHew7WwTmlrLS65
-rVKNXSSUPt3vLebTPY9ad72TaUaeGKsKOiEAvzVVcUdW8+8HeDq6NEHI9nacRYNc
-Zb5jrckXPTU8f0Cvob0VTikeUu+LAgMBAAECgYAB+JwsVWqkQq5w0JzKhTSDWSCo
-/1b72sGpFqoBblRBC/uymGtc1SAK0Jrnbzg5OvA4FWeJEsA7mBso4JN+vQEg5mpv
-/DSv00AJnv9BdJ33+/AMAuL9BLN3sVQDzuW/cIN0rPVhqZc0fBZhaivViperUdiJ
-wFxnH19u5B/dGsNMWQJBANjfWjtQEBbCKrvYlRGl35yuL7SnhiVQ7dF2NUTX0HIO
-3iwYIW5XB6oVmA3zsbFVurfTikThkQvlx3EK3r7tcPcCQQDBXdN7SxkLmv0NfS9u
-JeS7KCUR/FV8786gUXEVsewd6xXpcOlvs5nEQ47u/VetNiD4CHnJZ3JLD4/7iXcY
-86UNAkEAmcRLUtCih7Bl4khe8WNdl9a9BmbdKyolZKVegZBPP/+gsTzuvzA/w+2J
-oSLPM4AoYlw/pjUUxY3HCjR92Hu74wJAcCs+X5oruCi7PJTu66V9rvfVsT5AVQ5D
-PYqg3+XrQ1u4xUcjkxGLVGegRZCeyLLKozc/do7UpSgs7MxMUyQbDQJBAL02YM/i
-ctKBDAvEfg0KcBhrqjVexfdhft4Z6BY7GBqqrsQePzV4bz5dR0MdlP++JKdokCl3
-vlOy8LJ4asnRG34=
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALftYoVnXB0Ntc8L
++QFPfvndGjDy2YDm/5px+S+3149TTdDiQubE4sxJTcL8IXmU5SgA3/A4yL+poebM
+dRGVap4eMSCOdpAEURRAidhkYQrr2iiPpgU5WG30Q4Ae+14ZB/Dp9jXy/Rrjv6HJ
+aPUaYTy7iTRo6hxvXxdm1lpvHCz7AgMBAAECgYAGmeLO/HOtU0Pdg+lEQ8ZAGF6Z
+t82RfnHLIgRE75sxRuTkaDUiQZoNUHkVqaVXsoTlnsNOUtYShLBi9oJ3VPrw41RF
+x/sbwtAl8O55Ps4mHOS87ERsVwJBIL4luBXe6nuUJN3tA6UUo1y6t1AxVdcKQXuw
+WO0JnB33oNTDuo7UgQJBAOmVxKpFQeGeM0F1bu5jap2UrzMSrK78OwLmif+vHRlv
+sYFSfUXaEnw7RSrgtBNWb7tUw5i6RusrbRLpLVHOjzsCQQDJk7puqL26RasNYIf9
+bWyaV2qF0u0R6HoQH1IaBYJAOie68B1cvkpM1fhQYlT0Fm+iEM755xJaMy9mD0ph
+jn1BAkA+wvARtAQso/4vo2cIBIxcBNxCQ81EQx9z+w+vNJUEBZ/TGJ/ySdLXsHE4
+QSIBZCMnWXIosjxl6cgn4aE8rtyLAkAq5EVCMKOWVCauhQDKuxLl0H35FcWeDuKS
+Nafpo4xwkC9OBrOovVDgApOAvzumaHO+f2cbI8Dy8ns+czh3g7NBAkEAltBUuf9J
+M8pYnjy9NJL0zbJA2RrrWmMxcTOuYnAHlOzjKYqSjdigU9dAZB4HzNJMlML28tFs
+WZhVV9Y4ZxUvuQ==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
index 8ca93749b..7b1763930 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
index 347bc47ce..bb5fd8608 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTJaFw0zODAxMDExMjM0MTJaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
+MDExMjM0MTRaFw0zODAxMDExMjM0MTRaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAKPP31MJNhuRdxqi9tLgMo/B7yj3v5elVjw54P8igL0joDp4
-fM2U5dDQlArRVm59hDHew7WwTmlrLS65rVKNXSSUPt3vLebTPY9ad72TaUaeGKsK
-OiEAvzVVcUdW8+8HeDq6NEHI9nacRYNcZb5jrckXPTU8f0Cvob0VTikeUu+LAgMB
+BQADgY0AMIGJAoGBALftYoVnXB0Ntc8L+QFPfvndGjDy2YDm/5px+S+3149TTdDi
+QubE4sxJTcL8IXmU5SgA3/A4yL+poebMdRGVap4eMSCOdpAEURRAidhkYQrr2iiP
+pgU5WG30Q4Ae+14ZB/Dp9jXy/Rrjv6HJaPUaYTy7iTRo6hxvXxdm1lpvHCz7AgMB
AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQDEbNnKgxSgWPLFBxGjXTGItRT4NUj5pgiyGknHcJY6
-oErI/JYcmuLjb5pWhUL164QSe8qZahKwkJSF5p7Di+KsThJ/KzSOWsvGnYyPObmY
-EJJ015teZAfDOESrgdk229VIIt0FNK6bypaZPal1etgclAdPRk+x6xGvyssrVa3S
-gA==
+BgkqhkiG9w0BAQsFAAOBgQBe5cUVti0qB57EzmjbPpAlNQfO0mTNBauVY9LPBWIJ
+LItwQ0IZ4FtI+RqHdfmdREpl9Lac+qJ9xfOu/jnpGxMXiCrJ3LhR6M0chRvp0QgP
+0Hrsi1fhwLOaPLPo4uZHsIAiWMyGGJBD6k3g+pNfPp59z/PavNPH6m9ksqEPdzPw
+AQ==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.key b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
index c384a09f2..62d9269ee 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
@@ -1,20 +1,20 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: 31 2B 18 B7 AF BE 4B 4A D0 18 7D E8 01 96 53 29 09 2F C8 CB
+ localKeyID: 5A 0C 9A 97 E5 60 5D 52 7C D5 94 4C EF 06 96 C2 76 76 98 57
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAM6+EJ2LbxoEH5Kz
-poFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE1ew87+OzSqJdG837h4aq
-bk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2hJdshyJLHuHD5HbM6bO2A
-76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAECgYBGuQgQDMnF2ZE/awtThKDt1X10
-rAMRHGOoPGPZ9xuEgqBkbEp9et8pF9xnFUHk3XemqgenATjovtm+vICdkKJ4z+T/
-po5jM8A1ZlIRdEVBkDpS9BMg6unuzZ6XWlcLfygvkFfJQLI/kz8BX3OCKnba+hlZ
-98dHU543V4JX1xYGAQJBAOoNYYl251aXLSSIrEAonshadx0VrqKfqUDd6d5ExkNX
-/+Z6TWzYtJZP2uUzwyW3crMSsx3sX51cPwr7D7IGcxMCQQDiIRa7i41WLdbVCq60
-TkVNyoNBA5o7SjXlSTw0/roQSWvsix5BZs2LrpOUVfkLWDHur0sX/TteUhUDMHIp
-iIkBAkADCgdxNIUOf8oLRmcOMjjVmy8expBM9kvJVthZlYUJjNP61y24MxwtM35B
-KanoDHjF0IFY6x/WuELtTpNGmYTXAkEApfw33Y6APqQDL/pZZwyVHpbqZYypZ5//
-k8CAKz5XgaEDUWyE1ukJM+D/f0DkQAmLDXMqof9F1uRVfDPReN86AQJAOSIO8LJe
-yQzDCSbpoMxhX6EE3svNMNKiast0F7OazRKXJi/IiXMlSMQ5g/8kFkYo952JcenB
-RCEU15p4E1IMTg==
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKFOi+80c9pb3Uid
+QJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToyPruZ9yLq26a7c6sLYqEv
+pHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8PhzYl4p3M23rQzNSXcHC
+xcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAECgYA36Evq3+CplX5oLQyWlTFrPKfF
+GX00SvEy66r3J2QvPCQDtNalOiftPK07+O8yQWZdJU51BvJLnboVCLi3HC7N3QOK
+aDAXgBGzIGG3DzccIybOc4pur52PkuCmVSM0Qq3tSx6sxPmEWacBgWaiFGGu15AM
+o/OhlI+mfP1RK4jIYwJBANXq4uNiGIACfHOUpQxcD8yQL16E92/CJqE4LyMemG7U
+eHzfYdLDlhlOPlZTgcf8NycnzYkiruXLYzmewtBvyisCQQDBCiEoQWviGwTNhSvV
+aZlLmbo6uzDweKyq7RyBHB7RacOwHQ9/ZigMiHtSQKxXZBhNOnXM2EyOfKDMsttm
+RCCzAkAhV64rsPOOqFSLk2Sya3sO8H5hpioHImTxBhfayn8J71YkaJEPz+qKYTa4
+L+XvrPFPyhVwRZarPKtnpMZKxNHnAkEAmnQVZZU60bXWmO6FzQLqAeBlblqaZL3Z
+QgXn+bHbQqlCRuZpoQDG6IhHS9+tRVs0So6M9LLYRmWXb1FoVKIMGwJALCHxYw/a
+EUsckc2aw+mI3nVKr2hkJRRbn2px0uWSzXY6i76EMw/X58SKsTQDGxX6oZFRQGW0
+TITUGwqrFxFV0A==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
index 25f50f985..02367d9eb 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
index 6eff4f448..6513c9044 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/ca.conf b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
index dc948f87a..09e83063d 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
@@ -1,18 +1,18 @@
; Config::Simple 4.59
-; Thu Nov 1 12:34:11 2012
-
-[CLICA]
-ocsp_signer=OCSP Signer rsa
-crl_url=http://crl.example.net/latest.crl
-sighash=SHA256
-level=1
-signer=Signing Cert rsa
-ocsp_url=http://oscp.example.net/
+; Thu Nov 1 12:34:14 2012
[CA]
+org=example.net
name=Certificate Authority rsa
bits=1024
subject=clica CA
-org=example.net
+
+[CLICA]
+signer=Signing Cert rsa
+crl_url=http://crl.example.net/latest.crl
+ocsp_url=http://oscp.example.net/
+sighash=SHA256
+ocsp_signer=OCSP Signer rsa
+level=1
diff --git a/test/aux-fixed/exim-ca/example.net/CA/cert8.db b/test/aux-fixed/exim-ca/example.net/CA/cert8.db
index e3ef1134e..5aa6b374c 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/CA/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer
new file mode 100644
index 000000000..5fdfdb5e7
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt
new file mode 100644
index 000000000..8f00adf1e
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.in.txt
@@ -0,0 +1 @@
+update=20171217205108Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem
new file mode 100644
index 000000000..6f4ab63ab
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.Signer.pem
@@ -0,0 +1,7 @@
+-----BEGIN X509 CRL-----
+MIHnMFICAQEwDQYJKoZIhvcNAQELBQAwLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQx
+FTATBgNVBAMTDGNsaWNhIENBIHJzYRgPMjAxNzEyMTcyMDUxMDhaMA0GCSqGSIb3
+DQEBCwUAA4GBAGWZ1eVxdihOylK+Mts4bHZn1mIy4brvfqJk9kwwblJ0tJj0u7PD
+32XxwBxOgDOW9KCYC+xL2ObsUe8aRax8c8bpLzLrDm1DOMNqL7WULOeoid4UWLZf
+Qd+NclW3/1aa9oUa2RJJ45rIfTDRB7c3wr+0YkD7cX9oMtJ3IgGctR7s
+-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
index 5a5ba97d2..565cd2016 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
index b76bfd547..dc66bdfc9 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171216204807Z
+update=20171217205106Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
index 38d2071a9..a1ec2e518 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
@@ -1,8 +1,8 @@
-----BEGIN X509 CRL-----
MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQx
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MjA0ODA3
-WjANBgkqhkiG9w0BAQsFAAOBgQCvhjEkEZK5RItu+1xMobalh89/01wCeTBkc1JT
-TJPE3yCIAftOcJPn+9FXhixVTojkgLCNYk8RlTvD7cBWT98D2dIcRtHAQjDkciUN
-daBLCzqcH4OxN0tNBVgY8mf0Su2vW4+PDlMZJAmdGXf2BwmW00IExPyoxJCYmsfw
-p6rIyg==
+HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE3MjA1MTA2
+WjANBgkqhkiG9w0BAQsFAAOBgQAFrYL7zpUpEIizo66Gus5y9BeRPUeHFOc5YVL1
+sii6FqIrDtBJZjUvf+11ED5sdVrJN2T3rxbDPpm6NyBHjW7Tz69Tx1FjyMpRhkTC
+XKMCZIjysxYiteO7dcHgpJ4jHxO6UHd61CCOQKbX79oRF4Sfa2ABAxcWBsO0Ce/C
+/bUP1Q==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2 b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
index 96d582826..24335b8cc 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
index 9c5883f64..7c2dcd446 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20171216204809Z
-addcert 102 20171216204809Z
-addcert 202 20171216204809Z
+update=20171217205108Z
+addcert 102 20171217205108Z
+addcert 202 20171217205108Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
index 8d881b9ae..4c30664c5 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
@@ -1,9 +1,9 @@
-----BEGIN X509 CRL-----
MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
-dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYyMDQ4
-MDlaMC0wFAIBZhgPMjAxNzEyMTYyMDQ4MDlaMBUCAgDKGA8yMDE3MTIxNjIwNDgw
-OVowDQYJKoZIhvcNAQELBQADgYEAJ6In6PZ0YboHucwFUV9txmFltNJa9ZS3a1Nb
-1vgdGfyu9XVHBQiTHp240+XFMC3sylp5dKTCfZfyOxNux/woGirrjJrqPZt6kdFW
-zevWKDhvnRXPxLySSzgzCw/27QQzi6K5BHi+XP5HcRLGj55c0Of97mm8J/qnsin4
-nEH5Dks=
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTcyMDUx
+MDhaMC0wFAIBZhgPMjAxNzEyMTcyMDUxMDhaMBUCAgDKGA8yMDE3MTIxNzIwNTEw
+OFowDQYJKoZIhvcNAQELBQADgYEAaKKqlVNZJTNZ2EjUoAB3C8SO2sXomGeNrJZl
+xvm/9QkGbxDOcjjpWEBJ8ffcg97m/sT9WY9dseofUN1sAzm2xoNB+VJkLFBbhJH0
+rqJZLCTUh9LG0c7IY3/Rrb/AEUVl/5+XvDdtc+QJo8ywY+oVB7ccW1iEvjtzfg1G
+n25kDno=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/key3.db b/test/aux-fixed/exim-ca/example.net/CA/key3.db
index 377905cbf..9ac925099 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/CA/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/noise.file b/test/aux-fixed/exim-ca/example.net/CA/noise.file
index 74acca58b..8cd258c7b 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.net/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: 28375 2779 1798 1410 3672 2918 1756 1165 IR-IO-APIC 1-edge i8042
+ 1: 69775 6441 4183 4351 8821 6710 4808 2655 IR-IO-APIC 1-edge i8042
8: 1 0 0 0 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 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
+ 9: 116958 16080 12437 10549 27759 16386 11560 7036 IR-IO-APIC 9-fasteoi acpi
+ 12: 5146732 362636 240016 241533 534196 383274 265445 167959 IR-IO-APIC 12-edge i8042
+ 16: 3 0 0 0 0 0 0 0 IR-IO-APIC 16-fasteoi i801_smbus
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: 5099 2645 2048 2133029 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 307576 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 1528276 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: 6160879 6212197 6080647 5762425 6022590 5959545 5961613 6075333 Local timer interrupts
+ 122: 40662 2645 2048 8326184 3083 2651 2210 2042 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 123: 50 3 7 1 9 3 5 0 IR-PCI-MSI 327680-edge xhci_hcd
+ 124: 269 24 28 20 104 171 22 48 IR-PCI-MSI 2097152-edge rtsx_pci
+ 125: 38 0 0 0 0 10 0 4 IR-PCI-MSI 360448-edge mei_me
+ 126: 2 0 3 0 1 2 24 0 IR-PCI-MSI 1048576-edge
+ 127: 2247 56 54 23 3782468 37 26 18 IR-PCI-MSI 32768-edge i915
+ 128: 77 0 0 0 2 32 8 1 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ 129: 18 2 0 4 8 0 4 24684 IR-PCI-MSI 1572864-edge iwlwifi
+ 130: 658 1 0 0 0 8 5 13518768 IR-PCI-MSI 520192-edge enp0s31f6
+ NMI: 607 2649 2621 2522 2484 2424 2424 2470 Non-maskable interrupts
+ LOC: 29013600 29908567 29752721 28952298 29023548 28520116 28468408 28815966 Local timer interrupts
SPU: 0 0 0 0 0 0 0 0 Spurious 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: 2767471 1298401 589844 442459 433552 428642 274114 316935 Rescheduling interrupts
- CAL: 346242 329420 331874 336846 344965 333344 332836 336492 Function call interrupts
- TLB: 99587 89302 89373 92699 93692 88842 83748 88761 TLB shootdowns
- TRM: 3458 3458 3458 3458 3458 3458 3458 3458 Thermal event interrupts
+ PMI: 607 2649 2621 2522 2484 2424 2424 2470 Performance monitoring interrupts
+ IWI: 6 4 3 2 10 4 3 1 IRQ work interrupts
+ RTR: 18 0 0 0 0 0 0 0 APIC ICR read retries
+ RES: 7885527 3950261 2715187 2193513 2473698 1957554 1665356 1987982 Rescheduling interrupts
+ CAL: 987291 866818 901402 885321 915798 938469 935939 966681 Function call interrupts
+ TLB: 231525 195523 218511 215448 205509 204323 194087 201607 TLB shootdowns
+ TRM: 1627777 1627777 1627777 1627777 1627777 1627777 1627777 1627777 Thermal event interrupts
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: 87 87 87 87 87 87 87 87 Machine check polls
+ MCP: 202 200 200 200 200 200 200 200 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: 171612 kB
-MemAvailable: 1949360 kB
-Buffers: 25320 kB
-Cached: 1900320 kB
-SwapCached: 9076 kB
-Active: 9045324 kB
-Inactive: 6504092 kB
-Active(anon): 8608644 kB
-Inactive(anon): 4972928 kB
-Active(file): 436680 kB
-Inactive(file): 1531164 kB
-Unevictable: 48 kB
-Mlocked: 48 kB
+MemFree: 934856 kB
+MemAvailable: 13704060 kB
+Buffers: 452228 kB
+Cached: 12441152 kB
+SwapCached: 101680 kB
+Active: 2599816 kB
+Inactive: 12195548 kB
+Active(anon): 1356404 kB
+Inactive(anon): 588700 kB
+Active(file): 1243412 kB
+Inactive(file): 11606848 kB
+Unevictable: 64 kB
+Mlocked: 64 kB
SwapTotal: 8212476 kB
-SwapFree: 7958012 kB
-Dirty: 11360 kB
-Writeback: 0 kB
-AnonPages: 13615968 kB
-Mapped: 393344 kB
-Shmem: 322824 kB
-Slab: 237008 kB
-SReclaimable: 127500 kB
-SUnreclaim: 109508 kB
-KernelStack: 14352 kB
-PageTables: 95220 kB
+SwapFree: 7376112 kB
+Dirty: 10832 kB
+Writeback: 4 kB
+AnonPages: 1871576 kB
+Mapped: 415968 kB
+Shmem: 290116 kB
+Slab: 351256 kB
+SReclaimable: 257264 kB
+SUnreclaim: 93992 kB
+KernelStack: 12848 kB
+PageTables: 58588 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
CommitLimit: 16359228 kB
-Committed_AS: 29506660 kB
+Committed_AS: 7868784 kB
VmallocTotal: 34359738367 kB
VmallocUsed: 0 kB
VmallocChunk: 0 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 8423424 kB
+AnonHugePages: 0 kB
ShmemHugePages: 0 kB
ShmemPmdMapped: 0 kB
CmaTotal: 0 kB
@@ -297,27 +297,14 @@ HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 427496 kB
-DirectMap2M: 16211968 kB
+DirectMap4k: 523752 kB
+DirectMap2M: 16115712 kB
DirectMap1G: 1048576 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
- 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: 191748506 170914 0 0 0 0 0 3922 42697681 129935 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: 2455626 14797 0 0 0 0 0 0 2455626 14797 0 0 0 0 0 0
+enp0s31f6: 9760816648 13664538 0 0 0 0 0 8965 118421394195 83833297 0 0 0 0 0 0
+wlp3s0: 3643580 7768 0 0 0 0 0 0 4732829 8244 0 0 0 0 0 0
+ lo: 9996035 41708 0 0 0 0 0 0 9996035 41708 0 0 0 0 0 0
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: 31723072 82878 0 0 0 0 0 0 119518666 124425 0 0 0 0 0 0
- vnet4: 327621 2427 0 0 0 0 0 0 1590733 6985 0 0 0 0 0 0
+ tun0: 20139456 21861 0 0 0 0 0 0 3370846 19686 0 0 0 0 0 0
+virbr0: 47538577 146404 0 0 0 0 0 0 164360816 210422 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
index 7331ebeb2..3beef64e5 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
index 7cb8f0a19..bee4de063 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
index b6a7c269a..74e2dc7b9 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 20 AB B0 6D DA 38 DC 2C E8 14 97 C9 34 53 9A CD D1 B3 FF 5A
+ localKeyID: 01 11 9A C0 58 86 76 AD 43 C8 AD 6E B7 D8 88 6A 00 8D 27 AB
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTNaFw0xMjEyMDExMjM0MTNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCeodbLOpgOlgQW
-61h+HDyH0WA0uAUBWpbVU/s3JRVoNz00IPr4eCsIScaEG2v5JpD5PgkIjcxADYVw
-hWPx79RCWIM6aRtQ+MfW1FWwdASnF+mvqlnpAFuD9YP0N15Z/S45qTr6+M1irXYg
-CG/8+6vpw5V8IQYqLvwUmIvdpyjlfQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTVaFw0xMjEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwzxfp2vYw5w96
+4Eq57WBMZdmZZ4B27eqMV2gGS7fINlWoUqR6JsClfrBJ5A60LjsvPF2ccr9uyG6r
+mLlarc0kXBREXRpZdmcxX04MS7lu/1TnGem170ZzldtTXV/Z7UHukvDID+tYV2X2
+aTQblO2JbE1+9F2tXILc9TSX9fbBNQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AKule3gU2qMfFdZdJz4ZX0I882dt26ccqUhn9gdlxgMgxyygUEjNa1aQ2Fw95CEa
-zRuCuXh8kNQe3A7Oo6aTDqdtFDRU3yfOhPTamkr2Vxq9sLoy+C/5QDAJ/gPOw1cM
-uT+7JAx3Jf6bfDg/9m0tVTi5OS4n9myhq5RT6xReAW8e
+ABHsEhKoJeK909uBPQLCZVVVGiHybCGkoXbf3iLR8lQsEHrHi1B2Jh4b8UbHH/Co
+PmDmpRpbpQOjawMDQIRZxr5NJlBFSDHC9XN1LfIarevXrqmHz4YnuelWxR3dZ+mx
+joeBCLnshd8U80WmsVesPlNWnG8XCRdZ0QylvBpd1Ufp
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
index a724ca640..bda96e53c 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 20 AB B0 6D DA 38 DC 2C E8 14 97 C9 34 53 9A CD D1 B3 FF 5A
+ localKeyID: 01 11 9A C0 58 86 76 AD 43 C8 AD 6E B7 D8 88 6A 00 8D 27 AB
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqaiqWCFWBSICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGLzb86NzdkHBIICgAaWeSCqwXxx
-W/020iDsemI1oQqWmg3KtlzLVo00taV+JZSuDhjuG7VUtY7I9aGO30sKsHjvIzRT
-T5miHOBkTrAC3VYTbDxh9tXyoccUU3vi/IbBPlv9LBXBzJZq3rTlvsoCytI7utz3
-1vV6hSUuKO8ovQrBBTUr17zrcmmSUYOcV+2qgb2VgsbPP5Gk1LCzu/BMAhM0cwxP
-YEkVBogzhtzAMm9HVwT7rtQLmgSzYBfeRu/c2BqMAdUlzTD9Z3kSCFf9LzUu+DcB
-G0/whBtQnaq/BU6m5rZp5U8oUROk2BJ3U4j+jrbWj6NAykucYweM9Frf9ACvmwlL
-jYVvTzMAutfkXM9sRaE1BIezbvT2LTKrUiS/XQBAgAgTV/ygn1bGLaHYkvjvRyM4
-mMZicByY1dFE0FmTlVYrAM6Zkka07TC00mDtey14hD/jtVNVQ3GPCdMtI+Pc4M8S
-xQj2e5uxmFPs4wsUlOXupsKQUjU37Sa6S37Fxpypw6sdfCdlUp3iRKaIn3m5a3Si
-W6K2Q1o4jvqK72JQNesz528FfhGLsnWbN+T6Bnm281YmVIiiwWDTW8FbLYLTsb32
-gOIeVcieMwgAQO6RM9crh35qKvCFMW3pOPu6vQcGYdwXKnAM/s9jLGqh8PM+IrPs
-pA9R0fFlZP1KcmBJH9kNviZFmIrbFFaSZW8Bv28ulCJ1KEH2ol64QcXV0aZHwE60
-ibqYQ1cEXAwPpgRX7d5oH6LHxgNy8V/cx57+S9pvLNnbFMpONcvlc0Y/npVtX0lP
-2YFaNXc/OI/sNFDICeAQ+SXHtig93YsqD11m7QcZlfN90nDgRQLDz/LYHcTWHLDN
-q9kwi6NdHfs=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsdmFOA4pkusCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOwDCiGC5J1ZBIICgNkR92fHe4t/
+TnXkRaqoFcs/AOgsCc4NN9jqpuhcFU6vbzT0vR32//DNgTXdwDYFQJ8/Ff/ST96v
+o+/MqVNsaUXEd9cowKSRKLDaBI8HlfSFToQnBoCLNAzSDo4FD7iOKke7jUe3Aqfv
+cydn4xxdEQxlKC1UzTjsl9MgNdV3P61kGVDaFYcXGWsDJGoLsLbOZIurlL3In8hU
+68vsznk55hXioTocYJWHadhcgJULYd2inJx0yS7+S+aGzGzhSxf8Yen861zutNlw
+Hl61CJs+fzyxBXpZHb+JfEh2vIlCU+HFhdTCCaNU3lP7w8WacYWvM995jW1KsdAz
+RsJvFFLa9UTnhAou1FRiHuHD/XObF9sOUsvoqUuGjtbQG27FPPLAVG+H2Fc/fr+g
+7qLNMvpcnZaOipTF67iPdFUDuJy8wpnBMlvXkMKiWqhMG2Tv5fBhFR2ozoYasFah
+aSDhchL2Wpc+uwxA8sz+EsNnmkFDyc8LFLikPRUS3jn9PPDio1PLqlXBbSHlx3xh
+4ci75ho0gEqpmE8nfoNtzMh+QZadpg63iOn1Rcw2YqGnDRaJQyGqEJucUY15KtTz
++WOzVw55joukpgdiOuEL3dsR0mYJsDkq5oAD+FxNK9KzYXeNDKoCVNxc9HgXFRDX
+eQLQVZeBzorHnrwB0rBWc0CoSFq1ENwa+9Ij0Emd41Eeo/8nxEisW0nt+ezjEUdK
+ZwcFbdzUdLh6mU5y4acNDTNZ+oiEZ66lXK3sVGkcoleyhj7Y4J40ys3X7LfqWkq1
+BLoOQ7rt1NwWjLneSoUS9PzH1FoM5VAP3zkbZMywXsj6rpj2TMV5xIk3Ke+pLLtd
+gQMv6zy52N0=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
index 3fa59a3c2..3b3a2a794 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
index beb3ea9fe..a8b4ff4d9 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
index 5e027717b..63ca00468 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
index aad3fcf9d..d7592fc07 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
index 0d281819f..170190efa 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
index 170913f1f..51ba5582f 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
index a25962199..95ce1a7ff 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
index 78094a5a2..523c369db 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
index f9486b6f1..8fa0c98ca 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
index a33e50593..8fb99762a 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
index 13ea93d1e..66ef77e21 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
index 66da79775..d07da34e5 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 20 AB B0 6D DA 38 DC 2C E8 14 97 C9 34 53 9A CD D1 B3 FF 5A
+ localKeyID: 01 11 9A C0 58 86 76 AD 43 C8 AD 6E B7 D8 88 6A 00 8D 27 AB
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTNaFw0xMjEyMDExMjM0MTNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCeodbLOpgOlgQW
-61h+HDyH0WA0uAUBWpbVU/s3JRVoNz00IPr4eCsIScaEG2v5JpD5PgkIjcxADYVw
-hWPx79RCWIM6aRtQ+MfW1FWwdASnF+mvqlnpAFuD9YP0N15Z/S45qTr6+M1irXYg
-CG/8+6vpw5V8IQYqLvwUmIvdpyjlfQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTVaFw0xMjEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwzxfp2vYw5w96
+4Eq57WBMZdmZZ4B27eqMV2gGS7fINlWoUqR6JsClfrBJ5A60LjsvPF2ccr9uyG6r
+mLlarc0kXBREXRpZdmcxX04MS7lu/1TnGem170ZzldtTXV/Z7UHukvDID+tYV2X2
+aTQblO2JbE1+9F2tXILc9TSX9fbBNQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AKule3gU2qMfFdZdJz4ZX0I882dt26ccqUhn9gdlxgMgxyygUEjNa1aQ2Fw95CEa
-zRuCuXh8kNQe3A7Oo6aTDqdtFDRU3yfOhPTamkr2Vxq9sLoy+C/5QDAJ/gPOw1cM
-uT+7JAx3Jf6bfDg/9m0tVTi5OS4n9myhq5RT6xReAW8e
+ABHsEhKoJeK909uBPQLCZVVVGiHybCGkoXbf3iLR8lQsEHrHi1B2Jh4b8UbHH/Co
+PmDmpRpbpQOjawMDQIRZxr5NJlBFSDHC9XN1LfIarevXrqmHz4YnuelWxR3dZ+mx
+joeBCLnshd8U80WmsVesPlNWnG8XCRdZ0QylvBpd1Ufp
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
index 7332eb618..7f468ecfa 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCeodbLOpgOlgQW61h+HDyH0WA0uAUBWpbVU/s3JRVoNz00IPr4
-eCsIScaEG2v5JpD5PgkIjcxADYVwhWPx79RCWIM6aRtQ+MfW1FWwdASnF+mvqlnp
-AFuD9YP0N15Z/S45qTr6+M1irXYgCG/8+6vpw5V8IQYqLvwUmIvdpyjlfQIDAQAB
-AoGALo5M3cRKkC1S8e8MP6bF1Q6L76z6OxV9IwrMtbh6eeWMXto3Dekmp/4O9wKd
-Q7gf4CZmvE3xXfMZ8JYVaRH79y5hon34caRu5XQlieZKSkCW+g7/enLMTyIzzZDr
-NaK09GJ0/1dxbNJfFsNX0MefVWyiIUt5UqY/aYcudBVprHkCQQDSYONjoMlriQ0+
-QIfGmx1tVuRMjaxS2A2srBThq7r0+UA2XdpNl9ukIiqLmyI1cpt/nDTCgbQOpmbs
-6AtbP0qfAkEAwQhEjX3xI8WCqG/Z2/egJel1ffyqUefYXuX73H0bzISh0zVEfiid
-DbHbhyAiCtIkIJNhVBnZPIzxithMYB62YwJBAK1rwQZ3nJJQv+H5P/OwGmnvnvKc
-Ntlz0JHuqKf+8HbQoOYwJ6ye6ig7IedDUsfMWfKvya4tTUhmU6InBnWJjvECQQCR
-GhXuBm3t5dqBoxKxN0M7PHMFcZjWWOFc9KSO6byr0EeU7MW/z+e/E6Nhv9XXLH/b
-vO28unGCArDPHijLWErhAkEAyvpdWnCNP3UzRgMgjkID2WkW06sZx8D7LInR8QQn
-VCWsAGwnUxA71EL/X7x7T76qk+6n5WcLfhoQMwju2w6j5A==
+MIICXAIBAAKBgQCwzxfp2vYw5w964Eq57WBMZdmZZ4B27eqMV2gGS7fINlWoUqR6
+JsClfrBJ5A60LjsvPF2ccr9uyG6rmLlarc0kXBREXRpZdmcxX04MS7lu/1TnGem1
+70ZzldtTXV/Z7UHukvDID+tYV2X2aTQblO2JbE1+9F2tXILc9TSX9fbBNQIDAQAB
+AoGAAxmgEwO5u4uTNZwKkC40BfLm0oeowXnhDTsYTrzAiRXaATykHj4t54wl0PRB
+a77AK+jBJwj+B6+8/QZAmoq5ZSluJc7iZN0Ma3p3Mc/bhygFTNRFaY2ajfHiD0Iu
+lX2K7CBxhFHimmCldjGe5IhPzObd+QIpTpVi397DrJtUaSECQQDlJEinubLoxNNV
+LVLrHV1/SfTKBoXXBUkszGtLGhUeWAwgOQKloAIV57C3Ctik/nn2Hm845KGaMqhw
+yNnZDfjxAkEAxYh98Ln516WAqc1uOJbDVkfYJDZ1cYtXcuHIoJ8Wsoc4hE7ZOF0O
+dtGbP6GkP3XGN8QFB/kdKO+/8tJ/IZsshQJBAIhB0j6Cq4PE/xJIeGU9OgrmNH0p
+8c6R4xiTmj23jdVUcCl9HTjV9EeIVcoS1g8PEAEtyd+f/QTPmOAwX3K131ECQC/8
+raO6emCR+0TE/D7RGVkvkOmTNUrFMBRfl2611zy9rtQtl4Wiza290/pMWWt1QBcy
+DorWUOgt/jKOQoY2fUUCQEvPP9mHzvrzjWGCm4jTuw6WvhK+M+o1XCPujMNhVN0M
+YFCKPt2RqLZenWvdTxouJ5OVw7TsqxRrsbJiPpXzpjo=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
index b5436f836..af75b1c8d 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
index 7331ebeb2..3beef64e5 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
index d4a50b906..fe554f736 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
index a781e5fec..0232c2a20 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 3B E2 EC F9 FB F9 23 AD 53 E1 1E 17 2B 28 91 EC 0A ED CD 34
+ localKeyID: 1F D1 DE 25 84 FE BC C7 63 D6 EB 9E 69 1A 15 06 C8 4E 6E 41
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE1WhcNMTIxMjAxMTIzNDE1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3KMWV+L619V/
-YRCxml+TMflwa2/EazeebWwhbwY56m9mt74EI1MQ/LClEbx+efvtJ3ZMPXN63FXu
-waqh1MOcgZjPCVlMGLeOINormPNoC7hByDfJy4C17nSsBUOkruozrL8OLteJVBPA
-bRUxHtIWM5w5Mkcz75B8sI/AZEq9NQcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE3WhcNMTIxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA78bAlofh/mTJ
+krU0npKSLZvgKcA0f55xIT9h1NEkf399IT0PoFAYGBjar7PraKot4mMvw8E4gcer
+yx1F+SCFu7l7me1ErpmqsEMcD4fKwvzm2Uc98I0XGOIFgq0BP2fIH6cNrdESEE9v
+4E1otkCn+/g/kxiqYw3DH0LeZizyiacCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQC8qwvBmde9z+En9n2WgVqkB1ki7nM9+c+zV7b0iSpeMCZ/n7vUBWAJcFLmOLDa
-zruq9Mi3H6EkUJSWlcPdKA5IlaXcvORAfaeCFoTpjZGSypbO3klBuWSRsf+zciih
-N77o/GTQK5+6Lo1XM2ArFyp4H6gDvLIjs7rbQf3wjJQH9g==
+gQBhduzCnRpc61IE5jaIAsC0xYS35fjk+g+Ef6kgcRNUKnSIwJhlzbP9PSRmB1bm
+MJMO9Stbm8Bh+AU9YoZX9tUCqr4Vlj3LLKVbz3l4EP1In2wAhqUavY+owo0XW7P2
+7Xa+CZyFHuuftiaeSDzI57Up/Ue1p8AB9wbSlqaxGVhuGQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
index 93f01f30b..2ae8e3a2c 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 3B E2 EC F9 FB F9 23 AD 53 E1 1E 17 2B 28 91 EC 0A ED CD 34
+ localKeyID: 1F D1 DE 25 84 FE BC C7 63 D6 EB 9E 69 1A 15 06 C8 4E 6E 41
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIGFdRFqjUegACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJUyJiRl3tt3BIICgAOtV7TMYSUt
-jjtBwVJeSOvcQbEfX87QUfSaEUisjN6ypjnIy/hzAF4/n28cAMTEWWxd32xZoGaD
-Q6rIkIZG+DLcXdzcPTiqZcc0cfec9NC1gEZZkFUue+obyn0sf9GCkazlhTYqUEuu
-V2v0NxOIgguppSsjjA9rQxYTXQmtXgmgiQPbvH+Rj+0z3yLFdj+EtU9nlLOkY9Ke
-w4uB/VAmAgFRRh9tUMbPYrNDie1BmswdRM4KJxxN7qEzp0pdErY8retu9UfAeotD
-0uQa4cQzHxFRotxvlqK+dUCFDgS34/RyXAPxRtgShbilsv89wqHGIoNB2FUSbuJZ
-xNSHV/nSAz0T1s2XXbQe/aIV/lbgpASA/pWKdnqj1zdA1hrgjyL1KV+4s1/bPUzp
-KQRGUnbAAOrq+d/JIafo36ho7TLhRXksq/QE8XcK0gFCb3ePlgPgTPI6ywIs4bs2
-2ojICLXGpYuKgSliwA93VA7dGVyBbnCGayCQ49EYNKTpishu+kwmEnIulVfMiImi
-2KQC/K2AVVCnUJUlDod2OkY/KqZ0vvf9m52H0X9EY8QDJByXdDk7+MD6V5IsaQZr
-gSDv89xCNlA7Kc9aesKaVOHBXus3qXlTjkpYdUgHMqhzXEQ+iBytdImB62x+ROvE
-+9NLs0UQ7N8ErODFtxONwEONun4fuUpSVGayVgz+Sd4gGwDEgiLlUU2xTDRe2Hwp
-m7LkxPjrQT3CGgBSs150TTgtnvNRW2UiEyuVaYXGkT2uFJYF1qpHvOAIyS1Ter6p
-JOEZpTcYSVeSuzHRc3RT8EGn1L6FkSbNkKJnGfiMgQKnu5kCslgHiym7oTUyqzJT
-W1VafDgHUS0=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIQcqIYMGCluoCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFYA3JEf+IWpBIICgEwno96LeVBk
+C7Bf33v0eoWENsPV6Yqbon9fAivIC68RcKSmzB379CWsu0VTPLBGlHRylqhVceEc
+P/PKybLQ34NqPtHmQnmTolz7dSy8IKPmVp6XgiPpE4xHV2lggebxG3vwa5l6zZwu
+KOhX4UPZcYNfXZUAGWbDKH8Pauc6o1H3XIFVly2BkBpEq/G+wo0UIhh2xnZB+9nY
+yFLKbwd0y5+2ty/mjGPanrvIUTKLoGHFDHYTNDKjHuwqVbY4s2Jpf+cwniozRIL4
+BLK5SL0lz8dA8RMb5RjJBN1KFR35TIqtRsyT05AzeWAQRgqDK9p9KnZfaubj90Ao
+Eq/MygUzRcIiS5ppHf3MX+mgljynFP2wOUt05/oaHfzJ1PC2fs7q/G7K0VJ/dRkT
+qWZpJ4yqJKeW0O6R9+5AeytsKphMbasXobzk7yTVjk9IK2c96cNQxNhE9IsXKWc3
+x7/Y1wLPtO8kjuBy6VfrgTerT2+Haht33UBjEyHS/zvVZwigdRBXOfcwyFRLh7iH
+6WKSDGu63z0QVnk38hZcV7dyvfdYenD6lVvTZltPDGIy2Jxj7kLJnJMsjq9N6oJc
+ZZOEtYvgE2nEaWVnpLjG1k+jkGtFRqwW7U1RRJ/VPKeHrQoPNDkR3DBcnclPqC0A
+72bXtbrwuNHz5d0mLnaP1ucvgqWrQaoLYV/2rSZWo0JWOX0zBYFhgJATY1PrpQfX
+HFEElSpgvAwWUjDFS27Xo6+/TNvAlyMcIj1X2Oc1WwyOrtfzVl9iL+3f5wjV3yrt
+4R3eHibmNkSnMwSe/Sq67YBVCXkSoKcXoGRTstKdkfYO8Hx7h3YLIyq4gLJQQom8
+C6jFeuOWcGc=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
index 5d174197e..896a20bc4 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
index 4698590b7..f4c8b4ddf 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
index dc5534085..a8739820e 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
index 4698590b7..f4c8b4ddf 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
index 23b839fba..01ce2baa8 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
index 10b233441..a16d36ab8 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
index 10b233441..a16d36ab8 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
index 17eea9882..bd6a2cb58 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
index 32732190b..bf54667ae 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
index 32732190b..bf54667ae 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
index b92905ff4..18ccf5c0a 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
index ad58fe465..5e8873497 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 3B E2 EC F9 FB F9 23 AD 53 E1 1E 17 2B 28 91 EC 0A ED CD 34
+ localKeyID: 1F D1 DE 25 84 FE BC C7 63 D6 EB 9E 69 1A 15 06 C8 4E 6E 41
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE1WhcNMTIxMjAxMTIzNDE1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3KMWV+L619V/
-YRCxml+TMflwa2/EazeebWwhbwY56m9mt74EI1MQ/LClEbx+efvtJ3ZMPXN63FXu
-waqh1MOcgZjPCVlMGLeOINormPNoC7hByDfJy4C17nSsBUOkruozrL8OLteJVBPA
-bRUxHtIWM5w5Mkcz75B8sI/AZEq9NQcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE3WhcNMTIxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA78bAlofh/mTJ
+krU0npKSLZvgKcA0f55xIT9h1NEkf399IT0PoFAYGBjar7PraKot4mMvw8E4gcer
+yx1F+SCFu7l7me1ErpmqsEMcD4fKwvzm2Uc98I0XGOIFgq0BP2fIH6cNrdESEE9v
+4E1otkCn+/g/kxiqYw3DH0LeZizyiacCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQC8qwvBmde9z+En9n2WgVqkB1ki7nM9+c+zV7b0iSpeMCZ/n7vUBWAJcFLmOLDa
-zruq9Mi3H6EkUJSWlcPdKA5IlaXcvORAfaeCFoTpjZGSypbO3klBuWSRsf+zciih
-N77o/GTQK5+6Lo1XM2ArFyp4H6gDvLIjs7rbQf3wjJQH9g==
+gQBhduzCnRpc61IE5jaIAsC0xYS35fjk+g+Ef6kgcRNUKnSIwJhlzbP9PSRmB1bm
+MJMO9Stbm8Bh+AU9YoZX9tUCqr4Vlj3LLKVbz3l4EP1In2wAhqUavY+owo0XW7P2
+7Xa+CZyFHuuftiaeSDzI57Up/Ue1p8AB9wbSlqaxGVhuGQ==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
index b4a6a03c9..1615e324e 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDcoxZX4vrX1X9hELGaX5Mx+XBrb8RrN55tbCFvBjnqb2a3vgQj
-UxD8sKURvH55++0ndkw9c3rcVe7BqqHUw5yBmM8JWUwYt44g2iuY82gLuEHIN8nL
-gLXudKwFQ6Su6jOsvw4u14lUE8BtFTEe0hYznDkyRzPvkHywj8BkSr01BwIDAQAB
-AoGAHBOLdKmcnrnmA2BldAM02ZzSp8lJkb86eNV+t6saKZv9fTo/5TgyfDAFAWnJ
-dRUQNlUBGfzHpfbayBLs6a9EC06csZ4uwxoymOvBcahHoldm3Q/yulFmO9Xj+yr8
-FolQCQ8scXIqrwnmv3/J4zjbLuEpYGxKTBxfDWmtJ6IxjBkCQQD3InbKmpbGw0rQ
-FEqvBRj+uPrC6sC0fjl74dpJwotssNhzxMtRjO06QnAR7ykXEXUFZiHKG92OZpKH
-GiR3oFUtAkEA5I1JGATEx1nOq+7i0RnxT8SQobm80GVYfTsj2wPeVr57YUAEel5O
-vrXyQJ5ggvwTX32wcvEntexGLuFKOvl7gwJBAIINKOZFo8LFUsFdbE/eJuElBxE7
-6F0Tb7y5hd36+tQf3EhP747i0pQuEjvd14nELgjBTlbFgzpE0Cc4oqgxP6ECQQDW
-wX+WRxzUKSoO2phcXSEnkA9LN+kYdLJSchi9+oOYRMJQXkQW67jYcMTiPS94xP47
-MzJyvvFOe2ZzNJR4l+abAkBPTo8GMj9u0zbtClPzKBY2jqMmNaW3gzftkApffJ37
-7WMYebjShYlLaIJTFZvdPwZTrxtbQ/+kpGcHT3dlPMmb
+MIICXAIBAAKBgQDvxsCWh+H+ZMmStTSekpItm+ApwDR/nnEhP2HU0SR/f30hPQ+g
+UBgYGNqvs+toqi3iYy/DwTiBx6vLHUX5IIW7uXuZ7USumaqwQxwPh8rC/ObZRz3w
+jRcY4gWCrQE/Z8gfpw2t0RIQT2/gTWi2QKf7+D+TGKpjDcMfQt5mLPKJpwIDAQAB
+AoGAIyR44EHU2E7ipvidWGBtwaGG8+znxOHuqCDSBeRhT7kvwx9f8ER3mOXg/L+H
+UTUgDyjaZ1ElJwr3ct2SKTagYt/dikP2vLDR44Jfu8pq+HoXp9ZhgNcueyTK3x6d
+LLWT6ysNWniAp2I1unX9NAFrlzjikVB4Ii2i61i6X7/TRIECQQD/6BlMFIkLuqlr
+FDj2FYCWGDAeqjhYpMZYEljI+21+6cxaqpcIPaWKUXDN585cKCjh7TitJXrbn/K7
+viNfRHKDAkEA790lni0k7TYhT6D5sTnNSGKUmZ3C6x5lW08Gq7DNAN+6GGt4bEhE
+UKNtn0gRAjfP1zvDzzGuwiKCEmqEoNMTDQJBAM8J2p2g55ejtzm4rLT7hILqotPM
+Z7Xf6dCLV2WTdWz+fqTD61lxdqLHbPpJlr0ciKbwo7AB6LoTV/DozflfiT0CQD49
+1nsbH8/mEfLFxMU2SIyV+BV8mI3GT2rIMOTwdeHaLEIV8SO4BPIf1lxUqQU4Ulh5
+i7ACJmT96164AT5yRykCQCppsr15yTY26dmBbNHfyJlGNchHwfQFzXZSNsbORPAJ
+g9rSecR2JjWuhYo3jcUp0tJ4xBcZ37XHxUygx0uLPBk=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
index 1a7fe4cd4..e9abaca46 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
index 7331ebeb2..3beef64e5 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
index e86cf36d5..032179c75 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
index 9b2d8d36f..b9ef70b86 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
index da60eaf93..b3220e2aa 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 3A A0 19 D8 BC 86 12 CA 44 90 51 1E DD 9A E5 30 1E 15 C7 8F
+ localKeyID: 39 28 04 F7 9B 40 F5 6F 6D F7 72 3D 22 52 17 63 86 D7 09 5B
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTJaFw0zNzEyMDExMjM0MTJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCut9yQvAFmTP1a
-JQI9N3sGsBkh35w++U4lQf6FNe0ASQ8nqf5RbdbdTBGPyjszPjJreKug/b/l2gKw
-mm7qHxkep5xud3mjkO/Ia4lzdRe0AcUr61Ru6vfgwLn7aaypboABz9PllRBPwwCH
-ZfhRLRc9KBmCYqt88ko8zmky4inHmwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTVaFw0zNzEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDC/MjDGXrdS86L
+zBBqkdktHEvcc8c62zjdFIbpr45sltqx3o2GstMnTHCkRs48qBj+V1/vYXYoDT2T
+qJhFDbIR0AoHcin1BTqGl62xrKN/31C8K7e0EnbGZytVvguhLBhv7Pymvn9YKUaC
+zo5yoWj+jxr6PjP5mh1pTWZMulUm/QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-ABKY1Bv5fkvRtj10iU75/7lhoOQlRQ5U1M6MqzkhCAHuU7DeeJ3q6xhsslc1yHxR
-PbfN/2F0NDCfVSNgBbRIlwuCT/GkJLFN/7twIuV9N9nTOywqRloxemQvrzIZ6WQu
-ncV6INRNuCznybLEvvdl30TFhqLGJWYWZluZpKUC4qPW
+ADFL2kIImEaICoOAOxTsP/pQViyEDQNomaGnfRtqM9QREFIqzjIr15H+ZC6e0MQx
+blu6sp/IdDvbNBLpLzAdLuaukVwvR16uYw3Tb/5C5UbjGv4rTgEQghcoDRQxL6Yy
+ze9qOw8hT28ENT7OzHGXoR5LFdpIelZyrHIZxf7e3Ir1
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
index 3a28790ff..a0ac068bf 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 3A A0 19 D8 BC 86 12 CA 44 90 51 1E DD 9A E5 30 1E 15 C7 8F
+ localKeyID: 39 28 04 F7 9B 40 F5 6F 6D F7 72 3D 22 52 17 63 86 D7 09 5B
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIHwcRwfkU9DcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMoUT5KMQwELBIICgHUbtB7X+kXO
-4vAIUvQAZlYij1ZjVdeb5UDY/p6WyOUhXOizyyz6lrNR18ul4J1ibAjKH98B8ZIk
-jJSR9KDKv3TDu4Kx2tXcPR4qUb6yaFnA06DwrAXx4o/6/+dSKnBpBQPLf2H1a6P5
-0g4hq/HLIxxXQZemYEwsHM0KS8wcuJmq09JTjaFL35QtxsakCvYuo0rm5Mzjs65q
-sbJHkMR72aiZdwenUL8JQiYIHJ4R6jwNRCT+3cQKkICpjtBXhZ3AJr/783OY4drh
-Hk4TDglRDHyBsZq4RybFNxhwipK7KYhZFzEmrOyMMy8M9ZM4y11GYf3Klbk6B5c4
-nbm28nK3oNlDkbjwwbM06QRVdgfD0EeTL/ppEpTMV3b6H71Cbzdt+uqyLV2PVg+H
-iUsW2ORog6Il0yCHEN87NbOG45mhcXr04Cllu/SOc/PDVmt7GzmRAV0OH815JNZj
-F6Qufq063g8WVzLJgrhky/03Lv977ugBEFT1xiICRgGdj/tdVup/tIR04WG2qKM/
-wwLy70DwW/o0l9gXqTJ+wN4b9uUhPvhKxn5Jxqp7TdEgREKx44bV6Pjjz1X9gd0y
-eqpQ6/sG+h8vxru0Hzcwvb0XxqAnpQewVqD2Z5KdhoRuxj8CX6JLQHxiHOkJWbrB
-VsV2O/BsTs9p1mfiENLojenUMaXP0UGgzN8WkWF7oRLsqznozHAR8WcK6wlp4TgA
-Z7Laafi13nbLBRyVHhse70+WkMNBhJwRrPmpQicZynKe8Pjv70dAxYk4FA0B3F9M
-dmsVeQRqUh10JSVJ9DC+6y+tKPV6uCMBKKGy5mX9lHzvnoYWAff86H/7bogmtV70
-5mBPyioeH9Y=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhx9aJ+TiNIQCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPE14MZqoXYGBIICgKA1y27TAjxn
+OoKp8K2NHxEeHNjJR7q7L9PshVgBVI0puDA9n8893xsQ/ESTRarEoAlWjhucQ8+x
+fpAXiWh1AxDEYVlW2q0IKxXbe0u241i7QyCDBvYQuLJBTWv7OLsR7JqlzLwanvpC
+YKlNjMg+0IAglwyNeanAC3GyHbR01P6GK6bXKchDgsm2O5iTxEFYTZrXY2SYXXJ0
+FA/5hAh9BraeDPFslwdb8vjGjtBnKTHknXb0RFw6uHoc18++iplqqKN71NIGoTVA
+/1IuaZLB8mEYYdJMUpYGFYDxi0kHT9o4kYJQWJs+pjnOIuorf/XTT5l9InrGTBjS
+atIZAAhX6BG7xPijUpfxhu2Xjsfl28hssU7nE+50DaEkrUy5O/3VyiwlZvjqQ4Y7
+e+xIFTUoGJw9Noyl8fVaJFwXXGXhJ84/qAA8gKsekerVsVf5jpzN12G+Db0cH+L8
+NBS5SLioWLNyQslYc+DDB6k4G3u0XVOT0iLX8rLsKljqkpNaq/0dn/H7PYLcqt5X
+qAgGvblE5RqDpMtMN1o8G8CS9r2HIXGMfuD2NcbfuFpRlM6QygSVIH7OBMelHAhV
+Cvl5NXrRU+8pPqek1gqiAjpoRdGXgav7hLYe018jUdNpr0vJKM0jBXqQ8MERV701
+avOLD7qTuy8mrsIDcBdJE9Mtl7ZaquDlLNFAeFF9VIhmYz/afN5iKvxDAiRm6DFL
+Z1hGYUqLOhU8wxiHsGK3rp9f34Xz1S1Jb8vss2r31z/inIX1OUvzJGpFJc5hUU7k
+xFjI+4Z+jUkalpSBmzQ6EY5HR2dkEwP0Sicbnmnd2Pex8wVL/D83D/FlZ5OMYRu4
+O9HWMXlkYXk=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
index eadeb727c..5803ebbab 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
index e3afb3976..15e26b294 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
index 9070e6402..6bbb37f4c 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
index b8854e80f..c0b8ec694 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
index 5b32f24bf..8f375b104 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
index d25a9228a..dd70b243c 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
index 3034a2240..4d7c6e9ff 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
index 566423a01..0d134545a 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
index c22eab2d6..c4f3d01d2 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
index 5c651a849..aa98b18ba 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
index f2779a184..094e804f0 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
index 71241ea91..e2c0eb4a2 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 3A A0 19 D8 BC 86 12 CA 44 90 51 1E DD 9A E5 30 1E 15 C7 8F
+ localKeyID: 39 28 04 F7 9B 40 F5 6F 6D F7 72 3D 22 52 17 63 86 D7 09 5B
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTJaFw0zNzEyMDExMjM0MTJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCut9yQvAFmTP1a
-JQI9N3sGsBkh35w++U4lQf6FNe0ASQ8nqf5RbdbdTBGPyjszPjJreKug/b/l2gKw
-mm7qHxkep5xud3mjkO/Ia4lzdRe0AcUr61Ru6vfgwLn7aaypboABz9PllRBPwwCH
-ZfhRLRc9KBmCYqt88ko8zmky4inHmwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTVaFw0zNzEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDC/MjDGXrdS86L
+zBBqkdktHEvcc8c62zjdFIbpr45sltqx3o2GstMnTHCkRs48qBj+V1/vYXYoDT2T
+qJhFDbIR0AoHcin1BTqGl62xrKN/31C8K7e0EnbGZytVvguhLBhv7Pymvn9YKUaC
+zo5yoWj+jxr6PjP5mh1pTWZMulUm/QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-ABKY1Bv5fkvRtj10iU75/7lhoOQlRQ5U1M6MqzkhCAHuU7DeeJ3q6xhsslc1yHxR
-PbfN/2F0NDCfVSNgBbRIlwuCT/GkJLFN/7twIuV9N9nTOywqRloxemQvrzIZ6WQu
-ncV6INRNuCznybLEvvdl30TFhqLGJWYWZluZpKUC4qPW
+ADFL2kIImEaICoOAOxTsP/pQViyEDQNomaGnfRtqM9QREFIqzjIr15H+ZC6e0MQx
+blu6sp/IdDvbNBLpLzAdLuaukVwvR16uYw3Tb/5C5UbjGv4rTgEQghcoDRQxL6Yy
+ze9qOw8hT28ENT7OzHGXoR5LFdpIelZyrHIZxf7e3Ir1
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
index ef6bdf764..3ea7070ff 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQCut9yQvAFmTP1aJQI9N3sGsBkh35w++U4lQf6FNe0ASQ8nqf5R
-bdbdTBGPyjszPjJreKug/b/l2gKwmm7qHxkep5xud3mjkO/Ia4lzdRe0AcUr61Ru
-6vfgwLn7aaypboABz9PllRBPwwCHZfhRLRc9KBmCYqt88ko8zmky4inHmwIDAQAB
-AoGAE8REZXGHvQGv1h+CwddBiW+p4D2yqSM+dpOhToPb1ODvIH8ogSDqoq3E/N4V
-1YXPYX5M+JFMwR3pmP5X1w/+oNval4VyZRdVrOdmtoD5LSAyjQDe//XH8d4qh+sg
-MGWCMFSLnsM+xo/K8mAMjcKQZdRA1D58KE/uy9xIYBotAakCQQDYfhJFrrnfCG29
-Cvx9AGuJktJ3nmEYgXmSI0sq1nUo7SsyEqYSu3R3WlzoedZxGWZRPj9it+olFw32
-1m+f7fhJAkEAzpo2a7J71uy3BXIxlK6B9hNoBmp/Y4feWQ9tHqL7klvKa43uL4AB
-NCc4zUD1ghEx/DWMvQ8Uxm3Msk+CGshowwJAPLFTZA+w8jMFuNrMoCqu+zmbIYfY
-Rqt9rpeQaikHXXroAjiyMEw3QYKmy1Hk6X4qbhpaYM2Yqd9Fve6uCpMHaQJAG58u
-i3OPbwqy5X2A93nlUjsB+2mdonb12T5gvmnX7JdtFrghEiSxBIIB7B81M7CM2EVo
-jZZIlsbzSRusL1x/9QJAaEQb6mSgjK0DgtYMMkdAfC9DNDUr9B5OBhGomA84WQYC
-S1MbMj+sPi6beJTCP5HtLWYs7i6fXSyhXiWaXEHLvw==
+MIICXAIBAAKBgQDC/MjDGXrdS86LzBBqkdktHEvcc8c62zjdFIbpr45sltqx3o2G
+stMnTHCkRs48qBj+V1/vYXYoDT2TqJhFDbIR0AoHcin1BTqGl62xrKN/31C8K7e0
+EnbGZytVvguhLBhv7Pymvn9YKUaCzo5yoWj+jxr6PjP5mh1pTWZMulUm/QIDAQAB
+AoGAD9Rm1hP0+g9D8ux7rrMtfvCLpheOJpSSjrwyYblbZixvD76iHbvZ0Zhukp+e
+8aSx9sAQLUZryb+dbqXiysRcXtp0UQ5x6T8cY8ucecMQ3iQO2sjUeZW6h/qR+dF8
+MAXZ74WdU0hDapNTLwoWviahYUq2/pYGVu0vJtnJAr6dKZ8CQQDw3XEH7ngIXhBe
++KBpCoOoDP/dBikITtVn1fBFXHdLqHT57tDOQsRs5v97JZ1H1PSTz1Qyy7Tc5w28
+NCs5AkAfAkEAzz1a+rnCRf2YEidM5szR7PlbLUO/PEl9/u1BUHWLZ9AreMZv1R0k
+JMvBhsJwAAiH8bTpVWOONfSCcp/6TxJFYwJAMj2eZA8jzmsAcy7dFsvwpk7/17R/
+PpJjBSOk2HLvF0LuE2vy9fMLUcPlKmSwJ9mNon8uiuHeue0f+k/PbDbB9QJBAJpG
+vrfwGaQpCVBaWXFoAM89QpcL3A1xWI6y6PCQ0NrTqckbUJ2COCn8VXGQxfgAYdOa
+LioXFwMrpwDV/21l2KkCQDA6xvH3OJRwEWdba5B/02OeezOHeXsOLHk6YXt+5A6v
+rsknC1n/CkHk8UvMNnO6ZPIkoLm8bfFsCdxuDRIcs+M=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
index 7331ebeb2..3beef64e5 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
index f7719d6e6..62d64bb63 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
index 0b6b6f83b..69d7c9c82 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
index 39248dee2..9e20dd40d 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 26 BB 8B 03 3C 5E 24 21 F4 F5 6E 4A A4 1E BF 2C 30 44 F1 BA
+ localKeyID: 83 13 41 37 13 F9 8B 48 BF 7A 19 2E AF 2C C3 CE 41 AE BF 29
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE0WhcNMzcxMjAxMTIzNDE0WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsvTu1iXdH5k6
-LxZgoOo+Mb13Ym2vQEG6zGo6Kjtu3WPCc2bQEeiA+JhHIMyv7uAqS0g4koYVU3ac
-bg6qf/SjrymWyUGlFQn6ZVUxm+A1QI8tsU7Nixc5wbZQGtshrobGMYMRYORrv5AF
-tMKMQVf+IzKNHrDS4qDk7hyZPCSJujsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE3WhcNMzcxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv+zvAcvxTw7G
+L/0U4pF2Q9ozF+fT4icIhPfn4nJ26TpNNEPzGaZcBHE1uoYF26eRBKkPuI9jZLKK
+aI4r/stZJHLdPRcar6jo9UOWfkh8cFkL+sZIoDu9B70arwjbYFQ+SpL/MDXGCP7/
+QMU+UM07wiNhYwpI5wk7FGxSWBIiACUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQBto3HIMUJyB/kh422w2v/LTBY1YeGu70Z8zmJURnTmpMiURPX29P9TweM2cffD
-HgnEm0lAKgBubW+9kTbx2Z5vEhDHt+MulC3lBWBZgyXZrtHyJyrqDL2Lo9L4gWt2
-H0h3vuSU9IjrZZ6EyyiZTbLANlK8Ve7hfUvxQpuCb+zqlA==
+gQCA1RX+/cyPFYaT5X8jBtWpkdUMpJUiZFVWr7RW5iAJm6F6SwHPIA9vkVtaOZfA
+TM89+p8SiAR7cKAdC6NGd6yer5HT/15r4YZY8t9cEB1JmXvmOtof+qjBGTmm9pJJ
+eT1LNAS1PPiBYPh5U+JEC1rgB2TR8GkZ064pnWAtyKCJWw==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
index 890525ec9..961ac327b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 26 BB 8B 03 3C 5E 24 21 F4 F5 6E 4A A4 1E BF 2C 30 44 F1 BA
+ localKeyID: 83 13 41 37 13 F9 8B 48 BF 7A 19 2E AF 2C C3 CE 41 AE BF 29
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIiQ0ALEbm9UcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAGlXdbzIersBIICgAjHhQ3Roexa
-qfeg+Gouc0vK5gqz8yWI/ci7Y4v+CP2uRUsN0j6xSd4IrTwZyhy7Bic/qLEfxdH1
-UzkveD1lZ0bXqYL4P1F8X61CujQfU0jGhNf9al+dXJHIKl+OiQrwiFgPoVgcQ66w
-xKl17gJD8Boqb6n9Udm5xmXf1jQBMLOX+i+dhCS+XiV9HeFx1AEK3UZt3XzHBFoG
-ez9qnB47+6PLFaBGCNS1KU+aHDbgaXE15hcZYobFbSl4K6KeIj4kY3qQiCD3gjtr
-mR9dK4JWqn6NT4IPNEJ+mgBGHCo97Tv8ZYMbc+1MO9MxCvQDHuytY0MP3wbJlkF4
-HO4qL3u/Dn+WeNPUWk6lhQFFVCv363M+B2lCj44Priv6x+hU7AHlcmYQXRvhgSMO
-r6ftngEufNr+Noev8Xx849nbMh7D2WpCIZVTFamqfeYIt/sdYRRILXBy/4n0a3gk
-pkNhUiJ3Oo8uYQUXiYKC9+U9q9qKiV4IKo7kADt/rppORE3BqdlQAEbzBhLJpzd1
-uMGiww9jCNTsCIzmmdzHMKN41LKLtpwQtKry095QGwYV3WoNS0ynTseFkCp0bbl4
-U8Jf3hPsgcKKou6ZPyKg72yFNqHuvg0rDSE+SwjwqbyLC44HoBYxvQT9XrvleypR
-XEa1bDFIQqZdOViAt1IP+NSkPK6eLwIlrZtiPsbs5Ph/3SkuMtJbUU4RX3on+m0F
-wAKvooW+ruGOygmav5SmlRX9IHTicwYC1EwKaJ+60LyufcQS0xh6wyO0ICjMOb/h
-+HrIKHQZRYBolS5MwnQKhjLEinWaCBh1/dUslszpP85bN+ddFeQFr34hhX8X+FcB
-BjLygEHjP6Q=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhxAelQVibiQCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECN5FtKyn7wy2BIICgBPO92WTZxGt
+qAKlvORgY01WBoGNYwx5Ug/7uBwbzgHILdEGz3ZYfVffFmk+zZKlvDn2iKLtMCpb
+CE24ir9hKr+2EtXw1HDG0Zg5Ucb5xAZNMKBGh0oV8ay/g48gDTgFaSVsi40FxrlT
+S1Hzgj/ERDClFIzdMofUpkTveOzdJrp5zGHrHjBgPyF4dD+HAfvei3SODw6n0wiE
+QtCiMTofoc6M1HZEkgbUuK5iqKAYcYP9BiST1F5y5Hxae554jXOdZVrn2MyLvhvW
+h6eXYPBHbJY7SLlm8g68A6dr7Esau4lX6Ui5IVqC0RSdLnlHFT8wcaNOohvqOi5C
+1uS0UjEVujKvJDQ7i6OcU4mEL83PEMaEpgu+SprwpZpl3lXOM5RVf2MN6UQZ6iOU
+2VM0FYfrxNE+W7DVJrIJ2m4r7Ai7bSch+yjEbL1dGHcsO5npU+T8skUoyVnXZPNb
+2mq50Pg2L5bEWMQGOHmsaAwdl79mgpsqIIbG6zjUmAT71kl+TIETyacwil2du/Ur
+fcsvwryNxFOj/ERnaTDS2KyZLf+P8yvmRTVZbklp1Gjr6S518Pz/ipL+NLQyWrNz
+rmk215lccXau46f+5NTumEYSDk1FxbpmZm7wekkf7fh/waJGIwnx/feBz84V+vEt
+Rd63dzRWwpqV57n3hcb7SMO2Z4PnPTjfZwXGe1QZK77LrJzL45yS449l8koRBkoO
+ZsKAFa2I3P93UlXHb9e/287WFJodtMCBcRsYtu+Nr6tuesmCTnZoKI1x4Rl1MZOF
+nwSQZosOZIHbAGIvfz3NUGTp8YDb6/Tqp/XUhNNxiSZgsXIA6Ff8CujVbycesppu
+yyg3Ayoqpko=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
index d85c98cb3..96436ec30 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
index 28c63b01b..12cde5746 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
index 1a339eadb..23c7dde58 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
index 28c63b01b..12cde5746 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
index 7247b3a86..1710c9bb8 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
index f1b928070..925cc25da 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
index f1b928070..925cc25da 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
index 3aee14948..92114ae78 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
index 1301739b0..a93d470b9 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
index 1301739b0..a93d470b9 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
index 3d9fff58c..cc133b88c 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
index 66f3cd627..ebf8460cf 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 26 BB 8B 03 3C 5E 24 21 F4 F5 6E 4A A4 1E BF 2C 30 44 F1 BA
+ localKeyID: 83 13 41 37 13 F9 8B 48 BF 7A 19 2E AF 2C C3 CE 41 AE BF 29
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE0WhcNMzcxMjAxMTIzNDE0WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsvTu1iXdH5k6
-LxZgoOo+Mb13Ym2vQEG6zGo6Kjtu3WPCc2bQEeiA+JhHIMyv7uAqS0g4koYVU3ac
-bg6qf/SjrymWyUGlFQn6ZVUxm+A1QI8tsU7Nixc5wbZQGtshrobGMYMRYORrv5AF
-tMKMQVf+IzKNHrDS4qDk7hyZPCSJujsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE3WhcNMzcxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv+zvAcvxTw7G
+L/0U4pF2Q9ozF+fT4icIhPfn4nJ26TpNNEPzGaZcBHE1uoYF26eRBKkPuI9jZLKK
+aI4r/stZJHLdPRcar6jo9UOWfkh8cFkL+sZIoDu9B70arwjbYFQ+SpL/MDXGCP7/
+QMU+UM07wiNhYwpI5wk7FGxSWBIiACUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQBto3HIMUJyB/kh422w2v/LTBY1YeGu70Z8zmJURnTmpMiURPX29P9TweM2cffD
-HgnEm0lAKgBubW+9kTbx2Z5vEhDHt+MulC3lBWBZgyXZrtHyJyrqDL2Lo9L4gWt2
-H0h3vuSU9IjrZZ6EyyiZTbLANlK8Ve7hfUvxQpuCb+zqlA==
+gQCA1RX+/cyPFYaT5X8jBtWpkdUMpJUiZFVWr7RW5iAJm6F6SwHPIA9vkVtaOZfA
+TM89+p8SiAR7cKAdC6NGd6yer5HT/15r4YZY8t9cEB1JmXvmOtof+qjBGTmm9pJJ
+eT1LNAS1PPiBYPh5U+JEC1rgB2TR8GkZ064pnWAtyKCJWw==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
index f2fb32013..4dfba30d9 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCy9O7WJd0fmTovFmCg6j4xvXdiba9AQbrMajoqO27dY8JzZtAR
-6ID4mEcgzK/u4CpLSDiShhVTdpxuDqp/9KOvKZbJQaUVCfplVTGb4DVAjy2xTs2L
-FznBtlAa2yGuhsYxgxFg5Gu/kAW0woxBV/4jMo0esNLioOTuHJk8JIm6OwIDAQAB
-AoGATPYSGs2o1ZSHlcWJY9qpSaniRFXIdxltdMjAX/Y0XQiwkQGnvPPhN0gB2uS8
-Sr5j4gFatwTr+ft6Fci/4Yx7sbpWWacbg6P6iCo0Un/bX/cGRo/QpPL/im2y6zvq
-0FdIO8IjvGaiM/FDjs7hMwfS20jA+dT6IyccqWNYetfYa8kCQQDXDH8zy6nj96iF
-B6EijKupYOl+dmUSWSKpxMaX0F5hud+k6vV6tOl0pVlmEhLZUBj99quZ1lkYFOEh
-s+vdke7JAkEA1Qj4Va0a11UGFD3Bf4StmYzpnrWBQtd/gY62kwnrFO8nZZPn4OoC
-Ywu9KulG1SIHZKqN1KF/QTaJ71a9jnQO4wJBAIyAC7OJgswAiMexfmOWSKl3OdZ3
-//0G45DLkXyqlJ+A009qe0vaWxTs2wXHFS2KGWoD+YWe98K2EYj1hkrTB5ECQQDK
-73aRNwtgoQ/fbEzNirhMk51goIp4AAzof+iP/VzBXmhrLRAwgvqvG1mibQIaugXM
-8WOWcBlnJ+sR4dFEyG39AkBDUpliGMxCkoymzHrg9wFqzLMECKCc3ONhFfkz1J90
-gclTMXODHY4NrVHNzh4OtADzmTJmTRb7d7sbM5/Q7zJk
+MIICXAIBAAKBgQC/7O8By/FPDsYv/RTikXZD2jMX59PiJwiE9+ficnbpOk00Q/MZ
+plwEcTW6hgXbp5EEqQ+4j2Nksopojiv+y1kkct09FxqvqOj1Q5Z+SHxwWQv6xkig
+O70HvRqvCNtgVD5Kkv8wNcYI/v9AxT5QzTvCI2FjCkjnCTsUbFJYEiIAJQIDAQAB
+AoGABVQTKKYcW3kKCJAKseWe9nBK5dmCWO+DfYmSbweFhKEhPpe6WpZzTI5GExkg
+dYI39PyqmpGkjUmlrRRxZUAJB/0faDuKML4AfgKw/qF17Tgjs0UXMmP+xWhH5owD
+OQfR3WQZbiKvPJzv+jw0KeCI/xInGf9utXx+vCWLFxdK8wECQQD62MPqpagGmsT5
+HVI/FRR1radVglC16CZxcqo5hpsWzv6wa5/XYDbbcVDiZ96smg8Mk+yMRNykGb9u
+co3gL0elAkEAw95LUEaPT2a9GpCfjlrzwyjxnU9saMEyMIdUqxA+lgTUJ/c3Jmr8
+HNvKA0hmWenc2vtPKZFiF28MNjC+HI5ugQJBAOWqPz3/66YYX82BVgMhprjThEha
+5tCVu1TVWhsPLcGlRTR7ZT5I/hDOX/LajNpUtwCaEtKeXbD1TfqucU1XnG0CQBNq
+FUz/sXTNWjEn5KjXmxHdHRXaqYQ4oiDtSRcrpQh5sg3EE1Nbh2HU51Er+/ktlRaf
+klksb+yitTMp4a4y8AECQBuU3uviAEyPZ3/H2g3sk3z7OAfxrJ+yDBa7bxVCNqKD
+Iji6lm8nd5T3TqYx0Sb8NDKFr/7xkmyT4l+M/ooymrE=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
index 7331ebeb2..3beef64e5 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
index 16fea6332..7c9062aa3 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
index d4027d536..c041cb9a7 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
@@ -1,25 +1,25 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: E0 8B FD B9 87 58 EC 1E 8E EC FA 9F 78 EC 6D 7E 9E 24 0C 17
+ localKeyID: 69 72 E2 63 A7 B5 AC 27 40 75 52 26 F2 25 F0 8C F1 5C 91 38
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTJaFw0zNzEyMDExMjM0MTJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMJfigB1bwusGslh
-v0GCQtOb+OKCiRNNfBbV09wozWYySTVJPCYBPy20hPJsNU5fw8nUOfSr1kenhbiq
-CRJ/B8Tx6mLpR0aIr+iUO7Is9XwGglbVmR5TfZ7KQCrgdW23XUwp0ZoixtrucgCQ
-5mka6dJrYQ9WwIQTB+fSN33bECatAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MTRaFw0zNzEyMDExMjM0MTRaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANVH7zIGC44d585t
+XcyXnYDjwyhLki3hraCHa6IFcyuuysiUrGISJGwl0/49+msC/9KIvCWg8kjE/oWz
+C/ex/aCAi2YwLZGuT4xszWhTIz5weYmi5oVloyITl9GeNPXoylLPmnhHW7JfmbH6
+OvNcL+y211KO1yCVKxwe3vUzahfbAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3Nl
-cnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2Vy
-dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQAyIjcFDOgOnRBOMTL8
-uBTqg2dbA9ptcegVtk+QWHST4/Iq4Uqf52CP9Sii7ZGf3xOT4NP6PTbOr354o0kg
-6S+uEzVeUJOa5PPt9RjfC8PeBx+HTLnZzp+iKok3fNOp+HXCJWzhSbNL5WejGGH1
-ZJqnF5j4eeF9OJc+Ju99pB+Ijg==
+BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
+bXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQA1xBe2Q+dkcSIc36qk
+lx23XeGIpH+9XfwuRcwyHniQJwl0JBLGwRjPUgk9n5I7xleNjGEujxVNMKDJtZ9F
+4sQ+CebdmzAxKKHU3vW+x9cIPctk64fqoMt5t0SD0+d1Zw8NmdEyneHTAcvSysXn
+SHwjpa/Qpi2r3xxNrtu+9BN6UQ==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -27,17 +27,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -45,14 +45,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
index 76414ae42..7386326f8 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
index 1f2b4b7c7..153ae400d 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
@@ -1,37 +1,37 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: E0 8B FD B9 87 58 EC 1E 8E EC FA 9F 78 EC 6D 7E 9E 24 0C 17
+ localKeyID: 69 72 E2 63 A7 B5 AC 27 40 75 52 26 F2 25 F0 8C F1 5C 91 38
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTJaFw0zNzEyMDExMjM0MTJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMJfigB1bwusGslh
-v0GCQtOb+OKCiRNNfBbV09wozWYySTVJPCYBPy20hPJsNU5fw8nUOfSr1kenhbiq
-CRJ/B8Tx6mLpR0aIr+iUO7Is9XwGglbVmR5TfZ7KQCrgdW23XUwp0ZoixtrucgCQ
-5mka6dJrYQ9WwIQTB+fSN33bECatAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MTRaFw0zNzEyMDExMjM0MTRaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANVH7zIGC44d585t
+XcyXnYDjwyhLki3hraCHa6IFcyuuysiUrGISJGwl0/49+msC/9KIvCWg8kjE/oWz
+C/ex/aCAi2YwLZGuT4xszWhTIz5weYmi5oVloyITl9GeNPXoylLPmnhHW7JfmbH6
+OvNcL+y211KO1yCVKxwe3vUzahfbAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3Nl
-cnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2Vy
-dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQAyIjcFDOgOnRBOMTL8
-uBTqg2dbA9ptcegVtk+QWHST4/Iq4Uqf52CP9Sii7ZGf3xOT4NP6PTbOr354o0kg
-6S+uEzVeUJOa5PPt9RjfC8PeBx+HTLnZzp+iKok3fNOp+HXCJWzhSbNL5WejGGH1
-ZJqnF5j4eeF9OJc+Ju99pB+Ijg==
+BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
+bXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQA1xBe2Q+dkcSIc36qk
+lx23XeGIpH+9XfwuRcwyHniQJwl0JBLGwRjPUgk9n5I7xleNjGEujxVNMKDJtZ9F
+4sQ+CebdmzAxKKHU3vW+x9cIPctk64fqoMt5t0SD0+d1Zw8NmdEyneHTAcvSysXn
+SHwjpa/Qpi2r3xxNrtu+9BN6UQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
index f0363be79..b61bd5f75 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: E0 8B FD B9 87 58 EC 1E 8E EC FA 9F 78 EC 6D 7E 9E 24 0C 17
+ localKeyID: 69 72 E2 63 A7 B5 AC 27 40 75 52 26 F2 25 F0 8C F1 5C 91 38
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIB8awWTQJWDwCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHhODpPcFArEBIICgOVTDWy3/4t7
-IXPphJtRLBVmh1VdpsaKk9V6FBmkCFp887CjSAgV0yhh9G6zbLUIAWdO/6tVdoSG
-dBqy8euIOjBqOx8BQWNlwlhSSL3JSqTL3zLBHwcAf803Q0RBBbHy1/lnwS2IE5Jo
-RapBH4VfoDNosSS9e6bvMSUB2a+Vn76A6rgI7KAJ9Uw9MokMTXjJly+VVix57NWs
-epRhQ6eTCA9uw+Y0ZJ8zMeDHANrqIRNKpHUjjQNfoK0mC5tLVQtrIBF4sHOC3dZI
-PMa2OZZoJb8Mt/nGIjTScyubTnoDcHZ9WPzbU31VC9lnM7zSR1Qmykd47vnSI/08
-Zrnxx5uqysOrzuV8iM5+5qmxgV/6bK56jR7BVS+vXP12YlIJPtgk0FefUctMl79H
-b73G47D2qKIhnE4ecNHafN2Nfn7y4DbIINdYxKobrtG2NM6zcYRXpOhaXWhgYvkL
-sPymFzg4AyrAmwiWKSIBHSioRstakqpkNM2uyYbqQSlTRc1v8fgBFxeyt3eVj9mR
-h5qGpwpzWHXaS8tpUOyt06O5sNoSQFErSxMtMcsgHm5Ey3+/KF0Qi/PvZ5BmAV5D
-M1bWMecFOvQDHMl0b6Kwr76KQiqd8+1zfwZqhNbc0kFtynjfIJrerL5W7YBW28an
-mWw1jHjyezazY9od3JjOq3HWMzHEogwzlAYMlZ805aQPqI8ElIpy6x/s9ouvfopN
-dBgLpWtbO2xd03fkKi5OlovTYiDZsebgbaCJJB0Ci0xqyMW9OPpxITY5UEHwA610
-H880Eb92S/WBH9k4NbXjHwoACoQ9iCHVjkmWroqEAYobSu3p93j6hH3i603ZhwOq
-1fsbKWsLu/U=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIAbzDXwulWlMCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECN2IMycEH5NFBIICgEUhEFp2nkX8
+1GbVBN3BR1N0DVolwJ7Ae8bjDAHiTfhd33DEwBELm16Hg2fNWkx6aJBREs9mY6qP
+xWoscuDGyBDV9G/yfN8Ekv/JgIyUSmlaE8MOFJmYSJOtcb1gRZkFvj2R8JGqY3EB
+9LOp54k7jtt6gpE92sfUp2iGLTHL4gD+Zmrj0mMZJDKThmrABMj+VDl/0P6rW/mE
+KIZdPP6awKLrR+Rv2mOqcArqbgOj4SInPy6oW5eFMp3V25BeWulrVBZqXs9RuGwx
+1fo6qb5SC/zkjrbGQ6exRzq7JY5Cl377hC6ubtQpLqzXpNPi92HaYYhvpsEWreZP
+frviHIaK8FJ4JSsiCruBOPPWzKyzn5Z+NT3aZGjmtV6Nfey12tNqiLfdptrQm9pH
+W88sRmOxMgnaTYCOcYldM67Lkx5Jopa4poYTh5wvyWrQ4hBvQ2JdT6uwE9Uzkd+W
+0zBfxauoULiuoyQXMeHUZ75E8OG0k0rUOi/gscec7q8VavX8NwNlFVpCytskUfUM
+ajBJ7SdZ+iO040wbVWU6q+d0X0zRgoKDlNcSCPL05wsYUWXthqBl828wCM70V6II
+tF2ghNInveu6vYSuv9+LSvyo/mlACXllScGEo8LYP8fiNrCJVrZ+i3GYKSeYypDZ
+PihMmSIjBaeSKcTgrK93NneV8M1q4pDITJ/IoZz3aeYhwfR87CAfprGakb9uOzLP
+3Rl2qXIvKMG5XyQmeu2rq7EUGzTUbdAG1ABPrgGw1L7rkGWS6Db1L2pMdQrb9YlE
+I2tPgfgKl2ilAGpiWs0DddflJTXJ9tKeqoVPl6NXRt4Eau9cSowA1wR6k/5lb2Xv
+cDLQUQdx8Dk=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
index 84a3a846d..9a6190ec2 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
index 759a1d48f..3631938fc 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
index 98c399e41..0da0bcfa5 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
index 1f8da6889..6c9b48f38 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
index ba9f63b99..c7330841b 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
index dc8b758d0..71832d971 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
index 1bb17e851..b9dcb6ea7 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
index 738f33c56..1c6dca31d 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
index c09983f1b..878cd6770 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
index 017ee1d30..da33f385e 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
index 4958c2672..80b0e100e 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
index 6b43ef1ab..48d293188 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
@@ -1,23 +1,23 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: E0 8B FD B9 87 58 EC 1E 8E EC FA 9F 78 EC 6D 7E 9E 24 0C 17
+ localKeyID: 69 72 E2 63 A7 B5 AC 27 40 75 52 26 F2 25 F0 8C F1 5C 91 38
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTJaFw0zNzEyMDExMjM0MTJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMJfigB1bwusGslh
-v0GCQtOb+OKCiRNNfBbV09wozWYySTVJPCYBPy20hPJsNU5fw8nUOfSr1kenhbiq
-CRJ/B8Tx6mLpR0aIr+iUO7Is9XwGglbVmR5TfZ7KQCrgdW23XUwp0ZoixtrucgCQ
-5mka6dJrYQ9WwIQTB+fSN33bECatAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MTRaFw0zNzEyMDExMjM0MTRaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANVH7zIGC44d585t
+XcyXnYDjwyhLki3hraCHa6IFcyuuysiUrGISJGwl0/49+msC/9KIvCWg8kjE/oWz
+C/ex/aCAi2YwLZGuT4xszWhTIz5weYmi5oVloyITl9GeNPXoylLPmnhHW7JfmbH6
+OvNcL+y211KO1yCVKxwe3vUzahfbAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3Nl
-cnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2Vy
-dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQAyIjcFDOgOnRBOMTL8
-uBTqg2dbA9ptcegVtk+QWHST4/Iq4Uqf52CP9Sii7ZGf3xOT4NP6PTbOr354o0kg
-6S+uEzVeUJOa5PPt9RjfC8PeBx+HTLnZzp+iKok3fNOp+HXCJWzhSbNL5WejGGH1
-ZJqnF5j4eeF9OJc+Ju99pB+Ijg==
+BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
+bXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQA1xBe2Q+dkcSIc36qk
+lx23XeGIpH+9XfwuRcwyHniQJwl0JBLGwRjPUgk9n5I7xleNjGEujxVNMKDJtZ9F
+4sQ+CebdmzAxKKHU3vW+x9cIPctk64fqoMt5t0SD0+d1Zw8NmdEyneHTAcvSysXn
+SHwjpa/Qpi2r3xxNrtu+9BN6UQ==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
index 9c36f80ee..e6eaf2ec5 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDCX4oAdW8LrBrJYb9BgkLTm/jigokTTXwW1dPcKM1mMkk1STwm
-AT8ttITybDVOX8PJ1Dn0q9ZHp4W4qgkSfwfE8epi6UdGiK/olDuyLPV8BoJW1Zke
-U32eykAq4HVtt11MKdGaIsba7nIAkOZpGunSa2EPVsCEEwfn0jd92xAmrQIDAQAB
-AoGASFKGJa+MVvp9qQq+wCA4v0XcsGNDn7QIBPMg9l0UN/9j7/jE8ZsrJ9VwVkde
-+j91uSZHPjul6llxzwktgP1VJRL7yqNU7R4SLnH1R/vxcNxrthMQNhPKDOhuuFHu
-vwbJuGCXP22Rs28uRoi96SYC7VyvYtrVTopHFLruD+riqb0CQQDzsSfyoapFiVmv
-3vH490IS/h8KXPKP0dFOuH2rbVM7gu/SrbdBgDVH0wgmNB6mVeHnZeXbWU4FqEVB
-ppRzfF6XAkEAzDC1r9HbGCro1vLK4KHoIRgJ6IsNqnP0go6maG4wXfeTW8Ya6T4n
-aRqvUTZm7W7bElnBlBfnRGYfc61SVdGRWwJACQ/MYXxbfYx29lA/BTgEj/o9I0CD
-kI+HzfqUSbyd/LeIvXfSObBPyuTxB6KmhR7qcJVcb8SpXxJ7yM4t9QFp7wJAUDy/
-2IQ1fSy3bGfh8x2MUxzYH+osh5OjPH6Dw7uxA+vamxCg2JDU+cdDpz0ieyC5s19T
-4zb1aPpcV59/IDwGywJAYIfTR8dIWJ2GiO8PbLPbeQCD75zdFKTzJ3iu3FXQs+eG
-j9YkYoOCrd0N5lkv2VVFYdUFJ99qKLgcehxzqCihBA==
+MIICWwIBAAKBgQDVR+8yBguOHefObV3Ml52A48MoS5It4a2gh2uiBXMrrsrIlKxi
+EiRsJdP+PfprAv/SiLwloPJIxP6Fswv3sf2ggItmMC2Rrk+MbM1oUyM+cHmJouaF
+ZaMiE5fRnjT16MpSz5p4R1uyX5mx+jrzXC/sttdSjtcglSscHt71M2oX2wIDAQAB
+AoGAWJNW3gYPr3ZxClR2U50V3uz4ZFg6Pc7Pbm8/PpsX0Sj286V3EAWr1bRCHgD8
+aovk1blOtivo41rYv4rz6eskQs13LOCOPd203m7UeoZsrogs3he/nRWxfftAssqg
+Vm/rLxdGDxEAUPJq+u579qCsQgSl7jm7ncCk4objSJpbrt0CQQDsFYZGKQgMcTNa
+FbAIuRH2gT75gdtAibIW3I4qCm5tJOFVRClJKHhtveLMVxC9PKBA5bDx0fPT/XqJ
+24HmI8IXAkEA50X0O6YXRMrHLeHXDFvNXgH1TI6QXtEZ5i361+OU0pUGh9ZvSD9o
+QGgLkahWLGsIF2q8Wi4UlYxuBHRDOlkG3QJAQqgxKU4cf6bWoPDOqyfV8ou7hCcu
+CKLYLaxIV4Zqd1aaaMC+B3Htzs52YsuSZlvfw3MW6rAk8A35s0LPAnPGMQJAEk+6
+n8Jt0zeO/7YC9eqK3yeeiXo8OhWqTExVsSRG00mTY8v5sam7kmXqjJTchdXPpTMB
+SM6fOJwO1fFypTsJTQJAZEWb3kE/YxtbUSgI48//mTmk2esou3ZLiEB8ZZsrsZVJ
+Ej6uUH+oqUk4xO1O8pM4gkgJCH9GSVlfvNvp3VgQcQ==
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
index 7331ebeb2..3beef64e5 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
index e026addf8..b9471a4bc 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
index e1584f4bc..9d67ce107 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
@@ -1,24 +1,24 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: DB F0 A6 20 CF 85 FA 97 D5 2E 21 63 FC 8A 8F E9 19 D5 F7 F4
+ localKeyID: 54 FB 5C D7 4D A7 32 31 72 D2 2B 6B A2 EB 32 81 4E 5A 1B F3
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE0WhcNMzcxMjAxMTIzNDE0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdzkeX0/ipD9YG
-I5c89/QOl6KT/FdxnUCYm27O/UBeFyxA9cIZYX3U5n1XtywV8iXN8pHRlAyXDzRc
-pCaQCI/UyY+dgNbc0ouPHrSt/iB+RUjChJrCi3cj/5lGyGW8iQ60SuAildOVa4Tn
-UUpZwIvD+q3sB7TWlfSgAmUMBgFoswIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZlzAAFO0CinxW
+9W0WATpMYpFYgiqZd2z2+nucbslOuJDsLHqKn5sJSL1pXnZP50CIXKuYfLK0GS+i
+7UqXdalTbZ/Y4CH5kLDSfrKJLqkgB+gbTHIsEhwGC+5Z2M7NXlk6rzxQavQ3Dp+h
+yuyfDc/C5V+asL9+S9Q+aKnwBltgJQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEAej++PL9z7jkt
-49KtSuFggOshr34l1Y9KfBSDjNu5U/nWLj8p89RjL2HkGy2ssKdrECYi9jmJDj6q
-2fgBHqXEEzZySpDoNK6zP9uv6JYwUy5YqrydX32k7slSB5VdPbqI4UO+XUK8rsiJ
-+6V8srRXT9QCLQ3K7I1BHvd5tVBftV0=
+E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEACduCkaIWVVeW
+mI9SWw1iMf3gIxMSx/hK/CFcthAfGwcq7Klpe3k0iDHqTAzJrgIOoiBRo/bKn2s/
+Ta3ykS24YF7SdkFWPE22XZiQ1qoSH5ShVg1M6+jo31Cbtl1bO4sPiNcxzlgFDvmt
+RD7zGZ+em4e8hzZhB4Np8dOec6H9bz8=
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -26,17 +26,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -44,14 +44,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
index 36f18c1e2..4762cb2cf 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
index 3440c1ab5..470ac8c5e 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
@@ -1,36 +1,36 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: DB F0 A6 20 CF 85 FA 97 D5 2E 21 63 FC 8A 8F E9 19 D5 F7 F4
+ localKeyID: 54 FB 5C D7 4D A7 32 31 72 D2 2B 6B A2 EB 32 81 4E 5A 1B F3
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE0WhcNMzcxMjAxMTIzNDE0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdzkeX0/ipD9YG
-I5c89/QOl6KT/FdxnUCYm27O/UBeFyxA9cIZYX3U5n1XtywV8iXN8pHRlAyXDzRc
-pCaQCI/UyY+dgNbc0ouPHrSt/iB+RUjChJrCi3cj/5lGyGW8iQ60SuAildOVa4Tn
-UUpZwIvD+q3sB7TWlfSgAmUMBgFoswIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZlzAAFO0CinxW
+9W0WATpMYpFYgiqZd2z2+nucbslOuJDsLHqKn5sJSL1pXnZP50CIXKuYfLK0GS+i
+7UqXdalTbZ/Y4CH5kLDSfrKJLqkgB+gbTHIsEhwGC+5Z2M7NXlk6rzxQavQ3Dp+h
+yuyfDc/C5V+asL9+S9Q+aKnwBltgJQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEAej++PL9z7jkt
-49KtSuFggOshr34l1Y9KfBSDjNu5U/nWLj8p89RjL2HkGy2ssKdrECYi9jmJDj6q
-2fgBHqXEEzZySpDoNK6zP9uv6JYwUy5YqrydX32k7slSB5VdPbqI4UO+XUK8rsiJ
-+6V8srRXT9QCLQ3K7I1BHvd5tVBftV0=
+E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEACduCkaIWVVeW
+mI9SWw1iMf3gIxMSx/hK/CFcthAfGwcq7Klpe3k0iDHqTAzJrgIOoiBRo/bKn2s/
+Ta3ykS24YF7SdkFWPE22XZiQ1qoSH5ShVg1M6+jo31Cbtl1bO4sPiNcxzlgFDvmt
+RD7zGZ+em4e8hzZhB4Np8dOec6H9bz8=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
index 220271b19..14752e7bd 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: DB F0 A6 20 CF 85 FA 97 D5 2E 21 63 FC 8A 8F E9 19 D5 F7 F4
+ localKeyID: 54 FB 5C D7 4D A7 32 31 72 D2 2B 6B A2 EB 32 81 4E 5A 1B F3
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIWJhMOXf20eACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAc/phy22kp5BIICgFa7Rv3+buh4
-+vIw4C1TIL7yhh6qgi3bjOfPExayuj806A+bO37/veiP2R8sMK5U9GUt72OJGcWe
-W19VR/J9CHFCaKy1KTsO50EqEY67X2m1u9f5SaeaZNI3zv2n+xmBG6lroJRUbPco
-Um0iVDKwhkUo3DcSrldSzhzpA7ttE9jmMxRxodldTeSs86V1rtx//jLW3JOKc5mc
-oFxlY+yE79PMPobBvomlNvMgVj5eNbCigqb1i2SKdNCScqEK97UiWM1zRS9GSSmP
-kA/kkidijzJiitK3EytJSchPUd5SpOLW0P6OzDKBdxrc2skesEUcVrXIidcyss1u
-zqiZ4NLNcFSvtSpX9+qSJ3nvFtblAu7TD1c9dT6X1Qg7IOga7wdezRwxFP0c9u1m
-5Ab2TzfNDtfragQ4b6ugS3urhngLOi1AIKmsrOZ0cQx33t1N446wtgrJ8wUuiPDW
-7J6d9sn+b1GzY6bSKHA0YQ1QrBtAPOTuRzr/6XCcUU3B9b9mGNlvjqNlS7NhvwwY
-nQhNGZwzXxutMxDoDloR0mrhRy3gi5BRNrA++XJB4OTnAnceT641/5q34H4IWqMw
-/REMYYGTPW60kMAenmhYOPxAzWH+0Qb5wcUxNmOIy+GtppIafy0KSxB9JGbs1P5w
-ZfmomrdC7k3HFRI0QyiRQFtejUppfdZPUN9Q+OlSpAlaLxuXD1751rQhjV125XFQ
-PlO0XEbivTj+oi16oVKk+KeBDtBRoiiIkK+Yj7Y/tHDo2Ak/StuApj0f9LWh6CGs
-C1LGwtcIjnmKLcTWdy3SWogFj7laNokxiLFRl74knyYHK4AudvtsqvpVMt3NVbgt
-hLrsPTl2YzQ=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQICL4dpOTDtE8CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLs4fMvRcBTgBIICgFL8H95N3zcg
+mRjJ7gKfh9LXdVjROyvnjlEHR2ZwYWjPcet2DS0uLY9OWNZSEl12moXFTzYrqx9v
+uoaCfYhkRZlfzrfIar6v1qsyptJPLRsKY6/FrI8/7OBpXkyQZfPTa0y4lkJpurjE
+PfX3ZVxHDJqG4Kv0+PaBpMa0qOgcMqlFtRDC53jFDSsPw4lmqwTN0T8Upc3Fc4qj
+qOCT7ctjioQEM1ih7r5eRLqP7fzLujHto6INf8cgCAMT8mCyoAS4YBbMKIxAyf6F
+yKoAyr4Ka0/I7xGfkok2IIYvxbUtsaDxrd3OV+bPJ5jzCmVZq6l8Z5KaZGHfsma2
+hd6WKgZnYilXB4Ym1bZIWyETZSZ+BlSFR95ynu8os221rXJkDSa+d5d/1ewrwGXX
+c9l7xzYj1UoML0ClAxY1vr/bHGppBU/7WXgSgAHeLyp3dW5ciBrpzVJYfG+9NUt9
+t6s35dJOI1MhL2QgEH4h6c074xcARIYIa+s1CQVSYCjN2juzf6F80PfSpIwjJo96
+2wNnIn3C9sPJRoE0eVUwmhjSRp07ipv5pLiHGwPiVuaRJwx1zZRwS26bDccSAmuW
+Q/7NANZCE0j99GouR+mW71obFl3uQx8+Uforv0P32oJtLxIzCOCYQpltbTDJvSC6
+1St8ehS6+ynHI4EXM4+LjpS4WqXAd/ASpLSj63KyFBAKQsuoTJ6IlVv4Xlihzyfo
+8t55mfbYOoJyl9R0NFj4QM8dGGqOzOBCOGxLaYS8Qgt1QyLoJ2sc24fuyAajnSeV
+RuY6JNAHINrwkJcI6Yn5E+YWXhSx57/WzSQbK+C5nRl0FG2Y90u3xnTQYZPbLu3G
+Dg+Aqo+a0sc=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
index 8717f8f0b..407b29489 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
index 270314bf0..fd508a072 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
index 2dd4190a1..b2e215977 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
index 270314bf0..fd508a072 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
index 142106182..21f83075a 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
index 0218a25ca..56cc9fec0 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
index 0218a25ca..56cc9fec0 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
index 20fe105ad..089811ea5 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
index 7482cfd77..c0970a73f 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
index 7482cfd77..c0970a73f 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
index 42b9361c9..8396e2e53 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
index 89c847c98..6daba765c 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: DB F0 A6 20 CF 85 FA 97 D5 2E 21 63 FC 8A 8F E9 19 D5 F7 F4
+ localKeyID: 54 FB 5C D7 4D A7 32 31 72 D2 2B 6B A2 EB 32 81 4E 5A 1B F3
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE0WhcNMzcxMjAxMTIzNDE0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdzkeX0/ipD9YG
-I5c89/QOl6KT/FdxnUCYm27O/UBeFyxA9cIZYX3U5n1XtywV8iXN8pHRlAyXDzRc
-pCaQCI/UyY+dgNbc0ouPHrSt/iB+RUjChJrCi3cj/5lGyGW8iQ60SuAildOVa4Tn
-UUpZwIvD+q3sB7TWlfSgAmUMBgFoswIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZlzAAFO0CinxW
+9W0WATpMYpFYgiqZd2z2+nucbslOuJDsLHqKn5sJSL1pXnZP50CIXKuYfLK0GS+i
+7UqXdalTbZ/Y4CH5kLDSfrKJLqkgB+gbTHIsEhwGC+5Z2M7NXlk6rzxQavQ3Dp+h
+yuyfDc/C5V+asL9+S9Q+aKnwBltgJQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEAej++PL9z7jkt
-49KtSuFggOshr34l1Y9KfBSDjNu5U/nWLj8p89RjL2HkGy2ssKdrECYi9jmJDj6q
-2fgBHqXEEzZySpDoNK6zP9uv6JYwUy5YqrydX32k7slSB5VdPbqI4UO+XUK8rsiJ
-+6V8srRXT9QCLQ3K7I1BHvd5tVBftV0=
+E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEACduCkaIWVVeW
+mI9SWw1iMf3gIxMSx/hK/CFcthAfGwcq7Klpe3k0iDHqTAzJrgIOoiBRo/bKn2s/
+Ta3ykS24YF7SdkFWPE22XZiQ1qoSH5ShVg1M6+jo31Cbtl1bO4sPiNcxzlgFDvmt
+RD7zGZ+em4e8hzZhB4Np8dOec6H9bz8=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
index 6df0eb4bf..28f85e154 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDdzkeX0/ipD9YGI5c89/QOl6KT/FdxnUCYm27O/UBeFyxA9cIZ
-YX3U5n1XtywV8iXN8pHRlAyXDzRcpCaQCI/UyY+dgNbc0ouPHrSt/iB+RUjChJrC
-i3cj/5lGyGW8iQ60SuAildOVa4TnUUpZwIvD+q3sB7TWlfSgAmUMBgFoswIDAQAB
-AoGAIQV5AXYPKDWRgp1218lUXihzYv5nkvm7KF0aQe+lzxGPxuYE7RwSDImksdPf
-2Nk8M+0qigiKrUyYBONyqEaAtFa1WL+BVPJj6ni3A1A4esz6ZmcuFMIi11WBEdft
-UIAi25KySUcQoVrGoSYoiVpPUSHfJhi8Pywi/io+3Ay85gkCQQD0GARrKxJoWMwI
-0NwvVLkdd/AIaCQj0G0SqJQaOhTn1o/6WHAxXf+db6su9dQGqkngXlkmpbu+7i9n
-uYGEA5WZAkEA6J/0BVF8K+4peLl+FbtFLkGZyF37q8VxxmGxDty7lKjNa+wASKz4
-rB5FgJS9WJKW6Vs/Ago4/ZCBUf6W+h6IKwJBAKiF+G8BIslWHTAs+wfWh6PXzaoQ
-NHthiBystOvSk+Jomaju7C65RiStF1Ppt0QOx8iXexearx+oFKSZR9kcHGkCQQCo
-oIKQdGARrEQNylDWyfi9Ljqe31n3S1pNVzW1M1cazT6Ts/EEvbZJdmwlaCzVjvWs
-VUOYY/aqAF1uJaIlz4ofAkAzbLarOQCllPkwc0WqahctkNhLGOxpPt5S+VU8Z/XB
-BxS2EpBrCXARgKi2jA+Yza+wEnjl6ZfIgeWgEb4C9aNL
+MIICXAIBAAKBgQDZlzAAFO0CinxW9W0WATpMYpFYgiqZd2z2+nucbslOuJDsLHqK
+n5sJSL1pXnZP50CIXKuYfLK0GS+i7UqXdalTbZ/Y4CH5kLDSfrKJLqkgB+gbTHIs
+EhwGC+5Z2M7NXlk6rzxQavQ3Dp+hyuyfDc/C5V+asL9+S9Q+aKnwBltgJQIDAQAB
+AoGAXA6R2UcBKzUJ/ARjvY6RaqW9FnQjr8AOEsPQrlNUygBeF/2Nbr6t6hSjRkQX
+zCBrdgW295GyTW3mcIjyKPg3xXNOvxtR3N5NSOXJw49ar8VOExOqIrcfP9nsxQ+l
+H/UsF9xJ8cqx3blHtpHNn00JQ7jGfjIkYXCEPSVRozUJt7UCQQD3BXworsSQIAs6
+XatW0Y7/cHNtiidL98AyBtHzUwAYeEusy3+6u+jbK0FWWM+PqPWSayHPM3juSQ0Q
+yDK8d+YvAkEA4X/ZyzVrPA+P+tKM7zCSAKrD80gEwytFiSEk5c4Ww5C6MaZyv0XP
+LtWJJi3jSDB9VHxTNH1kBZXG2JvLphRd6wJAOlu+YHIhmBcp7+kPQJyTlv9/FaLs
+88KdUnRQB5dVT3KkFjehfoFEWvsWHYsvxjXZhnTu8N+tM0Zo4s0ZR3NgGwJBAM83
+DC0W3n6nklgbqRSXXmMsiLoDQRUTq2dSxLRECFkXonHDkYhAnx1bbhdebY/FtzWu
+tUrzurkDJGGh8Kah6pcCQGQls2OPc3yjoWIyhtladn6IXu/4XxNb5M4Hjdxd/nO2
+ljQsvEEer93DE8wILdAFys2pCXdTngjwLvdqypsYcMY=
-----END RSA PRIVATE KEY-----