summaryrefslogtreecommitdiff
path: root/test/aux-fixed/exim-ca/example.net
diff options
context:
space:
mode:
Diffstat (limited to 'test/aux-fixed/exim-ca/example.net')
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/CA.pem22
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem22
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/CA.pem22
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.key30
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.p12bin2965 -> 2941 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.key30
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.p12bin2343 -> 2319 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.pem22
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/ca.conf18
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.emptybin244 -> 244 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt2
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem10
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2bin293 -> 293 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt6
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem12
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/key3.dbbin24576 -> 24576 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/noise.file110
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem44
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem40
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.respbin950 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.respbin967 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.respbin967 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.respbin990 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.respbin414 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12bin3111 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem44
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem40
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.respbin968 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.respbin968 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.respbin968 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12bin3111 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem44
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem40
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.respbin950 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.respbin967 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.respbin967 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.respbin990 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.respbin414 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12bin3111 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem44
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem40
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.respbin968 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.respbin968 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.respbin968 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12bin3111 -> 3087 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem44
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem68
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem46
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.respbin927 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.reqbin96 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.respbin950 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.respbin967 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.respbin967 -> 939 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.respbin990 -> 962 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.respbin391 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.respbin414 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12bin3189 -> 3165 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem24
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key26
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem44
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem57
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem51
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key34
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.reqbin97 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.respbin928 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.respbin968 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.respbin968 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.respbin968 -> 940 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.respbin392 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12bin3109 -> 3117 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem29
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key26
131 files changed, 758 insertions, 697 deletions
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
index 01f1d8922..8664a3269 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
@@ -1,13 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
-ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
-NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
-ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
-bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
-zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
-Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
+w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
+xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
+LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
+/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
+RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
+GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
index ca3546956..ba9d9e638 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
index 3b33bee50..2aed3d496 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/key3.db b/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
index 8fcd9b43c..084770b3d 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.pem b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
index 01f1d8922..8664a3269 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
@@ -1,13 +1,13 @@
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
-ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
-NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
-ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
-bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
-zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
-Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
+w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
+xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
+LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
+/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
+RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
+GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
index 424e12f12..2023f8c65 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
@@ -1,20 +1,20 @@
Bag Attributes
friendlyName: OCSP Signer rsa
- localKeyID: 29 36 40 F6 57 99 69 D0 0D EB A8 54 6F 21 27 2B BF C4 E3 9A
+ localKeyID: 2C 45 3E AC C0 F1 EF D0 2F 29 71 33 62 0A 8A B3 8F 2A 5A 30
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOnWxALh0dzk0VqU
-SJtY7LsA2ywNkGTK6DIl47ZtEx/Ohk3hW8F89Z4q3YbNNpmXuNaBu9dCMOfUtsXl
-qWpXawMdVNQe1TZzkCt7IcQrFf8a1TNk7nWkYIgwzTb0kdV1Ki1OjF2G2K3MgQbf
-g2QaESpyZAPjAFu4CjbXagm810dfAgMBAAECgYAQZhNQ8G07RIC6DXQaEN5pLuIv
-8LOTnfcyrR2PCY8xx9X7WDaLFyxSb0ch0PpnQxCfWnHF4spzN6OptTVwU7kZWH9w
-UrxABUaN/1Fxw/Y6vrNEbwywVloDyIhkjA0QP4kgTLRRcJdv9VLfFtTHslFdNmJP
-yWi2emZ3BimI+nJngQJBAPe1oaClgWfkpcysjTc54+VlFeJxmCm/XW1sN1+mdxld
-jJ6dcgjbOFEz/9Uprf08YcQPXX+bQZUNOF6ZAy7jaC8CQQDxqkqoQ5sdktTlE1gS
-Yk4twCZK8on7R0I9BOu6QrDDGmUY1rzgMnSMTI8T8C9eDZ/sEs1k7T2clfrfRkR+
-nRfRAkABkoWUH3jS0AC9a9r5nsRzkFCzP0VX/n75UtaHJOdcodtipl0y8TFKUqot
-EDaqhNeaBv7w8GtaJttUvmPmyErBAkBV77GWvlvFm3Y7c7KI7w5P9JlpY3Avu/pR
-CpPs61RCPPugZpRJwYdycLMcavfdIUkyQMlrT3XuXeMVTL6Eq8ZRAkEA70NhgseN
-7RHtR/G6gTz4Uk8/pKFYqTdoDVZL/wv3KWSGyx0NjFMQwNpOMdnfqW5BRrVw9DUl
-fKdmPefmqJo4IQ==
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAM9XmsMSvKp6sxY/
+pPrz/3ui+qqv8e943N0tsxre1ch4Az/jSJCEaqBDgX918DbE2dTQ+l02COZ55ttO
+JuU46iQ/j/KA0PzAdkTuqQiJ7yZXKd5bt0jqplUqnRKjC94saWP1FVygCsavOe0H
+IefgQo4C/f0A03jZWOMwAsQ2ogYpAgMBAAECgYAyACYL412YfgDofV4ff45NhjLN
+TSM6lOqsMtxVf0XOM3TTKBAEe85LyiO1NV+BkayXN/McXc69J8n+emUCU5yQxJxX
+dOSGB+5NACWGujcoP0hmoRFUzDNuNPFc+xMqxH/ONRbndYk4pd2WBwkQMyq5YP7z
+10vc6XXhy3sodyX9JQJBAOjFAELMt4bCYo4Aq6yc+dMUtzyvezDot5/JJjxiTkIp
+HSke3gd2fZqgnuCCIwLSimxcYxGy0UwThevB8s+YE/0CQQDkCPbEDpDKZk7sIbFz
+l+Q1UQ0RJCT+ITYcZD8RxPW64u1bLV5892537zXBJBzEzSYTJjwOvjsj696L5Pmm
+ZhSdAkArkMONvRcUZ8leXo3DDtZLRXNOLmHWM5g6lcFMR/HxvBQzIA3aQ7kaebmC
+t5ip7JHv2hLIuzklDfpgt7okVIhZAkB59LlU/Z0+Qh0veI2ZDsEEKsbcRgJqz4RL
+BuocLMRnIPpkaw0/tG0mQ47yLsgcEMOuNiKkl+S1P26UTu+dqLaZAkB7KQQCpOfj
+gHi30Ip2jVCKKVlePemYsr6JEaRBW6wfHSgLbcc7SDwBDdOMhzR4eOIcEavY3po2
+rjbvcT+YDLmz
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
index 6e14d8af2..15d055d7f 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
index e9e0b39f2..082f125d6 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIICDTCCAXagAwIBAgIBAzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
+MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQ3MzlaFw0zODAxMDExMjQ3MzlaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
+MDExMjM0MTNaFw0zODAxMDExMjM0MTNaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAOnWxALh0dzk0VqUSJtY7LsA2ywNkGTK6DIl47ZtEx/Ohk3h
-W8F89Z4q3YbNNpmXuNaBu9dCMOfUtsXlqWpXawMdVNQe1TZzkCt7IcQrFf8a1TNk
-7nWkYIgwzTb0kdV1Ki1OjF2G2K3MgQbfg2QaESpyZAPjAFu4CjbXagm810dfAgMB
+BQADgY0AMIGJAoGBAM9XmsMSvKp6sxY/pPrz/3ui+qqv8e943N0tsxre1ch4Az/j
+SJCEaqBDgX918DbE2dTQ+l02COZ55ttOJuU46iQ/j/KA0PzAdkTuqQiJ7yZXKd5b
+t0jqplUqnRKjC94saWP1FVygCsavOe0HIefgQo4C/f0A03jZWOMwAsQ2ogYpAgMB
AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQBb1nuA0+kNV2jgMvTGaNvhBKlRTaC28uyBS0kN/A9r
-Nbnq/B4Uf1C+lkiCCRe2tNir0iiOeT5oiF6IA1GofX2wNPdHuNr219kpWggBgELo
-JIBMTF7NaAVigxZNDxASNXPjbsYyyVKieZGUcjErr0sAjzOcxzoIkVntR2FJFBR5
-DA==
+BgkqhkiG9w0BAQsFAAOBgQCTmyVj/GNFTfOC2LHWjs9CjxGaGHz37XYJmjmtbWXM
+RAC1J8bgUqZQzJq/SbfDDcRKJD63pycYH0oK7fxrYeZ3MfIebuRcYJ7I3nPJMoNY
+tfvl02lWHmGJFmE4U2b/2U31BWc3Q1sl+DlT3+bKJiuGqGGmyDod8NSPbBAz1EnJ
+qw==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.key b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
index fdccbe5fd..3adbac715 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
@@ -1,20 +1,20 @@
Bag Attributes
friendlyName: Signing Cert rsa
- localKeyID: 8A D0 2D F8 EC FF E1 DA BC 17 E8 D4 8C 0D 27 C2 2C 2E C9 D4
+ localKeyID: E5 F2 EA 2E 57 7A 67 18 A3 0F 7D 20 25 68 7F E7 82 4F 24 22
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJ6XqBCKF5vePcuU
-luX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+mQGStFJNz2FJmMapEOR6
-yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi08PGSMJKJXu1o0uCVjGuc
-BT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAECgYBDcnwnjJM91uaxDiCe7evx8RFY
-H8DL9NDNnChF5v0/inbKrLkC4t0yKlxnPmgUIzBNUIpB9erjkkN86DtzamoasNUN
-b1AIOVadYgGn6Aq8GhjY+P6g1WLzC90eE+3qGOgCVuf08oGQRyQSzESqEhcuiaPP
-GsxDCEnNUqHn8M7BgQJBAM9R5iX2Wn3+T1iQA6aNds6ys3gJaLGdUm9HN73fiyvd
-6o3xV/iKEDXeUljYRyvdQYopKMvwjDeiZF/CRCP+wfsCQQDD1Lkjnqg1CEQe+KiZ
-yNSc2ht7qwRyRktUK2Ldrl5mvpERFUzkd9CWdIwIeJcSQOW23tt0w2WQO/xSSVgX
-KhJTAkA9V28wZk7qHpfdjWb3Hb48dFVzu9z1SKY+dKUCkiT8isG+090Cld8sASb+
-UKfmS6X7uifvB7KFN5BZYQKGX/eHAkBH8QICv+pzcRH1fswRkuHorYejKvR7Nq+9
-wCKV5dTwUdnhOL4CwLF0VGSNSB/XqNe7Eqv0fUP2dNMBN8iQ2ffZAkBeZCdcueFo
-qirzYVWPVCADotr5PE/Bm3cKEInBs9GjHE4pG3M+Tf/r6fITb9KZ0EdBlNheVoMV
-Pg46Pr/WRl70
+MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAM3LDZ2KKrH4YTGA
+k60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyEGIc2EyVvyaIWasY2rqW1
+9m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8YaXju8gzhy2/eAj/w4M7
+o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAECgYAWqvv5c0DSW1nCskx8op4v+PkA
+E7bU9XbisJEx5rnmCn03JhJVvBeuSZrFNSxfJw7YgVCUSOQtqClNpIDxWWHZAxoa
+WzJ4S6Evc2qNi6knjAFwaL90qXiE+wBv/5NtZJOCYE5C/fgxIt3ZKcSNEMkl9blp
+IZwLVcdIlYA62jjDUQJBAPB45X74TlmynexC4Azn0tN+IIFrhdc6xLe/gm3C0gcY
+xUWXNvIYDDSoQDZmxwS8mLBQFs2XS8YoheyzZjy/b3ECQQDbFOXH+bSpWCNI7wM4
+9QgcJJzNUigi7I1xPN0TVc4NP3aRf6qethHVIxkX6hR0H0JnBjUFEDPiL01M/Se0
+WcHTAkEAvbgUD9VlMz1JfNHSJDxtx6/1g0XKZWEXPITaKTCQNUsksF+52MyCLLUl
+XAZANAt7R3cYVoFsJd1os7NiEMFT8QJBAKhFH8x+Jd4gHVHqit4XjjgXgvxNCxjv
++h+ssN0l/ZK9WPOeTE2E6KN9RsvQdg9O5zC8WsLd1Av5avUkSHfErRMCQQCHPAAL
+VWQFd8alawkNozIVUPWEOC7iVWOfEvvnE+09NevVJlxW6sL1+pv+vrBLBOukQTCC
+7spJ8rlK7cUugnOz
-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
index eb7cea118..7941c34c8 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
index ca3546956..ba9d9e638 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/ca.conf b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
index 200c0f9f7..2c4388a7d 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
@@ -1,18 +1,18 @@
; Config::Simple 4.59
-; Thu Nov 1 12:47:39 2012
-
-[CA]
-name=Certificate Authority rsa
-subject=clica CA
-org=example.net
-bits=1024
+; Thu Nov 1 12:34:13 2012
[CLICA]
+signer=Signing Cert rsa
+ocsp_url=http://oscp.example.net/
ocsp_signer=OCSP Signer rsa
level=1
sighash=SHA256
crl_url=http://crl.example.net/latest.crl
-signer=Signing Cert rsa
-ocsp_url=http://oscp.example.net/
+
+[CA]
+org=example.net
+bits=1024
+name=Certificate Authority rsa
+subject=clica CA
diff --git a/test/aux-fixed/exim-ca/example.net/CA/cert8.db b/test/aux-fixed/exim-ca/example.net/CA/cert8.db
index 61c9febab..155cef1ac 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/CA/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
index 111d70f2f..3cc83605c 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
index 711ad2c03..b1f47aeed 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171202184206Z
+update=20171216011707Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
index d4d4023e7..16ba8587e 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
@@ -1,8 +1,8 @@
-----BEGIN X509 CRL-----
MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQx
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjAyMTg0MjA2
-WjANBgkqhkiG9w0BAQsFAAOBgQB6ZdVxxhuHlfUavHLO5Dusztg1ZKJ0gtHx6rrY
-ZkMgEr+5RmMPxDReDZa0IxZqTc29ZCZ1tqjCrmAL4cXFi6r6yD2aR7vBvkdtvPA8
-NHHdEUVa1iePS4JqO0qSc7C6Luzs28792egwlRc3RMMCAoi6yDo/3pAC+BvyLxNZ
-j/VMIA==
+HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MDExNzA3
+WjANBgkqhkiG9w0BAQsFAAOBgQCMieUwhQ9xi2JuN5RvEhoSELKC4YCHbw44EV3Q
+LsXwjlpBncPBxiZo/rhkNmu/qNXjGA1WBU601cHkGcQXaXLPKo3P1flaBOhL/1F8
+9w9hFOu932c1A1V8IxAYGA6lXnswi5V3Km4nYtefjQD7rYaMbQwfIAqX4rY0b1As
+sPM5CQ==
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2 b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
index 031d3d76d..3f3cc34bf 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
index edb250faf..1c243fdfe 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20171202184208Z
-addcert 102 20171202184208Z
-addcert 202 20171202184208Z
+update=20171216011709Z
+addcert 102 20171216011709Z
+addcert 202 20171216011709Z
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
index f071ec877..fdc3c31c1 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
@@ -1,9 +1,9 @@
-----BEGIN X509 CRL-----
MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
-dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMDIxODQy
-MDhaMC0wFAIBZhgPMjAxNzEyMDIxODQyMDhaMBUCAgDKGA8yMDE3MTIwMjE4NDIw
-OFowDQYJKoZIhvcNAQELBQADgYEAgNUhwOEs1Kpd8mdNBlWhauZQMN99OZ2/ez8D
-dy2nFByxoC3gILohtRN/6bZo0Xw9Ilm42Ifl28ZwF/XMywLgRi4F6mCsTIL2iBcd
-Y7hYyd+V98LwTsiKS2l3VVB+AkT2YObXKBH6bZ07PJl66zaw/Fb6EvUPCDqcfvt/
-U79PEkQ=
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYwMTE3
+MDlaMC0wFAIBZhgPMjAxNzEyMTYwMTE3MDlaMBUCAgDKGA8yMDE3MTIxNjAxMTcw
+OVowDQYJKoZIhvcNAQELBQADgYEARRVelc8xn916fSmWsu4zu/MtPqJQOuzhr6tv
+hZOLbh4cF2eUGoA7AeTlfRmmwSJDbalyPIcES+J3jLNbJ/OVkAsaKldfZoI2fBTx
+MTtvjhJ8mlR/IaEywzxJzQgr0UxsTCGcEwbUcjELLJuFr2qPpPHbb+VU3M9XvQBe
+R0K7Cjw=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/key3.db b/test/aux-fixed/exim-ca/example.net/CA/key3.db
index b71a30b7f..beabba78c 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/CA/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/CA/noise.file b/test/aux-fixed/exim-ca/example.net/CA/noise.file
index 5c4788157..6ef09ba9c 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.net/CA/noise.file
@@ -216,72 +216,73 @@ power management:
CPU0 CPU1 CPU2 CPU3 CPU4 CPU5 CPU6 CPU7
0: 75 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
- 1: 31269 202 87 48 453 423 74 52 IR-IO-APIC 1-edge i8042
- 8: 0 0 0 0 0 0 1 0 IR-IO-APIC 8-edge rtc0
- 9: 41534 3276 1387 877 7155 5730 1146 669 IR-IO-APIC 9-fasteoi acpi
- 12: 2318674 35852 10877 6907 58328 38294 9421 7960 IR-IO-APIC 12-edge i8042
- 16: 0 1 0 0 0 0 0 0 IR-IO-APIC 16-fasteoi i801_smbus
+ 1: 36953 740 73 30 664 400 99 40 IR-IO-APIC 1-edge i8042
+ 8: 0 1 0 0 0 0 0 0 IR-IO-APIC 8-edge rtc0
+ 9: 78513 9414 672 193 3930 3366 890 185 IR-IO-APIC 9-fasteoi acpi
+ 12: 2901234 64831 5457 2075 45248 28156 6890 2620 IR-IO-APIC 12-edge i8042
+ 16: 1 0 0 0 0 0 0 0 IR-IO-APIC 16-fasteoi i801_smbus
120: 0 0 0 0 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 0 0 0 0 DMAR-MSI 1-edge dmar1
- 122: 6059 2640 2167 208561 3549 2888 2163 2225 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 123: 11 5 1 6 1 18 4 0 IR-PCI-MSI 327680-edge xhci_hcd
- 124: 218 86 28 17 18 37 23 3 IR-PCI-MSI 2097152-edge rtsx_pci
- 125: 235 80 13 0 180 12202 0 4 IR-PCI-MSI 520192-edge enp0s31f6
- 126: 2 6 0 0 1 2 12 1 IR-PCI-MSI 1048576-edge
- 127: 298 81 68 39 944054 40 36 26 IR-PCI-MSI 32768-edge i915
- 128: 15 0 0 3 5 8 7 11 IR-PCI-MSI 360448-edge mei_me
- 129: 16 3 4 0 7 10 2 0 IR-PCI-MSI 1572864-edge iwlwifi
- 130: 217 118 38 21 142 132 15 20 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- NMI: 542 1338 726 1755 1377 574 1182 153 Non-maskable interrupts
- LOC: 5731327 12110136 7172966 15459593 12388773 5977859 10893650 2709009 Local timer interrupts
+ 122: 6192 2656 1995 638976 3343 2724 2207 1782 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
+ 123: 28 1 7 1 2 3 0 3 IR-PCI-MSI 327680-edge xhci_hcd
+ 124: 260 59 40 24 12 13 7 1 IR-PCI-MSI 2097152-edge rtsx_pci
+ 125: 4 0 0 1 0 141144 0 0 IR-PCI-MSI 520192-edge enp0s31f6
+ 126: 0 6 1 1 0 0 12 0 IR-PCI-MSI 1048576-edge
+ 127: 388 49 69 20 1293842 24 72 40 IR-PCI-MSI 32768-edge i915
+ 128: 13 8 1 0 4 13 10 0 IR-PCI-MSI 360448-edge mei_me
+ 129: 31 2 0 4 4 1 1 0 IR-PCI-MSI 1572864-edge iwlwifi
+ 130: 472 177 79 17 234 80 20 64 IR-PCI-MSI 514048-edge snd_hda_intel:card0
+ NMI: 517 910 1871 1480 2860 2448 1488 1879 Non-maskable interrupts
+ LOC: 6821846 10426338 18563397 16012904 28148887 24504155 16316969 18889553 Local timer interrupts
SPU: 0 0 0 0 0 0 0 0 Spurious interrupts
- PMI: 542 1338 726 1755 1377 574 1182 153 Performance monitoring interrupts
- IWI: 28 0 0 5 13 0 1 2 IRQ work interrupts
- RTR: 7 0 0 0 0 0 0 0 APIC ICR read retries
- RES: 6214211 1012955 876569 80772 350923 43031 16372 17334 Rescheduling interrupts
- CAL: 55518 38528 41399 31968 43915 46731 41271 53177 Function call interrupts
- TLB: 38864 25517 30447 18261 30283 34832 28015 41609 TLB shootdowns
- TRM: 2295187 2295187 2295187 2295187 2295187 2295187 2295187 2295187 Thermal event interrupts
+ PMI: 517 910 1871 1480 2860 2448 1488 1879 Performance monitoring interrupts
+ IWI: 58 3 1 1 16 2 1 0 IRQ work interrupts
+ RTR: 6 0 0 0 0 0 0 0 APIC ICR read retries
+ RES: 12075154 1391705 533941 177241 287938 72263 62869 48691 Rescheduling interrupts
+ CAL: 180655 143208 98859 104850 41110 73752 113286 111989 Function call interrupts
+ TLB: 53363 51506 31574 33734 16525 24424 38918 42710 TLB shootdowns
+ TRM: 3945657 3945657 3945657 3945657 3945657 3945657 3945657 3945657 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: 63 63 63 63 63 63 63 63 Machine check polls
+ MCP: 91 91 91 91 91 91 91 91 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: 16292156 kB
-MemFree: 11440852 kB
-MemAvailable: 14205996 kB
-Buffers: 168088 kB
-Cached: 2422536 kB
+MemTotal: 16293504 kB
+MemFree: 9526140 kB
+MemAvailable: 13821984 kB
+Buffers: 437980 kB
+Cached: 3579080 kB
SwapCached: 0 kB
-Active: 2310344 kB
-Inactive: 2152824 kB
-Active(anon): 1237588 kB
-Inactive(anon): 267172 kB
-Active(file): 1072756 kB
-Inactive(file): 1885652 kB
+Active: 3759460 kB
+Inactive: 2482184 kB
+Active(anon): 1519936 kB
+Inactive(anon): 326136 kB
+Active(file): 2239524 kB
+Inactive(file): 2156048 kB
Unevictable: 48 kB
Mlocked: 48 kB
SwapTotal: 8212476 kB
SwapFree: 8212476 kB
-Dirty: 3296 kB
-Writeback: 20 kB
-AnonPages: 1872552 kB
-Mapped: 640120 kB
-Shmem: 268188 kB
-Slab: 192320 kB
-SReclaimable: 121136 kB
-SUnreclaim: 71184 kB
-KernelStack: 12304 kB
-PageTables: 51220 kB
+Dirty: 11148 kB
+Writeback: 0 kB
+AnonPages: 2224724 kB
+Mapped: 671568 kB
+Shmem: 327224 kB
+Slab: 326436 kB
+SReclaimable: 238592 kB
+SUnreclaim: 87844 kB
+KernelStack: 12432 kB
+PageTables: 54060 kB
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 16358552 kB
-Committed_AS: 6749572 kB
+CommitLimit: 16359228 kB
+Committed_AS: 7104468 kB
VmallocTotal: 34359738367 kB
VmallocUsed: 0 kB
VmallocChunk: 0 kB
@@ -296,13 +297,14 @@ HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 218600 kB
-DirectMap2M: 6983680 kB
-DirectMap1G: 10485760 kB
+DirectMap4k: 247272 kB
+DirectMap2M: 10100736 kB
+DirectMap1G: 7340032 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
-virbr0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-enp0s31f6: 68746005 70692 0 0 0 0 0 3154 11933383 54506 0 0 0 0 0 0
- lo: 103039 867 0 0 0 0 0 0 103039 867 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: 13292850 17711 0 0 0 0 0 0 9359951 16745 0 0 0 0 0 0
+virbr0: 60189 494 0 0 0 0 0 0 548231 726 0 0 0 0 0 0
+enp0s31f6: 66808098 75169 0 0 0 0 0 3746 18376786 63294 0 0 0 0 0 0
+wlp3s0: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+ lo: 2832452 10497 0 0 0 0 0 0 2832452 10497 0 0 0 0 0 0
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
index 3e855d958..63ddb4752 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
-ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
-NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
-ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
-bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
-zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
-Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
+w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
+xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
+LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
+/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
+RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
+GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
index 499bf24f5..f2ea8bfb7 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
index b7e8ab460..de418d53a 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 31 2C 81 1D 05 A3 93 09 0B 7B F7 88 22 C9 94 EE 29 B9 87 8C
+ localKeyID: 7F 93 5A 71 A7 4F 6B 77 6A 00 1B A7 EF D3 36 BA DB 64 C7 DE
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQ3NDFaFw0xMjEyMDExMjQ3NDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+0XnpgoUkghhO
-U/r3DJ43qS+gCZi8d6a67/8TRFhJRfxUTG7CtNdS1lCymZ/5S4HO0l/R9uceAL5X
-LBAYO1EX3hHEc7IGFMc7ciZ3Nr92td0saxZuPdR+la8BkvZBP3n6WtOFYWAYw51p
-IMnPz94dpgLbFGCYjeE07GtdGzXa8wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTVaFw0xMjEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDH3xYtjWPX7OL2
+1qWtIh5YIYPDnPd2Oq5+MU/VStQ0YOe0slhkh9thKLK5jf8OLUuFoKYyHoPD3nhD
+uk7RKVeQzj0fACd/0uqkAmgaLlg0grS1FhPUcVGHv8/5VepAqD1CTKxw4vNXlLQy
+qNvAwMBogQ0E6lKo3eGwrMcqQDX9SwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AHNc1UX9+HoLSSi2XGzHwy7mV+XAfAjCWcvBoDM/FLW7RSmj2chnrIjYf3/NwTow
-+PjfjB1CkMomVHRFlk6H84B/kLBfhfXbI97zT+pJ1WSiYqMAjD3aKkePuR5XkRbm
-gdE+d5n1+1GYazh1L9jIgjwvUhR9fqG4hWJSXEbyWDNN
+AA49vc79t/fQujwKm6O0Cx73EYaiZc4+0AzlPnJpPDlRPLxN5ZsYbPlzAytckVFC
+cOmbZOW/4j9HzO47rT4XLIoC9nWIFWwI+ziXLo0fJ6BcWpUZgOAsXdvxV/vnEwLt
+XPk+c7E9S4iafvXAgeRoO5AFSv9VTwNvufXwcRrbHagm
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
index 95fdb2c0a..0083d9b3d 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 31 2C 81 1D 05 A3 93 09 0B 7B F7 88 22 C9 94 EE 29 B9 87 8C
+ localKeyID: 7F 93 5A 71 A7 4F 6B 77 6A 00 1B A7 EF D3 36 BA DB 64 C7 DE
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIzeCULWBvTOsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJVAfVL6XN7qBIICgFRwMyB2788h
-5WG0W3JAlyQUC7Dv8KFP1gLtZjKidnvGooYOCROti2+kXlGOUMNh9FrUOAhGD/N6
-ldTQ/Q4Gnm6HHg574HoP0raWoPvkGLZJIks+Mfs8DDXigUkTAZM0hq0m//KTQCgO
-v5SqZ8kBWUhxYdAR6hE87RYiPxKEHFA3bnLq9yZ3wCq0Rg4gHwxOFdZU+ojFTGNd
-SLqW90aNVnJC50WCtbmUgX8f0akFD91pJJsAAnqx6c2oAaspIJy3C+gQyAea3XXs
-NhbDjxQ+9c5C32JfRgkOcdn3rDW+HVbboHyzub1AlBWASWFH18OUnpl5dRSUXcW+
-C67iIGqcwyUGh2Fukf6KRO6i9EAv9a1JCLQ2IXLRFdjyLx9IRxhrQtIpBBqlNcX/
-t1pt5MOOyE4h0birx5JJmTzVG8LoXsqJcO8C0ehfV7dV3bDt198eoBMoqNXqgG3m
-7z+QOJG+ZnOsMpU4MjFzqt18VC/+c1SAgdUttuNtyTCEhQoBQY1CKff9HQSbSHDI
-mFPuSQdhNy7SfImCtt2hzukk8dmA2Zxj4jpb1E5Mhi8f6ZtZbpj/IulLHrOZNT5r
-btZV/K6unfIOQdYv/3+t7bgmdx1K9E82cV431mrvwFMITBQk38ZU4C09JIXrrJ+y
-SeaTX99Ye0hsfCd3wc/ZzaoSmCrVRcY9WwtX0R0Q3t/OWrAuzEPuoZlSappe5bwL
-BzwQ6tLCKpJUDjYsRB1PihyY6GkZLrpH07jE8a0DfdlE+lSksQP7cEFMcl18NsE/
-QxnCDT7ty3Eq3V+SzinlRSzmJ9Dc9OQf5nXMq510CdoXeAm0mw1iTqDnbAnOQmKp
-39oPtzHNuRY=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI9I/lCSm8nygCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFyTcthNjTZ7BIICgPcDpcsyFNT/
+OrvGDaQuvlGwdWCztsoq1jbj1/uTwDbJhu8z+CnKhesVrnIWMMXf/9V5+HtAVkNE
+YirmfR6RSXLef3pq8GGsiThy23sBNTJWAnjoagKX81xvlIENqxEJIYn4zxsaBGkx
+jWevqcNMjyXUesNji8/wq1bFOPn64jVbEQIwDeaO2Oc5oFkkkIl0j7COwClM1nIn
+IQ5HwbDDLzkYgH3IYL92qNPi6R5j/T0ZrOipss8udWcw7MuKLpJLfw7nWiqOegXs
+lBv4xWYzD6Kso9WiyFdLp2IeFvXk6mFukOQ8DD+Cjs5NNeZMZwsfmwkXaTcRV6oW
+mcrfeoDfv00dnjnm1bP2TUqwW++LhXUKVD7U2cG6E3lk1zc/gtiwzJEN+lLDc6aB
+l2uAIkv9j03G+DqjHpU2eGk8GMt8mpwTvEC/MVvZypKhBKfraiVc9w61NOADgNa0
+ASyt0KQY4bDluXN6PAIC140JtmbUTRhpIAAHYyoCvf/HAXptH9yggrFEPmzPZu/Z
+fJ/1V4vzLiaKpzhcxuAv3pEa0eXS6GbLMBk+M142yBOIwXIp067jTKVIiprZ5Bmx
+7obzjOxVmIjDRWibkXU/osyZlWSfS1P6YgPjJV95oOdv1jokv2554Yep69EKJ6kh
+D+Cktg3QXboFmDRkCtwzL99chGpTE7xFyXEwJI+aAZdzRxOrro6vKQuEdKhSdDLh
+w4XUAy41XiFmysLEZJzCpohEil15DF059S687mKh01nEVqk5KF0+NBJg3n4P+UKF
+YYxF/1716FxkOOp1RS/4e5nev42UlnJ8bqoI2vKFNbAlFxXH6jHvUV9e1M+jw5jm
+VeP+CJkGWl0=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
index e656bfc15..816ef2522 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
index 3d8df3e51..0e474dbcd 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
index 07671e17c..d63f6c113 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
index bb4aac053..e22da87f3 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
index a8e82de74..8936e2cc0 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
index 7555bf197..c92b8862b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
index 74a1c6fd0..af94e40a3 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
index c3e36b4c5..0f05e0b28 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
index 4a69334e1..6e1e217aa 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
index 3c88d1094..9bd2e3f6a 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
index fc7246b1e..04735189f 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
index 0fbd7f1bb..a4f7f6cb1 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: 31 2C 81 1D 05 A3 93 09 0B 7B F7 88 22 C9 94 EE 29 B9 87 8C
+ localKeyID: 7F 93 5A 71 A7 4F 6B 77 6A 00 1B A7 EF D3 36 BA DB 64 C7 DE
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQ3NDFaFw0xMjEyMDExMjQ3NDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+0XnpgoUkghhO
-U/r3DJ43qS+gCZi8d6a67/8TRFhJRfxUTG7CtNdS1lCymZ/5S4HO0l/R9uceAL5X
-LBAYO1EX3hHEc7IGFMc7ciZ3Nr92td0saxZuPdR+la8BkvZBP3n6WtOFYWAYw51p
-IMnPz94dpgLbFGCYjeE07GtdGzXa8wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTVaFw0xMjEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDH3xYtjWPX7OL2
+1qWtIh5YIYPDnPd2Oq5+MU/VStQ0YOe0slhkh9thKLK5jf8OLUuFoKYyHoPD3nhD
+uk7RKVeQzj0fACd/0uqkAmgaLlg0grS1FhPUcVGHv8/5VepAqD1CTKxw4vNXlLQy
+qNvAwMBogQ0E6lKo3eGwrMcqQDX9SwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AHNc1UX9+HoLSSi2XGzHwy7mV+XAfAjCWcvBoDM/FLW7RSmj2chnrIjYf3/NwTow
-+PjfjB1CkMomVHRFlk6H84B/kLBfhfXbI97zT+pJ1WSiYqMAjD3aKkePuR5XkRbm
-gdE+d5n1+1GYazh1L9jIgjwvUhR9fqG4hWJSXEbyWDNN
+AA49vc79t/fQujwKm6O0Cx73EYaiZc4+0AzlPnJpPDlRPLxN5ZsYbPlzAytckVFC
+cOmbZOW/4j9HzO47rT4XLIoC9nWIFWwI+ziXLo0fJ6BcWpUZgOAsXdvxV/vnEwLt
+XPk+c7E9S4iafvXAgeRoO5AFSv9VTwNvufXwcRrbHagm
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
index ff4354424..65dd43bae 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQC+0XnpgoUkghhOU/r3DJ43qS+gCZi8d6a67/8TRFhJRfxUTG7C
-tNdS1lCymZ/5S4HO0l/R9uceAL5XLBAYO1EX3hHEc7IGFMc7ciZ3Nr92td0saxZu
-PdR+la8BkvZBP3n6WtOFYWAYw51pIMnPz94dpgLbFGCYjeE07GtdGzXa8wIDAQAB
-AoGAELiMx8xdpr+AVMDMLEDeo77/bYqEZ/jOKJxmNtsq0gTqzGeZicCiC7VnAzeD
-YADgrO3HYr/m1xIL8S9AcSHQLwcdgqokzI0O/gF0mx1c/4P9TYi6jkkxmrvj3UGH
-9DlW7bDD92frb8w0ZX4MWL9OrAIAIVnNG0/gAdYerHYW5pkCQQD1puxhjdkkNDsc
-eJxoa7iPfYhNyIpDvVmTZAEj/x7ibJ1VS6MjFkfTsebef1l7RaCV6aXJ8Q61Idtr
-v1vqGrSpAkEAxts7s6GyUF5xGkwUJgr0FOCvEld3cT40dnEyq1foWRArnw4x6HRP
-mOdiUmAmmNrCy9/Ks7qrH9s3QvgSe8d4OwJAX+KZD/cbU+tjS1i0zHmHn9LDGoF1
-nr1RMpvtagySFJWK0BlnAzIWNUaStDSHS/vAk+OQiAOk1wTxLdyS1w03iQJALxnQ
-e0zKcpTcD1GD2Drx81wAu8Rx6yXDwWYwjTsmMqpM2sC++4NJMztjI4XYvo3aY/Xf
-ClElpUcEQN2Ha0Ak7wJAIpqg1TLWLWRPvfbZjKYMsgOxKupJm1pufq3/n+sgAyDd
-qUvKCUsx1nxnVWltjtMJaJY9QxfRG6ILyVr8EBWPWQ==
+MIICXAIBAAKBgQDH3xYtjWPX7OL21qWtIh5YIYPDnPd2Oq5+MU/VStQ0YOe0slhk
+h9thKLK5jf8OLUuFoKYyHoPD3nhDuk7RKVeQzj0fACd/0uqkAmgaLlg0grS1FhPU
+cVGHv8/5VepAqD1CTKxw4vNXlLQyqNvAwMBogQ0E6lKo3eGwrMcqQDX9SwIDAQAB
+AoGADY/uslKYxssVL4irH09kXbiQd1KMXCJpOrjf4Oo98fvtXQ6I/vFVCoe3cO3Y
+s76RFFUtUdNOP5k18eqPdJPolBUjbIgZoE4nggOl3PFtfhN3xgNKVfeaXBm07PW5
+1IUCkvSZUtUltzRK6yZk5ONbKrkeKsxSTErmkBNLend6mFkCQQDp23Zgadj9Ck6f
+oAm/zWw+dB3gbBct9k8iL1eBLZPJv03848HiKwSQxMvSCe/9k7+wvEyQEo1JO+NR
+FxUyJOKHAkEA2svUv2S+vQSmBzMaxvCW0aUwnyfA1fXc6GfGdq9OPQLvlMpiweNN
+i8k1mfgGDhDZnTPE0QFhzQOUfYFaBcYMHQJAPZ/9g86gxZ2PtnS/3PFPEu4aaWdS
+fGQp2kJLdtkB1uo4rOl/0A+x9kxFwaWovlPO8c3NBzI8VQ4ZCudgSIR7xQJBAM1g
+9C1Mlja7vFWZxRLlF81m8IMVP9AX3+tQLl2OJTTkIpxadeVmRo5mqygCRzzA2GTW
+CXPfhjx5ldNRrn0o8IkCQEPzDRwJ4bhdkOlPH25HkmHiwBWOrNtaYLxz7bh1mPLZ
+AbGEifbIp9jsXmpMLrt4rPbBZXT7drMHgMMx1NjrQx0=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
index 0818bf68b..14ed5345f 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
index 3e855d958..63ddb4752 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
-ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
-NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
-ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
-bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
-zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
-Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
+w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
+xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
+LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
+/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
+RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
+GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
index 070f1bbcd..56e747dbb 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
index cf8edca18..ff8df35bd 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 66 8C 1C 3F C0 5A 2F F8 C3 67 79 59 F8 C5 E5 26 10 F3 AC BF
+ localKeyID: 15 5E 15 B1 43 DD 5B 16 2A 5C F2 82 D2 9F 4F FF CF 2E 16 FE
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0NzQzWhcNMTIxMjAxMTI0NzQzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAr28Am9j3sJUs
-+nHJTkavLJeJr3vh/0Zi0TNCRO9fmRUaxS8f5Xxc1oumtkZKLRWmb4BKte7+zYHB
-jwZAYpgd1jF5/xH2KmQNtgcD05DQknxH3DX4Tklob+PuUCQeTOdIFVeZ5VM1w7s0
-9qK9Ip13csvt6hBmxtd+SxeF6p+FIEsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE3WhcNMTIxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArgzEgDRr0AQS
+xDojWqcYJenCWDEY/NpODPKTf0AqA+8v1x0wRsafq56PsIyscc9V8hH1nrKy+yQ/
+9K9/Q31Mv6kHrdM17H0XkwYJXDrqoMbYzT1CYwssB9VxJtJyCccrCXVy3UNJ/H3x
+uEwuDdHBHRBjBZbpR/yScFUl2Ep4MwUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQBTVY+g7wU+4a2PQ97Ou+6KsC+q2ZM+v0zIxlI394bs9bzk369dCSExdjF+OF9H
-cVPvXgljUAyp7ub0e4hv0r2VTR8C02unZqm3bj7gyiKdo2qxt2byX3U7BtdLOJxh
-BSgiHUfF0dvlzl40wBDVxqhTg4dIFVsYJUxGiOmDzuA6pg==
+gQBAd8eYuCaPHDZoXm8EwaiMkncqs3BTfLmTatgzzFtKv9Dmtmsc30dfsjuZnXm2
+l7NpRFUMmhKQy5eRx0ee9DdU8ZfckOQKNh6fZBVg2Yw4RO1XUtY6cxwtqNtGjsFJ
+jBiID/ON+1w9AMWnGMGfeJ0Hv8vUe8/YqP8fbunf4/LUVA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
index b39236962..2bbf66888 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 66 8C 1C 3F C0 5A 2F F8 C3 67 79 59 F8 C5 E5 26 10 F3 AC BF
+ localKeyID: 15 5E 15 B1 43 DD 5B 16 2A 5C F2 82 D2 9F 4F FF CF 2E 16 FE
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIiQUOTV36USQCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFoGjWz9Cs87BIICgOFWjw5C1gO6
-qAtMZPDmpmfWMKNAZzdq3874GaT1zqFDgyHcqppZ9tHlXPV+CjUcT5wtUN4vZpTA
-+WaSxdgdVyjtuTzEstHLS5xyRVct8tqJUbuKaHcuP7GNYpepJcgq0kUvZt9obvKN
-hYQHEVpv1ow1M7YyZNJfh//KMiXAk9yPC7xGdRMrEnajaHVr0bZctFrzW9I/D+q9
-uyM7Eem4z+qL+9slhu9gxr+kIcvufk0vjHSRsUurFAKzPH1uxcTAEMKS6ItRV7Zh
-HOhApmjFv1Q+Vne1LhAXN16X84Y+w3y/TJuUgnkPfhLOHKx+3qcj+EhJHKUJGlFh
-qMLE4lJi/pNPaLqWg1yijk4E12r1LH1nXmyiKUVwwCqU/nJVrF7cU11MEyqbShC6
-HgsZXfR8bTQPsZyB6AKPIyXZs6WG3T63uaF2ZfIabxiNk2pgufdEC1kTASqcI5q7
-/XJMMWmO8NjfIckpLJ3HnYWdLF01FGai5YWHTJwFOlAU7tqWdnA2nmbgmfCdLMRO
-SPmbXzfVAGlVoGPhA1WoGYw/01QpfapmoNz/ZHXZZGQzzPYsl0TExz3XLDIdquWc
-2J0OapusPLH0A2Nw4nbZM6QmiWkXQ9LkYn936EFCOtgqaXJDzvUxGgp3XhRIwCXh
-r33u1EMVv6DeXMSQtU8qBn+9bE9oz8UvzuOvpWA1q5ITZi3eoo+zFqMOBPp0lglM
-pDlpBE5EPXAa6D0vnfkJsazi5aLEhWQ3hFHL9Uc57DRIFWngoMdY99lTV86Fjers
-1KKbqDSnlwBb3ieH2MV3sXlPB3Sr9sRT03CiK4gNJ3N2Ko3Vuv+wzRyOvrYkCH6r
-ioemabOFuRw=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI865PqaogKaACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBT7nNRRaluIBIICgBLFSXNLPWMp
+M07NUb4KU14Q0edarPUyWv00v+z/Lz39hOTjUwDw6WuB59ogzg2MyqCljP8YUtvW
+4H8kk3mEq/0spX7Vb8Bd7laZySfIvHzeHQWq8+8TS6yncdZMhDSXcxcMT5YQ9Xaq
+8hCdaNNq8mfkR52FwMviw7BBvkNDjyuAq91joPixjk9kukkEtUosMqlU/GJMoRvF
+9dShrk8qN3idweipRXEJ5Irpup6JtC2M9nIt7ft1JyLxJi1kh5uYUzkc08ySuuzg
+QItGDNQzLGVsqqqy6mmrrMetrgn26LBFIIDHxYFDhe00PR/oKb56FdIWpCH1SumN
+Yx+GHOoE9ldRpSKR0U76KntdJESMfPkVcttvn2VxaBQoE/6FkLtc8H27pQcov4gq
+jzcpIfZN5EQUe1E937F3qIDRvcCNmGbNtWqOaOq5riwMlXyYjGazFHkUM2Fq3Xy2
+h/aD3W4mKEzHo8n7OPDFk3XDgPL65QrtjRqJdNV5/sqBn1c0G7JVQkLBR73N9/oH
+K8HYF9Db5ztPn9GtQ/CeRTAJgDi+31RXmDE7ADfsrxAH/Jimsn95y+141ZgmKFEj
+NK/SomNzcywJyXFJQ62NTPHJslPy9K1WgXHMmc5jqC/MRX+sEVF/hoveqgs+Jrxf
+ZiYs6xzK3idhsjr2m6N2B3srQYTI5UJgmBtWAAyXnRbyDmx3jTpr0rkI/2/bhtxs
+OhoUP13cIRuN09af5WxjoI4U8RrpQdNMj+kBbbqXZ55RUavgSH1beNyOrIzSunU0
+8A/VE5MeDO0CdlggdwDoU0FPbSkB2DHbU5kdmA2r4L5k41unDJSD1ABEsQ+njYEi
+KCJrXQBxSdE=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
index 0c67b0606..0c502c149 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
index d55fddb43..60e78c7ec 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
index 948ae0620..9b48a51e9 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
index d55fddb43..60e78c7ec 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
index 751c57aad..b290e26dc 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
index 4c4aab6b4..f44e0442b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
index 4c4aab6b4..f44e0442b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
index 20678025b..06c3343b2 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
index 2830522ad..e1a76bb77 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
index 2830522ad..e1a76bb77 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
index d39843fc4..550801747 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
index e27f2ae22..d94e1b9cb 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: 66 8C 1C 3F C0 5A 2F F8 C3 67 79 59 F8 C5 E5 26 10 F3 AC BF
+ localKeyID: 15 5E 15 B1 43 DD 5B 16 2A 5C F2 82 D2 9F 4F FF CF 2E 16 FE
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0NzQzWhcNMTIxMjAxMTI0NzQzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAr28Am9j3sJUs
-+nHJTkavLJeJr3vh/0Zi0TNCRO9fmRUaxS8f5Xxc1oumtkZKLRWmb4BKte7+zYHB
-jwZAYpgd1jF5/xH2KmQNtgcD05DQknxH3DX4Tklob+PuUCQeTOdIFVeZ5VM1w7s0
-9qK9Ip13csvt6hBmxtd+SxeF6p+FIEsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE3WhcNMTIxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArgzEgDRr0AQS
+xDojWqcYJenCWDEY/NpODPKTf0AqA+8v1x0wRsafq56PsIyscc9V8hH1nrKy+yQ/
+9K9/Q31Mv6kHrdM17H0XkwYJXDrqoMbYzT1CYwssB9VxJtJyCccrCXVy3UNJ/H3x
+uEwuDdHBHRBjBZbpR/yScFUl2Ep4MwUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQBTVY+g7wU+4a2PQ97Ou+6KsC+q2ZM+v0zIxlI394bs9bzk369dCSExdjF+OF9H
-cVPvXgljUAyp7ub0e4hv0r2VTR8C02unZqm3bj7gyiKdo2qxt2byX3U7BtdLOJxh
-BSgiHUfF0dvlzl40wBDVxqhTg4dIFVsYJUxGiOmDzuA6pg==
+gQBAd8eYuCaPHDZoXm8EwaiMkncqs3BTfLmTatgzzFtKv9Dmtmsc30dfsjuZnXm2
+l7NpRFUMmhKQy5eRx0ee9DdU8ZfckOQKNh6fZBVg2Yw4RO1XUtY6cxwtqNtGjsFJ
+jBiID/ON+1w9AMWnGMGfeJ0Hv8vUe8/YqP8fbunf4/LUVA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
index a2b5539dc..44552a828 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCvbwCb2PewlSz6cclORq8sl4mve+H/RmLRM0JE71+ZFRrFLx/l
-fFzWi6a2RkotFaZvgEq17v7NgcGPBkBimB3WMXn/EfYqZA22BwPTkNCSfEfcNfhO
-SWhv4+5QJB5M50gVV5nlUzXDuzT2or0inXdyy+3qEGbG135LF4Xqn4UgSwIDAQAB
-AoGAElSpvnRoySGFOMlWl0sTzGKB0f1tS1mk7fwKUslPoV9kU9yNMNLnoR6oIEfu
-7JAPEHvaEpwy2/FQyBYx+GYG8+lI4dPYMYBvaONoaOqQBjthtVfIzHcKbZz4dSXI
-jOzhdm9Jkh9+FAPtQdEzDBuK+cZcm3cMR/x2hlt+XUANDRUCQQDndZR81Nw46jjN
-Vx5KAswlKzYghBTR8bFo+18FC9xu7n95/WKsT2ROesZd2g2PrP1VNBLmILvBFhjS
-TMm2QTo3AkEAwgi8efN6a5RjtHuRK7o8nu3RGcduoGjeapJ2Kyby/Jzgn98QSRIe
-OgfQT97ddEHtL6gu1/z+V8dm01SaXOBwjQJAWspRW4H3fE/LxigVFnzwbOf9TFXj
-ANMofwCTLhyP8+eTk1tkGCjwNKSOKQQ+a4w0tvY9L43JeBzd0agTO21skwJBAJYR
-aawsKo+Pyflp5GJcfMwyhJmajC4WTYdBVZGUYzQLJROg0xigoa4iIvPTG5Xx8z77
-pZc5PYGoYBeshGK213UCQBAuVOcc64mOujsB9Ay/RL6ayc10s9zlCWwJdJhfkV4u
-hhZlbUYbPNpxBCEw7xjXX/X04kMm9bTBUfvQMPeWZWA=
+MIICXAIBAAKBgQCuDMSANGvQBBLEOiNapxgl6cJYMRj82k4M8pN/QCoD7y/XHTBG
+xp+rno+wjKxxz1XyEfWesrL7JD/0r39DfUy/qQet0zXsfReTBglcOuqgxtjNPUJj
+CywH1XEm0nIJxysJdXLdQ0n8ffG4TC4N0cEdEGMFlulH/JJwVSXYSngzBQIDAQAB
+AoGABE/FqGVkDFWlf13vVUYRZ5MIYPXqaA0iZNi3ha35vHo25a3P7djqyK4XYijB
+9tnLh8EhJArKO0V1HiMg1HOsrIJP9YBryElg/mXS6aPqs0VeobasyddxcO2+ncMR
+ErAO/KsE0WGu4z2i4IGQm6F+h8R5RI4VjPG7kD1ozYCF/yECQQDihe/ojWWzEyEL
+7f/FqxRTFiNvwN52kd+G7CRmWnnKQ77+Jw5yRaw0AHpk4VUnVKqHz1Ihf9P7DwNV
+HCg9EzSxAkEAxLLPmJ4qXGH8sFc1OLkDuqebe+d1P6UOz7wKRw/0GLUIZT5XcxLV
+IkQpQY5Je3y59razzB8ZxBggSols/DUIlQJAVq4V7ZEd13Z8cMoz03nxnxGbocnV
+1t1fAYwfKaN5czKVRT/AwW1zxbphG3U2VoSJdMqajQMTJMDL76eEpkpRIQJAXPjr
+2QaBnVMPfkZqOJpy4coRWxqHOAMLojMOZJJs3TTMeBZkfVbceSrgmUTpBL5qo+ut
+xoC4zBBfSvv0EK38lQJBAKkOWDLJn2RGnm3Uf1k/3CxXy8DpO/hlOroPvErbIZzR
+wPrr3b9xPclZ1iCdE4mRxhKfpaI2kLzG33KUuimPpzI=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
index ebf98795d..bcf17cb26 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
index 3e855d958..63ddb4752 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
-ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
-NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
-ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
-bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
-zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
-Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
+w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
+xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
+LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
+/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
+RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
+GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
index 075439ad1..46b01b37f 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
index 62a499e84..403f8f262 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
index aa13e1f4a..6070b42a0 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: A5 4D 11 B8 D4 DD F0 E5 A2 06 2B 05 17 63 D2 F2 18 A5 48 0B
+ localKeyID: 26 C4 F1 B6 B2 18 C3 D8 62 C3 B7 7F B1 63 FE 1A 05 7D 08 69
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQ3NDBaFw0zNzEyMDExMjQ3NDBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0uXUo2Ea2ruUG
-JT8eHDpXgbSS1W1/msvT/eASmBQdo8bccj35+B/ZumNF3eGANYXRw8tGgDD16F8B
-9OShHYPJLtPiAO0I7a+Gw/rtUUdeMYEZAElCarkinWb1/PPGuARAEFb7JNx3L/Y1
-huIj1phHmOpZjrWzPsSdQjNTOlG9uwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTRaFw0zNzEyMDExMjM0MTRaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDK3yZb8oFBEG7Z
+5FwtwC1uNRxr3P2UqPvPDBV/xPZ/zV+9hXdI6QO/jPuQg2GAfKKJEn+WdlJPXiex
+oCpCw4RIzBjGTVzc5LSHV9pBovKGwmybEnPcXz1olNxsKmxaSOPSCw8KdkSzEnAZ
+cNkWvzMvMaZuQNMw+rKq9uDyRzB1lQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AJlkk5AMm4WI0oDftBsNUur6cljBxyFegsg92AeTxPpBW2NzLo33UiBO2DcFIuv8
-Odg7pKAV+iq5hnfqjfCEbfQm1fEaNIIXGwtD4MgU05DZGb2svyWyloU0xuJx2hOp
-7Mqw+eHceg6MCEB7X+tcEQeNx6eGRIJ4hZfJQNawtEVX
+AHdM0sDiqGn0H9EllWFPVGRa3UR9rk4Asz+lnk2afcFQ/GSRSUEf/XnzaWT/sV4k
+4JS4Z61hpcU2xE0Woo5Ml8dtxmVKyB4TZ1KT9AijgZbNPG3KciK2fwedmk5gsSfE
+aOJ6H2nLuQfe8Ba2Ffzw7C6Am9FIiHxOc2gAPBYbyaZJ
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
index 420b6891b..d3e6bd274 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: A5 4D 11 B8 D4 DD F0 E5 A2 06 2B 05 17 63 D2 F2 18 A5 48 0B
+ localKeyID: 26 C4 F1 B6 B2 18 C3 D8 62 C3 B7 7F B1 63 FE 1A 05 7D 08 69
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIy4R8PFDb6gsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKtFEe0Z0caGBIICgA2/ju7QDYF/
-+tTSlonpmUsSvjuYmKJ+K1pJ2MJxFTz/sd5ejgc+BhXB41cOa0uYhQuuirCitbC8
-EkU9JcZubAabTiRe8I5ReAQgP7GHtQLUoxH58tcb619suDAQ84CWNXuTFHnscUbr
-AAI22dSo6I6xMaHV79+c9BS/duIskN7+LNPlbSUDjY/OYOJWuuSfGI3+ZhHV7RMO
-rPuX/0BFHJz1FvJ6LNXhxFs+W/Bv2vFi0I6VaCdGr+8Fz7KmacX/+yu3vBApYXcD
-uV3843oI5m+insQ4I7p0EodlSiojWCbt6qD4gBcuoyXqhkIxJedAMEmXhFOJlLEl
-tofu/hRh2Log2L9c7VH/hG8qEyIG/4aT9gCS0flXpO/qH1k5EoTl0FdmKCMJQIF6
-3QfAHDPx8Hecz0kxHAxAPX6oYViPonJncQq44gygCzvs2elFzG68aLq3M6PvhAmZ
-KzI9kVM8QXJk3LixI6UqzqpNUJr6UucmPMbwe8YUsTBNCuXKvYe7mMU3q6AFhHpl
-v3aIiUZvlhShHpa1iruadPQFZBJ1DPQD8CsI8ykwOUS5vVisT608to188Gd72TJk
-Ml9Atp+6nybqRemPheYaqqwrQ6AswDaX7kK5i5Bq8HURqBy5iJwedWG7yg9XTlt/
-UkBiYQJE54KOusxS14ENQY3TsRNmcTn2P4PLyp7Q5xGmAfSgMzFecSdkY17UJLFL
-HMjT4hfH9IFHA7VesvkO4mD6ZpCsY1ZsW16it2Joe//eivQ0cqwNC2+Ph4cHaB6b
-lbZ8iVPKwM+CzuicteLKRWkrDEON27L5z3F0eMyhL6nQmANBLGdJ2ped5Fqhhibg
-N0FfvVNR6KY=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI5YUUjsIypQ4CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJ7bIstO7Wk+BIICgA/QvrilpuGh
+nQD7SW4W0LMKjXXbOyXf6+SBU1iXFnjOiXMgPVWJx1eqP3M65+7PehK/xwciiive
+y+FMm8XspTw30uUXrahuA2j03EV3CETjE6fYVekMszDQX7/B0sZvjoP08QNMxeSg
+Gz9Qz2af/RqMDaEGr6oN1Asf6jrLXjv9qLv4uDL4JtYH2qY/t7ZRid80k9oM+0fR
+rPJ5Ekr2+vO9k4PkvYlu5K9KXRkJvlN47zrTJGbJIc3tj/SztmCNND2hAxFioBbR
+AeIKBG0/JhTEWl8ebjo71eWsjD3BEx4W02Lwe8a4oJDHv1zrEnfdhdNx4GsigEDP
+gkSyIT+/V7aH0kmGr5lRLcYKh0ofg7axF7Y1n0BKDrGy5kVwaDn3UMUaWAaCIJJ5
+7c0T3Ym5c69NMjdpuOF/LMUBWYz85N/EPdamnr/B6Bpoc0vPhPkBgQfhJfTjfKSC
+iniX7ShNkN+ELfDOSi+5aHRSSiFBd0lhojf20E3wPUQVW3XJzj+mXvxNzVyu0yrw
+oJv+1VUo2wjYhoyxmNbbjD9LUYIR+0D18xkUde27m6Crz7XhFvDKWoff5/5JWSnU
+sLcBQpMW9Yf3c8rf5N21fNH3aWxXY78Xbe3C7TvgXpRr7038l2Fk2Y6g7v5eibRk
+PE+cepM606kiHaRIsB7tT9Qk4+H1qBvxlkbVrpfbEqQhJZxJiHHboO/VAxwThAPm
+Lrk7LGLrGPuHyc19L2/9kZtDE1d7lrBdbx/U5j6yqXp+UNtNvReVe8SPnyRN2hzp
++s7wnUZ1cZLIBldn9Pq7SD6XZCFBWRSGRSuJ3u9byPTkQyhWdXagRehm6YmY7xLE
+n+JKUzJ2GcI=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
index 908a62640..7b8dfe126 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
index c8b077aa0..4921a26d5 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
index ba799effd..841d1e60e 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
index 6c9548bba..ee93bf242 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
index cc770eae9..2e97f7c90 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
index 237de8850..b677ef086 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
index d8be11dbc..bce692b99 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
index b2036fb85..ecf7677fb 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
index 372f68e96..662fbf3d0 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
index ca1a8d066..e69c10a62 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
index 00c41d6a2..19858afcb 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
index 02daea60e..7f2677d20 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: A5 4D 11 B8 D4 DD F0 E5 A2 06 2B 05 17 63 D2 F2 18 A5 48 0B
+ localKeyID: 26 C4 F1 B6 B2 18 C3 D8 62 C3 B7 7F B1 63 FE 1A 05 7D 08 69
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQ3NDBaFw0zNzEyMDExMjQ3NDBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0uXUo2Ea2ruUG
-JT8eHDpXgbSS1W1/msvT/eASmBQdo8bccj35+B/ZumNF3eGANYXRw8tGgDD16F8B
-9OShHYPJLtPiAO0I7a+Gw/rtUUdeMYEZAElCarkinWb1/PPGuARAEFb7JNx3L/Y1
-huIj1phHmOpZjrWzPsSdQjNTOlG9uwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTRaFw0zNzEyMDExMjM0MTRaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDK3yZb8oFBEG7Z
+5FwtwC1uNRxr3P2UqPvPDBV/xPZ/zV+9hXdI6QO/jPuQg2GAfKKJEn+WdlJPXiex
+oCpCw4RIzBjGTVzc5LSHV9pBovKGwmybEnPcXz1olNxsKmxaSOPSCw8KdkSzEnAZ
+cNkWvzMvMaZuQNMw+rKq9uDyRzB1lQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AJlkk5AMm4WI0oDftBsNUur6cljBxyFegsg92AeTxPpBW2NzLo33UiBO2DcFIuv8
-Odg7pKAV+iq5hnfqjfCEbfQm1fEaNIIXGwtD4MgU05DZGb2svyWyloU0xuJx2hOp
-7Mqw+eHceg6MCEB7X+tcEQeNx6eGRIJ4hZfJQNawtEVX
+AHdM0sDiqGn0H9EllWFPVGRa3UR9rk4Asz+lnk2afcFQ/GSRSUEf/XnzaWT/sV4k
+4JS4Z61hpcU2xE0Woo5Ml8dtxmVKyB4TZ1KT9AijgZbNPG3KciK2fwedmk5gsSfE
+aOJ6H2nLuQfe8Ba2Ffzw7C6Am9FIiHxOc2gAPBYbyaZJ
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
index 1104c9dc6..5ad2d6082 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC0uXUo2Ea2ruUGJT8eHDpXgbSS1W1/msvT/eASmBQdo8bccj35
-+B/ZumNF3eGANYXRw8tGgDD16F8B9OShHYPJLtPiAO0I7a+Gw/rtUUdeMYEZAElC
-arkinWb1/PPGuARAEFb7JNx3L/Y1huIj1phHmOpZjrWzPsSdQjNTOlG9uwIDAQAB
-AoGAE0UjJPPKtnf3m6wlCsTfw6zk4DM5tb1/tl7/oXvtyStJbQARc7HtU334T97U
-yKLsXe2OoznP/qiEWOUP684F2yOnSD/QtIozLzx+IpVvnQwyJDW7iZdIXA86xWC5
-jRc8MkHqB32b24NJ1spa9EUsdvsx9N22fX0M1VJDxQ5QH0ECQQDwdXl0jyocrBQR
-9JgwaygLK2tAX0Hi3PkVv14QGlSyG0zVTsKlWQy82ZToWREKh85rjxitt+l8k447
-KTjXRVUTAkEAwGekztwGkW0x8BsssyuLJey+UB2bnCg9Lk9bIX7RrtHjntAxLzwo
-ZI4eDDpJc2HxNBAT53Zq0ck5Q19plksRuQJAN1nzYV9rRDpgTFnPhqXEC/4srB7B
-XeWb+OOaVX6aLH2YTCnbKJC9G+PCIVIPWCs22w+PkL2bI7Abt4afrP4qvQJASk18
-QvqLesvdlikYaRTuxrWXhV75wiN0BRdWTSgpl8asjZ8+70vfGX4csoIr7Wgsevue
-hCuh8uQvvgnxv7272QJBAK3tlX3jidvpg+2SRTMy8j7YnadO63UzaZDAF6azXCdU
-M2Gs4khoFWMx2mdsX+PDrMFr1Lt/sOtWIy0+6WcIIq0=
+MIICXAIBAAKBgQDK3yZb8oFBEG7Z5FwtwC1uNRxr3P2UqPvPDBV/xPZ/zV+9hXdI
+6QO/jPuQg2GAfKKJEn+WdlJPXiexoCpCw4RIzBjGTVzc5LSHV9pBovKGwmybEnPc
+Xz1olNxsKmxaSOPSCw8KdkSzEnAZcNkWvzMvMaZuQNMw+rKq9uDyRzB1lQIDAQAB
+AoGAAKe8hFAsh1zvOWLvF/K78tQsav4ZZOaFfFi0pRH/cyWNqUYKFEE0aDpOAbHQ
+RHhNP2trir0ybNvdUvSKeRFlQaQg3cP1hfZfpf2OrG09e15wnwbgnGR8ajDxGk2R
+C5CxvCEQ2BjV/mCadY1dP4Xc1zJbmFPi5asOk1G8KbaFt+0CQQDn5Q+NzUYNanTm
+ABbVGK+04oWV+dNg5qrtdipouLUSl94fOL6AYwoa7FXRxEhfoU4TysjNdcInUvnN
+Ba3ChH/DAkEA3/XB2DT5vL/BKbEQtCjtUhY39Q2qItr2ERKCQeKniv+RZAILCYax
+hGlfDCxTR1goO/FkxId/AdgukheZ9qT3xwJAORWtN4YRuZm8PyZEeJ7EGi4tHldK
+jq8Z4qzVEcRuZq5V8q+gTbCTuz70fVfpTQlDVCH2PoW/jrihX7QHKzw8ywJAb8wT
+PuV7ATDLsQ81ommHxmFW/5oZoxqgmPcfVNpa/nUDU+P9NH0rYkjjbIU38TZdp0ai
+IcTtrrMG1GC5t7i0AwJBANy+lCT/l5RlKbK7ZQ1hZbOnOANdPIu40fbR/bJM6iwb
+LMWGkSlk0sIFGvwi01D13vcTrACtrFSkv7gzn1YyCyw=
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
index 3e855d958..63ddb4752 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
-ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
-NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
-ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
-bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
-zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
-Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
+w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
+xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
+LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
+/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
+RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
+GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
index 29c9c0553..6e4fa2b27 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
index fd80ea9b8..e16854303 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
index 059e0aa76..f6eda58c6 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
@@ -1,35 +1,35 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 15 CA 25 01 42 68 1E D8 78 42 F5 0C AE 62 0C 96 9A B8 4E 09
+ localKeyID: E6 0A 1E CD 7E 1E 3C 01 48 74 7A 8F FF 72 FD B8 9B E6 90 57
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0NzQyWhcNMzcxMjAxMTI0NzQyWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3AV2vAw+R5p
-2mK7x4XyEGX+hrsMI4ftU+nNjemcx8mprhwjqOqpybd8a72f2KxhsJX792n/25f7
-ZyFG8+ADgBPA9w4w8UOwbQ1yeRQEe3pWpPMT3YzLH7I/tixjteZ0gahvsj9WbKvV
-ZRg1zvlDg+ANcMCu4gvKqnW0A06kuaMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/apGI+TU//+e
+Im5k/lK3vazxvX6BKRjFHWp0oqpYflECPMLM4j8gOo7RmlY1WV9BCswJ7XqOQg+6
+3q1vv/gT8YQdemMSEVYBOitf/byDXgq/1ryhim7FNd4f33nyG1r00f887/ohCsZl
+bEy8h8SiNgnfbudutgpGZKpypggxvT0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQAqXyFF/xJYgRgLAU8wZV0dzOWU2ypbEiMMHMrXuG3Ts9rDRMtcLGAz4Qleumsb
-kS7dNe6qH7hXyFwseeXpFnJa0knbYifF3CEyP26jWuh+5f4f9oVZZzwRe56/kE+h
-8sOz5tNp3JtNHKandvqfZ6lKtvRbk2pirVajYYfpV0bXEA==
+gQAs+NWJxd2V4TWn1KVdP0fycQOkcwqx3L3Md9Q3fgnn2Sx6OrRbOie3IpGWx2Pm
+lf+NUGBKI33oaKpOr6Hu2kqE4M/qGssoMjXUQS2B4RxCfHiod/fjB+O66IThrLYE
+4aLWdUMgk0dd8Ep8i0ssDLzcdpDd72ASS2f13GdYjP15tA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
index fe4574cb5..5d1184180 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 15 CA 25 01 42 68 1E D8 78 42 F5 0C AE 62 0C 96 9A B8 4E 09
+ localKeyID: E6 0A 1E CD 7E 1E 3C 01 48 74 7A 8F FF 72 FD B8 9B E6 90 57
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQILpJRxdm6uqYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKkGbYKTz02zBIICgAnOQYUp5L9H
-JHK0EPoxqcl3bgdU4tSV3yzC0r1BPv3cdX8DIRDvAoF4Q12MEObgQ2Xm4aFiUXFm
-wMT6QWU78DX+4apIUz09m1xmxJT6/xXrBgAuiEPNugJonyo/VIcP+IcWJnm5R5LZ
-iZqrppVwHEg3/d0XS+MtbeNOpGBLW+VeSQypzco9gj5JnkrlYTJS4MTwhdziIHyl
-nYwwl5dExsfAFhAjh+DIjqQpgWYw9ZyZMy9zXSO3ObPTPjkGaGFGi15+YXzZ29cY
-fnbLQ0wiIuEUT5nagMDa4xwkq6tvbEN3TEP//W1mC/xMm4Z9iRZsj9woq1ZuAcle
-Q8/BmPkDTTXlN3XQS8io77DLBO80Alg1wuQ6bCgrLKBwPZlMgKFWBZQh+RvRULSF
-d8wgZ15B2Ceq0MSuYsbHDfdZGFuYIHvE5aKH+N3vlp1gFpxmH+1Zx+JHTGV+JhKO
-zhXaqS3wSBUgDQL7WX6oWS50abC/wLu2z8IaEEb/mRk+uOYaq3k4qbUM1G2eCs3X
-MTHvkRXSy9JJAAndRbVN29784i/whlHjKvIbTUXY0DJAItlGyk/pYl7X+3MkjZE2
-4dTN0J/xGQKbNHL7qlPdIVS6gp1BXT2LSuuhOnjK5I2S1hiV27/mSUCWdTIJ8DC2
-0JhOk+ZYJV+HVK6t5afzBml083/C2kAs/c5uq/70lrZbW8aQTPM6d//tpXG54bEv
-PL+a/+rV+6sGki1AAeu9QBSQDQcZTlmHno5MY7pz8YVP2JXHJmvVIs+BaNseAsbB
-Gpi1SBjQ2+2rxx3e9hDENZ3gWkwXZEwhVqtP0qRp2hs7WOhC3q9Leehbnjv0jvSO
-HYr1yUPGqhw=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInd56Mc5DjZ0CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJo8VFTap+ZeBIICgPvKz4ydRWcw
+YKpGYAYu3etaBLW9U7DiLMyONabHO7Dz2xlrPkDUP1Ph5V6nLqiMXcNdco5ULVz/
+mlITC2ZVaKfSKJkTHvGrLbhGIpdJqfSxrKNLw1NOXDWH6dLNKdCyXwAglCulvyEO
+54h1l2FPxg3SHsjaMa7SZZ03qXwfhICLBSqqtf33Goh7GdabdlgUDuaSdSq0czqF
+3RcF8+UCFUR6uAUP2yBKXhf5gByMR0Ah7rdCXfNJCg9y/DWT+PCfdH392cROkLkM
+HhzkzoSN1BiU3BqljYGVyvJS6LO8thUhFviZoalMEkFZR4hFa0Gj8tuduY5Dbdjy
+BK3jbxh7cKU1T/1HVGdKM/9JdEsBFEhrkiLwNFZEWNtBVNOAYZihWlQmVsgRW138
+YVbYoe01W//o5gPToShxce7kfXS2HQyi3PZMEGVlXQxIAYOubmMox2MDVqbCIUdE
+xGpOYyJQicv1wH0J0IeXAxt+LTeC4y2wZTi/jq97NriveBbswBp17gSj2uh1hmaD
+6OkJyvhh06EMxmwofGQNKVCOKHQGKxAVUKTcDOtNC00Lk8BghXaRxx+VLs6Mg09x
+PE9gBTlIH2UaE/Wpe6KDd11c/09zudbR56aoX69R+hhzF9VdRZYqynDMLoM57UtR
+na3qH3Ww9/ewUzAXlSChy9fbv/5Lwi8jU+sRGiVuK7D+7+5doOivcDBoGTa3vN5N
+OxvE1U0dCC6rh/64KnC/y8dyL9ye2GC54gg4eVEKetFyHLjaegCsPgapnn5Cobn9
+S/hAau/deCRguEhGIFSLcJlewrJnlrNRaD1tJgdBlCSeNe9BqE411ue0Pu4PjAul
+J4aV/QKHhKw=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
index 6850ff92c..0c2946011 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
index 2c9f146e5..fe24be47b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
index ebc1ec517..81438c5da 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
index 2c9f146e5..fe24be47b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
index ed07962f7..d3e991342 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
index ebce09554..3d8145a32 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
index ebce09554..3d8145a32 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
index bf40ea79a..740c15093 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
index b473656ad..61aa79bf8 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
index b473656ad..61aa79bf8 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
index 035917e30..e24e62283 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
index b6e01cbf5..f8c4e67fa 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
@@ -1,21 +1,21 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 15 CA 25 01 42 68 1E D8 78 42 F5 0C AE 62 0C 96 9A B8 4E 09
+ localKeyID: E6 0A 1E CD 7E 1E 3C 01 48 74 7A 8F FF 72 FD B8 9B E6 90 57
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0NzQyWhcNMzcxMjAxMTI0NzQyWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3AV2vAw+R5p
-2mK7x4XyEGX+hrsMI4ftU+nNjemcx8mprhwjqOqpybd8a72f2KxhsJX792n/25f7
-ZyFG8+ADgBPA9w4w8UOwbQ1yeRQEe3pWpPMT3YzLH7I/tixjteZ0gahvsj9WbKvV
-ZRg1zvlDg+ANcMCu4gvKqnW0A06kuaMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/apGI+TU//+e
+Im5k/lK3vazxvX6BKRjFHWp0oqpYflECPMLM4j8gOo7RmlY1WV9BCswJ7XqOQg+6
+3q1vv/gT8YQdemMSEVYBOitf/byDXgq/1ryhim7FNd4f33nyG1r00f887/ohCsZl
+bEy8h8SiNgnfbudutgpGZKpypggxvT0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQAqXyFF/xJYgRgLAU8wZV0dzOWU2ypbEiMMHMrXuG3Ts9rDRMtcLGAz4Qleumsb
-kS7dNe6qH7hXyFwseeXpFnJa0knbYifF3CEyP26jWuh+5f4f9oVZZzwRe56/kE+h
-8sOz5tNp3JtNHKandvqfZ6lKtvRbk2pirVajYYfpV0bXEA==
+gQAs+NWJxd2V4TWn1KVdP0fycQOkcwqx3L3Md9Q3fgnn2Sx6OrRbOie3IpGWx2Pm
+lf+NUGBKI33oaKpOr6Hu2kqE4M/qGssoMjXUQS2B4RxCfHiod/fjB+O66IThrLYE
+4aLWdUMgk0dd8Ep8i0ssDLzcdpDd72ASS2f13GdYjP15tA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
index 89d36944b..685436bde 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDPcBXa8DD5HmnaYrvHhfIQZf6Guwwjh+1T6c2N6ZzHyamuHCOo
-6qnJt3xrvZ/YrGGwlfv3af/bl/tnIUbz4AOAE8D3DjDxQ7BtDXJ5FAR7elak8xPd
-jMsfsj+2LGO15nSBqG+yP1Zsq9VlGDXO+UOD4A1wwK7iC8qqdbQDTqS5owIDAQAB
-AoGAW8efW92/BVIQCqh5pdddWSUPfwQeZFAdUO3W3U256OmQcjEQFAozskTFP5RI
-N6FZnbxWncrgAgRWHvSpxHheg04LvY1qPpP5rWtcn5NJA9I3uVR/3VBkRsn62+U5
-SXbB3HHytqMGfjs3LdfUD+Ubm1viej4jvrbWD/RxQ+hAJ50CQQDo5O1Hvobn2myp
-F6S8+3NEdKyTIyLxecE9T69BTeo+V8Nf9gR8gLP5RGaVdLV1hAPWqJW15iUx+Tr6
-aa7jqQD1AkEA5ASdIgGaXxUnX+Q8Fzdxf7mi1z/AXXoMv/CrD1M8pBaEbj4tY+89
-CYQiferClhOJNJAnleNzOBwuQWdCFuhRNwJAGnl7p74248BmvcocRgdnkQ6aV5eU
-71Jh7zBRweCzkiaz5QK4e9a9nsZxyuebgSJitVIwwp7I96dXVwQQh3y8yQJAYDp6
-PgHDLmF1Doj5uyqQ4cBsMr8a5dg+TTq6Vmtgajd+iDABY+1xKvTywYUzvbZc7yvv
-KNimpYVvF/cF8zj0HQJAA2Ccl5+YBj7Qu6387mJFCjd/Vv/VlJkPrKZrCeCVDVue
-I3D9yBawdmdVLQrzrGP4KhVzPZ7vrz+hu/Sfbbqscg==
+MIICXQIBAAKBgQD9qkYj5NT//54ibmT+Ure9rPG9foEpGMUdanSiqlh+UQI8wszi
+PyA6jtGaVjVZX0EKzAnteo5CD7rerW+/+BPxhB16YxIRVgE6K1/9vINeCr/WvKGK
+bsU13h/fefIbWvTR/zzv+iEKxmVsTLyHxKI2Cd9u5262CkZkqnKmCDG9PQIDAQAB
+AoGAB3Krrwudvmt+tOOZZwc+Ol081tPDTpXZ2ciBprIKOaE+x9Jvahgw5c9CM74i
+wF5F3l+JzhV6XlGwaq/cd149FZwUySG8wAnB+rXz+Sxiu8GyXX8QHGS5MlmgYEu4
+jPK3gY1V3098eXY+75O8J/22ITIohcDMA5PzEeQns7P7LTkCQQD/F8V/cEZJiwVn
+QMHRNGlFC2Up1dYC5gUzwPJHv7I6NAsDmd3QDiIzBCHyFMGDiTV1uJ1kgALh2LG5
+sdAZr5LlAkEA/pEz56wRKLrsxJAqzyZcQKZZXrJd3k53ocr/aNRt8sLNuPYZ3bz4
+6QEPdjJWa2NRGG4Bh3yaN87fLd9JhKAjeQJBAJUFwBz47DbefmOZkyCya6UoSQst
+nv7GfdeEKoX72RTjfmO2Kbz35MbE7UfNFFfRemexWFFz7zsdKoZ++EFpLnkCQQDO
+BFkLTrd8TPq8gSgECTlzoKyG9Lb+6GXs7EoTXoe0hW7UF2cLipmuiAspTsedlPzW
+VoCqU27DZ4o6p4/p42eRAkBAFcz5M9OsETk1OIOrOFbHXrhRENLhoTs49CAG3sJt
+F82g7LnXWMVossWYR+rTGsuzBMQCM7CNw302l1ew9f3M
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
index 3e855d958..63ddb4752 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
-ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
-NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
-ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
-bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
-zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
-Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
+w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
+xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
+LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
+/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
+RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
+GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
index e6c014326..209e7bc7c 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
index 8b8e73a6c..5534c777d 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
@@ -1,58 +1,58 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 43 43 15 3F 39 3D 8C 8F 7C A6 0D EC 95 D8 71 0A D1 01 06 4D
+ localKeyID: 89 6A 06 67 FC E8 7F D7 48 DE 8E 5A B4 A8 9D F0 78 77 28 E3
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQ3MzlaFw0zNzEyMDExMjQ3MzlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOB7RZXhsaIRqU/q
-VwdMMHLpYyNq5PYy5vv9LKRKdyYKrdneevar7XSRhtgTijk0bGHLjOkb9IsbO7lD
-rdhec/O7arQjFvaxzitS9p+na7gXlY2mSwRD8ynEm89akIFy9bLcAm/Sjsjx+5Ai
-n/I1CDG8+fRIwvYdkH8XeHBSdzcNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MTNaFw0zNzEyMDExMjM0MTNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPuVg3pbveHgoKH
+fUNkYTlf4eihEIsk2kfsGKyw0zibuPQabxKThrKDjx4/m54+pJbuKF7pWolg9XGy
+xpR/qGDLvzzo6bfMZh6rm0fxbOT8XpXpMLoqE3kRIJEymNqx3gkMIEYbP3OKzP5x
+u+VF9LcINNmFzQU3Mv6gE9VLajS1AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUubmV0giFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBs
-ZS5uZXSCCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQBPkSiLv66UTJZKIjhK
-qibpeuz7QzX/Pog2uJwF96U+an8ERd6CoQ5Rrqg3xsEBbVd7y2MY6oZr5zbx/Bep
-7oW0zyNypM/xQhqQBLWS+GjMupw214keT+lfpg6/RU2XlcBjfT82vfuSVaNL9CUm
-Smh4/woDuJ1/RawGmzIpIIn3NQ==
+BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
+bXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2Vy
+dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQB2UWYprO3yj8kXHaFQ
+NxRMEvOqU6pPzntU7JtbtU9AsjQEN1B6rlUUq8kGTVbK5D+ZcLWMZ8Q+KzXVR8YU
+1GFN1YGEH8godVnw4mXB90KJQ4xlz83TOb/ZiJM7yIKeYylTiHP8unuMWjYQz4oE
+pmHSoBPGUzPBZHpqYL5aZHkBOA==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
-ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
-NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
-ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
-bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
-zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
-Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
+w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
+xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
+LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
+/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
+RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
+GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
index 0598da52f..9067e2c78 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
index b8c8e79c6..890772102 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
@@ -1,37 +1,37 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 43 43 15 3F 39 3D 8C 8F 7C A6 0D EC 95 D8 71 0A D1 01 06 4D
+ localKeyID: 89 6A 06 67 FC E8 7F D7 48 DE 8E 5A B4 A8 9D F0 78 77 28 E3
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQ3MzlaFw0zNzEyMDExMjQ3MzlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOB7RZXhsaIRqU/q
-VwdMMHLpYyNq5PYy5vv9LKRKdyYKrdneevar7XSRhtgTijk0bGHLjOkb9IsbO7lD
-rdhec/O7arQjFvaxzitS9p+na7gXlY2mSwRD8ynEm89akIFy9bLcAm/Sjsjx+5Ai
-n/I1CDG8+fRIwvYdkH8XeHBSdzcNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MTNaFw0zNzEyMDExMjM0MTNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPuVg3pbveHgoKH
+fUNkYTlf4eihEIsk2kfsGKyw0zibuPQabxKThrKDjx4/m54+pJbuKF7pWolg9XGy
+xpR/qGDLvzzo6bfMZh6rm0fxbOT8XpXpMLoqE3kRIJEymNqx3gkMIEYbP3OKzP5x
+u+VF9LcINNmFzQU3Mv6gE9VLajS1AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUubmV0giFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBs
-ZS5uZXSCCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQBPkSiLv66UTJZKIjhK
-qibpeuz7QzX/Pog2uJwF96U+an8ERd6CoQ5Rrqg3xsEBbVd7y2MY6oZr5zbx/Bep
-7oW0zyNypM/xQhqQBLWS+GjMupw214keT+lfpg6/RU2XlcBjfT82vfuSVaNL9CUm
-Smh4/woDuJ1/RawGmzIpIIn3NQ==
+BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
+bXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2Vy
+dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQB2UWYprO3yj8kXHaFQ
+NxRMEvOqU6pPzntU7JtbtU9AsjQEN1B6rlUUq8kGTVbK5D+ZcLWMZ8Q+KzXVR8YU
+1GFN1YGEH8godVnw4mXB90KJQ4xlz83TOb/ZiJM7yIKeYylTiHP8unuMWjYQz4oE
+pmHSoBPGUzPBZHpqYL5aZHkBOA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
index 4a11a5c38..40a86efde 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 43 43 15 3F 39 3D 8C 8F 7C A6 0D EC 95 D8 71 0A D1 01 06 4D
+ localKeyID: 89 6A 06 67 FC E8 7F D7 48 DE 8E 5A B4 A8 9D F0 78 77 28 E3
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI2zMZlYsRf7oCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPuf6XS6X2qIBIICgBfyS/AXl0ir
-mFW7QjyyQFg8beujRroRfBV8T6FPtOFpTwBegKcdldMDxqyHfZBXaKyiwK4FqPo+
-Qbcj3atrqvd2/vC/BZomGEFHPRl2xMxAFU2sWpEQ8JdOcGrjOVBx1eWStbwmGJTU
-7T/ohxIRcrpLTvRRwrDiW16MqfwzARILvN3GXXNZ6tAsR2zBNiWZOq6355pkQJVv
-5p6TiejTaQMrTooGb2UvBINMP2MSs9/3f5U3iBgGgXa+26uurfcPcnzjq/Y46AwU
-ydRcYV7otkLQMuPmCtG19lVrNA7woRz3ZjdYlVkGEr8H77KA2ZsuUO7kvzD4rUoA
-C5ReksYL4iGDXr7H6lsQileqcvYLPnBBhllIONtazfKpDXCXnPOog0btA2c7kboX
-KTy2uZUfztrBIEhq6i/xN+WxZvW6ODrcKbJx0FnFeFAGmpNG1D7O2nMqqrO2sJN9
-FouxLwQeF/hS+niwrkCSLlBLxbsRqlwm5XMat645bRJWGEAMibUEP1IRzswvxM/B
-gk4Hgc7XeohThsaVq4bLAPeTZ5Cxzd6sysOoZqvf+j7+MHCKZ6ka3nZSyc8cwxh6
-Kzn019TfjLWxM/1J+BsIBcqtjq6K47wvNUEMEZTttRgnNwGCVmCwVqSbtUBplm8Y
-TeLAlH5zaG7GZUxtWvQD85PFr1CefMncv+GRft9YZ+IDoTfLJhv7DaZLN4KxqDAW
-rug+qOsXW8czbTQASnyBrriGaV1fvxOgyqqX57akqZo0G/r5FmGvKxDlIkJEpJ7V
-XPk1Fs9inbHF4plwE58tfexEqXALxj5hhxU7YaBgDtt6HmN+JBtTj5DO/DcwZmT5
-8ON+YoZzcAU=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhZEQ9rAxa2sCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOgRV/f8pJeKBIICgHhmTZcserjV
+BeTa5fGZn4DlwkbW4ka4wpD6vzByQZdQtvuKhenmkwFa34v42XbGkahWDRQA2QMi
+FyXGE8OXxDVfs5SQCHOo/euyH8K3du44NpdvXLuscnJ7Iv8ZUi8MP8AmtbevznDT
+PR55ntaEreuz+SVoxn7E6Pj0qhoSsKyCBf7k1IRXywrVnQvENbDlkSKRidlE1O6x
+YU8i91FjlYmwy1eFWHwaedyzSHdPDRDq6NWXK/rIMTdYfPOYWHlDAKBC1yxBzoHQ
+X+Ppbk8lkBJYNolVbum2O+/qGlgi0dk2CW4HVTkhzJ/NEpWDprOqxxg4sQXU5hJw
+bX6s2lA5C8Pe4qNRM6mEVLGs87aat8y8lhuILWXlPc88ybBzmH6x+B7m8W0NdBa2
+oqkRjXs+VUrVvtf7s69aXQutBxMhSDm3KV0MIni+C+VE3UApahjEMZVsExmpAq7H
+GBVJMY8k+oXtvIwYXbdkD9PQbfia2NijJ5LRUdCuzhVRdHumPQFdm56LDqxMw7zN
+dsJU//sXbnFARXH9i2uNEHxKwPTN4cOdY80SR1b9oCqjtlrO3kCSSSbDTDHPGklJ
+cyNG40t8urPLq8HR4z0E2tlKlultniRvPhsdy6DGfE2S443ksjWX7xPJAMF66ALC
+ind6X2VapvNihTKzejN4R6dkomcXTSxsxk+cYd0g3k7+fBQeTrGQpjecJYuRIS1Q
+M33q/rYtEFqRoHM2o+qK5URdZ10DiiUrHEw5U7hm+eWpBMj/T8KYR8gNEKd2nTIE
+erHGPR4OBJdUh+8ecjW5GI0U9207XSaMrZRATN220yHth5027Qf/HakqN9jNkepl
+Ybchh28QUqc=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
index 5d29f5964..9f9485639 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
index c9aac7124..4189e9fbd 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
index 11c93b9e3..37e33cda6 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
index 85f79c5c8..5dee084df 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
index 29ed5dbea..a56d972d4 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
index d82a753e4..d1d73014c 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
index 6d03a4534..331a855f7 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
index c90b7b935..0b6b0a50b 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
index a0a1972ef..4aa66664f 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
index fd42d722c..260459bf6 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
index a835c2320..4ffeadb29 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
index d6aa725d4..3e781a983 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
@@ -1,23 +1,23 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 43 43 15 3F 39 3D 8C 8F 7C A6 0D EC 95 D8 71 0A D1 01 06 4D
+ localKeyID: 89 6A 06 67 FC E8 7F D7 48 DE 8E 5A B4 A8 9D F0 78 77 28 E3
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjQ3MzlaFw0zNzEyMDExMjQ3MzlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOB7RZXhsaIRqU/q
-VwdMMHLpYyNq5PYy5vv9LKRKdyYKrdneevar7XSRhtgTijk0bGHLjOkb9IsbO7lD
-rdhec/O7arQjFvaxzitS9p+na7gXlY2mSwRD8ynEm89akIFy9bLcAm/Sjsjx+5Ai
-n/I1CDG8+fRIwvYdkH8XeHBSdzcNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MTNaFw0zNzEyMDExMjM0MTNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPuVg3pbveHgoKH
+fUNkYTlf4eihEIsk2kfsGKyw0zibuPQabxKThrKDjx4/m54+pJbuKF7pWolg9XGy
+xpR/qGDLvzzo6bfMZh6rm0fxbOT8XpXpMLoqE3kRIJEymNqx3gkMIEYbP3OKzP5x
+u+VF9LcINNmFzQU3Mv6gE9VLajS1AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUubmV0giFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBs
-ZS5uZXSCCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQBPkSiLv66UTJZKIjhK
-qibpeuz7QzX/Pog2uJwF96U+an8ERd6CoQ5Rrqg3xsEBbVd7y2MY6oZr5zbx/Bep
-7oW0zyNypM/xQhqQBLWS+GjMupw214keT+lfpg6/RU2XlcBjfT82vfuSVaNL9CUm
-Smh4/woDuJ1/RawGmzIpIIn3NQ==
+BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
+bXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2Vy
+dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQB2UWYprO3yj8kXHaFQ
+NxRMEvOqU6pPzntU7JtbtU9AsjQEN1B6rlUUq8kGTVbK5D+ZcLWMZ8Q+KzXVR8YU
+1GFN1YGEH8godVnw4mXB90KJQ4xlz83TOb/ZiJM7yIKeYylTiHP8unuMWjYQz4oE
+pmHSoBPGUzPBZHpqYL5aZHkBOA==
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
index b03d67831..e11876ed9 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDge0WV4bGiEalP6lcHTDBy6WMjauT2Mub7/SykSncmCq3Z3nr2
-q+10kYbYE4o5NGxhy4zpG/SLGzu5Q63YXnPzu2q0Ixb2sc4rUvafp2u4F5WNpksE
-Q/MpxJvPWpCBcvWy3AJv0o7I8fuQIp/yNQgxvPn0SML2HZB/F3hwUnc3DQIDAQAB
-AoGAL1doAzY8FUsmuyMXdANKI23becxxGYf+JS4NRF+s9ZGifPRZ19xF4YPQXZDv
-YWWQJua74qyB2/VkGMvwZZVz29Gj0T2Bgy/F4vdfaiCSeP97Xfr80Om0CT29biFo
-MHO4xasCFJGZxac+/hWdHT9nJahYTXio3zKwwUB6L65EV7kCQQD3ogR+80HsiE6H
-Vs/XeGI8iRYdbXAxkNS99PlgrjqL/wTIb4wIrv/P/wZf46JkjvHTbBdbu21XP9Qw
-UoULv3K5AkEA6BD/vmPYTzYFhVuc7puIwWluOaxJvLqoAnU3nnFwC9nduWmQuh6N
-ft0FZ1fmnf95bIVQUxXFbwjj9yz0XevM9QJBAPEnGJXAs3xzKXZnNjSxiYlGPwEd
-aFr8nhD3FjvusBlRmgjPiGGUeo7F3iFXfvfKtPmdlAnDNrH2+N6uHd7Y7BECQCO3
-0hUUuwteDjV7Z0kWaVMTjiKUUPkaZZeTQQ9C+HLqgoTyKZNr9m1LSXShg95XnvHE
-BxvyouO3I5c8tRProi0CQQCV2RJ7bsvUN/vZSU0XFf2atdhlg8YmAxhIXUHmGjyP
-fjY6//ajk2f80eRuRFyqdeA+zsVkhqvli0bnldi6Dopm
+MIICWwIBAAKBgQDT7lYN6W73h4KCh31DZGE5X+HooRCLJNpH7BissNM4m7j0Gm8S
+k4ayg48eP5uePqSW7ihe6VqJYPVxssaUf6hgy7886Om3zGYeq5tH8Wzk/F6V6TC6
+KhN5ESCRMpjasd4JDCBGGz9zisz+cbvlRfS3CDTZhc0FNzL+oBPVS2o0tQIDAQAB
+AoGACky/mRVSpmGLLc7/ab56Z33Z3m2GKWOyXxih71yi+1HoIybuEIFOec+2gtdq
+YlO0Oeibr4HYUQEUagDwsT1jYFrkxLBgJhMR6Ne8Pk6qyWeBlTdYR2XyGecUMwhI
+1O0eflznu1e+U7njKpet6Qa5g3mlJWLTXpTVy8BhIFWBG8ECQQD7Lzm3BzantQaI
+UM8gvvDElYUMABHRNjiMNrrMv6fccbkdRacdI/nnR4ldBP00m8Rkfq75YdTsp245
+VDPgbC1BAkEA1/518eZFzyrvlzDh8GLuj7rO7CPg62aVlocCBcIPfi0Xocs6v07D
+aYNJ8g18q2+VgYkxrx0C+87WX55RdGoGdQJAUGsAOV7v2qWUX9QvXDaFcwrDu+HR
+0n9ff1SOXbsGjQdD0uFX7XZ1LdyzV7qfLlaoe9wrPOBbgSDhoy0YJsO7gQJAKdbx
+0+zuQuYnSRs/+QfA/HiMUrPUguT5PxJh8umXhLKJbF7ov1wrgEndThUMvEy+IjyI
+MkqlZE+5uQX681kCbQJASY8cM4oPsXlUu5gnIFtWTVtejy8DWhb9VjIsPd19q+zI
+Cof7eFHYwJxHeY40PNUPMSStpG1b3/bJ7OoaVcmkyQ==
-----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
index 3e855d958..63ddb4752 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
-ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
-NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
-ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
-bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
-zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
-Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
+w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
+xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
+LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
+/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
+RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
+GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
index 0c2c70b2c..b34623cca 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
new file mode 100644
index 000000000..f7a2a621b
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
@@ -0,0 +1,57 @@
+Bag Attributes
+ friendlyName: server2.example.net
+ localKeyID: 9D 1A 7A 47 26 87 CC 9E E5 9D 04 31 80 63 EF 87 D5 E9 3A 6E
+subject=/CN=server2.example.net
+issuer=/O=example.net/CN=clica Signing Cert rsa
+-----BEGIN CERTIFICATE-----
+MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
+MTAxMTIzNDE1WhcNMzcxMjAxMTIzNDE1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAATRVl0QgxZDT
+pR2QEQ6T4Tf4T9LKY1tI8Dv/S21Ky79eOipi3clGt5Ses1fAlYZ1YIx9DvSE/Zs2
+eaa7BM7A4uVuubzTVibYpmQRnoP6+aq3T6Sub43q7u5ajdmRDAr1NmAP31kUELkd
+xeI8Acrr8cxRrlhalgkPQfYm4zyqVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
+QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
+BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUubmV0ggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAavHM0unGP+/a
+uffgcslwik3r101tlloW0ZDsFUbMxJWWr1VJkqJ2f1kN8frZrGs77Va5fAkD93qf
+8nys4Mx1ARMagR3D2DECmJZdemvjI9ec6mljUXabXWpAR0PaBJNqqDF4tuW9ZIkY
+mQhL9IP0n6Rz7TR28ajbC1X+VRw5lYs=
+-----END CERTIFICATE-----
+Bag Attributes
+ friendlyName: Signing Cert rsa
+subject=/O=example.net/CN=clica Signing Cert rsa
+issuer=/O=example.net/CN=clica CA rsa
+-----BEGIN CERTIFICATE-----
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
+-----END CERTIFICATE-----
+Bag Attributes
+ friendlyName: Certificate Authority rsa
+subject=/O=example.net/CN=clica CA rsa
+issuer=/O=example.net/CN=clica CA rsa
+-----BEGIN CERTIFICATE-----
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
+w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
+xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
+LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
+/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
+RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
+GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
index a9844fab5..7134c1372 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
index 964ea125a..20e4cfd35 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
@@ -1,35 +1,36 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: F5 18 BC 7C 70 B2 E0 30 3D E2 84 11 C8 38 AC C9 40 A9 2F 1C
+ localKeyID: 9D 1A 7A 47 26 87 CC 9E E5 9D 04 31 80 63 EF 87 D5 E9 3A 6E
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjDCCAfWgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0NzQxWhcNMzcxMjAxMTI0NzQxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGjmPu4xUrJQMW
-VFMlJbm6ZU8hVq1AYMQI0NIumzEN6l8g8kABcZusFP+FBN0OcvPAuVZNITtJiBZA
-CvDIa+ZxjWrwDP9AVNLG2I9fjzM+TQNLOPv4O+QxTqwZZBgF3uP8BNFaYvxcSmZ6
-LlgzcyciU4npp2LMaTxuWEd/i716vwIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB4G
-A1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEA
-Z/TviUZC/prVkYrqbWpICiZM9erZaj6rhfDvpN8McbKa4qDQecD+pkan5QdWF30n
-HpDbs4fM8VSA1cjxbqh0ey8RioQa9F9PcoHpYaxR82gKZBakd+3odg+Evui+cXT2
-P77KWgYTOAejGpArL+E2XSDtbJXeUgzUWPbYzLC2quY=
+MTAxMTIzNDE1WhcNMzcxMjAxMTIzNDE1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAATRVl0QgxZDT
+pR2QEQ6T4Tf4T9LKY1tI8Dv/S21Ky79eOipi3clGt5Ses1fAlYZ1YIx9DvSE/Zs2
+eaa7BM7A4uVuubzTVibYpmQRnoP6+aq3T6Sub43q7u5ajdmRDAr1NmAP31kUELkd
+xeI8Acrr8cxRrlhalgkPQfYm4zyqVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
+QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
+BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUubmV0ggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAavHM0unGP+/a
+uffgcslwik3r101tlloW0ZDsFUbMxJWWr1VJkqJ2f1kN8frZrGs77Va5fAkD93qf
+8nys4Mx1ARMagR3D2DECmJZdemvjI9ec6mljUXabXWpAR0PaBJNqqDF4tuW9ZIkY
+mQhL9IP0n6Rz7TR28ajbC1X+VRw5lYs=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
-DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
+DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
-mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
-8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
-ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
-fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
+AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
+GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
+YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
+GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
+q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
+63yQbkcs1zncLa/1
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
index 0c0af94e9..507f25d0b 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
@@ -1,22 +1,22 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: F5 18 BC 7C 70 B2 E0 30 3D E2 84 11 C8 38 AC C9 40 A9 2F 1C
+ localKeyID: 9D 1A 7A 47 26 87 CC 9E E5 9D 04 31 80 63 EF 87 D5 E9 3A 6E
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIuHO0MX+BBKMCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECP1hwF894JBWBIICgP+WpnvdaQa/
-6PgTUa4IsvDON20FJUb9HsrF4Ea3hATu6mz06osS5gTE72rvgc1TFb84YnUfYql/
-n8VE0QEwrAdPqCLaZC7HQe8BU7eBFmwhgZQsm+XQI2SKZ5pS5v1j+sFr0a4zLd/O
-tO36nxyhFf8O4y6FVqT+vm2GUgxwCKLRk+1FSa/tWRg16C+UE6Ffp/IvG8aOQyRV
-+xXNZw+YBnWg5QuMPN6ek18Ay0g0hwaCjXuFxMxaUJU+xUDurDjpcBRd1RNrGLOE
-KSBnXV9iI7VnHny1HIH2GTi4XYLFsSiR/AG27dlpXKXpRANx049D0JQmJ+zr7N6S
-NqcTBcHZFAqLrSFcHcdQT2uhWTxWU5rsxZFpGsibvxAqSfrQY5Jyu/2OUUnqwG0H
-ILqKaOVyyxk+ubpxgig3B3EJa5wj5BrBziEjR8dr1GJhTcE9B5SbhMls9dnva34a
-x3czQEjCb4jkK6/ACeY3zy7DgfnvFs1Qhr+9ZD0pTrgwcBxN2HwZ8COh/HHsWfpU
-cJvapDXxxhfkvS8+BkQfz28rDH8NLtu6aJSWITeS/DrCxPvo4eYtrX2ZlycvWVLj
-3J7F2wJEFWPiNjzrazJ4Na8R/m8Fkii52K2OpPZj8IowT4JS9j1vjX6fZSX+oa8L
-NhkGOq6E+2SIInKcIj75K3jt+HN8NrDKtV0CcNDYhZT30r0aLECfzaJ05WpJ57Fi
-+4dsNkFeWKuu3mdcKbPZznOyAaNoWtTCzzyROolkQ8I11Gm+mbLlcUQuevMtlcvf
-JSicFXiHiBgPEZGmEH02KSjeU8/fuqwSsBly3QGxlgEgaxB7F66smufA346aGqhv
-WviST5aOqQw=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIf3aYUadBHRECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECK8HIh2KNOgVBIICgK3+aS2brQpp
+ZwzDXSeeYjTxKTjfe/MJvWuexHBw9ywyQR0bVms5GTXAPbuiYNRQPbmEUbjAfyuh
+SPlPKomyyUrYEa7dr6xVhVEl6E/Sm/NKrG9iQHeA/q1ctF7WMF/mVxHH9PFDTFuO
+U+UzplP68N1UsXAFodTmdvUnvKCzliWp86LBv+eJjHJ4L8Nv/xsJdNblgHgYpq8g
+vyPr8HjJjeNo8+wduv5SuusFqlpuPqmk+22q7Yo+rgOL3X2sj1Bl07xynzYv1O1a
+9CdHV2f8Lnx31FFosy5zksdyERtXVt1iOTRfV20gQfHW88eGuvugy7GLMhwRsHvE
+TkHzKLIStiU8bmLtw+5l34+m90o+oXIpuaiZS3Sui4jLWOs7EJtYsFxGpG7Yl/xp
+W9cR0EjJnQLxX5CdWrypFYWd3/enFO7m7rNoupNbz9TdKRFZVT/gtjwvnilBuuk5
+lFbi7RM/3zO+KuOyoxzmgUKrTTKeSiMGNCa7dCi7t4c90+mZtyLI6JCq7ZQEG6gM
+ESzVtcso55UDU8Wp5KsUQWpRPryL+Sie0OpdzJDxcg0yzboMauwQpcQdeRANBE4u
+lPBGl/Z3YGCV5g7jnVfnab06inErRIfMJovZ7ut0hSQtbREqMDVPBcW/k1rUtFI2
+Sk3feI+sFUaN/XVnNX/z8MN2/Fm/Ix63ZmyJpFJ096gBQgHCIu8WzcJnSrPD0OTS
+DiJV4+whRDn0VzjssV1JGg+w5PCdAZpoAyD/KIHoLuKE+Pn8zgEz4ccbHC3N6Vfr
+ccdSQvYJ8s/FQdtueVU2KfPwVWHtE9V3EAljudsn+ODg0Q7ahgAsshUz0sh+mhoU
+bMius+zsCj0=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
index e75b9d74a..96d23cb92 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
index 84a84e606..0b963d49f 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
index d5e951d15..7a901e053 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
index 0a0bdd2d9..0b963d49f 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
index 5db10e4ee..a0dce0e07 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
index f91271ac5..f048279bb 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
index f91271ac5..f048279bb 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
index 7a86399ec..c05019efd 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
index eea20a776..9463162a3 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
index eea20a776..9463162a3 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
index 375836b3a..3e6303c0e 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
Binary files differ
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
index 307e5fbd1..510e5e328 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
@@ -1,21 +1,22 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: F5 18 BC 7C 70 B2 E0 30 3D E2 84 11 C8 38 AC C9 40 A9 2F 1C
+ localKeyID: 9D 1A 7A 47 26 87 CC 9E E5 9D 04 31 80 63 EF 87 D5 E9 3A 6E
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
-MIICjDCCAfWgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0NzQxWhcNMzcxMjAxMTI0NzQxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGjmPu4xUrJQMW
-VFMlJbm6ZU8hVq1AYMQI0NIumzEN6l8g8kABcZusFP+FBN0OcvPAuVZNITtJiBZA
-CvDIa+ZxjWrwDP9AVNLG2I9fjzM+TQNLOPv4O+QxTqwZZBgF3uP8BNFaYvxcSmZ6
-LlgzcyciU4npp2LMaTxuWEd/i716vwIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB4G
-A1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEA
-Z/TviUZC/prVkYrqbWpICiZM9erZaj6rhfDvpN8McbKa4qDQecD+pkan5QdWF30n
-HpDbs4fM8VSA1cjxbqh0ey8RioQa9F9PcoHpYaxR82gKZBakd+3odg+Evui+cXT2
-P77KWgYTOAejGpArL+E2XSDtbJXeUgzUWPbYzLC2quY=
+MTAxMTIzNDE1WhcNMzcxMjAxMTIzNDE1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAATRVl0QgxZDT
+pR2QEQ6T4Tf4T9LKY1tI8Dv/S21Ky79eOipi3clGt5Ses1fAlYZ1YIx9DvSE/Zs2
+eaa7BM7A4uVuubzTVibYpmQRnoP6+aq3T6Sub43q7u5ajdmRDAr1NmAP31kUELkd
+xeI8Acrr8cxRrlhalgkPQfYm4zyqVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
+QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
+BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUubmV0ggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAavHM0unGP+/a
+uffgcslwik3r101tlloW0ZDsFUbMxJWWr1VJkqJ2f1kN8frZrGs77Va5fAkD93qf
+8nys4Mx1ARMagR3D2DECmJZdemvjI9ec6mljUXabXWpAR0PaBJNqqDF4tuW9ZIkY
+mQhL9IP0n6Rz7TR28ajbC1X+VRw5lYs=
-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
index 0f28eb251..31cabaff2 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
@@ -1,15 +1,15 @@
-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDGjmPu4xUrJQMWVFMlJbm6ZU8hVq1AYMQI0NIumzEN6l8g8kAB
-cZusFP+FBN0OcvPAuVZNITtJiBZACvDIa+ZxjWrwDP9AVNLG2I9fjzM+TQNLOPv4
-O+QxTqwZZBgF3uP8BNFaYvxcSmZ6LlgzcyciU4npp2LMaTxuWEd/i716vwIDAQAB
-AoGAVSufEkm2OtuVh26Ee9rC4IG0f8h+aK8ZZ+6rOfK4CBAQ3kEL05K4BAi90oFT
-kW8dv/3AVzV6CQCnCrGmt1IRdsIxBv4TTh+1IqcQ2A9ULnN5DUbte2PsX7MeW8ad
-BYDnhagCMxmB1jc61AsJ8jl83DJWZETOS3tN4TQLNJz/MYECQQDwY+MFHjrffT/N
-16tkJT1BT38V0EA31uezc0TVecndS3OwsDzKpu2QHHlrB8p/wwurChjLaQCIYpgZ
-im8dX5JtAkEA03MULasACjZ4puEXY+m+iRWOpqR8Q8yP/Eceh2YHR9oKAiw7y240
-XSzny1iYIJE0Y47opw/wzKifAZN1xAFmWwJAGv8cv7ZlZjPqtnNCDD0iY/NJkmmQ
-zLSV0NFhKZhD01Zl57HjId8dTtHj0OFPHIoLBWpc3nssVCS+cB/b2rChAQJAXGHF
-6iHw1YVw9zAWwQ9JsKjbd1Eb/Z8tNUJ5Qxy/h5PqlYJv6XRPqnnJF92wMWJfajPw
-z7S2NyRgvBaJ+EXISwJAGdlWxvvmauhcstfdv+32ufMl7flPA1yGDzuSPv7xaKQX
-2j97VP7j7vm4sh9iCvj0IM93uHmJhunMz/zqdH+DRw==
+MIICWwIBAAKBgQDAATRVl0QgxZDTpR2QEQ6T4Tf4T9LKY1tI8Dv/S21Ky79eOipi
+3clGt5Ses1fAlYZ1YIx9DvSE/Zs2eaa7BM7A4uVuubzTVibYpmQRnoP6+aq3T6Su
+b43q7u5ajdmRDAr1NmAP31kUELkdxeI8Acrr8cxRrlhalgkPQfYm4zyqVwIDAQAB
+AoGAEd3K0zrBLH+AgNaOJVgWUC0Wj9+gUL7la/3BciRq+25xf0DQWDolFD8u8C7m
+DStHbhKu3/rim/bGrk9W9B4ivZIg+5y/zoHV7KdErYNLVjn0LjzkBEBwsYHveui6
+zDD12a6zK37GXD986r3335JB5e+iLSyoU6g0M1SM9XtpVBECQQDqq2dsj87Mo3yf
+/Tof5J6PjqaaG09nLqMPuTJz1r0sMCJvJRPeWyX+O9b3XfFigXTfImZoa5J22bTS
+CKLXIqBvAkEA0XUE+dSguhQNr0g03tDjUl/lD/Kwk/7fNOaQqWUBTjcJm3eCbAQA
+fkULIb+nmXlli6Q++Luq3k5PpSibPvW4mQJAdhpTj9CEXHs/ImnYUerGXiuF73Ml
+MCHJkQU8vg3p4Q5MljFL4ZFv+pZ1JsOR02ihwBbZAV56NPR2S2prQei8YwJAVvrA
+MTrx77PKJwLWKb0W2StHRQMj/qE1cZNZeW6fRyqly7CqMU7MIaNsRvx+jcYSvBVd
+rQ7Jmv1sJ4qgRVnm6QJAGiP5PxBYQ0jO5ySXMqs65P7l8STqP9qBSq2DY56SqYsV
+gmI+e1qf1d34uod4wwq9cKCT8BlNn/gPA9Z7IE67pA==
-----END RSA PRIVATE KEY-----