summaryrefslogtreecommitdiff
path: root/test/aux-fixed/exim-ca/example.com
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2017-12-19 22:14:18 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2017-12-19 22:14:18 +0000
commitd4fd1b83a197d73cbac114fe53f3448d8b5c7cc2 (patch)
tree595ac359ff45f8e9f8b29f6432cb088a17cf7a88 /test/aux-fixed/exim-ca/example.com
parent3721c5545411010ffbea82fc58b883664d07e865 (diff)
parentb4ad78623875988d016ff816dc6c9c382be897f9 (diff)
Merge branch '4.next'
Diffstat (limited to 'test/aux-fixed/exim-ca/example.com')
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/CA.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/BLANK/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/CA.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.key30
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.p12bin2962 -> 2941 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/OCSP.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.key30
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.p12bin2340 -> 2319 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/Signer.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/ca.conf10
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.Signerbin0 -> 234 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt1
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem7
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.emptybin244 -> 244 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem10
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.v2bin293 -> 293 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt6
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem12
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/index.revoked.txt.attr1
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/index.valid.txt.attr1
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/key3.dbbin24576 -> 24576 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/CA/noise.file140
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key33
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.reqbin68 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.respbin920 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.respbin938 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.respbin938 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.respbin960 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.respbin384 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12bin3108 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key33
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.reqbin69 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.respbin939 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.respbin939 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.respbin939 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12bin3108 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key33
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.reqbin68 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.respbin920 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.respbin938 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.respbin938 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.respbin960 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.respbin384 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12bin3108 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key33
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.reqbin69 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.respbin939 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.respbin939 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.respbin939 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12bin3108 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem60
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem42
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key33
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.reqbin68 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.respbin920 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.respbin938 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.respbin938 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.respbin960 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.respbin384 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12bin3186 -> 3165 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem24
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem40
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key16
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12bin2759 -> 2730 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem22
-rw-r--r--test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key10
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem36
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem57
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem47
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key33
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.reqbin69 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.respbin939 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.respbin939 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.respbin939 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12bin3106 -> 3117 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem29
-rw-r--r--test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key26
145 files changed, 807 insertions, 716 deletions
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
index 8695b3696..ecd523b31 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
@@ -1,13 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N3YjbHA
-BEKAiUHwJ0VMAAe/KMOM8slXOAKni4v7Vf6BzbO5B6uaKhDV2n3V0vXwMdAoeBaq
-3s9CHOjDXwjF1qf/p4w3Z2aUIVt/Mb+uEcPUlq0Nr8OLlH11QKbkvFtLxU3sUAoi
-fcaydi1q3tszjPQ0tKlLo6kOzcgi8d47WccCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAAzD/Zszo
-X4ieSQQxDOH53VkiAJDs32qso9YzGbQaenuRnVFCuo7rt68cjMcOjzf18/I+iMeH
-nEcdqkfoYB4Z3LXvDaRGZhg/ZOv58muzRnsW2oQI9yFqDwD0FZPtM6Vq0AWXjLuq
-IogOI5fShSo7H5hc3vrkvS7KUhzuv3FKnaQ=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
index 46a83eb29..25bd38a5f 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
index 5fc8c5baf..7685bc776 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/key3.db b/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
index 7c95320c9..e25620d62 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/CA.pem b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
index 8695b3696..ecd523b31 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
@@ -1,13 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N3YjbHA
-BEKAiUHwJ0VMAAe/KMOM8slXOAKni4v7Vf6BzbO5B6uaKhDV2n3V0vXwMdAoeBaq
-3s9CHOjDXwjF1qf/p4w3Z2aUIVt/Mb+uEcPUlq0Nr8OLlH11QKbkvFtLxU3sUAoi
-fcaydi1q3tszjPQ0tKlLo6kOzcgi8d47WccCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAAzD/Zszo
-X4ieSQQxDOH53VkiAJDs32qso9YzGbQaenuRnVFCuo7rt68cjMcOjzf18/I+iMeH
-nEcdqkfoYB4Z3LXvDaRGZhg/ZOv58muzRnsW2oQI9yFqDwD0FZPtM6Vq0AWXjLuq
-IogOI5fShSo7H5hc3vrkvS7KUhzuv3FKnaQ=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
index bc3ac3dd6..b039e2ae8 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
@@ -1,20 +1,20 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: DF 7B 92 8A 30 65 84 F5 1F 40 C2 E3 04 B8 D5 94 4B 27 A3 0A
+ localKeyID: E2 FA 33 F3 03 63 BA D3 6A 68 73 26 A7 0F 5A 17 58 37 00 95
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANfwT5lSrhpXixJb
-YhRazEgMSNNfUrJ5y1Qyh24hGpwyV6njExis/lSzce77xW/f+g1M9DKa9c971B5+
-bpSoH+b3psJEHQ2lx8I3tBnQMzjAaIJknLNoEyE47gqAT7KmLINS1hIFVgMObg8q
-LvXO1NN4pUKUPNaVb8bMe3hTSWl/AgMBAAECgYALabxN879CTX81ugETPKtQYYnV
-1ijGSHFVOBMitdA0vOUXlGoKzgCRPydrRKuuRThvodzER0ltAnP3JU04lobnssl9
-5hCLEA3YFJ+Xu1Rp3ZijJkUaPpBMxxvojceW/jn9SZYj76AiOVHcToLqmWcQylk7
-pQ9aC+tML8/WWO4I0QJBAP7no1XNczYeygGlVJUlwj+vJhGfkEBflDjcxZsQjzft
-wpoZcFxxmTMZPoesQPxiiLQioLR0sYkPpqXqDpB1K/ECQQDY3dC1flCrlJxV3JYV
-gneZL9oFfdHlFWovR61Mm03qdW4pkqag934WAcJhW5baoCYtisZcwhBu2u0C9KIb
-fRxvAkEAqst6XZtzfufSYpfsvKK4LQOmdlh7xyZDonYK0YOe8tKUebxh1Q8on1xi
-0XVRdcpv3oL1OvSVoEikWLcjWxengQJBAK4QS8aA3kr5ewnHhYc6Mrh3meyyclgG
-+jV8uHI2bTF0k7k2hhvIyiDrxJLUKp7L0BjZvCETepEfkwC+Tab2om0CQHSaLUT8
-TtGDEOIJ+6jWoGOGaHXy2HOPPAP6BKmQ4zndbPM5DXo7DXOZF9Wv2JhCqvtCVXi/
-uTasfeGJOuOrp9U=
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAK8Sadt5dFFR8Ad5
+McPMCQbqKFV8DQP0QfnMq5IWxZMSGpcbi3RJLe24R+ZZ39tAkGsKNzPT7YgvQIne
+Xa9Cb2t9UucJqu4GXA+3ahOd+pDrnbtJb1f7AI4+KNDAik4sHgxe7yQphugck1bY
+9Rvxk0yGVytfTuNKzjkK1qV2N7bDAgMBAAECgYAqCPJIw5slkVZf/P3xZJKASgWg
+LNZVLjcPGtDRFU2f99dRk8gChjWUX8xHpymkE5b5VG0XsRlVuv60e6Mj2wA0OamS
+Q2rILLIEqL3R0rBhyvcSq8fvjtTFrO10Yl/GL9xm4z7daaqraBuYDlzhSCbc+y5h
+BZwrEzWNvR8sDZzuUQJBANakmIJOj2QmCVxvoXINrxHRrMeAdGucVqCprHNe6+Ny
+3HhSY/L+4uIy49uZyuJc5n2QIE/n0SK6epWhj2Dp7zMCQQDQzfN4vhAtUMX5lain
++QLSgK4wi8f2saQcDPgqpOl12JsghpDHx3XBfYb6Dh4+K6JumVcmc98fc9ZcuVur
+Q1oxAkA/qYYKcB6bh6STJBDwcRqR4Gysp27gU/hloq2hcm/ogDLgBR/b/LlyecGX
+aqAAT6mVaGANEya2dDTTmJ2cEwZ9AkEAk1oTzIyMS/5ph8V2nPtcY4MN6hJqzgv0
+nRsF8sooOtLePmjYOTPoROC55TMbYpJWcahi2S8CMWcEyrDAIS9JsQJAa721f6yV
+ddxPZ33OxHN2egqb0VZ0pwBQWfgoX5jK8fkpof/LclZnXau4x9G+5N8Q80ea0JAJ
+grA/N012n/qfIQ==
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
index 877a0865b..53e5ea346 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
index 4374c4892..e6f959fdf 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIICDTCCAXagAwIBAgIBAzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
MDExMjM0MDFaFw0zODAxMDExMjM0MDFaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t
MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBANfwT5lSrhpXixJbYhRazEgMSNNfUrJ5y1Qyh24hGpwyV6nj
-Exis/lSzce77xW/f+g1M9DKa9c971B5+bpSoH+b3psJEHQ2lx8I3tBnQMzjAaIJk
-nLNoEyE47gqAT7KmLINS1hIFVgMObg8qLvXO1NN4pUKUPNaVb8bMe3hTSWl/AgMB
+BQADgY0AMIGJAoGBAK8Sadt5dFFR8Ad5McPMCQbqKFV8DQP0QfnMq5IWxZMSGpcb
+i3RJLe24R+ZZ39tAkGsKNzPT7YgvQIneXa9Cb2t9UucJqu4GXA+3ahOd+pDrnbtJ
+b1f7AI4+KNDAik4sHgxe7yQphugck1bY9Rvxk0yGVytfTuNKzjkK1qV2N7bDAgMB
AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQCJjBL0Q8ZmS1u+Ch1GQYctaj6ob+3qtYHYURCmXnZB
-dQIL9BIsZ8bPRjs1i7Og1EfsWp7INs2qTsThPa4OWFYLrI55AvI/9ztwjf5i2BKJ
-aS8yVTmxSb+K/6wUOo4frpHtq/xogNSVhuD0b99xk76cSEganrtEE6dClZMJu9o8
-Qg==
+BgkqhkiG9w0BAQsFAAOBgQAMPEaTi7g8PZuliLt1ODdQmheZSoIzY6YVXCVZvJUQ
+3ibb8ANAkrXX343bN5VTtuXNa5K629/Dr2jjZiBOlUDyXxI8Gz7sZpShX1WheQsD
+mfRmCkeZo5iYYwUXNYAmSkymi8IP0n8qFakvhBUxpaAEYRJwZUZx1mtRkt4KzPXi
+9w==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.key b/test/aux-fixed/exim-ca/example.com/CA/Signer.key
index 76b414e25..d7a3326a3 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.key
@@ -1,20 +1,20 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: 99 41 8D A8 6D 6D BA 5B D5 FF CE 4A 2F 1F CE A0 88 4C 77 87
+ localKeyID: A1 F3 F4 37 A3 B9 CB 70 4F 22 65 FF 3B D0 08 66 E5 CB 25 2C
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBANlcwo5q84SEtVy5
-W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8ZJGICt0RYVIJCcaa7FUt
-5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR1XUy2MvioMH2lyc/PbV6
-2XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAECgYA8HZ0LgYXvMTrttbA8q/yz97cN
-4Be9kg4ZXOzQFRTuuLSkjU2PPzlQosKi7XpNC7ihcpSdeTV0cdWKK2MWfdryN4V4
-6PazAXU1scw8IaL1nsLY3B22cyc0I3FAN7KD/DitqHfGvIBxVHBVnY7nCnG5jtkA
-M6YlVsktAhv2PwAiWQJBAP2xKizmPHb5ivcxwBB0CyH5Za3WghPE9EIN4HyBw2m+
-ph3g66KY1DjN/bZWunB4f9DjVOGBQBcSmETjqwPJcv8CQQDbVvw7+9S+FnIuIrA9
-Bs/XovnFsFdN8itIjv1DpruDctUOa3WFHtGBRn816PVeS6ZAMri5TDvPqoThgD1I
-+zt5AkBtSwgKc94Uu4kc2bgO3o91QYaGj+VWMwGv+159BUJ0qgfS03VwhTrYhhYJ
-me+USLV3/pgw1ogP6JjlBNhGN2FtAkBhuTSySPY1Ju0CTyQ0XGeXzJ36DSIosT/F
-mSePz6Z132C7hvcaM2vmbBFbZIqF07Cjo7WXoTZ4xKFlkuw7KuwJAkA1aQipz4g5
-7bRW+8/h0+k9ZlYZlJyaQlIA2lMLJLVu3WPd9e3+8AxIS49I1iJKEDlGwtigPt4x
-uJx/V9ryk+xn
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALFHTtwaKeCfLlDf
+/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIflTY0VBym8/Iu/ExE476g
+RmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtEYKvUPIyWaAvqBbwY1QOy
+HNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAECgYAJlnB+mUoLUR1kiyWNqncHrKge
+SEgu/pJfdMoRB9/0uLRR+jqb0ZJN7jqKDCjTuT/7TlECZH9WPwhaKbmxpOY8LwWc
+BK3p6xnjuvgw4DvDUN8U4wQe6bNRcuHaz+X29AeXMjESn5rVhlRtirbFFXUlT6fE
+EouTtGGkjmb2CMPvgQJBAOAV+rOGyuJey8RxHmjQAomwDznw/2PbTZVySTxKLSi9
+5V5xYXGpEKsAfzskNizu9NlccsoIrG8qGtk3h02PLaECQQDKhsP3TnD8YEgTSqkD
+J1yErHOnoN4JYxLUGH/vW/G2fd8NEgY08Qc3mxeUgPr31tkxXeywH3EninZEfEnY
+3xCnAkBqKB9vQxEEMpJnyor0bm51WfGsqk3iuXbEsLKfHCjOnz91AVN/a+9Yg1DC
+7MG5ga5+9nvu2DMQKqszcknn5UdhAkAF+5UuaRLNYcq/RyVXAoKpKK8B9K6aeGLG
+ATNGTuEFExLTwASO68/axKodqPHBAIfJ/YxQZ51gHacAvusvjOdhAkAyGZAo9RxY
+PxM0xAmKKIcXbhNol6AqgpvmNV6HV+JXqJzuIiyzlbPFgfd+JQe6OrxYgfVvmiKv
+wFSymVKzv1Vs
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
index 2d30fe16a..0cd6aaf32 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
index 46a83eb29..25bd38a5f 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/ca.conf b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
index ae7b6b644..eecd87c27 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
@@ -2,17 +2,17 @@
; Thu Nov 1 12:34:01 2012
[CA]
-name=Certificate Authority rsa
+bits=1024
subject=clica CA
+name=Certificate Authority rsa
org=example.com
-bits=1024
[CLICA]
+sighash=SHA256
ocsp_signer=OCSP Signer rsa
-signer=Signing Cert rsa
+crl_url=http://crl.example.com/latest.crl
level=1
-sighash=SHA256
ocsp_url=http://oscp.example.com/
-crl_url=http://crl.example.com/latest.crl
+signer=Signing Cert rsa
diff --git a/test/aux-fixed/exim-ca/example.com/CA/cert8.db b/test/aux-fixed/exim-ca/example.com/CA/cert8.db
index 9513a3b2d..b9b624243 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/CA/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer
new file mode 100644
index 000000000..7c9b5da32
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt
new file mode 100644
index 000000000..8f00adf1e
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.in.txt
@@ -0,0 +1 @@
+update=20171217205108Z
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem
new file mode 100644
index 000000000..fb00dc38d
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.Signer.pem
@@ -0,0 +1,7 @@
+-----BEGIN X509 CRL-----
+MIHnMFICAQEwDQYJKoZIhvcNAQELBQAwLTEUMBIGA1UEChMLZXhhbXBsZS5jb20x
+FTATBgNVBAMTDGNsaWNhIENBIHJzYRgPMjAxNzEyMTcyMDUxMDhaMA0GCSqGSIb3
+DQEBCwUAA4GBAKTxaFNLywmLS8lwq8Zovv02EVqND7cRXlJByZJhxutszkDchMq5
+oEFPbxW8+Fc3tZqTMMLq2Fu5tViVzL0ziVVNs2l98wG3ws0PAXeiFYPJ0FgBYdam
+OEkTkAs8SwjUYq7YOVK2pzFK2NJ2f0uld1LfwMmLiYXBiRnIbiUW1fx+
+-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem
new file mode 100644
index 000000000..20ba802ee
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.chain.pem
@@ -0,0 +1,16 @@
+-----BEGIN X509 CRL-----
+MIHnMFICAQEwDQYJKoZIhvcNAQELBQAwLTEUMBIGA1UEChMLZXhhbXBsZS5jb20x
+FTATBgNVBAMTDGNsaWNhIENBIHJzYRgPMjAxNzEyMTcyMDUxMDhaMA0GCSqGSIb3
+DQEBCwUAA4GBAKTxaFNLywmLS8lwq8Zovv02EVqND7cRXlJByZJhxutszkDchMq5
+oEFPbxW8+Fc3tZqTMMLq2Fu5tViVzL0ziVVNs2l98wG3ws0PAXeiFYPJ0FgBYdam
+OEkTkAs8SwjUYq7YOVK2pzFK2NJ2f0uld1LfwMmLiYXBiRnIbiUW1fx+
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
+bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTcyMDUx
+MDhaMC0wFAIBZhgPMjAxNzEyMTcyMDUxMDhaMBUCAgDKGA8yMDE3MTIxNzIwNTEw
+OFowDQYJKoZIhvcNAQELBQADgYEAn5ZwGpzxpslUm/7LRkIlajXyzGp+8iTsovc6
+6ibiOtZo0q1gp8AooZDv5lrZkWDVzYOs+eozzI0sOROxpQ4SE81dEwwBy9DlTvQu
+MA7DFDQWYPr3BoK4VRIJwjrHBY8UClt8DwY7O2NwtDHakslLFgq0dFZHKcW9c34T
+3qkrgBk=
+-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty b/test/aux-fixed/exim-ca/example.com/CA/crl.empty
index db811f4e8..84b568977 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
index 5c3cda501..dc66bdfc9 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171105161901Z
+update=20171217205106Z
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
index c77198919..0c442e975 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
@@ -1,8 +1,8 @@
-----BEGIN X509 CRL-----
MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20x
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMTA1MTYxOTAx
-WjANBgkqhkiG9w0BAQsFAAOBgQA3fw/iu8rnPn5It/R8IHmx+65u1PC851Y0N2QV
-AuKfYM9PsoCykxFXC3YVq7pL/PecqTZEsE/aoQx6HuBdfJnLWB5djArqSUua/ENY
-lYabOFfr8ueNQmC+mcqbuATx6pt33JzXNPD13uhTKwFjkx1A7DrlQX/jkqUZe8nH
-HCCDeA==
+HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE3MjA1MTA2
+WjANBgkqhkiG9w0BAQsFAAOBgQAOfOXd2OgzRF9Ftj0Nuh19RRunj9P1InuaLynR
+l6DhlXHRwUD6/YkBGvMgJp27UT/1d67yyGBD4kpEJcgGMeJ6Yq7O7gA+V0tdQcnY
+3rblV3hkzsEkzemfMdF8FnZLZuCyJHxSh7kbmR9dqYHDLF/tiNWt3awTMtXB54fT
+PW09hw==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2 b/test/aux-fixed/exim-ca/example.com/CA/crl.v2
index cc4c5d7c5..21ee927d0 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
index 20311aa93..7c2dcd446 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20171105161903Z
-addcert 102 20171105161903Z
-addcert 202 20171105161903Z
+update=20171217205108Z
+addcert 102 20171217205108Z
+addcert 202 20171217205108Z
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
index 7840f5d41..2b2f1f434 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
@@ -1,9 +1,9 @@
-----BEGIN X509 CRL-----
MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
-bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzExMDUxNjE5
-MDNaMC0wFAIBZhgPMjAxNzExMDUxNjE5MDNaMBUCAgDKGA8yMDE3MTEwNTE2MTkw
-M1owDQYJKoZIhvcNAQELBQADgYEAWSJk6909DsDkqmIg0ZPhJD9Wkvg93KI7xfzr
-P1Jl76DJBDYLfEeCG2tCP0BEK9qiiigLm+4yq03xpWFaNYo9LYwK+vcoqaBDkUy+
-96ODhpGM2+Sd/9X2RQAxKTBQKKv8/OkVrP9fV92Ee1PItdI3FC32Ca7+/HDMfmfV
-lQDNxU8=
+bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTcyMDUx
+MDhaMC0wFAIBZhgPMjAxNzEyMTcyMDUxMDhaMBUCAgDKGA8yMDE3MTIxNzIwNTEw
+OFowDQYJKoZIhvcNAQELBQADgYEAn5ZwGpzxpslUm/7LRkIlajXyzGp+8iTsovc6
+6ibiOtZo0q1gp8AooZDv5lrZkWDVzYOs+eozzI0sOROxpQ4SE81dEwwBy9DlTvQu
+MA7DFDQWYPr3BoK4VRIJwjrHBY8UClt8DwY7O2NwtDHakslLFgq0dFZHKcW9c34T
+3qkrgBk=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/index.revoked.txt.attr b/test/aux-fixed/exim-ca/example.com/CA/index.revoked.txt.attr
new file mode 100644
index 000000000..8f7e63a34
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/index.revoked.txt.attr
@@ -0,0 +1 @@
+unique_subject = yes
diff --git a/test/aux-fixed/exim-ca/example.com/CA/index.valid.txt.attr b/test/aux-fixed/exim-ca/example.com/CA/index.valid.txt.attr
new file mode 100644
index 000000000..8f7e63a34
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/CA/index.valid.txt.attr
@@ -0,0 +1 @@
+unique_subject = yes
diff --git a/test/aux-fixed/exim-ca/example.com/CA/key3.db b/test/aux-fixed/exim-ca/example.com/CA/key3.db
index 6565d0cd8..1be48c144 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/CA/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/CA/noise.file b/test/aux-fixed/exim-ca/example.com/CA/noise.file
index bb707059d..210d9f839 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.com/CA/noise.file
@@ -46,7 +46,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5431.34
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -73,7 +73,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5431.79
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -100,7 +100,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5431.63
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -127,7 +127,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5434.63
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -154,7 +154,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5432.00
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -181,7 +181,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5431.94
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -208,85 +208,86 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5431.94
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
power management:
CPU0 CPU1 CPU2 CPU3 CPU4 CPU5 CPU6 CPU7
- 0: 70 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
- 1: 39 16476 1416 1089 6857 1983 1674 1959 IR-IO-APIC 1-edge i8042
- 8: 0 0 1 0 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 284 4834 2265 1628 7027 2758 1632 1695 IR-IO-APIC 9-fasteoi acpi
- 12: 273 1626151 37392 40715 288530 39254 36081 51183 IR-IO-APIC 12-edge i8042
- 16: 1 0 0 0 0 0 0 0 IR-IO-APIC 16-fasteoi i801_smbus
+ 0: 75 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
+ 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: 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: 7136 3040 2312 1908 4546 3822 75945 2347 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 123: 22 7 1 0 7 3 4 1 IR-PCI-MSI 327680-edge xhci_hcd
- 124: 89 19 22 25 79 55 27 54 IR-PCI-MSI 2097152-edge rtsx_pci
- 125: 88 15 127570 11 48 25 19 21 IR-PCI-MSI 520192-edge enp0s31f6
- 126: 1 1 1 0 3 1 3 6 IR-PCI-MSI 1048576-edge
- 127: 561 174 98 789459 240 230 184 147 IR-PCI-MSI 32768-edge i915
- 128: 34 14 0 0 1 0 0 0 IR-PCI-MSI 360448-edge mei_me
- 129: 22 10 0 1 10 0 0 0 IR-PCI-MSI 1572864-edge iwlwifi
- 130: 92 103 30 22 194 115 10 45 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- NMI: 9 12 9 14 10 9 9 10 Non-maskable interrupts
- LOC: 567716 554896 727085 1034643 584080 592635 624369 549045 Local timer interrupts
+ 122: 40662 2645 2048 8326186 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 3782852 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 13518769 IR-PCI-MSI 520192-edge enp0s31f6
+ NMI: 607 2649 2621 2523 2484 2424 2424 2470 Non-maskable interrupts
+ LOC: 29014738 29910147 29754034 28953856 29024391 28521696 28469173 28816545 Local timer interrupts
SPU: 0 0 0 0 0 0 0 0 Spurious interrupts
- PMI: 9 12 9 14 10 9 9 10 Performance monitoring interrupts
- IWI: 0 1 0 0 0 0 2 0 IRQ work interrupts
- RTR: 7 0 0 0 0 0 0 0 APIC ICR read retries
- RES: 85583 31067 11917 8325 7466 6913 6401 5898 Rescheduling interrupts
- CAL: 73161 74171 68752 70655 80169 75209 61391 70903 Function call interrupts
- TLB: 55150 56119 50377 53791 62195 57072 43366 55765 TLB shootdowns
- TRM: 0 0 0 0 0 0 0 0 Thermal event interrupts
+ PMI: 607 2649 2621 2523 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: 7885792 3950261 2715262 2193529 2474046 1957554 1665440 1988038 Rescheduling interrupts
+ CAL: 987291 866818 901402 885321 915800 938469 935939 966681 Function call interrupts
+ TLB: 231525 195523 218511 215448 205511 204323 194087 201607 TLB shootdowns
+ TRM: 1627962 1627962 1627962 1627962 1627962 1627962 1627962 1627962 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: 49 49 49 49 49 49 49 49 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
PIN: 0 0 0 0 0 0 0 0 Posted-interrupt notification event
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: 15852528 kB
-MemFree: 10535936 kB
-MemAvailable: 12484200 kB
-Buffers: 128136 kB
-Cached: 1542420 kB
-SwapCached: 0 kB
-Active: 3134176 kB
-Inactive: 1817128 kB
-Active(anon): 2706712 kB
-Inactive(anon): 79680 kB
-Active(file): 427464 kB
-Inactive(file): 1737448 kB
-Unevictable: 32 kB
-Mlocked: 32 kB
-SwapTotal: 7933948 kB
-SwapFree: 7933948 kB
-Dirty: 3980 kB
+MemTotal: 16293504 kB
+MemFree: 934072 kB
+MemAvailable: 13703496 kB
+Buffers: 452228 kB
+Cached: 12441380 kB
+SwapCached: 101680 kB
+Active: 2599800 kB
+Inactive: 12195432 kB
+Active(anon): 1356304 kB
+Inactive(anon): 588448 kB
+Active(file): 1243496 kB
+Inactive(file): 11606984 kB
+Unevictable: 64 kB
+Mlocked: 64 kB
+SwapTotal: 8212476 kB
+SwapFree: 7376112 kB
+Dirty: 11044 kB
Writeback: 0 kB
-AnonPages: 2975780 kB
-Mapped: 495468 kB
-Shmem: 80740 kB
-Slab: 143672 kB
-SReclaimable: 74472 kB
-SUnreclaim: 69200 kB
-KernelStack: 9152 kB
-PageTables: 39092 kB
+AnonPages: 1871520 kB
+Mapped: 416280 kB
+Shmem: 289864 kB
+Slab: 351256 kB
+SReclaimable: 257264 kB
+SUnreclaim: 93992 kB
+KernelStack: 12832 kB
+PageTables: 58172 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 15860212 kB
-Committed_AS: 11673848 kB
+CommitLimit: 16359228 kB
+Committed_AS: 7879332 kB
VmallocTotal: 34359738367 kB
VmallocUsed: 0 kB
VmallocChunk: 0 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 966656 kB
+AnonHugePages: 0 kB
ShmemHugePages: 0 kB
ShmemPmdMapped: 0 kB
CmaTotal: 0 kB
@@ -296,15 +297,14 @@ HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 202752 kB
-DirectMap2M: 7602176 kB
-DirectMap1G: 9437184 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
-virbr1: 353867 2838 0 0 0 0 0 0 1474230 3810 0 0 0 0 0 0
-enp0s31f6: 43449731 65089 0 0 0 0 0 2075 6949500 57088 0 0 0 0 0 0
-virbr1-nic: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-tun_wizint: 4130741 7381 0 0 0 0 0 0 1092175 8002 0 0 0 0 0 0
- lo: 5706 74 0 0 0 0 0 0 5706 74 0 0 0 0 0 0
- vnet0: 393599 2838 0 0 0 0 0 0 1609950 6362 0 0 0 0 0 0
-wlp3s0: 0 0 0 0 0 0 0 0 0 0 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
+ 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.com/expired1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
index cde036853..c6accd35b 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N3YjbHA
-BEKAiUHwJ0VMAAe/KMOM8slXOAKni4v7Vf6BzbO5B6uaKhDV2n3V0vXwMdAoeBaq
-3s9CHOjDXwjF1qf/p4w3Z2aUIVt/Mb+uEcPUlq0Nr8OLlH11QKbkvFtLxU3sUAoi
-fcaydi1q3tszjPQ0tKlLo6kOzcgi8d47WccCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAAzD/Zszo
-X4ieSQQxDOH53VkiAJDs32qso9YzGbQaenuRnVFCuo7rt68cjMcOjzf18/I+iMeH
-nEcdqkfoYB4Z3LXvDaRGZhg/ZOv58muzRnsW2oQI9yFqDwD0FZPtM6Vq0AWXjLuq
-IogOI5fShSo7H5hc3vrkvS7KUhzuv3FKnaQ=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
index 5082e03ed..0cc8c2ec7 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
index f6cdd036b..569d91be7 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 2D F0 80 D5 36 FE D2 A2 89 8B 45 96 53 27 78 75 9A E2 AB 74
+ localKeyID: 11 3A B7 95 2B 9C 29 53 DE A2 85 E3 4D 03 0B 39 AA 06 23 73
subject=/CN=expired1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDFaFw0xMjEyMDExMjM0MDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtHBMZtGtODyg6
-OC4nWNIjICkgfR3e831qmWUhMR671zF0tcywM8yH74jRQJP30nHzvrvkIT11Z540
-yvZzK4mzoZXQm466fwivjUkUK6T5nT76zbc2+mN8pK6s+xG2oxF+w1aeMaldJ9nY
-D1jEPenQL/rq5Sb0kC52wkwSSDI/MQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVGSR3x/dy3K1D
+9ksiSdVXCeWMLkH3MbKzc6vGq7/kKoNNh85Zu9EnftbwY0jyBUSnhyi8sq6VTT3b
+NK4aLcTCvinzlEIaM5HFD/h/dsLBTPuwVo9FhsJtgGwI0c0ZktyNOQl9SsHqOkWz
+AJiFqzo+3As4Q3xWwWpdhtXTaOPAkwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AHBdui6MIhv8xE3jegdB+3d/UaC9iZJhrhxFfD3eirbvdA2IOfpglHoora5Ll/WB
-CgKC8NkwYf7kdTPM0T0hSjy9nlollFTxk0BaS7xKJdOjwDHVAIR1xpnw3wC/jIK6
-U42/WCIXJG1VsbpwI7zohfcfL+1OsJ4SvKYGMR9Tpbqb
+AELflNznRRAJHrDXTjLsHl7IC0N5eS3j4/cckAA0hsvQfuwoQu15A6301WyfS8vQ
+JBg/rHzX4ZkSVovQ0ximDRgPsZ0Ytj7zz4kfLnVOEHzVDv0boH4UNYMOWziTJFex
+Zl1VQzLlik1oyO/qfo7EysB12RZlm7mshkD/XV0zwkO1
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
index d770088a3..fd67faff1 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
@@ -1,21 +1,22 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 2D F0 80 D5 36 FE D2 A2 89 8B 45 96 53 27 78 75 9A E2 AB 74
+ localKeyID: 11 3A B7 95 2B 9C 29 53 DE A2 85 E3 4D 03 0B 39 AA 06 23 73
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI1UyiYnYKO9UCAggA
-MBQGCCqGSIb3DQMHBAjWD6vdWh3+PwSCAoByLQ9hJ+2ANh1Z88M4f7pVMVnGk0yr
-qxX/IjoB9H8KnweVCtXP38T6Wuhm5JEVXOK1HWA/5A37mfLyk7YHvvYWcH7CmLMa
-ssMOlDmCBXZWwnSseeZyvuJedsXIm6VDc8JNPeshVTkXEAmaA7wu5Vr3Tggg/tIh
-S2XBReFIZWa4+ibGGj7n3z5TsDQMIufZKAtl4WdrwDnUBGrQ5gt5TpXrtdHsYsHA
-cVrt5XFDMytSPVgiL3X46p5/b3MCUBivyKvvRzDz5LmcJ3iGERnfFoUKiASJPoPp
-YBx91ehwq2tC+ciQFGOcQ2yt8F45yiMwgHYQK3McDf3NbScylfuTzDU+BA19HPBC
-yE2taZAwYmqfihXiZQ3t20kT2n7CbdZBYJJsyKnc+K32AYofspKzZEU4ypqcTJ4+
-4HDAgCwzKuUrMvbKUFyQw+OkaD8e7Vl8q/X6yYtwPviWDO893cigFCYiPcPYaqBc
-snzL+T7zjw7x5rtQ2IPqx3jfjX7hDbQvvK3ZEWTxqkUrx4JeLGHIK5kNE5DHK6G7
-0jjuNzYN57BuzYKzO5Nd/N6vstyITTEpEWz2jTOXqWgr1lF3isy3yKcVETL/tUd8
-nDltQvN4kzqbvW9f1VtD+pKBhyuBv077FXw3RbHukIjaIDSg+fSjukm5vbEpx+ms
-JuB2Jx/VSOfUH303Q+lbz1Q2X1Ikn6d7oF7hTrvz6dts0bqtbXxB3+2RY+c3RPhE
-wfTzyqKQVCwifbEXC4aMKRZruhzWpw6H0GEvOfSXgc9O7ntm8B20pCka4tr58R+6
-iB5S+2vmsjCGC0PSUjpCj0jkPmnw1fDP7W9bg23w0CtMKQRw2xrxMIiG
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIgkIbOgBN9YECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLGsir1I4gLUBIICgCrulaO7xBkc
+GYBbg1ga7mNDUyadIvk4590APLip3on48zzw0NMFSEFMcmxmbFAffjqPlit2jqfy
+3bYxP1qWAUCn8lizPSsvl0ZUaetD/RezM1JV0a5W/JDxdX3DgDOcnFRXZdyzCz/W
+vx8G69btfgMr/xTkBEpcYK0x2YTBGrRGqW8YqgjP5wcS3gJrAZgnYLFdXmNDp4Wc
+QcysKmtCTrlG9awBaTlf5CyF1wwHWpKmS2rGuBMLY1zr7N0+EICKlfLJ612ON2Iv
+2IkpiwEpYtR2mo6lW6ULjBc5Ah1CwxkqFyIGk/zxJnYGGoVgYobNK0Hl9yTNSjSU
+TXG3zMOoaHr6+W6rK1xAXlArkP0GAW2Jfc/6SQMiNuqxczSrgeDC05mp9uH4p7ly
+lKPSWJupzMi7PUF3dmYyR1578uEykbRpOOSH1tL/KUduGlesqJi3XzGH1M6Ajhwk
+xXfxiO8zEsCbtlSkAiiiXEFx8pzPz7eUhG9PGLt+/HN/DeM9bEIFQgvuWwq0Qa3u
+aS9gfj65C2wxUVqycq+6LG+8lSeoFjmKlQNNK/o2f56skfo1JpFR7Zy50C4oLV14
+8TbfofPUQnDVuqnuEP3LMIGNDlf3W8aip6CiCd1C3c7AgO/rbhF323ZjpbpxmrSW
+uQZAIu/avmVdtKUi+k7twb6jaecbVW3KUg9LnwAFHBzwRhy239FxUIZ3z7+9IOoe
+gZXF1OnaQo9U9lRmFPmkjGCIv5RkgGZ7G4+Ing0m2hDbaFa45RJn1+x51msB1V8y
+TwErRlYvWpFW2HI3SoEqr8axD4AWWCGHl7o9j8DV1AsV7L1B9DSPLdVfUH2vPafD
+k9MfD+MTcEs=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
index 76a1b88cf..58215459e 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
index 9ef0b4f54..1753432dc 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
index 9e192919d..cc85143a1 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
index fbcc60ed9..8eb6640f3 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
index a1b7a417c..24552969a 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
index 2dbb36d65..47b413510 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
index d9f4b0110..4a0093761 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
index 6524a9d08..81a380556 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
index acdbc9ee9..461bd62d5 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
index 7cab7b15b..084867c14 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
index db7574a05..9e3d49c35 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
index b74a2ff05..94c607094 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: expired1.example.com
- localKeyID: 2D F0 80 D5 36 FE D2 A2 89 8B 45 96 53 27 78 75 9A E2 AB 74
+ localKeyID: 11 3A B7 95 2B 9C 29 53 DE A2 85 E3 4D 03 0B 39 AA 06 23 73
subject=/CN=expired1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDFaFw0xMjEyMDExMjM0MDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtHBMZtGtODyg6
-OC4nWNIjICkgfR3e831qmWUhMR671zF0tcywM8yH74jRQJP30nHzvrvkIT11Z540
-yvZzK4mzoZXQm466fwivjUkUK6T5nT76zbc2+mN8pK6s+xG2oxF+w1aeMaldJ9nY
-D1jEPenQL/rq5Sb0kC52wkwSSDI/MQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVGSR3x/dy3K1D
+9ksiSdVXCeWMLkH3MbKzc6vGq7/kKoNNh85Zu9EnftbwY0jyBUSnhyi8sq6VTT3b
+NK4aLcTCvinzlEIaM5HFD/h/dsLBTPuwVo9FhsJtgGwI0c0ZktyNOQl9SsHqOkWz
+AJiFqzo+3As4Q3xWwWpdhtXTaOPAkwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AHBdui6MIhv8xE3jegdB+3d/UaC9iZJhrhxFfD3eirbvdA2IOfpglHoora5Ll/WB
-CgKC8NkwYf7kdTPM0T0hSjy9nlollFTxk0BaS7xKJdOjwDHVAIR1xpnw3wC/jIK6
-U42/WCIXJG1VsbpwI7zohfcfL+1OsJ4SvKYGMR9Tpbqb
+AELflNznRRAJHrDXTjLsHl7IC0N5eS3j4/cckAA0hsvQfuwoQu15A6301WyfS8vQ
+JBg/rHzX4ZkSVovQ0ximDRgPsZ0Ytj7zz4kfLnVOEHzVDv0boH4UNYMOWziTJFex
+Zl1VQzLlik1oyO/qfo7EysB12RZlm7mshkD/XV0zwkO1
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
index 223bc5ce1..7d6c85dd3 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCtHBMZtGtODyg6OC4nWNIjICkgfR3e831qmWUhMR671zF0tcyw
-M8yH74jRQJP30nHzvrvkIT11Z540yvZzK4mzoZXQm466fwivjUkUK6T5nT76zbc2
-+mN8pK6s+xG2oxF+w1aeMaldJ9nYD1jEPenQL/rq5Sb0kC52wkwSSDI/MQIDAQAB
-AoGAAQboAucHG/ELFA1Xq/QWJKjNyNuOw2ikyqHn769GHc2RBYtukD0LOzAFZ8Uy
-TrrfSJe0SNr80/PhasuP2rvcMHbtM0ajvsnUPlF+wRezWlj8ibKMfH8vw5gW95G2
-3+ZI3wf5uoesaSGNb6ITEnHxcIfpR1SXOyhIf9OOmJGtoAECQQDZI1iwHZhZIxND
-LgnVyD7xLhv1aVIeR9ahOccaa7+AWySVkwK8udiw9NmbApbLAku4au9GC9jLBwWj
-KuZYNitBAkEAzBd4jUWGxiOreVViywiuVVwCNjU9CtEgUMhZUEpNSS8qNr7MDEiI
-90+rjOSVmnyJ5gqwHnkJIIH4dYBuIJTH8QJBAM1KPspbYLM9lzOXrlLBfMi3SFWw
-2qOoVcKehqBzKF3pTeBgWmEl8Dn1dFq6iuiqZf6Yk1oNT008eVb380mJBUECQH0x
-4Kd4gOZGt0dk04eMubRvDoRGQD3EbzhezjrseWBtaE3Q2MaoMCzVWHzDM+pifwz4
-fXUT9j9Uux8JO4UM/2ECQQDVOjqxjLlRoX67D3G3k8ObBOMT0tufK0ekfJvdgQzc
-rLsc9QZXGoeOSEoaf4AQxByy6J4QnjVW66G+UhItPxRB
+MIICWwIBAAKBgQDVGSR3x/dy3K1D9ksiSdVXCeWMLkH3MbKzc6vGq7/kKoNNh85Z
+u9EnftbwY0jyBUSnhyi8sq6VTT3bNK4aLcTCvinzlEIaM5HFD/h/dsLBTPuwVo9F
+hsJtgGwI0c0ZktyNOQl9SsHqOkWzAJiFqzo+3As4Q3xWwWpdhtXTaOPAkwIDAQAB
+AoGAJn7PPrAp/F7vEerpMb2Cw6FvDT7B/eTFcnN/4XjfRlmDtLrGxSEPrIHWVECr
+ScU33MemzUe+EAyPEw1WMjZ4Z51Df/gqX/9pJkvQAhlJUE1ebiuQ9zoG1oBTuIUN
+iCzBw6XMriv6IyokFSi5pylPezKJsTD4syn9OVq1woEQfGkCQQDw2NKGJRyrQaHW
+pTRZOU5129K9DjEmmT12Wcv4GH0477AKPAj5Dwk18r5D3wj7m5RQcwdPHOi1jjVL
+l1xgmH/lAkEA4oFjOujaSnd/pLNpXDbgpqwPdp9mb9CbSb9bu8yWEwBsqfDlVKeL
+k54GsFagidnyWzmozItzyIQkbVfTG90HFwJAe6qpdo3Jybm6ks9jMMk3G1dTPxXx
+cONQZtu22t4gNkMEfkzTQqdQ0G2i+pCkOSVqo2BdCWdLqiWqAfVnToYfbQJAHp/5
+57QmF51yn7U2UKaG12I6MQK6WfHtnRoHcCvoOqd7CbstdrW0lH/wTZVY3WqfbyAr
+p4RPYlQjjLksLP9EfwJAAIYdNAfxGFyQBIZDfvHrtbgqvh5vMfvlywRLeTXKtD69
+GC2ICZ6YXUQpvMb7KZ5FcRMeT/kyFxm49dAWTCHC0Q==
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
index e3f1e846d..5726b1a39 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
index cde036853..c6accd35b 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N3YjbHA
-BEKAiUHwJ0VMAAe/KMOM8slXOAKni4v7Vf6BzbO5B6uaKhDV2n3V0vXwMdAoeBaq
-3s9CHOjDXwjF1qf/p4w3Z2aUIVt/Mb+uEcPUlq0Nr8OLlH11QKbkvFtLxU3sUAoi
-fcaydi1q3tszjPQ0tKlLo6kOzcgi8d47WccCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAAzD/Zszo
-X4ieSQQxDOH53VkiAJDs32qso9YzGbQaenuRnVFCuo7rt68cjMcOjzf18/I+iMeH
-nEcdqkfoYB4Z3LXvDaRGZhg/ZOv58muzRnsW2oQI9yFqDwD0FZPtM6Vq0AWXjLuq
-IogOI5fShSo7H5hc3vrkvS7KUhzuv3FKnaQ=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
index b1949366c..d9c92b857 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
index e1f627620..6d0c80150 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: D7 25 3D B0 CD 84 B6 A0 91 23 8D 39 0C 9F E3 D8 A0 D6 E6 35
+ localKeyID: 2E CF 5F 43 53 BA 8C E9 2F 62 95 52 FD E6 1B A1 1F CB B7 DA
subject=/CN=expired2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDAyWhcNMTIxMjAxMTIzNDAyWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApen5xbyDM2wZ
-HlNaaYAjXzrDC/qwnlhffLVl0l+/+fMx83Yf9yn/MoB+RHxK2Zl8W3BHu+WmlJan
-MLK7q3Tv1X6hYQLR16CluTpLQswUK5Sxc/TdH0k8b+vR9uwDPQ7NVQ4LGnWwEMxN
-zGw1jWiGSg9fL13WKU9fCScIkQVe42cCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA2WhcNMTIxMjAxMTIzNDA2WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyUlBWmdTM96y
+ac0i8r1M520NAWSe7mqaefQ8ikDjcL8OOLFBm6WWZ2Twux5/OnIybzTJ2WKm58fa
+TOlEiw5GsnhnjMTi9zHhEUdJn2/Gz/0oaGfkXu1QsHIP0SjfEGUy1lvg/EhXnPz4
+XGixIZyhQLqOiOrx2BhFqGVZ9FYzO4UCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQDGjEY07fjC0JYOYgwOhBXOMJkrTa8Hh4FvXMBB+Rt2VsRf5thkkcKl9Wi1BadE
-os+7qAhS2PHxtmM3aWilxC/esEe7w6bqSv5VT2qSAzOp/q+LGNOB/vDeR+tr04Jx
-o3AhBqpoy9FL3zue1VYYqZn2myvMsWQ0fqwRQAd/h7RQhQ==
+gQBNavRiDJHQwrHch2BJLP7BCtAPshqO9aJNicnXVDE5f7MKc6wjcjgoMNn25Y8w
+WlT+3LGZuvT9QUfC3XSUzafiYDzaI+KxBMQWlztTyoxV0Ug2tVoN65WgiIKgAIwC
+LjP5yVh9q3dsoEpBQ0OGpw7t5Jd4z5isDVdAxQ7LIPpu2w==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
index 29fd9aebc..a8942ef1c 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
@@ -1,21 +1,22 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: D7 25 3D B0 CD 84 B6 A0 91 23 8D 39 0C 9F E3 D8 A0 D6 E6 35
+ localKeyID: 2E CF 5F 43 53 BA 8C E9 2F 62 95 52 FD E6 1B A1 1F CB B7 DA
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQImZNS2klCPs4CAggA
-MBQGCCqGSIb3DQMHBAhII6fkFNt8pwSCAoD0/XaFALLxjx8IJE5txE8nJBFbLuLi
-K1iL5ahVQ9UbPcDp+Ysjh4ME9b+tX/n0lZIc2Bhj7mUgLWQ2l5E8SjcZkWD4EkwF
-DzRm6/VvKIWZAx2Izc/fklbgBC4Ua8juXELF10sdJ9a9aixb6ur7a0c92VBdDiWb
-NKAJ38yeEuYKQbQuyC+HbI1wzOGWNzFAwlkOm/uHJr3+rA/l3KWGg/ok3yRLUoth
-q6HQ1f3T5ZRKzLE3oacjRgSsvo+1wNwpAtUcasUdQmqwmkoBbwfPJpNOFNxMWmz1
-z/eu8grSlVVmBhVOywAHhowzN4B+qRYWt19laYcUK9dQDdix6enCdf23loZIwF+M
-8bdajFdHcvpQ+7UW7Z94oa2/Lq/sGUxUMQtjO6Tr0sywoNCPIyS6YfvZ8TuAiazF
-xW/enLYQr2GbZ9abkKBtSxGBaPOzrcuNB82ja9TYS/f+Dn1q1fABUj1XzKuDJCWP
-PmdTdphnA/M9hie7ceDFkAKZZi1S/m3KZjQWg3mJYdgXBNlZSoL5lnEtoIAqdg6y
-6PS5aK7DOClEEGd2v/8I4awT4SxtQOlNdwGfgtsw8rdOwaUEZSeXJHPPMUu+6iPD
-if1xj5Pw1KBkcYePQRX5JBEOC0IZ0OtmxvWWbJ4uK5Ng7W+1mgf2PUCWwtOYtQvL
-Kxxgk/9/kolu3Txg0FcSYU8fZKoKaSJl+CP41fK7GONiduHc8Ok33jZShdcw5E2k
-k90hk3l6yp6hdUnAyzbY8DnSWPRHnoy/ZkHcwUvwr2u9p/PXKwK4cSyRKgKTsusP
-uAM4Ifxj+AKCRR75LxBy6BrSTLZzFtV5SmvdjDKGc3kPiSjulSjCm860
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQILtiYmswfV5wCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJCv2ZpdgYbsBIICgJRWLJSp/sRa
+X5GinSqjXfa4IBVtGXeYBuisP1XtWBb0/dP2L0bxgg5TTpxfPTXJPY2VeBDLyh7a
+xTz5i8v0TnGVy7fJeDjwhfJw3fQy/s/XAFhNeu4zSwtzvU+FGcHgXdywvS+Riq4F
+jKgoNnv86wWN/gbSYi3Dx7wapHSNIjwUqaKPbp6DQbr60V/QLU1gYYK7L/7xb4T4
+PvPc11SytPHGi6AVQJQC7Vc6l317sVHwYA7r0ES7x0v5EPBDsgw6pfZvg9Dufn7q
+sylw9qZ/FOwP8wPMmPOMe2QTTOXMmcZsshB4yCRnPubFT6LlARnjGPmPH+NNOtYY
+ywARDO3ZjYFmCvM3zyCHfrCbV9rR6wQIGfAmVrLiNbVv/FWdJGIZ/cbDgAuvoTUE
+j5qRdb7O6hhXRQjmHpiIK07tE/V4MdcAwlizfxSMsdrBVh5K1LTd6ZAUaLzDyXHs
+UdFSVhdYOAHryEzNtVGAMbJf0zT8CxYxQboCOCffoVvI7Fb4sK6syDtXAZZFJKdR
+1GJULr2IGxdppS5BXHZ9egezRpKombVECkctEnjgKGQmiK20Zs7wHUcnh9S97C3l
+oF9UXieisHTDY7SegBu8ufU55vCi8TSD5AtMMkyGCPU68YDEPcvD6YKeJQ3R1opO
+5n7z9c+QWT61L8pIjBADxSxV9VP023q0fc4HODLWBjpxDgw1lvkAaoxQFTNFu8nx
+AIX+MN+9jrHS+2ZJrfcHJRug8A7SCrc7/is8H3RlenvXiseJIUXaFec0Y4ug5ZTi
+1DTdhC7U9DmHFOsvgxEyDgxFpPV5/2CHLQyNREiTqs2jg2a8sTxF3J8p2FVKbD/6
+G/1U0JXS5H4=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
index 48a7985f6..608b267ec 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
index 0243f9dbe..02615500f 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
index 63246620f..4529ac728 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
index 0243f9dbe..02615500f 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
index b6ec943ea..2de3cf922 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
index d151d8546..3c5017150 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
index d151d8546..3c5017150 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
index 69f266075..7c1bd8c3c 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
index 5da2d5fb6..ee478a865 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
index 5da2d5fb6..ee478a865 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
index c75c7daf6..816258f90 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
index edf8f941d..19910a050 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: expired2.example.com
- localKeyID: D7 25 3D B0 CD 84 B6 A0 91 23 8D 39 0C 9F E3 D8 A0 D6 E6 35
+ localKeyID: 2E CF 5F 43 53 BA 8C E9 2F 62 95 52 FD E6 1B A1 1F CB B7 DA
subject=/CN=expired2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDAyWhcNMTIxMjAxMTIzNDAyWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApen5xbyDM2wZ
-HlNaaYAjXzrDC/qwnlhffLVl0l+/+fMx83Yf9yn/MoB+RHxK2Zl8W3BHu+WmlJan
-MLK7q3Tv1X6hYQLR16CluTpLQswUK5Sxc/TdH0k8b+vR9uwDPQ7NVQ4LGnWwEMxN
-zGw1jWiGSg9fL13WKU9fCScIkQVe42cCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA2WhcNMTIxMjAxMTIzNDA2WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyUlBWmdTM96y
+ac0i8r1M520NAWSe7mqaefQ8ikDjcL8OOLFBm6WWZ2Twux5/OnIybzTJ2WKm58fa
+TOlEiw5GsnhnjMTi9zHhEUdJn2/Gz/0oaGfkXu1QsHIP0SjfEGUy1lvg/EhXnPz4
+XGixIZyhQLqOiOrx2BhFqGVZ9FYzO4UCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQDGjEY07fjC0JYOYgwOhBXOMJkrTa8Hh4FvXMBB+Rt2VsRf5thkkcKl9Wi1BadE
-os+7qAhS2PHxtmM3aWilxC/esEe7w6bqSv5VT2qSAzOp/q+LGNOB/vDeR+tr04Jx
-o3AhBqpoy9FL3zue1VYYqZn2myvMsWQ0fqwRQAd/h7RQhQ==
+gQBNavRiDJHQwrHch2BJLP7BCtAPshqO9aJNicnXVDE5f7MKc6wjcjgoMNn25Y8w
+WlT+3LGZuvT9QUfC3XSUzafiYDzaI+KxBMQWlztTyoxV0Ug2tVoN65WgiIKgAIwC
+LjP5yVh9q3dsoEpBQ0OGpw7t5Jd4z5isDVdAxQ7LIPpu2w==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
index 0509284ac..7d72da0b5 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCl6fnFvIMzbBkeU1ppgCNfOsML+rCeWF98tWXSX7/58zHzdh/3
-Kf8ygH5EfErZmXxbcEe75aaUlqcwsrurdO/VfqFhAtHXoKW5OktCzBQrlLFz9N0f
-STxv69H27AM9Ds1VDgsadbAQzE3MbDWNaIZKD18vXdYpT18JJwiRBV7jZwIDAQAB
-AoGABY+IeAif6xbJ5rrLcnLBfL0W8W1XAw+aL69SuNDNud5dQ7gnTRziuToWQUxb
-I9zhjpz+Qn1pblx4QQkUgiQar6LLMgW4ZpJBCKQd7AGdzirSUqUgY2IwRUam+9Jr
-NkBLiUlPcQ9GbEDUBSZ/JQJCIMrtCUAc//uERHgNF3prJ3UCQQDUX3gedmnKvMQY
-+YLRIYEfFo6ASUfTEs0Dt2A4p8ICLNXa2rVsE09dAqUyepUYa6geXXRxEPeEsLUg
-xYGK+ZAbAkEAx/9D3k45moQYt+S0NE/fPcd673mAGV8i8d0cr2QG9zTpoIszmHH6
-kqJkh0JmOuBLOP7pldqR8Vibqj1JsXMmpQJBALrLri+9H5g/KIx/Cl1ABv59LKIR
-0qcJJmJabLvocnDPVtrE/EYvReMdbIhV4cY1Cw6KTN0We1+uveIxVpwSnnkCQH9D
-gQVqE5+uZShHgSA0nyLp1+GhGBGNB2iOwh0dco1F/1Boo9li1gcPDRdA+lqGtXc8
-RplT70B7mPqYa1depf0CQQDT02pzQYCGet7u/NKyJi1Cc3UFx6FnielEL96zmtWT
-EbYXb7aoazRiRttYiYGauU8NebHaTWAHaTFf+EVzfJLz
+MIICXQIBAAKBgQDJSUFaZ1Mz3rJpzSLyvUznbQ0BZJ7uapp59DyKQONwvw44sUGb
+pZZnZPC7Hn86cjJvNMnZYqbnx9pM6USLDkayeGeMxOL3MeERR0mfb8bP/ShoZ+Re
+7VCwcg/RKN8QZTLWW+D8SFec/PhcaLEhnKFAuo6I6vHYGEWoZVn0VjM7hQIDAQAB
+AoGABGHMoy30LQEoY67EV8IAwloIqjLZVenqtoR3a/AZM3tpURkky0Fp2pLjPcOe
+c/SH/g1JZqrj5NBgQ4PhiuBy8AZRm1b8XA+aDikshWumVefchjt3dpZwltdPLYw1
+B+Y5YCaDIAN8conQ+GBNhGE26e8QaksOcwzY7zLMFE1QCkkCQQDxMSbZFGB/6/87
+x80aRkPX2LALl2nG7HMhgd6SGifAHwLVTKCtkRgqyXnQZ5Yt39iQ0hMMgctfS5Yj
+4JSFB+IpAkEA1aTl1lRYK9A9j2ZDKf1UiEdnnoUE9QRUTLz7zidZ6InHQUVFHHbw
+EnZDZH8SRtMkyp8DzVkywMjmTIyCsMQR/QJAXVLVYz1dMWIROgJPPBFgAs6XH4UQ
+qqWmzpo/kmyIYPAe2oVxznbL0RJwDdFm7I0mcLK4KCi4lkDa8TrefLLWMQJBAKPk
+Oti/nWAHAKKYHWAB0a41sLy/aH0ZlB3GQBj2wRcNUsi0ff8HEsXm6W4XuQqSAUBa
+2gzWp4OS2nDQvZUi5HUCQQCshGdN0wTB/Opx4ja0TY/P+zoxNfOLX5TbaDdF4Uit
+BEbAk7yaLQ9vZXBSgpxXkr2oAxsltaRLmc1GQRtDrayG
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
index 2768cbd5f..b92d5066e 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
index cde036853..c6accd35b 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N3YjbHA
-BEKAiUHwJ0VMAAe/KMOM8slXOAKni4v7Vf6BzbO5B6uaKhDV2n3V0vXwMdAoeBaq
-3s9CHOjDXwjF1qf/p4w3Z2aUIVt/Mb+uEcPUlq0Nr8OLlH11QKbkvFtLxU3sUAoi
-fcaydi1q3tszjPQ0tKlLo6kOzcgi8d47WccCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAAzD/Zszo
-X4ieSQQxDOH53VkiAJDs32qso9YzGbQaenuRnVFCuo7rt68cjMcOjzf18/I+iMeH
-nEcdqkfoYB4Z3LXvDaRGZhg/ZOv58muzRnsW2oQI9yFqDwD0FZPtM6Vq0AWXjLuq
-IogOI5fShSo7H5hc3vrkvS7KUhzuv3FKnaQ=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
index 90c6e822f..b76538765 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
index f4d6ffc16..e2cf707b4 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
index b25f19a6a..af15d75e9 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 4C C0 73 49 E2 6D E5 D1 73 F1 0A 72 4B 0F 9F 07 88 2E E2 A4
+ localKeyID: 98 A6 67 6B 44 FD 94 63 18 18 7F 6A 7A D2 3D DF 66 C0 6E 88
subject=/CN=revoked1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDFaFw0zNzEyMDExMjM0MDFaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWGeoiTtjQGgld
-+qA53Ah8LKoHUUf68bUK2LApL/QX385PUGx4s5D9nWRrJcyUjWDa6Dcq5a2KzamD
-JNIrzknF0kvPgY0wNtWhuxHMKfKWL/1cPGqXe2tW1RQRWZ9+NnfQT1zJJGe7bhgm
-MxKc/u7bw5g3rS6mijIBTj0NIwLSxwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDsdwu9PSYjL1f
+WC5eLgCXa0bq1Jc50NieHN5ydpxB3Zys2ti34lNqQEqFmkWwTy6CfMUUvqncqvhC
+FPdOHAvRkKrDteXpYRU40YgZy8Tf+/x27CvGpZ2Wohruvwrts5F1ChqDi6hObl9S
+p0kerRHLoe98CDqLW+CxmvmchNgCfwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AMK62ueK6c1CLviNLweAAmUedPoDq+60UsXHgJdapLd3SPTbOnON90e252gkLBcF
-cx/HssJUysJic+r3qKrSPRDtT4KK1j2fx/KIEDgyr8/u4F5R7UcK+WyiA/IVX1y5
-8Z0iNPzOTKGTAAlnnF+nZTvoOQS0Y93N9IVNFWLjrqTV
+AJMKgKfXkftMHP9bwQ5WWJGcNbmkpYP9PnsJGn0M/3G6SVcY9GxQyKSDw4GmoVaR
+Kr+JEZFL+UNwbVobW10/29rvXn8nBlPowFW7YS/XxdM0WMA6w+ZMoekeU+7DpBAq
+SArj3U1kCBnK1jb71O7Aj1cVQXT9UMxRx+SMWC0zLFC8
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
index d1d3f0ea5..6f00126a2 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
@@ -1,21 +1,22 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 4C C0 73 49 E2 6D E5 D1 73 F1 0A 72 4B 0F 9F 07 88 2E E2 A4
+ localKeyID: 98 A6 67 6B 44 FD 94 63 18 18 7F 6A 7A D2 3D DF 66 C0 6E 88
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIde1ywCSD4GcCAggA
-MBQGCCqGSIb3DQMHBAg4DHTMV0XGBQSCAoC1KXNuYDr6cKKrifCTLM2Ig/tKxl5v
-dgxEKjzyyFu9elepe+DM/DJFzt3kK16SL257va54hubh1ics6GfHTmVVSKk7P2dg
-tG9ERb1/IU+S1Ybn3zyVF1yzLXS2+2eIsiA2YlqwI3HHs8QVbQA23ZTzSVoGjZJF
-xZHPIovabqk+8waN0aqGkySdy7DVMMpI0zmpZ+v+eTkox9hxZ35eekBO297qlL9G
-+q9RXJxG0K32s33imDsz9laRlbU2o953Eto08YfiZr498L8ZIXlfGeaTBsZGiF3+
-R5vT9KgoImdg04gVqeP1I2t1oVEcqyljxxHzTlIdsNKXKVw7G3iX183HC1iyRc9O
-e3b3GzBrRsgu6lM/PphPKzOtzct+Pzv/RypMWEodbfRmGAibWXbNeFX0TjTCT/zt
-cpqD0m6oErjFvPmB4tDR+8BrDr1WbVUT60ZTPV/EFpcazY07/MvyjLbNX/v3lvrg
-fJnlh3E3P/m0CsopbdzaLcIBvLbdLnGxN1Q+pJjwJupsDO8PX/kbIg8nTaTP0ZK9
-XPG+whtccwaehBB1yC/21UJ/SQJa3eJwieaOEKkt6DXzsnOAUXaTNaWrGs7bDS58
-n/BioHG76HJVJorJ+nblE66kFsicxOdMAL6dP+l7bsup4RjwjlCGBpknwt2Vnhm2
-Kyn17WhZqsl01dyTGwy67qbQG5L7YEIckoRyl5pKS3l0z5xZV8q7qDMIuO63zre+
-j3yhSu2NROvYSkZAoDSIo+4hq7X9G4cqSx6CycR6xfo0vnFVu0Yu9nJKURzLKNdi
-xjxEYdjY/9R5R1ji+YB1rNALLdAQMHLIyFZuC54rqWA/Ta+V9E5047zO
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIraAmh5Hz5MgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLd0uIVgUYBaBIICgKC+Bq3xDcih
+xIw795zCFmwYE96dbTkfFa+I/6O74TdzoVzl+udw56MLnLVeen+KHTxJsA2Eiv2J
+Uil02vnLbB/VeXDGPSvPwu7CxWc5GdXmrkXS6gttNmAhuqcy0cOmH1Gx/e4qk7Nr
+WFgAANNj07FBmmEvcDQz0YtEYf/t4tioZo7xoO+tg9cMgRufrp04f1p6MlV1FOjB
+ZLCEPHetvBM2s2LL7F1X5cve7pWvFprOAoz3aaLvpwYdNy4Wk8/xSf9cl2VDomSs
+I2csRRT2JFcRlGQaSbhrtecDlNTEfXfClhwIMuwbfXsRcb7aRxKkdkSa1GDbMkDn
+IJah0z/3G+zBuCVNH9geB7ybxCrcdLRgScLse6be3BA59LUl3bhP0YvLj3cYc8dY
+HlRWJxyStMwz4+bg4xa7c1KsSt9utd/Fbzz8C/c9tyZDWNzeXoZgneb0Jmemk4o8
++L+dXqujWKHJqsI3pSl5Amv/QjHFjh6bg/j8VgDe8qxhkx7TR1/VxfCj4NAp6IgI
+m8onSmPqwahEzLW6DoLvqCbmpBKbXsZTcBRE5ZbE/bZd32K9o2dbYMvB6SiXU39D
+R79marfIwIhma8qYmmhTLXoAhuK9s2ZouvSfSAdS0Jy80I9HATKtz7/gvZlg8aA8
+lAVC5MnMgBciRBDAWgco7uHIWL69L/O6J+NmkFA1Ql2N95nOFJaAQC92G6pVsPCJ
+FICkRQrBCSnkcEjwX/BhHdP5CkGUZLs83brJOQzYNI6EFsBnl+xK4BwO/y5mezlI
+K6BXqoJZ2xJ3R8wBzKi8hPBYk66aKew8vDmWQq3AU+Skla/8yavQQfP+H1uhuSri
+323Zh+Oa3S8=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
index 486bc4fed..534b77a3a 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
index 84739bc4f..0d755f471 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
index 5eca96c9b..71e01eb2e 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
index 305958559..780041741 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
index db49977dc..18204f14e 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
index c2c5d68b6..8c42fc2a6 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
index f9b913e46..856afb1fd 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
index 3990794fc..63b5b00fe 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
index 6f2e84d1f..26803cf28 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
index 8e288b063..9606ef38a 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
index 134885c8c..bb0372652 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
index 835876efd..df215d277 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: revoked1.example.com
- localKeyID: 4C C0 73 49 E2 6D E5 D1 73 F1 0A 72 4B 0F 9F 07 88 2E E2 A4
+ localKeyID: 98 A6 67 6B 44 FD 94 63 18 18 7F 6A 7A D2 3D DF 66 C0 6E 88
subject=/CN=revoked1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDFaFw0zNzEyMDExMjM0MDFaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWGeoiTtjQGgld
-+qA53Ah8LKoHUUf68bUK2LApL/QX385PUGx4s5D9nWRrJcyUjWDa6Dcq5a2KzamD
-JNIrzknF0kvPgY0wNtWhuxHMKfKWL/1cPGqXe2tW1RQRWZ9+NnfQT1zJJGe7bhgm
-MxKc/u7bw5g3rS6mijIBTj0NIwLSxwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDsdwu9PSYjL1f
+WC5eLgCXa0bq1Jc50NieHN5ydpxB3Zys2ti34lNqQEqFmkWwTy6CfMUUvqncqvhC
+FPdOHAvRkKrDteXpYRU40YgZy8Tf+/x27CvGpZ2Wohruvwrts5F1ChqDi6hObl9S
+p0kerRHLoe98CDqLW+CxmvmchNgCfwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AMK62ueK6c1CLviNLweAAmUedPoDq+60UsXHgJdapLd3SPTbOnON90e252gkLBcF
-cx/HssJUysJic+r3qKrSPRDtT4KK1j2fx/KIEDgyr8/u4F5R7UcK+WyiA/IVX1y5
-8Z0iNPzOTKGTAAlnnF+nZTvoOQS0Y93N9IVNFWLjrqTV
+AJMKgKfXkftMHP9bwQ5WWJGcNbmkpYP9PnsJGn0M/3G6SVcY9GxQyKSDw4GmoVaR
+Kr+JEZFL+UNwbVobW10/29rvXn8nBlPowFW7YS/XxdM0WMA6w+ZMoekeU+7DpBAq
+SArj3U1kCBnK1jb71O7Aj1cVQXT9UMxRx+SMWC0zLFC8
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
index f0fdba7ba..80aba4907 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDWGeoiTtjQGgld+qA53Ah8LKoHUUf68bUK2LApL/QX385PUGx4
-s5D9nWRrJcyUjWDa6Dcq5a2KzamDJNIrzknF0kvPgY0wNtWhuxHMKfKWL/1cPGqX
-e2tW1RQRWZ9+NnfQT1zJJGe7bhgmMxKc/u7bw5g3rS6mijIBTj0NIwLSxwIDAQAB
-AoGAFPW/HT7qn98+QoQm/z/iWF6HaL77obGomSUi6qCGSd4M4WizFDmNr+s8KcP7
-qSFfTx7246a0XIdxmTEK630lbWAMc6uIpk1ylHQ+MrtIthhwXMN9Pe6SOoVYVrlD
-IjjW/xywRN2Bv4C7LO++vwijZC0y+LKPOZgGvgu+8JFPy+0CQQDulW422AGwE3dx
-brQ3DIVoue0JVGAqOoWXDbrRpFzMb/E0rXejI1dypjRhcE2ZCu9Q0cnNqE7sTRTK
-SgnY8NVVAkEA5br2wtUf+46W2VmW1I9zFYnkJ6m2egnuJsnA93pJiRrUkCJBMswt
-RFhIGouq0MWUE4aco8SxdqiD3CJ/kxMHqwJBAMAHnD8eWzVqZa/yJ7FLLbHePFBP
-DlvO4Kl1DpIgVeTikOUSXgH7ty37YpuutXZiG78UK/aQ6n09iWdMcmKfbUUCQD9w
-nAg9trFPNRUcimx0mMFP7POPCFc3Os73VBSDbp8wC5cp/ns6qx1+i5rZCvjQNw4V
-VFhdTuyHqLI3zKce0DUCQQDMd2vUyYNolhTjUOg+ojj0JGr1AmTpRqBbVd3Qu84r
-LjyF3YKaiD18Y4dtzQfCWNzyhkKd4k4nVaY1cygxSqEF
+MIICXAIBAAKBgQDDsdwu9PSYjL1fWC5eLgCXa0bq1Jc50NieHN5ydpxB3Zys2ti3
+4lNqQEqFmkWwTy6CfMUUvqncqvhCFPdOHAvRkKrDteXpYRU40YgZy8Tf+/x27CvG
+pZ2Wohruvwrts5F1ChqDi6hObl9Sp0kerRHLoe98CDqLW+CxmvmchNgCfwIDAQAB
+AoGABkmdqHM9tJ+4/z+Ruybr5UbmGr9v3cSvC7gjvDZsDisKUKd2FRppfF11HNZ4
+bLzD4soSzvgn9FYYmeRF5Irpej4yZk8phVyAkeokpM3AeSI0ogwa0eEo8BqcSTo8
+0F7/jmrFJWfIY/De0NS3OY3s6kJjnFRh9RzTRMsS8FXAXRECQQDk1bfVpoKr+pqH
+YAefcgpuPVqFs1K8sA4V7tPbFt5cLt08V7NSBwZ+BKfs/kjvcwbU+bQK4oQVB2hc
+4z0M+wVnAkEA2u0EOrirzPtc6pHjw4gEhXeX1R8YhvWQ3qKKWmeQmac7uwKeq8Za
+34ZuKI48k4nBCQjnJ5O+UQ4thZtovuaTKQJANS6SNd4n2k44oaOowd6gG/S4WABQ
+BzgnXeOOawmKjgP6OK7tJvApCxqL6GFElBm4icCqnij8p2J8V7IcGysvmwJBAKxc
+AIFu1Su8FqpDE+vkkZK21l4fbkMK4PS3SW/lq62dQWR5qoyYzQDAqMfbPAv4X3cK
+gFrjceoE3IgdE7mAdQkCQAK+y9a8tqc9rfWWygTMqEDpaksb6gX9iCe3M0obvQGv
+CjmrSihgH4Ax4/9pyzhzoMaktyt47NCEq5Y6mghOiV8=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
index cde036853..c6accd35b 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N3YjbHA
-BEKAiUHwJ0VMAAe/KMOM8slXOAKni4v7Vf6BzbO5B6uaKhDV2n3V0vXwMdAoeBaq
-3s9CHOjDXwjF1qf/p4w3Z2aUIVt/Mb+uEcPUlq0Nr8OLlH11QKbkvFtLxU3sUAoi
-fcaydi1q3tszjPQ0tKlLo6kOzcgi8d47WccCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAAzD/Zszo
-X4ieSQQxDOH53VkiAJDs32qso9YzGbQaenuRnVFCuo7rt68cjMcOjzf18/I+iMeH
-nEcdqkfoYB4Z3LXvDaRGZhg/ZOv58muzRnsW2oQI9yFqDwD0FZPtM6Vq0AWXjLuq
-IogOI5fShSo7H5hc3vrkvS7KUhzuv3FKnaQ=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
index 59574bcc2..b17492281 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
index 7ae7ae479..81156c7b4 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
index e084d258f..4e1f49364 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 7E 85 5C 51 34 1E 3A D0 E3 21 36 59 EF 77 71 6C C2 DC D5 42
+ localKeyID: 74 A8 5D 76 70 26 D5 BF 09 D2 76 28 56 4A 09 63 C1 3E 74 38
subject=/CN=revoked2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDAyWhcNMzcxMjAxMTIzNDAyWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv457HTnG6tQp
-fQeayAQ6Coz7JiuYkLEqRanlL2R6qdvWENPIkr3LAeXjZBb3la0lEgg1ouwL4RL4
-yYEHMnwt99jXethIG+JZS6SYVTaopm9gOWk1HpacaMFTMZgwv52R1cgCUm/Uth50
-1Be7C8lWgPSR03KfkdmBxYLuSUyPfg8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA1WhcNMzcxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWnQq5CGPVEE
+nyli+ZdX0j40iMHy1f74fR3hvZS2mzoVPfJK5/QGK6yQ653Oaos1Vxtm8m/RbIQh
+GN+ozzFTbFvVrFjGzDFrwq8DJiPDYeq2IobRJJ5yn7Uux6v6A0mBpqfrVVYjQlPH
+GBD5TPCN0mNkfI1NZlm3mWVoy2lxU7UCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQCEiOCabF5VLQs0vTdIV0JVYNZKYFDpOI8sLar23Xxhf0RN9fBTiAQnXPCw7ZHy
-Tcy8Sc63lYuXqOQos9GM3ejsAtevrol2xZoYcnWvigZUHRX+p5kwN9E4mGkVLO14
-raobs9XhLSIlPDcEXW15cuHa66Mq5xWuAZ9wUMvwCyoFRQ==
+gQCqNJnznvo85tNaulsd7UtAriF/WafbhQp0i41bnD4gMxQ6mHHVgEmeIDqY3jjg
+B7GG3O7sqp7JeQa+yRrD4OxEVIxBQLFIsfwwxxaklGom9wh6MjHzgyW3K7EAYi/V
+CSgzHvGoQ2g+VmeyXdFLmriszi5M0fMizgbeA96h2KoJlg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
index 348d76186..327c4a312 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
@@ -1,21 +1,22 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 7E 85 5C 51 34 1E 3A D0 E3 21 36 59 EF 77 71 6C C2 DC D5 42
+ localKeyID: 74 A8 5D 76 70 26 D5 BF 09 D2 76 28 56 4A 09 63 C1 3E 74 38
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIxsl/hF+kYl4CAggA
-MBQGCCqGSIb3DQMHBAiCbdpohZr9+ASCAoCzG+J1yg/PB+jphh1qXT84lTBK4G1m
-v46KcDdsWM12ZdTTZZVLFpgoux1diGwOJ0DEwbXudXVjc6pXfmJphgOvhfF2RWcl
-kN8VDPslm5AHDNyMzxK9gMkjsTItyBkpAn3KZeGrllnitJGrXb5oyUG5wC/8QrH2
-vfip7bZr0QpwdmHCy5dGrKFbhq1M5wHu3jtXeUlvvOoWCHJbg2BZx9VD/Xc6ytE6
-eJPe4J2seeYMzNI8t6MwSPvnwIzC8rEcO5nteWBJdWetucC4w3OWWU4/2iIV9SvP
-/YBT9wHpstWVYTxLYnIE/59vXUGZEJXsgHvLGaYH2VFziDuCk+N4oGko9FrTMYHV
-2LmdfamGLKq3qtfTbqemJ4XEehBghGiMDxHca8CqBX4EF0QI32AxZarhCGaUBGuF
-NWWD4Qyv2Q8J+C6amCCl1ht9sfIvjH9a+hOH/h7Cy2gvEHPNiwN8ppbfdIxxvdDO
-gF+8gA3RtcOMnEMHUi2mRgiT5cVG2+0D17X6rBwYvOBIjZQZB0CKBuNWzdcbWNeG
-jmwuMbEAnSN85pcxIf559VQ8151CxpZ4E166eEOXe3dQ0A2GGwS+Up7BgdYyFpub
-U7FRHwJTuGCZ1ecFAekPnDYGMloOg/adXmuDLpuFdYAy0rftfzY1NljEYx/77HsR
-mmZD7Hs0NqJNRaaC2WWfzc9SNG4ru9msOWCP8kKAEvVQDa9keel8qbkK/d/RDLvI
-b4chuUejqeZ0oOfw7FK24VIrmXRJnuDGfb/J7ryIJctDhSe1e4RIHoTnqUTWg09B
-c4nuMBSB85ghoP2aXX9aab/V19yhQ0UnCU3RqUJlfvpWGmhJYoMSwc0I
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI1zwihuvGBhsCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECK1nd9++uvUtBIICgBlpfub4yRmW
+udFwK3GM6yk42ovS/NcBCzZGk/Gwv3z/dgzCwhsBhQ7AByHxi0u2XhCJMdWGS48f
+wwlmAWjpy2okDR92QDALMoUj6ud1HvZiqlDXdx61hbWaCiICw3QlzTo/A0d6hRMR
+BPxJ1P8Ky4Pb+GCoQRI1RzAP93AK2bkT9m8PLUxKnQpUdnP8o5ni5cO5l2t+FYsv
+7+cRn1PKGq08F3oO1bcrPf9Mm/6V+Tyl6vaIB36NlqZBq+zG05tRWFIl4KZl5vcj
+z2X0GUIiql6ZWL+2Q/qzsYxQLkIwD8w/hX2hhKteP/hlcSsGXL+utw0WR2OFFHOg
+RdFeiPTEaaCTsLURV2UOfBaHEkns60fxs7wgqbfPDB4CGTyeb/ZV8C3L4f98Disb
+vs9cH/cPTsj71RU2TOZEtGPjWyjnwv1fxkCDRmaNATioxrkbx9LZRvNXosOdwCvy
+WUU6sWzfYYWP+YYaLDwbQH8sPph2/3gsIBziCR1BognOuBr7RQsrNtMXcCaRNiYG
+HJAampXZh+DePYa5k8RZeCE6nCbQQXK9CkJgqCPxqcuATiPT2wmq+feOikizTEwr
+lD8aGz2AwWYZChK/fdIfhGRY8a/Bnwyff5thox0lpXTuVIdIGFl8Gf47NpvbQbY3
+mINJgCczw8IWf29ZtRGpBg78BM0SAIG7yluRm1HJBSzD02WE/fisp1DcvAj9Ywxp
+EDYH6DAJt3vnum96BDY1szk3DPd86EiWDkeOsoK0+bLaBKdFoqbYe98rWK+4s0xV
+3o8r+SfD/4zv/08OifNk57KPkBS3VTvqcwjNY68b413TLJoS9CeRNTMJdf2g6rYe
+WvNaQf3EW/w=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
index 862739b47..c97771ac9 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
index db6f0e980..8fdbb9c89 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
index 2072ac479..56dcf0dba 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
index db6f0e980..8fdbb9c89 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
index 77c7a2f78..11049662b 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
index cb0de9731..294e1f759 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
index cb0de9731..294e1f759 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
index eced7fefd..7f08f2c52 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
index 843eb9130..07c290099 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
index 843eb9130..07c290099 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
index 2d32de43e..702852cd1 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
index 05cb86845..8bcc0dbf0 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: revoked2.example.com
- localKeyID: 7E 85 5C 51 34 1E 3A D0 E3 21 36 59 EF 77 71 6C C2 DC D5 42
+ localKeyID: 74 A8 5D 76 70 26 D5 BF 09 D2 76 28 56 4A 09 63 C1 3E 74 38
subject=/CN=revoked2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDAyWhcNMzcxMjAxMTIzNDAyWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAv457HTnG6tQp
-fQeayAQ6Coz7JiuYkLEqRanlL2R6qdvWENPIkr3LAeXjZBb3la0lEgg1ouwL4RL4
-yYEHMnwt99jXethIG+JZS6SYVTaopm9gOWk1HpacaMFTMZgwv52R1cgCUm/Uth50
-1Be7C8lWgPSR03KfkdmBxYLuSUyPfg8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA1WhcNMzcxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWnQq5CGPVEE
+nyli+ZdX0j40iMHy1f74fR3hvZS2mzoVPfJK5/QGK6yQ653Oaos1Vxtm8m/RbIQh
+GN+ozzFTbFvVrFjGzDFrwq8DJiPDYeq2IobRJJ5yn7Uux6v6A0mBpqfrVVYjQlPH
+GBD5TPCN0mNkfI1NZlm3mWVoy2lxU7UCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQCEiOCabF5VLQs0vTdIV0JVYNZKYFDpOI8sLar23Xxhf0RN9fBTiAQnXPCw7ZHy
-Tcy8Sc63lYuXqOQos9GM3ejsAtevrol2xZoYcnWvigZUHRX+p5kwN9E4mGkVLO14
-raobs9XhLSIlPDcEXW15cuHa66Mq5xWuAZ9wUMvwCyoFRQ==
+gQCqNJnznvo85tNaulsd7UtAriF/WafbhQp0i41bnD4gMxQ6mHHVgEmeIDqY3jjg
+B7GG3O7sqp7JeQa+yRrD4OxEVIxBQLFIsfwwxxaklGom9wh6MjHzgyW3K7EAYi/V
+CSgzHvGoQ2g+VmeyXdFLmriszi5M0fMizgbeA96h2KoJlg==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
index 097ade916..6890906de 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC/jnsdOcbq1Cl9B5rIBDoKjPsmK5iQsSpFqeUvZHqp29YQ08iS
-vcsB5eNkFveVrSUSCDWi7AvhEvjJgQcyfC332Nd62Egb4llLpJhVNqimb2A5aTUe
-lpxowVMxmDC/nZHVyAJSb9S2HnTUF7sLyVaA9JHTcp+R2YHFgu5JTI9+DwIDAQAB
-AoGADyC5zlQQG97c1pfxfFcBHRuHK2Yz//FN4lSJhKr4bk5YjdmmicLdXm1WU5g7
-aKGqP3il1mkH2Hg+wkMjW179OOZKHihJc9p4Pq+A9fOUuCGjuC/2kP22XjpEOlfa
-p11855B529/gu3ZzLutmquryKwq6N7KjwLdi0FuanN0ZzekCQQDjZDWReujtC8eF
-0SFsAxe4QhEnG2vQ8WO1J7s6UceroE7z8HgrCYCgtK15wfJ0yM0CuTcB9KWRqemR
-PEoZMcFFAkEA16gbbZD2ryCla7WareBAGiHPPey9Szb7+yYS5OLymJ4p62Uc+StD
-pRcvo8fRnNi4od6O+hnVKI6NZNhGJMZVQwJABiCfKOps+GZG3B5EjkqPCxIMsEcW
-4qx+iVUmwG2Pudo6BmzGcDJzWuFDg3JsfCUlERu4lb7n70Lq3lUHkiI7GQJAdMYb
-a/3GBdhYmnUwt5wpOb06+d4aNgMk+L6KFpRpJojmTAdpY+awb1GZw0as0xBrEYNw
-yi54xMhD+eo+OSWH/wJBALWEww0MZgdci3eje6m27lB4tNNOpTfHRGsO3ZHinj3W
-fOHlOvsB//6IEOHkrglt48Tm1C7h05svpOQTav/toDQ=
+MIICXAIBAAKBgQDBadCrkIY9UQSfKWL5l1fSPjSIwfLV/vh9HeG9lLabOhU98krn
+9AYrrJDrnc5qizVXG2byb9FshCEY36jPMVNsW9WsWMbMMWvCrwMmI8Nh6rYihtEk
+nnKftS7Hq/oDSYGmp+tVViNCU8cYEPlM8I3SY2R8jU1mWbeZZWjLaXFTtQIDAQAB
+AoGALffQOHZo8TnIN2vGsjteDAHsynQOGv42YMYxWLV3kP0E/2wOkYJV1Rt2dglT
+fc8IJmPE2+nnhDsDAr5liJjYkoY1peWF3tliD9sj9NhwBGJLk09m2LTR2mH0MgbI
+fElXOQl4AwaDM5S0/s3hNb0SsH+C3Vr02Chd7UKnhixI1CECQQDyrCvWiZd7bXXr
+4dwrAXkK8An5mWua8GkR7LxkNhDAPqWPx7HiTo7oLm+PIlsJjjToV8hgTb5s+rGA
+DU5B1vpnAkEAzAkW3+ztuL1Tg495GjS/ayXbGXnbiKkDsNMBgGTVcrhhdgB1U2Ik
+wuR3jDoGT4WBkd9kqd9kH+qzjjxx6nqngwJAEPdkoT1BcAm5IuLJp+AUfGVH7UGC
+unRwhCZPDZqSFT7MCH9nunDPoQAOIK3AO6zLmir5AXKuC6SDYHaNsCC9pQJADiZf
+OL5UqigvH4OWsXORBtxEOpsR14NpJx0rEH1ttBwHXkif2l2HESEJDWeEwoUOvFAS
+yhkc932uYCHfAJTrAwJBAMAjR1npUbf2REnClP6VYJ6qhtfw2xgPdWiQfvVtyt+J
+r8tjpScHlghDvLFKzCFov4+QZGIaZGX0dR087hWhqAI=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
index cde036853..c6accd35b 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N3YjbHA
-BEKAiUHwJ0VMAAe/KMOM8slXOAKni4v7Vf6BzbO5B6uaKhDV2n3V0vXwMdAoeBaq
-3s9CHOjDXwjF1qf/p4w3Z2aUIVt/Mb+uEcPUlq0Nr8OLlH11QKbkvFtLxU3sUAoi
-fcaydi1q3tszjPQ0tKlLo6kOzcgi8d47WccCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAAzD/Zszo
-X4ieSQQxDOH53VkiAJDs32qso9YzGbQaenuRnVFCuo7rt68cjMcOjzf18/I+iMeH
-nEcdqkfoYB4Z3LXvDaRGZhg/ZOv58muzRnsW2oQI9yFqDwD0FZPtM6Vq0AWXjLuq
-IogOI5fShSo7H5hc3vrkvS7KUhzuv3FKnaQ=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
index 8a9e724da..9e9795309 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
index 73a429b46..29d231359 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
@@ -1,58 +1,58 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 68 38 70 91 66 B0 26 4D FC 76 CF 59 D5 A5 27 13 36 F5 B7 71
+ localKeyID: 1A 46 FC DC B1 BE 7D 7F DA EA 76 75 69 D2 3A 50 3E 58 94 0F
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDFaFw0zNzEyMDExMjM0MDFaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALlFAifASi7qE45T
-XoRxVVlxMIINSa5ZYyGBSoLbQKLv1RsPGvxrKrJqJz8ofI136t91H5nWhHF8Bf5s
-V+1sAdfj3jhz0Qz/HJDGXTmU/3562nyyFyTXqhV2n/NJLCwfHOs7vWk7rR3R2R/p
-lTjXvUKU91aSRy0luEDhvxq/PosZAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8u6xFkINzVzn/a
+tZNmSSSPeC3DbFmcPKYy62lqRQf0rDP/SbiNe4yYmoHynTguN5+/A3pie0+bdwVS
+8NyTH4cUCO/8RBIMfIaI+xusFXPtTrTNf8OtravljL7rF0kUbG4vLTARgpSxtpnR
+fLX51qVWRF7sR7NsNmp13z511UgRAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tghNz
-ZXJ2ZXIxLmV4YW1wbGUuY29tgiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBs
-ZS5jb22CCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQB6zTAn0nyd/scSF7rq
-9DiRwk5akqjirevjFh0RDKyiPtB0E3Eu3E3CNax+bqqsnVl8qJzFGfQFlqaj4wzg
-DEsFzjpQMqB+skObhcYaZNLB++T350AGUdvoUN4ToOzG77h1XNu9jlILwWZNReBx
-sth3GIF5TCnewLmrm6oUHmrdnw==
+BgNVHREEaTBnggkqLnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVy
+bmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2Vy
+dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQBKp0xZ4RomCgCdCDhw
+Inmj1+koPd+rLefivbNk9xuGV9huAV9+m8ovNNlAYqy204rTXa6Lhusdb0v4WWOp
+UToJMT8jGNhJReP/z6w3r6EFID0MlQoDNaMN36WioGrk4/FBMtJ81rd+kvxh98Lw
+ttQaEZsB3WehiI2pRFSRscQP1A==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N3YjbHA
-BEKAiUHwJ0VMAAe/KMOM8slXOAKni4v7Vf6BzbO5B6uaKhDV2n3V0vXwMdAoeBaq
-3s9CHOjDXwjF1qf/p4w3Z2aUIVt/Mb+uEcPUlq0Nr8OLlH11QKbkvFtLxU3sUAoi
-fcaydi1q3tszjPQ0tKlLo6kOzcgi8d47WccCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAAzD/Zszo
-X4ieSQQxDOH53VkiAJDs32qso9YzGbQaenuRnVFCuo7rt68cjMcOjzf18/I+iMeH
-nEcdqkfoYB4Z3LXvDaRGZhg/ZOv58muzRnsW2oQI9yFqDwD0FZPtM6Vq0AWXjLuq
-IogOI5fShSo7H5hc3vrkvS7KUhzuv3FKnaQ=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
index e2e3ace41..a61212af7 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
index 24f29d1a7..ceea00514 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
@@ -1,37 +1,37 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 68 38 70 91 66 B0 26 4D FC 76 CF 59 D5 A5 27 13 36 F5 B7 71
+ localKeyID: 1A 46 FC DC B1 BE 7D 7F DA EA 76 75 69 D2 3A 50 3E 58 94 0F
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDFaFw0zNzEyMDExMjM0MDFaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALlFAifASi7qE45T
-XoRxVVlxMIINSa5ZYyGBSoLbQKLv1RsPGvxrKrJqJz8ofI136t91H5nWhHF8Bf5s
-V+1sAdfj3jhz0Qz/HJDGXTmU/3562nyyFyTXqhV2n/NJLCwfHOs7vWk7rR3R2R/p
-lTjXvUKU91aSRy0luEDhvxq/PosZAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8u6xFkINzVzn/a
+tZNmSSSPeC3DbFmcPKYy62lqRQf0rDP/SbiNe4yYmoHynTguN5+/A3pie0+bdwVS
+8NyTH4cUCO/8RBIMfIaI+xusFXPtTrTNf8OtravljL7rF0kUbG4vLTARgpSxtpnR
+fLX51qVWRF7sR7NsNmp13z511UgRAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tghNz
-ZXJ2ZXIxLmV4YW1wbGUuY29tgiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBs
-ZS5jb22CCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQB6zTAn0nyd/scSF7rq
-9DiRwk5akqjirevjFh0RDKyiPtB0E3Eu3E3CNax+bqqsnVl8qJzFGfQFlqaj4wzg
-DEsFzjpQMqB+skObhcYaZNLB++T350AGUdvoUN4ToOzG77h1XNu9jlILwWZNReBx
-sth3GIF5TCnewLmrm6oUHmrdnw==
+BgNVHREEaTBnggkqLnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVy
+bmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2Vy
+dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQBKp0xZ4RomCgCdCDhw
+Inmj1+koPd+rLefivbNk9xuGV9huAV9+m8ovNNlAYqy204rTXa6Lhusdb0v4WWOp
+UToJMT8jGNhJReP/z6w3r6EFID0MlQoDNaMN36WioGrk4/FBMtJ81rd+kvxh98Lw
+ttQaEZsB3WehiI2pRFSRscQP1A==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
index 92aaeef74..4b892580b 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
@@ -1,21 +1,22 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 68 38 70 91 66 B0 26 4D FC 76 CF 59 D5 A5 27 13 36 F5 B7 71
+ localKeyID: 1A 46 FC DC B1 BE 7D 7F DA EA 76 75 69 D2 3A 50 3E 58 94 0F
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIHHll4kyNluoCAggA
-MBQGCCqGSIb3DQMHBAiqfjrDuLu0ngSCAoASeOAmvBbKOFWqco4j31ohBkskyIo1
-lHZiUJzeVc+6FVyrLgikBELx2/P4+xpVQD1eyEBSIE42aT9M1kZ18mxWwNIOIrzx
-40lP+AY5Pc1ATUdLSe9Zx1LR9tgMJFBDBvUYuH0dzkYzXdYntfk549dlyAaISSN2
-JEHcva3+DfMt39YHGjDCk59QMHbKJv0hBjhtZJ3Wy/Djys6pDnfPa7rXm+mE/xgP
-1T02A6g3b29BgHykpxwL1gqrrOVoWfDkRDUbQeDNha+B1hGvoioUg88ncTC414pq
-w5UkHUEPsU0rRWnEL6OOcGojNc5vFXNypD5lAsX9DBTyZ0IagJmpJwAb6eXkZm01
-yu3ZHFOakHeaumBbjGXpCyvyfYmMQ6ZEWhySZe6sdZANN11tDk276+i/qqCRSKnr
-XXFyNQn+8trT7v5Jwy9CXpFUviPgRd7xAjLrvItMWpzK+0heMJimsDORXNnHlkOs
-vPJQa+nIzQ2isr7ZF1noarbOcjNYJvkPK3yuoG/oZQXtFWz84/QxGLnRmryP2aTj
-GLgU/xBEBkm1GjhlWzkNQE8t7XVm47MX9i+MzuuManUMTDA7hRqAAzKc4m1Lx801
-ju7yJl9TKcVXVyx/n0/SV4u7DM0y5UotuunEwn2WB8mTOvIwX3Wqyc8kw4m2wEDG
-GcsuH6jvN3ATJ1sWwpnExNEzJiY50idzgSI6Oamf8fCKiJRyjJ5/LX5w9QpdH4G8
-yrypanaU6S/Sn7zBVASY8UGtWtV9J8HJFuZgtWhdm3F6cnAeQszDZHD5FPxYfv/E
-R/dp+6VuUDlnGAwW0ukNGdaNYm7ym3ZtkGknN7tn81cDCAf7f7XpFodI
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIHovK/g+qWjMCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECP4xkWIBKyMBBIICgFMvujBX4+EH
+jtl12JEPSL3dUJk9mAhjmpQLW8Sgzvft288oUFUtcTS0C8dcYCT6OQlksB2bmi1d
+7W60zIwIR/sLC+C44CQU7jeRoPhRowMSt+jaqjzvbkdAPfS2zjCHpFov7vrmv76b
+IbufOVoS0d1Th9IDJBUyQEISbzA+hlF8otlnOHuvOr/X8SLlEOPukE06sC2ur7EN
+Y/zTAfRzYgPkesVctseUrYHTHeZJodR4HkVZKUsE0o63rtlpgUwb5Hhmu1Q6junc
+jhzliKIbKx5lUhdGfrkl340TE+fSMURpVSCEdoLSEJ3a51E58dUAtYUJ2W2R1e23
+s5p1F5PIW0ew51Ro5Cp7FC0h5BSr6wWNaFdNgoLntyqGPgGwjy+hgznfMnrtkqg3
+bHRjSHSHfLmUdQxNTu8+2ZJfUnoA2kQ/076Wp6hk5U9isYhdt5H2C+Wm4vNW7YjL
+N3L+qHzY+8j/MnFcqFHqDHbukcAsoJNuCVnTrQq8T11NbnZWyxH5Mf1GX3M/bPWq
+ocB8LLyHqNfvVLzxs8lBIL/E6A3Vi+sjVznqpb0dZK90aJpPODJ7G/Yi03u/JJea
+kTtqSsbgaBnU3OMlN85L8T5HX63oEzKyco3MtwwsblxOpC5+472nKHhszITpN2Tb
+PwukhYl8z2qkMqnWV8XDYvV3ZCLR0SCpsOkEQfBGZ/s1Qyd1bg1t13U942w0CGqw
+hK4tX30V/8V3AOWPe6tiXezm31uVDR7qSwnAS1rT66EJVrw5ebiAWhShw2Caj1EN
+ItUGRr0uAIsuQWXd98OlkfzLthnkHXahOCp+y/47cpM/tTkfcisJzZAf5z1FYhEv
+NK5HIqffIQE=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
index fba3a5451..2a5c85ee8 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
index 5d1bde4ae..cd4558291 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
index 136f595ff..c5e8cd643 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
index 68738ea96..de0e711b3 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
index a3c75feae..1c103e71a 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
index e2b192e16..2952c69b2 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
index 8df84c747..030f38245 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
index 3563a96a7..52435cc4f 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
index e10a9e747..11b3d44ad 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
index 3914b9bc8..5d3f0f97b 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
index c445f0d1f..d54e84908 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
index 9ba919c3c..36f82a125 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
@@ -1,23 +1,23 @@
Bag Attributes
friendlyName: server1.example.com
- localKeyID: 68 38 70 91 66 B0 26 4D FC 76 CF 59 D5 A5 27 13 36 F5 B7 71
+ localKeyID: 1A 46 FC DC B1 BE 7D 7F DA EA 76 75 69 D2 3A 50 3E 58 94 0F
subject=/CN=server1.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDFaFw0zNzEyMDExMjM0MDFaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALlFAifASi7qE45T
-XoRxVVlxMIINSa5ZYyGBSoLbQKLv1RsPGvxrKrJqJz8ofI136t91H5nWhHF8Bf5s
-V+1sAdfj3jhz0Qz/HJDGXTmU/3562nyyFyTXqhV2n/NJLCwfHOs7vWk7rR3R2R/p
-lTjXvUKU91aSRy0luEDhvxq/PosZAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM8u6xFkINzVzn/a
+tZNmSSSPeC3DbFmcPKYy62lqRQf0rDP/SbiNe4yYmoHynTguN5+/A3pie0+bdwVS
+8NyTH4cUCO/8RBIMfIaI+xusFXPtTrTNf8OtravljL7rF0kUbG4vLTARgpSxtpnR
+fLX51qVWRF7sR7NsNmp13z511UgRAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tghNz
-ZXJ2ZXIxLmV4YW1wbGUuY29tgiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBs
-ZS5jb22CCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQB6zTAn0nyd/scSF7rq
-9DiRwk5akqjirevjFh0RDKyiPtB0E3Eu3E3CNax+bqqsnVl8qJzFGfQFlqaj4wzg
-DEsFzjpQMqB+skObhcYaZNLB++T350AGUdvoUN4ToOzG77h1XNu9jlILwWZNReBx
-sth3GIF5TCnewLmrm6oUHmrdnw==
+BgNVHREEaTBnggkqLnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVy
+bmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLmNvbYIiYWx0ZXJuYXRlbmFtZTIuc2Vy
+dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQBKp0xZ4RomCgCdCDhw
+Inmj1+koPd+rLefivbNk9xuGV9huAV9+m8ovNNlAYqy204rTXa6Lhusdb0v4WWOp
+UToJMT8jGNhJReP/z6w3r6EFID0MlQoDNaMN36WioGrk4/FBMtJ81rd+kvxh98Lw
+ttQaEZsB3WehiI2pRFSRscQP1A==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
index 1aee1ff42..b21104ead 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC5RQInwEou6hOOU16EcVVZcTCCDUmuWWMhgUqC20Ci79UbDxr8
-ayqyaic/KHyNd+rfdR+Z1oRxfAX+bFftbAHX4944c9EM/xyQxl05lP9+etp8shck
-16oVdp/zSSwsHxzrO71pO60d0dkf6ZU4171ClPdWkkctJbhA4b8avz6LGQIDAQAB
-AoGADsP/C8+ppJCM9h293Ydcz9qTYky7JRVEWczAn/+SaLSoQtZS28WSFb3Gb/mt
-kjwkRiKYXf3jTgTI7iyQsMBCwIvM00VLAbQE3t3BjBhYNBztXHgCGOGD36kFCQJk
-nKLGC+TdEdhlqWpvVcdUzcHsY1n8o54IoBQaTnR6wJdcyyMCQQDkRoUO3ehedl8J
-h5dVn87qmKZAaKdCj+0zv1+fIEXn8DlBGzKxNkjdjZAEekuIcqqHODc8duFO2NlL
-fwE//nXDAkEAz8VcSyGTCO+STV5BSCP5c5P4ovoIRAXuWaJJ7bfwicrbtZfgpfOe
-U0Cppqayp75U2wsvP2MCaFbHmsQFbdUB8wJBAJ+qD4Ehh1ki9EBHHXufRmviD063
-pF2zK5bpQSmcuiiLZpB6RI+cx4RncpcfLtumUE457LCW+epbVEkw8R/gjF8CQQCU
-WN06A6HhKnTyas7/vDfazxci/pUyRG3Xb+mLIt9K8x2Gfgd3VgeAd9Xp2HINFPev
-Yj/86SuJ5hQkq7sYnZMDAkBgqwXIJ6N5W2jH+d06aBhi1ChZ+JmeUqhzZOV4eT+h
-ya+PwKiQrPJo6EOCciHq2wJiIw5ADShZXi7+IdA2g4yp
+MIICXAIBAAKBgQDPLusRZCDc1c5/2rWTZkkkj3gtw2xZnDymMutpakUH9Kwz/0m4
+jXuMmJqB8p04LjefvwN6YntPm3cFUvDckx+HFAjv/EQSDHyGiPsbrBVz7U60zX/D
+ra2r5Yy+6xdJFGxuLy0wEYKUsbaZ0Xy1+dalVkRe7EezbDZqdd8+ddVIEQIDAQAB
+AoGAFIt9BkuiZ0kRF072Bt4I7nCxr1a72wOqD1BpABo91S+h7JgUqec8c1vl+nE3
+aPegTsgvd/E7HtD2U6ypXjN9V9yHh96fe/gGjxXUbCE5ls3jGnAMW6GtcHf+x+OL
+02LNfCD3lUljtbZA1TFOvj8FJ6RrJchfzSz1vyvnchvmu4cCQQDyL0/SS74Gv5Ou
+Xec4EGSd/DQCeke88nf0SIWBR2bpfLrf1Ur0shVXsIL1Jh9YvFaKQMionb4peRDo
+FNxA6F5XAkEA2wB4RhhKe5BnyTc9uWFBQLzk0NHu244xMAb+lQQqXG41o6PHlT+D
+KuPOup8ZjOK2kkmGiiONOTkZpeZ0zJA71wJAYjooQN4xm6EWL/GsN0QG20EQgzS/
+ZfZeCrljVLT2G5tYXDKxbR/RojhYVT/6FM6GtxphiGo6V63f2pGjZ7wXjwJADxxn
+MB749LGwF5gyMBpf0EG4YBg8LPYQusmgw1N4QMxx8wqX+NpbCJiTaRkVQD1cb5eX
+KuztD6e691GBeaPyHQJBAN8BYcR2XoIiIQvCrJH5PJgusTICbdMftI6EvlzkwoSD
+EatfQIaWWE+tceqK3csGDb4NkiIAFogFSK1LGRzBjnw=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
index cde036853..c6accd35b 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N3YjbHA
-BEKAiUHwJ0VMAAe/KMOM8slXOAKni4v7Vf6BzbO5B6uaKhDV2n3V0vXwMdAoeBaq
-3s9CHOjDXwjF1qf/p4w3Z2aUIVt/Mb+uEcPUlq0Nr8OLlH11QKbkvFtLxU3sUAoi
-fcaydi1q3tszjPQ0tKlLo6kOzcgi8d47WccCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAAzD/Zszo
-X4ieSQQxDOH53VkiAJDs32qso9YzGbQaenuRnVFCuo7rt68cjMcOjzf18/I+iMeH
-nEcdqkfoYB4Z3LXvDaRGZhg/ZOv58muzRnsW2oQI9yFqDwD0FZPtM6Vq0AWXjLuq
-IogOI5fShSo7H5hc3vrkvS7KUhzuv3FKnaQ=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
index 9c31e2c70..29b64a508 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
index 5a863771b..a9ea832c1 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
index 5821da3a6..eed87f9d2 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
@@ -1,36 +1,36 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: F3 51 92 80 EE 0E 15 CF 66 DD 08 F5 3B 25 04 72 96 18 B5 3C
+ localKeyID: E0 17 8A CF 74 D6 61 D1 12 31 3B F5 E9 F0 FE 3A C9 78 81 A0
subject=/CN=server1_ec.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICrjCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBSrVQcxLe6HON
-7ZWl3ImT2edPxEqzGZYbZrEPsv+AjOdoFwlEeyW1otKLM8N0nAWDU7NukAA+Y+eV
-87AuYHs+sTMALjgmY+PxNrCy3eqe0FNxg+O4zN5fY+V2KLkuK9i2weChU6GKz6VI
-t6vW+joSxsew+P7lL96AOntFZ8xN3xl4StCjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
+MTAxMTIzNDE5WhcNMzcxMjAxMTIzNDE5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
+LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQB1ubm7y2hpf8A
+PpGOAfdu4qNIXh8QpXT3wrmwg+LssCjXKvCNZtlA9bluYGSkVK8o7QXLIKxrWb4x
+eKRW0w1Bhm8BnKtC2znA3Rw7TRErRF7MelYgI1BTqeIZIzewdokg8iHVpP2h0XL+
+Verdwojs1jNNvyGz9Bqt3+J7hddg3rYOsGejgeIwgd8wDgYDVR0PAQH/BAQDAgTw
MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
-VR0RBDowOIIJKi50ZXN0LmV4ghNzZXJ2ZXIxLmV4YW1wbGUuY29tghZzZXJ2ZXIx
-X2VjLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBABnqbnB1EKQisMe/a1D7
-oHulTvJoHlg9HI3ROcvxCWn3gKKiZ8JpRyIXneDNNZpCz8B5MWJfwijONA+aL+oG
-5wjYL9IgnqsUzklUXD2rN6epWLaLICsNxQoPVGcq1xMt4FkKdvk3I/0ulLjCYTPo
-kBVn+I2iCYu9gm0l9U+p8bbw
+VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYIJKi50ZXN0LmV4ghNzZXJ2
+ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBAAHH8k1i49be/X2e66xq
+wk69K2dtWEliPC56lIAPQqev2P9MD1ZyuuL3l4A90qGooZcqf7cSUw2ie8Uh1HrX
+d4WcfkrUXBNAfgN0HGnkJU214JewxRFD58k+qntSshR9x6GePi6Zva2QkyB9YpjF
+suLsTzCsqaDZmTWgMbgLPlOY
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
index 78989a870..459491706 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
@@ -1,13 +1,13 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: F3 51 92 80 EE 0E 15 CF 66 DD 08 F5 3B 25 04 72 96 18 B5 3C
+ localKeyID: E0 17 8A CF 74 D6 61 D1 12 31 3B F5 E9 F0 FE 3A C9 78 81 A0
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBPTBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIlcwjFE5MPHkCAggA
-MBQGCCqGSIb3DQMHBAi+ikbijJKLjASB+LizSd30D7Y5KjItwF/PHonzaf3/HhKV
-umjASvrpYlvy8U71q5CGYVyzGZZ01qZ9UibWCFBvD311nO/MU4gikRSCDCwGhFrH
-yLuGpOsp5pEN7aZACFvDChtyb+SAmINOxmeGtITaQrd39fK0jvbNJDPlc/NIpVPR
-BLddi8+Qr4L+qM3QZi93aZSfBJiPwEIwUKsfhxEEVVcKlF7Uh2uV8lHpwIP1KHAY
-07Acl/Z/k6yPL6/9a9+x92sSYM8ysMc2oOuIlv9bsjhOh1OvuNZ02DCSG4yE5PUt
-Uq1dOg/vqBGfBWoJ4PB+QnCcMf9avHV2C2uJJsNys8jx
+MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIh79X+VfzLosCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECH5VbzTpNflHBIH4t6hSXTWYY3sB
+D+Sp/1NdSB+3zrb+G8iXzt5H8a5dEiUwjaXSS8l1+Xw7SpppLLuqrv1v73Fwsi6z
+EDS0M0bMJz/wPq/xM8LkT2ohOS4p+bsy90/46SiSXSSrXKnGkEe9sDzaoLcE+//J
+7xIpOnLFPtqsJ39+aIdjeiqbGYHcSMi0AYpycB+6KHZipPOanvdxhkb/lSQNXCYD
+T24PW8WDctE8iuVCMTrJomX5FLXiCH/W9m6citmprvDo1eewdQFHeAQ6ZwYTAz2Y
+Rj0lqOg6LlbGLnVFl4E3jHvO3gBpSBqbWbWg6c59QPHDNQ9NiqHQwDHjmT1R1dw=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
index 47ada66bf..21dccc088 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
index 97e86943a..2c518e681 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: server1_ec.example.com
- localKeyID: F3 51 92 80 EE 0E 15 CF 66 DD 08 F5 3B 25 04 72 96 18 B5 3C
+ localKeyID: E0 17 8A CF 74 D6 61 D1 12 31 3B F5 E9 F0 FE 3A C9 78 81 A0
subject=/CN=server1_ec.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICrjCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBSrVQcxLe6HON
-7ZWl3ImT2edPxEqzGZYbZrEPsv+AjOdoFwlEeyW1otKLM8N0nAWDU7NukAA+Y+eV
-87AuYHs+sTMALjgmY+PxNrCy3eqe0FNxg+O4zN5fY+V2KLkuK9i2weChU6GKz6VI
-t6vW+joSxsew+P7lL96AOntFZ8xN3xl4StCjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
+MTAxMTIzNDE5WhcNMzcxMjAxMTIzNDE5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
+LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQB1ubm7y2hpf8A
+PpGOAfdu4qNIXh8QpXT3wrmwg+LssCjXKvCNZtlA9bluYGSkVK8o7QXLIKxrWb4x
+eKRW0w1Bhm8BnKtC2znA3Rw7TRErRF7MelYgI1BTqeIZIzewdokg8iHVpP2h0XL+
+Verdwojs1jNNvyGz9Bqt3+J7hddg3rYOsGejgeIwgd8wDgYDVR0PAQH/BAQDAgTw
MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
-VR0RBDowOIIJKi50ZXN0LmV4ghNzZXJ2ZXIxLmV4YW1wbGUuY29tghZzZXJ2ZXIx
-X2VjLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBABnqbnB1EKQisMe/a1D7
-oHulTvJoHlg9HI3ROcvxCWn3gKKiZ8JpRyIXneDNNZpCz8B5MWJfwijONA+aL+oG
-5wjYL9IgnqsUzklUXD2rN6epWLaLICsNxQoPVGcq1xMt4FkKdvk3I/0ulLjCYTPo
-kBVn+I2iCYu9gm0l9U+p8bbw
+VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYIJKi50ZXN0LmV4ghNzZXJ2
+ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBAAHH8k1i49be/X2e66xq
+wk69K2dtWEliPC56lIAPQqev2P9MD1ZyuuL3l4A90qGooZcqf7cSUw2ie8Uh1HrX
+d4WcfkrUXBNAfgN0HGnkJU214JewxRFD58k+qntSshR9x6GePi6Zva2QkyB9YpjF
+suLsTzCsqaDZmTWgMbgLPlOY
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
index a0fd598b5..a400a3713 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
@@ -1,7 +1,7 @@
-----BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIBPUPiTROKyPZXKuNddLWl8ngGLh7mZnD37RZdNf5iGZn86fGM9tWT
-eCs+sA1FGbyLLVt+SXGOR0iS0V5zguTqpLigBwYFK4EEACOhgYkDgYYABAFKtVBz
-Et7oc43tlaXciZPZ50/ESrMZlhtmsQ+y/4CM52gXCUR7JbWi0oszw3ScBYNTs26Q
-AD5j55XzsC5gez6xMwAuOCZj4/E2sLLd6p7QU3GD47jM3l9j5XYouS4r2LbB4KFT
-oYrPpUi3q9b6OhLGx7D4/uUv3oA6e0VnzE3fGXhK0A==
+MIHcAgEBBEIBHFhFJ4s3N0FlAYZzwzUyOmLWKvRy93rhN41JhR/fpgAY4pZW+JPd
+SfQJbQBbc3yXHfuGp8vJrrK7qj9Bc/yd+UqgBwYFK4EEACOhgYkDgYYABAHW5ubv
+LaGl/wA+kY4B927io0heHxCldPfCubCD4uywKNcq8I1m2UD1uW5gZKRUryjtBcsg
+rGtZvjF4pFbTDUGGbwGcq0LbOcDdHDtNEStEXsx6ViAjUFOp4hkjN7B2iSDyIdWk
+/aHRcv5V6t3CiOzWM02/IbP0Gq3f4nuF12Detg6wZw==
-----END EC PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
index cde036853..c6accd35b 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.com/CN=clica Signing Cert rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.com/CN=clica CA rsa
issuer=/O=example.com/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2N3YjbHA
-BEKAiUHwJ0VMAAe/KMOM8slXOAKni4v7Vf6BzbO5B6uaKhDV2n3V0vXwMdAoeBaq
-3s9CHOjDXwjF1qf/p4w3Z2aUIVt/Mb+uEcPUlq0Nr8OLlH11QKbkvFtLxU3sUAoi
-fcaydi1q3tszjPQ0tKlLo6kOzcgi8d47WccCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAAzD/Zszo
-X4ieSQQxDOH53VkiAJDs32qso9YzGbQaenuRnVFCuo7rt68cjMcOjzf18/I+iMeH
-nEcdqkfoYB4Z3LXvDaRGZhg/ZOv58muzRnsW2oQI9yFqDwD0FZPtM6Vq0AWXjLuq
-IogOI5fShSo7H5hc3vrkvS7KUhzuv3FKnaQ=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
index ff0d142d7..7e56c3d67 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
new file mode 100644
index 000000000..907769db0
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
@@ -0,0 +1,57 @@
+Bag Attributes
+ friendlyName: server2.example.com
+ localKeyID: 77 8B 89 22 47 D2 AB D3 65 BA 15 30 A5 01 41 AF 05 2E 27 1E
+subject=/CN=server2.example.com
+issuer=/O=example.com/CN=clica Signing Cert rsa
+-----BEGIN CERTIFICATE-----
+MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
+MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCf6MdoozlJCZPw
+dIHXdFHddXJfZ5xn2e6XoMmSjqOrOJYIIFKdgtlrMhtTVU1VLlK6V7H8142r78YQ
+4RKcj9QhTuQJxrrVtVuRt38Zy4RW0/+ujMcXoV8nV7Yt1c1z/tIJ4afSapAnAAm5
+wVdIbUhUeM/K5Wozm1gV5OCtNZPa4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
+QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
+BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAgAA5TLssFua+
+7lS39p+J/nFieS+QV5UHVGcv6RKWQRvFm93eaC3l16c1x+qx2ZUSQEkMBz0MdN9X
+0bYEX4NcFf6af7c1fez4t02sduqMRIqG4EI4eP9oigmDRBBntP2kXKTqkUHnjqd5
+N/bi+N6dD5aFGCIsXAavAYWUYsFpjS4=
+-----END CERTIFICATE-----
+Bag Attributes
+ friendlyName: Signing Cert rsa
+subject=/O=example.com/CN=clica Signing Cert rsa
+issuer=/O=example.com/CN=clica CA rsa
+-----BEGIN CERTIFICATE-----
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
+DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
+-----END CERTIFICATE-----
+Bag Attributes
+ friendlyName: Certificate Authority rsa
+subject=/O=example.com/CN=clica CA rsa
+issuer=/O=example.com/CN=clica CA rsa
+-----BEGIN CERTIFICATE-----
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
+DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyDGCW64u
+Q5CBaKQGpgZVwGjo+VAn2EpwbfCZkhJtnxESiZYigjBH8KaOcAGyuv6jqY3pP64u
+gPe3lRkqwnvnLkj4wYo7d1GpW12yRCN/n7oMUcHLceqeLc8iYy6k1szF+jdlcRPL
+2OXNEy2pgzsPRyWZyCS2xZE86byA4N+/Y5cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAeQnAdtC4
+EWA5tl8hRlOmc7IM6c40MJRB73/Oiul8xcS4l2qRLXUAWJjddxMPrLf4AYmc0vQz
+rcWmvkfdnjqX235D5YaOvfsIKr+YThtbSUvSK/uCGCxmiQHLQIWa7oWnFExIAjFd
+xxxXmvnPPG86dFoAm4AGS6kynXmWc4tvKYI=
+-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
index f038ea5c8..cadb6eff9 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
index 82b640ff3..dc9a7593c 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
@@ -1,35 +1,36 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 0D 9E 77 6B 02 AF DE FB 02 31 58 89 27 D3 05 CA 81 F0 03 66
+ localKeyID: 77 8B 89 22 47 D2 AB D3 65 BA 15 30 A5 01 41 AF 05 2E 27 1E
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjDCCAfWgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDAxWhcNMzcxMjAxMTIzNDAxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5xczcpFPcohZh
-Legf/wzSJvwj/dVkXg0MEyVulbMS+sgCwwSO6uGykJVc6ZKUnGqFyv5Icp1zG9Y9
-/joYefiXN5K1n/3NrtsET+6AJDWzZYz/AyRGd07xLwEw+Ip0/bqqNaxpc07L1qAA
-Bcwz2lcSeKsIDbYC9znSdEzuNUFmGQIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB4G
-A1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEA
-GQz0ggxKkEXx50eX/uWtlC7+JFwsJLBhU/nGBmOLxzHhptrRBLiqLYr8Chj92eZN
-nDr1HUY0jIC8PcPDjpgz1rs+6HOy3F++t7u+x1x89MQ2DUjCqqyjiM/PzuKsdU4V
-TVXsu8R4x8YSjCfXeKJAlOL4rPy2wU3wXRhzCf4Et4E=
+MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCf6MdoozlJCZPw
+dIHXdFHddXJfZ5xn2e6XoMmSjqOrOJYIIFKdgtlrMhtTVU1VLlK6V7H8142r78YQ
+4RKcj9QhTuQJxrrVtVuRt38Zy4RW0/+ujMcXoV8nV7Yt1c1z/tIJ4afSapAnAAm5
+wVdIbUhUeM/K5Wozm1gV5OCtNZPa4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
+QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
+BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAgAA5TLssFua+
+7lS39p+J/nFieS+QV5UHVGcv6RKWQRvFm93eaC3l16c1x+qx2ZUSQEkMBz0MdN9X
+0bYEX4NcFf6af7c1fez4t02sduqMRIqG4EI4eP9oigmDRBBntP2kXKTqkUHnjqd5
+N/bi+N6dD5aFGCIsXAavAYWUYsFpjS4=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBANlcwo5q84SEtVy5W/xqbYAzOiYUZ0Shp9+ry/Q/X5uhrDF9JSHNWJbXut+8
-ZJGICt0RYVIJCcaa7FUt5hTKEx4fgURr+Hz84ZgwesMxcECHJPq9ylrCqbPkbmFR
-1XUy2MvioMH2lyc/PbV62XXggJhHioStVLRfyVlkS1KvvR+HAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQBtPJwqu7DiDmFZd58L4xQ6JJhrJzJUDHmT7ikW2tOM58yisCgSnzrR
-xihW+49vUQ9lSGxBHaFwdehAuGTXydnf7/i9i6KA2RZ+Rq12FJFYOhjaIP7Sy1zq
-VXtb+P1eDBQQhz0WgysLVjgGdBiokRv86yY56ficoTQ6EyWzQLCU+A==
+AoGBALFHTtwaKeCfLlDf/wTErhOB6AB9vKHtyDbU6yDB/DrA5DLbug8m1oGGwEIf
+lTY0VBym8/Iu/ExE476gRmPNX/kIQsSNj9LtCIx3JXqLpc8ylw4cuVMOeFtBXNtE
+YKvUPIyWaAvqBbwY1QOyHNeoJ68hBdDPCn3oN2wrCz4if9QHAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAERD495HPM1BxM60EHGYLQgPjJPT
+/cL+nTKyIdv2UvzAnJaSFMMAB43Twy/jvkahsITVuieSU4kpev79KRNLfk+h25pf
+oPjaOfmOQVtHWN9ML8FDs0dLkRhJPuagObx17l/KEPkiK/jLB339fyO1HxaKhymE
+hdqYsdjjnBy/6U5g
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
index 3b100bdbd..d58ef339b 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
@@ -1,21 +1,22 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 0D 9E 77 6B 02 AF DE FB 02 31 58 89 27 D3 05 CA 81 F0 03 66
+ localKeyID: 77 8B 89 22 47 D2 AB D3 65 BA 15 30 A5 01 41 AF 05 2E 27 1E
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQISj8NfM4dQjsCAggA
-MBQGCCqGSIb3DQMHBAhAlCJYloV1gwSCAoCMamEc/QOzHYxmYK/+Qw9dFFXN52MT
-kpSO+pDm1MKb8lIm8IECdl4vth1uAcW9wj8g1u1sMPxXFlf95Pv2AyTGqQmG2lWU
-Z7yvrxBT/2KE1PuRQZOBkySuXQjZ8qOgw8tzr5bdunucDd7fyB3UXELIJd6bbLwY
-MwZ8X7lP/TWglgemfEYL06D7w6oZA22eM5lRuUfvhhdnM0E0SNO6T48lNtCXeFMG
-qU9wNgYpSlUoHaak/wITZC648NFablVtvxiQ9QVYblON+OPt1mOtFo3MTTTb7JQC
-NAITVl2OGcGJeDI6qTCDNRe6YKX80JkSNPkDsHzTchwpxPoIYA4rkxyAbVmPD2zd
-q0KmLZshoMeMXsh3GPqh3XB42lwK5GVVWUqD2d/RezMGsEO5GyxLsBnG+w9Bl8iz
-kDtIgy8eUgtWBRryb8QLaYbzpnV3TbGx9dRnoOWxivPe0VHNAvB63kSYIY2ja3yc
-iNX0B00x14Ec1dzfqG2k/xdewwuTyy0vfs6wkNKfBTloztop6LdInSzOJayc6B0L
-tRGA/l+IlR9MnKEYLE4v57kWc6Sdk/w4Ou+9EFyAy/IXFBDT8PXeJH4huYvuc6ZI
-2taUdSNoIf2OPvGoWp9x5g88lmLEMWCq3qa/UH9PpRApq77mCNfW+aiupmdhHEZF
-AE5kdzYZ4btAO3WhHNho1k3YZmbfa56lrCjKUusOjcrhRNwmkzQBX78FXUZd8hSh
-LnxKsVhIat4u4Ypa/XP+pdU6I2h+peeUF3wa0jqPZoNLTuA2aK0INxPVBmBEJY9u
-WTxYtjixUvAgegTgU0n3ck9LW3AjjjMi0rcZU6GyYV0sYxSvrJY3D06z
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI1vLqrptV+aUCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJxH1i8CWr89BIICgD5oxp9UMxgO
+FsJc3rds07IfU7tPIpm4sIpDbp9kyr/hpnYj4BtXt9wuQ+fxDJ1rPnUldj9wsCcF
+Zuxcy2cWiKR2gKPMWHWIu2cTLdbBekMOl3FwFMio/KECI8uo5YFSM7falvW40nkC
+iieGVsa+w2NTBWsAPHL+82DydqIYl0xDa0H7In3LTHU4Hw3M0ndL7HNJzKnQ8Dqg
+tCCK/bqZT1TaNLXCHDm4qSXLVxntlcrZJ4yYovG92l7oMOzSwu5Ctm7CHO4WRD9+
+dWPToCqZ4BM4+DkxVTCZns6ux1eOyhUMJp1vxieK2NRrDvlyqoNDTl+p+cbwPnWp
+wzYsnrZP5BlwqOYGtU34+/LDcU10OYnL9wfj+F2RBKcC10HcdfWv4uC6hjdUamL8
+OhrLjusyoz+XlUZK4DnelRrzVBRSJphghmXDXQ3qi8PP4wNwphLJzBU5lfEqiSL1
+nW7zadhrDY+9AX3deR+k17MzWEz9nTYul0UN/CZtD6RXsixA3IdAlCo0lKneV2EJ
+44lopW4LkyWurh81fH7whANq3WA8pr28NT872CyVXIXOOYAYTez1WsSiPVpMpuKQ
+6kSV+FryNaRshAa29KS74wr6XHnC5BmNwQbdxXD1hyFpQujiRzw9EucFU317Hu+A
+DicwhimMyG4TiLI3fyGyHw2jGHPIavQXjQUG3XgyXrQNCOJoL8EoX6CVuFw5dwnG
+8UYPcBPFfEHU/GoCroBysosSDJjf4O4XsGR98tiL2lUQlYlT1BrfQwguC0Z7FqI/
+7HdBwn0iwnGOQFrbRXIUYhQqnmmUSCPaysAD6K2cSBViJZsfeY+fOU4j85CylUgs
+9/P/d9N76g4=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
index 3519ae5b0..df711b4ca 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
index d0693f144..455d073eb 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
index b47ce8b4d..ebd9c2fc7 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
index d0693f144..455d073eb 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
index 7724fda3f..61e13218e 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
index 8ade2db36..7a0789ef0 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
index 8ade2db36..7a0789ef0 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
index 5123b172b..7b818f7c7 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
index 6eabdffa4..60feb64ea 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
index 6eabdffa4..60feb64ea 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
index ce12e54fe..03273d4e5 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
index b820bf8f5..825b4c4d4 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
@@ -1,21 +1,22 @@
Bag Attributes
friendlyName: server2.example.com
- localKeyID: 0D 9E 77 6B 02 AF DE FB 02 31 58 89 27 D3 05 CA 81 F0 03 66
+ localKeyID: 77 8B 89 22 47 D2 AB D3 65 BA 15 30 A5 01 41 AF 05 2E 27 1E
subject=/CN=server2.example.com
issuer=/O=example.com/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjDCCAfWgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDAxWhcNMzcxMjAxMTIzNDAxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5xczcpFPcohZh
-Legf/wzSJvwj/dVkXg0MEyVulbMS+sgCwwSO6uGykJVc6ZKUnGqFyv5Icp1zG9Y9
-/joYefiXN5K1n/3NrtsET+6AJDWzZYz/AyRGd07xLwEw+Ip0/bqqNaxpc07L1qAA
-Bcwz2lcSeKsIDbYC9znSdEzuNUFmGQIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB4G
-A1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEA
-GQz0ggxKkEXx50eX/uWtlC7+JFwsJLBhU/nGBmOLxzHhptrRBLiqLYr8Chj92eZN
-nDr1HUY0jIC8PcPDjpgz1rs+6HOy3F++t7u+x1x89MQ2DUjCqqyjiM/PzuKsdU4V
-TVXsu8R4x8YSjCfXeKJAlOL4rPy2wU3wXRhzCf4Et4E=
+MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCf6MdoozlJCZPw
+dIHXdFHddXJfZ5xn2e6XoMmSjqOrOJYIIFKdgtlrMhtTVU1VLlK6V7H8142r78YQ
+4RKcj9QhTuQJxrrVtVuRt38Zy4RW0/+ujMcXoV8nV7Yt1c1z/tIJ4afSapAnAAm5
+wVdIbUhUeM/K5Wozm1gV5OCtNZPa4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
+QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
+BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAgAA5TLssFua+
+7lS39p+J/nFieS+QV5UHVGcv6RKWQRvFm93eaC3l16c1x+qx2ZUSQEkMBz0MdN9X
+0bYEX4NcFf6af7c1fez4t02sduqMRIqG4EI4eP9oigmDRBBntP2kXKTqkUHnjqd5
+N/bi+N6dD5aFGCIsXAavAYWUYsFpjS4=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
index c16d834bd..8ca80238b 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC5xczcpFPcohZhLegf/wzSJvwj/dVkXg0MEyVulbMS+sgCwwSO
-6uGykJVc6ZKUnGqFyv5Icp1zG9Y9/joYefiXN5K1n/3NrtsET+6AJDWzZYz/AyRG
-d07xLwEw+Ip0/bqqNaxpc07L1qAABcwz2lcSeKsIDbYC9znSdEzuNUFmGQIDAQAB
-AoGAEXVcVlP/KZn1/nYA/ZjLjKhrQ7qkJkWMdlkKSIU7CgqVZ2UKdZ/vTAe4cb3l
-r5+vhxlXollbIKk6DiNpNEmqKerZKzH7n7VGnWRZsqeIQKVafO8+zchh6yKNmWWB
-Vpr0iyzPruv4bX5mnlMyzCBR/p6ThYqzGvwJIyCY1EupZoECQQDnGO3hnpDZeNW+
-goZ3rHYlZYVDbb4IUOg/sDFQ+AKUbeSU6Iz+XgpZt9dxqLBPha75jbqIAM/p9EhH
-BBqmACRxAkEAzcqKI0Ic/673dD1BfTJ8PP1bqrEg2Gn/7+jL/BXJz4tH1kPvQjdl
-uBdOCVj0A0TRVGEsgqWK34t8uIeYJHyQKQJAHOW2IUdVr4v3lln1/JL5NxXpwxO+
-9oU/dW9Py2Mn122ibqhhsRELVEqzywef/GGoDpaVY5pOZV/hhdfSiT1tUQJBAKNG
-SDVTNijSjDiohTYtAQ9uwPT71iB+cXbKUFWwf87wJc3lVoZF56mYq+yUq/2P8zms
-Y6FAcJ+OTyUlR9vjDIkCQQDPIe6ggdYsOjRZewUscxmGKEZCHiJcqWIzD2aURknx
-DHKbxu5n3tZlhBoaK0OxJCoNDWLF/cE5PYJpBhGatJLR
+MIICXAIBAAKBgQCf6MdoozlJCZPwdIHXdFHddXJfZ5xn2e6XoMmSjqOrOJYIIFKd
+gtlrMhtTVU1VLlK6V7H8142r78YQ4RKcj9QhTuQJxrrVtVuRt38Zy4RW0/+ujMcX
+oV8nV7Yt1c1z/tIJ4afSapAnAAm5wVdIbUhUeM/K5Wozm1gV5OCtNZPa4QIDAQAB
+AoGADnBIzRhr3D3qpzwF20vr9mib5qRm2XOymOtSOBL8EUI/PcWZYBKICidQk1Iw
+9N+FZcD0V8Woy50PT8fa09sixqib80PAeMQe+AwblNQ3BXz7VEZZKbzUdv5SynnC
+oYqWp8dToWPG1aNvF054ZRA5Uy2LIB1+Vpv7X0QCIXQruE8CQQDM4L8U8QBjU2mK
+5/fsurGSY1nqI9qUvo104LPLrTqmtSnQKai+0Nh7/Mp0vIK9nC1Gz9mha1KTBSW5
+Qbvk9DtbAkEAx8+DYUS9C/WtTuQj+i2+bzHPRiWwmeOZZdFEdTyctNXYegnHqnum
+PRHxVHKlTMKGB73lmfrZ7HxqTYVP1AtjcwJBAKCaNXAHFBTImF2pRbIvD2//rcZb
+YMdlMKJEWuz42JdCQIrLfVpHgMyA93vXIm3cdami2akt5kcVq+KzYsUxpy0CQErE
+KIoeGYs/G+GYVqoHsemTvtalxcZftwe1XaNs0cqM9lr8C92MNTFG5IHQAHCPnW2K
+Lj8G8cKe73wgdTWIKWcCQG5RXlsOUfUIEQTxgE5lbQhcMshnOpkJDOHzHoJmuXpn
+SRKwVq+2PXkuw+sAeXxPiKwhOvFbXBL3bwkhibhpxs0=
-----END RSA PRIVATE KEY-----