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.pem20
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/BLANK/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/CA.pem20
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.key30
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.p12bin2962 -> 2965 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/OCSP.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.key30
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.p12bin2340 -> 2343 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/Signer.pem16
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/ca.conf20
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/cert8.dbbin65536 -> 65536 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/crl.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/index.revoked.txt.attr1
-rw-r--r--test/aux-fixed/exim-ca/example.net/CA/index.valid.txt.attr1
-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.file134
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem36
-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.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key33
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.reqbin68 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.respbin920 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.respbin938 -> 967 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.respbin938 -> 967 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.respbin960 -> 990 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.respbin384 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12bin3108 -> 3111 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.pem36
-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.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key33
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.reqbin69 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.respbin939 -> 968 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.respbin939 -> 968 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.respbin939 -> 968 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12bin3108 -> 3111 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.pem36
-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.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key33
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.reqbin68 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.respbin920 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.respbin938 -> 967 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.respbin938 -> 967 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.respbin960 -> 990 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.respbin384 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12bin3108 -> 3111 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.pem36
-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.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key33
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.reqbin69 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.respbin939 -> 968 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.respbin939 -> 968 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.respbin939 -> 968 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12bin3108 -> 3111 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.pem36
-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.pem60
-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.pem40
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key33
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.respbin898 -> 927 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.reqbin68 -> 96 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.respbin920 -> 950 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.respbin938 -> 967 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.respbin938 -> 967 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.respbin960 -> 990 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.respbin362 -> 391 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.respbin384 -> 414 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12bin3186 -> 3189 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.pem36
-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/key3.dbbin16384 -> 16384 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem34
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key33
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.reqbin69 -> 97 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.respbin899 -> 928 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.respbin939 -> 968 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.respbin939 -> 968 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.respbin939 -> 968 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.respbin363 -> 392 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12bin3106 -> 3109 bytes
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem18
-rw-r--r--test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key26
132 files changed, 647 insertions, 641 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 b48d20d40..01f1d8922 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
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3kwC9CHz
-JH7sEDkHMdZRq8+XpV7l/hEqfv2gPvT3mak46dWrI/T3pJOqyNvUZV/LJ/gx/0uw
-9pmCg6Y5zNCN0qAGY4rSS/sbEOLYIw5wJbFnYfHtTwe3ZAdG+5WqKMBF2lHNBM3b
-PUB/kweoLhNLwserKHwMDC3sksfrwH29rpMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAzXt6KHIB
-qOJfZECgwhAWipxVR0BXek0hAfyTWl7q18+mWKYydQW0Z2VMN4Bq/ZUlOg+EM8NU
-1n9PJ4+I2QgAwVVXN4+cz7zgZ6XRZc1OkE98NyK504bVpJpan1gsx3I5GLJUgP2t
-B/WwqoFO+ANhT2margZSM6avJfaIh8gEass=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
+ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
+NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
+ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
+bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
+zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
+Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
-----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 34c6c36f2..ca3546956 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
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----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 f412e95da..3b33bee50 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 d1a9ad944..8fcd9b43c 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 b48d20d40..01f1d8922 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
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3kwC9CHz
-JH7sEDkHMdZRq8+XpV7l/hEqfv2gPvT3mak46dWrI/T3pJOqyNvUZV/LJ/gx/0uw
-9pmCg6Y5zNCN0qAGY4rSS/sbEOLYIw5wJbFnYfHtTwe3ZAdG+5WqKMBF2lHNBM3b
-PUB/kweoLhNLwserKHwMDC3sksfrwH29rpMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAzXt6KHIB
-qOJfZECgwhAWipxVR0BXek0hAfyTWl7q18+mWKYydQW0Z2VMN4Bq/ZUlOg+EM8NU
-1n9PJ4+I2QgAwVVXN4+cz7zgZ6XRZc1OkE98NyK504bVpJpan1gsx3I5GLJUgP2t
-B/WwqoFO+ANhT2margZSM6avJfaIh8gEass=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
+ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
+NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
+ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
+bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
+zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
+Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
-----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 f7b826f74..424e12f12 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: 53 BB 1F 68 6E BB 81 B7 1F CD FD 8C B0 08 7A D9 61 BC 81 79
+ localKeyID: 29 36 40 F6 57 99 69 D0 0D EB A8 54 6F 21 27 2B BF C4 E3 9A
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAKmmzvfGqq47MB1y
-7DsxXEYhlmLV+i0IN96elKWG9f0aExsitasvaxErD0lBijwHk4efsajdadla5Chf
-0J8RZn0eBQL7k5e6jiXvmKcvFDA0M5gXRLuh7CUjJWh6hMRRoMWaCc5DcdalL0EF
-OEhkm5PlVH2UgOvJCC6anG8UTeDXAgMBAAECgYAf56wCsw0ESUNKNoOwuh61Xbmv
-irhK4cHIDyC7ZH88gzvWnZd2wysqhmOQjk/V7ELVfbXmoQU4CDziTuqoD5irXmUe
-T02zYAaFYvMEQkLW9QiiKmQHpuhf5GUsEvxYe8qmpuVtCoygWCl0SppUxGRDpStS
-KCx87FTvWSJDBE3H+QJBAOInRyeXjKaUl0eYUySOuiAXl23amZpxVN+7gvjn9ewr
-TcWYkAsQF3yyA6n6PEYYe+FugSf+XhLcSpMRuvcGjNMCQQDACpV/R/JIjEC26AWq
-yWXhRV+1Wo3PZebInYsxDf9PBgtaeYLY8mrf65XhXgGC1Zg5bOgERMzL1pzOE78B
-3YltAkAIW5c/mVQzW85zcOextCygvv5zqt5+XK3cTtu6QyhNgBQxtz+riP61Nwb3
-oy3TEViSrjjLt5TWcZm38bHNK0rNAkAK2Q400GWZP4LwUg7v5MyCex666dCU5Jay
-wmN4c+f2GMtPYwnHI3pyB6bBwkOnllUw+Tvp8dD3urnE0ky52D/JAkAbX1GzRGNj
-HPICsVvPLUiLHFQHTjmkItJzkLqfN5rT6WFpGnmuAWw/f0QbjWx53ob2bRBEN17P
-5aANr4UJMFMd
+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==
-----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 7d604b43e..6e14d8af2 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 dd807941b..e9e0b39f2 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
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0zODAxMDExMjM0MDNaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
+MDExMjQ3MzlaFw0zODAxMDExMjQ3MzlaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAKmmzvfGqq47MB1y7DsxXEYhlmLV+i0IN96elKWG9f0aExsi
-tasvaxErD0lBijwHk4efsajdadla5Chf0J8RZn0eBQL7k5e6jiXvmKcvFDA0M5gX
-RLuh7CUjJWh6hMRRoMWaCc5DcdalL0EFOEhkm5PlVH2UgOvJCC6anG8UTeDXAgMB
+BQADgY0AMIGJAoGBAOnWxALh0dzk0VqUSJtY7LsA2ywNkGTK6DIl47ZtEx/Ohk3h
+W8F89Z4q3YbNNpmXuNaBu9dCMOfUtsXlqWpXawMdVNQe1TZzkCt7IcQrFf8a1TNk
+7nWkYIgwzTb0kdV1Ki1OjF2G2K3MgQbfg2QaESpyZAPjAFu4CjbXagm810dfAgMB
AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQAlUlo3jGxtQ0d/SLb7UN1j73P6ZY0cDxkSHASza/6x
-4cnDXBiD3qdHugdYHKED/OOMxm8XK49wDj9c6s9GZy9hP9AOn/EPqTQxJge/IjXL
-P7B2fE9Zz+Dg5m3kMqyBzrB/oTXOD3t9CbRJCECawofQ+5/ANXFnVB8eWuPggw7R
-Jg==
+BgkqhkiG9w0BAQsFAAOBgQBb1nuA0+kNV2jgMvTGaNvhBKlRTaC28uyBS0kN/A9r
+Nbnq/B4Uf1C+lkiCCRe2tNir0iiOeT5oiF6IA1GofX2wNPdHuNr219kpWggBgELo
+JIBMTF7NaAVigxZNDxASNXPjbsYyyVKieZGUcjErr0sAjzOcxzoIkVntR2FJFBR5
+DA==
-----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 ae0a3f706..fdccbe5fd 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: 75 B1 07 68 61 48 3B 2E BF D9 57 2E 67 F1 ED 1E E4 00 97 1D
+ localKeyID: 8A D0 2D F8 EC FF E1 DA BC 17 E8 D4 8C 0D 27 C2 2C 2E C9 D4
Key Attributes: <No Attributes>
-----BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALMuDick/uNCkK8z
-Wtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvsESWZTV5ckpsvoDrFQLFk
-6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2XlkzzQz12AzPpouZUyYs1+Sj
-wlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAECgYAYIRAb2mIOxaSJS2+kyPM01wNx
-w6v7zp5KBc1B3riQ5DuQBXEvhL7PBHeV2ZT3jLz8A5hkmJXJxE1xdibz433THXTG
-71l+rNfZzNlmDjFpVI+Rwe8wqiNb5gi98jU5sSJHuW235el/TBps4yXgfMz4ZErN
-S7Lh7l6hhXOCVmzG6QJBAO6j9rnVC2heNzRnPz1o4j3a/8cvFanGzYkGTi89CbyP
-1ZVxgY855OyPiR7KwkIhHtnxB++42dMmrfKudpEuwgkCQQDANsxhsUynfNjG51Vp
-uj5giqzmMcGhUL1/URxorLt3Am3p6vmpSpMxS01NzYzwJvpO4rA3lWVZhdkyLLlH
-epZfAkEA11JQY3qsUV55Vyo1sHY7dO5uTU3ZsRe1CocK8qqTZ3UslSwWZ6IoQZ59
-bbArOTnjOWi27YEP4eqLl2X9i5/x6QJAB2cU3/5QEXNBdgeaxoOhu14b4pGv/2J4
-qdqZ2X4tihvR19xw2RBCMvfPdlugPe+CXF9mof1i9dutzbzjNdmGyQJBAOlnPy02
-myqvM9YoP6tbgwPJxN/9g5tne20Ji4F4u8gZC4vvk4oEbdV+OUkA07gIZL0KWkKi
-14t8FjtLaie2nk8=
+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
-----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 8bdf74131..eb7cea118 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 34c6c36f2..ca3546956 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
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----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 2ebcda676..200c0f9f7 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
@@ -1,18 +1,18 @@
; Config::Simple 4.59
-; Thu Nov 1 12:34:03 2012
+; Thu Nov 1 12:47:39 2012
+
+[CA]
+name=Certificate Authority rsa
+subject=clica CA
+org=example.net
+bits=1024
[CLICA]
+ocsp_signer=OCSP Signer rsa
+level=1
sighash=SHA256
crl_url=http://crl.example.net/latest.crl
-level=1
-ocsp_url=http://oscp.example.net/
-ocsp_signer=OCSP Signer rsa
signer=Signing Cert rsa
-
-[CA]
-subject=clica CA
-name=Certificate Authority rsa
-bits=1024
-org=example.net
+ocsp_url=http://oscp.example.net/
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 372f1132f..61c9febab 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 bbca4d630..111d70f2f 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 5c3cda501..711ad2c03 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=20171105161901Z
+update=20171202184206Z
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 a71c9c797..d4d4023e7 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
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMTA1MTYxOTAx
-WjANBgkqhkiG9w0BAQsFAAOBgQA0kBwok3/EQWTCJ8zQRDz1Gjm1BL+E2cb/8DFg
-wIXTVWUkKqL8SsmufLrY8cb5qrCzFnhklOxaXC4vUB305qiMmfrECsXaGKn1udYQ
-90CLyLO5rJQzp6gpFp8Xe5W6Tx7ftfSQFaft63Knb+kT1BgzvWt4kZYeB36Om7v6
-fwtmXA==
+HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjAyMTg0MjA2
+WjANBgkqhkiG9w0BAQsFAAOBgQB6ZdVxxhuHlfUavHLO5Dusztg1ZKJ0gtHx6rrY
+ZkMgEr+5RmMPxDReDZa0IxZqTc29ZCZ1tqjCrmAL4cXFi6r6yD2aR7vBvkdtvPA8
+NHHdEUVa1iePS4JqO0qSc7C6Luzs28792egwlRc3RMMCAoi6yDo/3pAC+BvyLxNZ
+j/VMIA==
-----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 46ff265e0..031d3d76d 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 20311aa93..edb250faf 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=20171105161903Z
-addcert 102 20171105161903Z
-addcert 202 20171105161903Z
+update=20171202184208Z
+addcert 102 20171202184208Z
+addcert 202 20171202184208Z
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 555c14759..f071ec877 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
-dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzExMDUxNjE5
-MDNaMC0wFAIBZhgPMjAxNzExMDUxNjE5MDNaMBUCAgDKGA8yMDE3MTEwNTE2MTkw
-M1owDQYJKoZIhvcNAQELBQADgYEAljNKSLoRFHBtaoS6FNgra+O+ssbZzFpWOtK4
-l30UXD5ZmDTb70XrOZ8mQ2LbhJxMQSHoKYiSJw7gFu48CwjcVCd6UPDzRs9DRIM+
-lHqWU8DrsADTYnSBJSD4kPxK+HX9iw7KX5UZVeFOdj++p6JEG4ijEOOOkPeJ6C/9
-NCu2bns=
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMDIxODQy
+MDhaMC0wFAIBZhgPMjAxNzEyMDIxODQyMDhaMBUCAgDKGA8yMDE3MTIwMjE4NDIw
+OFowDQYJKoZIhvcNAQELBQADgYEAgNUhwOEs1Kpd8mdNBlWhauZQMN99OZ2/ez8D
+dy2nFByxoC3gILohtRN/6bZo0Xw9Ilm42Ifl28ZwF/XMywLgRi4F6mCsTIL2iBcd
+Y7hYyd+V98LwTsiKS2l3VVB+AkT2YObXKBH6bZ07PJl66zaw/Fb6EvUPCDqcfvt/
+U79PEkQ=
-----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/index.revoked.txt.attr b/test/aux-fixed/exim-ca/example.net/CA/index.revoked.txt.attr
new file mode 100644
index 000000000..8f7e63a34
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/CA/index.revoked.txt.attr
@@ -0,0 +1 @@
+unique_subject = yes
diff --git a/test/aux-fixed/exim-ca/example.net/CA/index.valid.txt.attr b/test/aux-fixed/exim-ca/example.net/CA/index.valid.txt.attr
new file mode 100644
index 000000000..8f7e63a34
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.net/CA/index.valid.txt.attr
@@ -0,0 +1 @@
+unique_subject = yes
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 c392363b6..b71a30b7f 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 bce75de82..5c4788157 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.net/CA/noise.file
@@ -46,7 +46,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5431.34
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -73,7 +73,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5431.79
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -100,7 +100,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5431.63
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -127,7 +127,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5434.63
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -154,7 +154,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5432.00
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -181,7 +181,7 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5431.94
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
@@ -208,85 +208,85 @@ cpuid level : 22
wp : yes
flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc cpuid aperfmperf tsc_known_freq pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch cpuid_fault epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 hle avx2 smep bmi2 erms invpcid rtm mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 xsaves dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp
bugs :
-bogomips : 5431.94
+bogomips : 5424.00
clflush size : 64
cache_alignment : 64
address sizes : 39 bits physical, 48 bits virtual
power management:
CPU0 CPU1 CPU2 CPU3 CPU4 CPU5 CPU6 CPU7
- 0: 70 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
- 1: 39 16476 1416 1089 6857 1983 1674 1959 IR-IO-APIC 1-edge i8042
- 8: 0 0 1 0 0 0 0 0 IR-IO-APIC 8-edge rtc0
- 9: 284 4834 2265 1628 7027 2758 1632 1695 IR-IO-APIC 9-fasteoi acpi
- 12: 273 1626151 37392 40715 288530 39254 36081 51183 IR-IO-APIC 12-edge i8042
- 16: 1 0 0 0 0 0 0 0 IR-IO-APIC 16-fasteoi i801_smbus
+ 0: 75 0 0 0 0 0 0 0 IR-IO-APIC 2-edge timer
+ 1: 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
120: 0 0 0 0 0 0 0 0 DMAR-MSI 0-edge dmar0
121: 0 0 0 0 0 0 0 0 DMAR-MSI 1-edge dmar1
- 122: 7136 3040 2312 1908 4546 3822 75943 2347 IR-PCI-MSI 376832-edge ahci[0000:00:17.0]
- 123: 22 7 1 0 7 3 4 1 IR-PCI-MSI 327680-edge xhci_hcd
- 124: 89 19 22 25 79 55 27 54 IR-PCI-MSI 2097152-edge rtsx_pci
- 125: 88 15 127558 11 48 25 19 21 IR-PCI-MSI 520192-edge enp0s31f6
- 126: 1 1 1 0 3 1 3 6 IR-PCI-MSI 1048576-edge
- 127: 561 174 98 789305 240 230 184 147 IR-PCI-MSI 32768-edge i915
- 128: 34 14 0 0 1 0 0 0 IR-PCI-MSI 360448-edge mei_me
- 129: 22 10 0 1 10 0 0 0 IR-PCI-MSI 1572864-edge iwlwifi
- 130: 92 103 30 22 194 115 10 45 IR-PCI-MSI 514048-edge snd_hda_intel:card0
- NMI: 9 12 9 14 10 9 9 10 Non-maskable interrupts
- LOC: 567497 554673 726762 1034458 583903 592347 624108 548791 Local timer interrupts
+ 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
SPU: 0 0 0 0 0 0 0 0 Spurious interrupts
- PMI: 9 12 9 14 10 9 9 10 Performance monitoring interrupts
- IWI: 0 1 0 0 0 0 2 0 IRQ work interrupts
+ 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: 85573 31055 11911 8316 7459 6910 6400 5898 Rescheduling interrupts
- CAL: 73161 74171 68752 70655 80168 75208 61391 70903 Function call interrupts
- TLB: 55150 56119 50377 53791 62195 57072 43366 55765 TLB shootdowns
- TRM: 0 0 0 0 0 0 0 0 Thermal event interrupts
+ 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
THR: 0 0 0 0 0 0 0 0 Threshold APIC interrupts
DFR: 0 0 0 0 0 0 0 0 Deferred Error APIC interrupts
MCE: 0 0 0 0 0 0 0 0 Machine check exceptions
- MCP: 49 49 49 49 49 49 49 49 Machine check polls
+ MCP: 63 63 63 63 63 63 63 63 Machine check polls
ERR: 0
MIS: 0
PIN: 0 0 0 0 0 0 0 0 Posted-interrupt notification event
NPI: 0 0 0 0 0 0 0 0 Nested posted-interrupt event
PIW: 0 0 0 0 0 0 0 0 Posted-interrupt wakeup event
-MemTotal: 15852528 kB
-MemFree: 10535328 kB
-MemAvailable: 12483184 kB
-Buffers: 128136 kB
-Cached: 1542012 kB
+MemTotal: 16292156 kB
+MemFree: 11440852 kB
+MemAvailable: 14205996 kB
+Buffers: 168088 kB
+Cached: 2422536 kB
SwapCached: 0 kB
-Active: 3133856 kB
-Inactive: 1816836 kB
-Active(anon): 2706508 kB
-Inactive(anon): 79680 kB
-Active(file): 427348 kB
-Inactive(file): 1737156 kB
-Unevictable: 32 kB
-Mlocked: 32 kB
-SwapTotal: 7933948 kB
-SwapFree: 7933948 kB
-Dirty: 3596 kB
-Writeback: 0 kB
-AnonPages: 2975520 kB
-Mapped: 495452 kB
-Shmem: 80740 kB
-Slab: 143660 kB
-SReclaimable: 74472 kB
-SUnreclaim: 69188 kB
-KernelStack: 9188 kB
-PageTables: 38964 kB
+Active: 2310344 kB
+Inactive: 2152824 kB
+Active(anon): 1237588 kB
+Inactive(anon): 267172 kB
+Active(file): 1072756 kB
+Inactive(file): 1885652 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
NFS_Unstable: 0 kB
Bounce: 0 kB
WritebackTmp: 0 kB
-CommitLimit: 15860212 kB
-Committed_AS: 11692028 kB
+CommitLimit: 16358552 kB
+Committed_AS: 6749572 kB
VmallocTotal: 34359738367 kB
VmallocUsed: 0 kB
VmallocChunk: 0 kB
HardwareCorrupted: 0 kB
-AnonHugePages: 966656 kB
+AnonHugePages: 0 kB
ShmemHugePages: 0 kB
ShmemPmdMapped: 0 kB
CmaTotal: 0 kB
@@ -296,15 +296,13 @@ HugePages_Free: 0
HugePages_Rsvd: 0
HugePages_Surp: 0
Hugepagesize: 2048 kB
-DirectMap4k: 202752 kB
-DirectMap2M: 7602176 kB
-DirectMap1G: 9437184 kB
+DirectMap4k: 218600 kB
+DirectMap2M: 6983680 kB
+DirectMap1G: 10485760 kB
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
-virbr1: 353867 2838 0 0 0 0 0 0 1474230 3810 0 0 0 0 0 0
-enp0s31f6: 43448732 65083 0 0 0 0 0 2074 6948879 57082 0 0 0 0 0 0
-virbr1-nic: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-tun_wizint: 4130741 7381 0 0 0 0 0 0 1092175 8002 0 0 0 0 0 0
- lo: 5706 74 0 0 0 0 0 0 5706 74 0 0 0 0 0 0
- vnet0: 393599 2838 0 0 0 0 0 0 1609950 6362 0 0 0 0 0 0
+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
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 fef1020ef..3e855d958 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3kwC9CHz
-JH7sEDkHMdZRq8+XpV7l/hEqfv2gPvT3mak46dWrI/T3pJOqyNvUZV/LJ/gx/0uw
-9pmCg6Y5zNCN0qAGY4rSS/sbEOLYIw5wJbFnYfHtTwe3ZAdG+5WqKMBF2lHNBM3b
-PUB/kweoLhNLwserKHwMDC3sksfrwH29rpMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAzXt6KHIB
-qOJfZECgwhAWipxVR0BXek0hAfyTWl7q18+mWKYydQW0Z2VMN4Bq/ZUlOg+EM8NU
-1n9PJ4+I2QgAwVVXN4+cz7zgZ6XRZc1OkE98NyK504bVpJpan1gsx3I5GLJUgP2t
-B/WwqoFO+ANhT2margZSM6avJfaIh8gEass=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
+ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
+NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
+ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
+bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
+zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
+Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
-----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 9d88971c0..499bf24f5 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 415238ac0..b7e8ab460 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: F8 8C 05 1E F2 1C 44 26 76 14 77 28 6F 4B C8 10 A6 E5 E1 A0
+ localKeyID: 31 2C 81 1D 05 A3 93 09 0B 7B F7 88 22 C9 94 EE 29 B9 87 8C
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6sferp1lp0jW/
-rpTqM3glt5VEOHO3w5a4nvEplLqNbZSUNAqgMhw1nXsYA0xfCeS0zCaEvuK9U58Q
-jxddvQxGEbtF1wFWPHa0P3HuEuZpQxstgr+Dmjh2v2C8cu6gA/8/0AM/JEQ1pPMj
-wXAGaCRtkUhY7RW+X4t9sgjjrH68hwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjQ3NDFaFw0xMjEyMDExMjQ3NDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+0XnpgoUkghhO
+U/r3DJ43qS+gCZi8d6a67/8TRFhJRfxUTG7CtNdS1lCymZ/5S4HO0l/R9uceAL5X
+LBAYO1EX3hHEc7IGFMc7ciZ3Nr92td0saxZuPdR+la8BkvZBP3n6WtOFYWAYw51p
+IMnPz94dpgLbFGCYjeE07GtdGzXa8wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-ACLOp0fuRcZP3yahPxZ0zOX73LmUCS3NAksjvmwBUMR0jvI+454qu9XkxfsKJ8pJ
-4bK+gJinpd2U6j+UXeU46aQ5x1ilJvMBE2EiOINRgQZB+5OC7ihn73uW4B0OLU1V
-DiEUk8LeYjWAks6AnxHJfbihkxoe8+aNdORFiSp3lmNd
+AHNc1UX9+HoLSSi2XGzHwy7mV+XAfAjCWcvBoDM/FLW7RSmj2chnrIjYf3/NwTow
++PjfjB1CkMomVHRFlk6H84B/kLBfhfXbI97zT+pJ1WSiYqMAjD3aKkePuR5XkRbm
+gdE+d5n1+1GYazh1L9jIgjwvUhR9fqG4hWJSXEbyWDNN
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----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 9f728c279..95fdb2c0a 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,21 +1,22 @@
Bag Attributes
friendlyName: expired1.example.net
- localKeyID: F8 8C 05 1E F2 1C 44 26 76 14 77 28 6F 4B C8 10 A6 E5 E1 A0
+ localKeyID: 31 2C 81 1D 05 A3 93 09 0B 7B F7 88 22 C9 94 EE 29 B9 87 8C
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIpeL9csmvxjwCAggA
-MBQGCCqGSIb3DQMHBAjpXC1GIppx0gSCAoDrhHT1p1greqAUV6QPgJNPoPkAEXTY
-uslD8u6wtwZTcZBFumAfx1KXwVK/rNAVo74ZrDawvMsUDk+THtNRe8K7LS22NxUj
-VEAfsgvm5XmmT7TQjJQIcJZ6H8bBqSEFW353n4lkKaaIzQezTCsPsFdR4TmTDE6v
-LsqtTCCbe0l58JJhZpALkhFc3Bx/qitwQKHE/YzATAw1bokzq7S/TZFCqm5/Rkj7
-/yA/CpmKwOpD8hY8rgkzAY+AYLjC6/ID2d14xPVi6WMQa1pBufoWXFZcKI5eGzd7
-WgLPiiFhgJTtyucyxUUNJJ0lr0oV/J1LDurG70qcPiomkLFVda0pWW0oDIxDe39b
-nOREDh/uHFhSEvOk+izF8tS641iJWcRrcz6fjHu0Sp8heLGnEz8UpZsZ5aSgtPM8
-3VVRTYVWya/8N5EG0mUXdj1sB1augi0spAd9D1PxiKCE0LR9xZWQOm5ewq/ybUl7
-jWF7DS9pZYiTBhN3lzlmSQlm5RVxlCDwaZjdJwzhJgpg0RQgwQFhln0jYjD4jKKz
-dInjaz7NunXbhlrQQmYte2oWantUKWm5TgR526N5HHsrbbznci0r+Umq7d5PR70P
-xfbE6FFWCxZ1AuYCp4iGoUAr7xUo5SIh26OjnLHytDRPPXFSyZLsupMGfWtiy6Wc
-7cArmFIBeYj/B8IfCobTp+W7O5sAxRW/7UBiK1q2jr8/v3+Y1jSD9JbWRgk97AHw
-xI5v7I1L/1mmAHLuNEopvuyYSy0EdajW3VecoNHhTKyZURxlQ1M3oMGnn5gwRg2g
-YRECXyC/FzyyquWhaIJ2iTgdyBG6wZKVwkMpeP9IdcEi26pRE6vmLeIn
+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=
-----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 0490e88db..e656bfc15 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 57bca6af0..3d8df3e51 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 3a4818c5e..07671e17c 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 dfa138b8e..bb4aac053 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 8d12019c9..a8e82de74 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 8cb087fa8..7555bf197 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 a34cdc96f..74a1c6fd0 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 36aac9603..c3e36b4c5 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 ee8fe3bcd..4a69334e1 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 44a9709c2..3c88d1094 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 8b22edc22..fc7246b1e 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 a598ab08b..0fbd7f1bb 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: F8 8C 05 1E F2 1C 44 26 76 14 77 28 6F 4B C8 10 A6 E5 E1 A0
+ localKeyID: 31 2C 81 1D 05 A3 93 09 0B 7B F7 88 22 C9 94 EE 29 B9 87 8C
subject=/CN=expired1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6sferp1lp0jW/
-rpTqM3glt5VEOHO3w5a4nvEplLqNbZSUNAqgMhw1nXsYA0xfCeS0zCaEvuK9U58Q
-jxddvQxGEbtF1wFWPHa0P3HuEuZpQxstgr+Dmjh2v2C8cu6gA/8/0AM/JEQ1pPMj
-wXAGaCRtkUhY7RW+X4t9sgjjrH68hwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjQ3NDFaFw0xMjEyMDExMjQ3NDFaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+0XnpgoUkghhO
+U/r3DJ43qS+gCZi8d6a67/8TRFhJRfxUTG7CtNdS1lCymZ/5S4HO0l/R9uceAL5X
+LBAYO1EX3hHEc7IGFMc7ciZ3Nr92td0saxZuPdR+la8BkvZBP3n6WtOFYWAYw51p
+IMnPz94dpgLbFGCYjeE07GtdGzXa8wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-ACLOp0fuRcZP3yahPxZ0zOX73LmUCS3NAksjvmwBUMR0jvI+454qu9XkxfsKJ8pJ
-4bK+gJinpd2U6j+UXeU46aQ5x1ilJvMBE2EiOINRgQZB+5OC7ihn73uW4B0OLU1V
-DiEUk8LeYjWAks6AnxHJfbihkxoe8+aNdORFiSp3lmNd
+AHNc1UX9+HoLSSi2XGzHwy7mV+XAfAjCWcvBoDM/FLW7RSmj2chnrIjYf3/NwTow
++PjfjB1CkMomVHRFlk6H84B/kLBfhfXbI97zT+pJ1WSiYqMAjD3aKkePuR5XkRbm
+gdE+d5n1+1GYazh1L9jIgjwvUhR9fqG4hWJSXEbyWDNN
-----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 5c3ed79d0..ff4354424 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-----
-MIICXAIBAAKBgQC6sferp1lp0jW/rpTqM3glt5VEOHO3w5a4nvEplLqNbZSUNAqg
-Mhw1nXsYA0xfCeS0zCaEvuK9U58QjxddvQxGEbtF1wFWPHa0P3HuEuZpQxstgr+D
-mjh2v2C8cu6gA/8/0AM/JEQ1pPMjwXAGaCRtkUhY7RW+X4t9sgjjrH68hwIDAQAB
-AoGAPpJZLPnYuOPQSd8sX9ZCRXnjGEtHVWbDRDtZHpOPdsksTAOpMAm7dKjEUccB
-OLUrJwFpQ4JqogO9wyICNdOfoeWqQijRwwibqpVD9lGgpDz2ERiw/WafF83BhmPz
-IfO7Pk811ZisMjKAW++GOCodnHzk3MzVVkHSWM/dvaHJrokCQQDk8mgCqWF1mOPj
-q3c4HeLKW8ch54/EL7c3F50SPsdQAT2rs7qggBLPoQs1HnZchjIKfXbdjZspcRDf
-tP1uCfP7AkEA0MF0v3h2oaflZXo5BLrSF+RPcbsDJLvnBVy8bwQuusLt3mEnXOBL
-u98desC7FUJihJjpDqH8sKXDhRuHzFDn5QJBALx0dP1L47djJKMxby84Goirx1y3
-OXYqOMwWmep81p+aheMiTIr1IYbbb1hIPPGoXOSZphB1EbWpJlSerMW5V6UCQCaj
-R9qQj1SIYNsRbjBD69LkPRgNxx0rciz55x6dJZEHt0MrtD9qfFn/h9NKjNX4fYeR
-TcGZlc2UQMYIPHBCoUkCQEE6JDrkpyFB8++TEO6fovwL1FYY6cvThB6dfHgsJNng
-zcmVCXyqZsp+UVWeCsn1gTYk58E6ABr9dFfE+kMnYXA=
+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==
-----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 5c5a91092..0818bf68b 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 fef1020ef..3e855d958 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3kwC9CHz
-JH7sEDkHMdZRq8+XpV7l/hEqfv2gPvT3mak46dWrI/T3pJOqyNvUZV/LJ/gx/0uw
-9pmCg6Y5zNCN0qAGY4rSS/sbEOLYIw5wJbFnYfHtTwe3ZAdG+5WqKMBF2lHNBM3b
-PUB/kweoLhNLwserKHwMDC3sksfrwH29rpMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAzXt6KHIB
-qOJfZECgwhAWipxVR0BXek0hAfyTWl7q18+mWKYydQW0Z2VMN4Bq/ZUlOg+EM8NU
-1n9PJ4+I2QgAwVVXN4+cz7zgZ6XRZc1OkE98NyK504bVpJpan1gsx3I5GLJUgP2t
-B/WwqoFO+ANhT2margZSM6avJfaIh8gEass=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
+ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
+NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
+ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
+bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
+zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
+Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
-----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 065d431b1..070f1bbcd 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 5247d5038..cf8edca18 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: C6 68 7F 28 99 08 18 A8 DF E7 DA 8E D1 60 FC 31 84 CE 22 4B
+ localKeyID: 66 8C 1C 3F C0 5A 2F F8 C3 67 79 59 F8 C5 E5 26 10 F3 AC BF
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMTIxMjAxMTIzNDA0WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAlZdym0qw/GF7
-n4Vq0Mp/Mg+/OLcbQUczPFRqxebHkZMMYgFYg6GttP8NoAFdnQhfNeNKSE7cuNKa
-jvUw9H5kEkjsrxHmciNcjM18slFm0VoJRhNs9wJSyB47e0gJnC0FM7txUq+UdiLS
-R5PF8xU1OTymmgP+6Itd9f8kx85ipRsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTI0NzQzWhcNMTIxMjAxMTI0NzQzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAr28Am9j3sJUs
++nHJTkavLJeJr3vh/0Zi0TNCRO9fmRUaxS8f5Xxc1oumtkZKLRWmb4BKte7+zYHB
+jwZAYpgd1jF5/xH2KmQNtgcD05DQknxH3DX4Tklob+PuUCQeTOdIFVeZ5VM1w7s0
+9qK9Ip13csvt6hBmxtd+SxeF6p+FIEsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQCpO1ztM/B+QWkJWCTaFrBLOJ44ZQEN0jhKb0JVZ9wlW3T6d9cN6a58ptjBvsc3
-EmbB1iBaKGLiPRlZKzfiPBMN6djS1/VGDxXiwiTklI41Atd4p7mnoWA5fRp+b4pN
-dgj+FC2LTfl0s03MMe1xhO8kAL1lU7ueJDkHhicOsHkEjg==
+gQBTVY+g7wU+4a2PQ97Ou+6KsC+q2ZM+v0zIxlI394bs9bzk369dCSExdjF+OF9H
+cVPvXgljUAyp7ub0e4hv0r2VTR8C02unZqm3bj7gyiKdo2qxt2byX3U7BtdLOJxh
+BSgiHUfF0dvlzl40wBDVxqhTg4dIFVsYJUxGiOmDzuA6pg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----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 bda73e53b..b39236962 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,21 +1,22 @@
Bag Attributes
friendlyName: expired2.example.net
- localKeyID: C6 68 7F 28 99 08 18 A8 DF E7 DA 8E D1 60 FC 31 84 CE 22 4B
+ localKeyID: 66 8C 1C 3F C0 5A 2F F8 C3 67 79 59 F8 C5 E5 26 10 F3 AC BF
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIFKoStEDfs1gCAggA
-MBQGCCqGSIb3DQMHBAhNSq4RJSvU7wSCAoDRULMeVsx9fTuxmEvZaNIfTD8l5Osn
-ce+LR14anKy91ou8mY4JhngN48E5WGhxo2Uq3rxvyVAoqxb7mDoqTJvjUWpAR0Aw
-f3hAMmfXEwGyvm0ABbmAOnmkNT86djmKPfpwE/oKo1fVr+3Hl9SRkxPtVxVUj1Ue
-Ql2KhU44Abq8G2ExY909HZXrPo9Za2YOBtrDesmdfJkxKurd3F/1+UdfTSUAOOQH
-C9wst1SO5xdyCdx3w3PvDrzcLWeR8c1bva3HQopgnJdWUxlnU0G2dxj6sYfJrc6D
-tdr58jDzfqNRrDsVGw/nFXulSp1SmMDyhnjW7oROah5l26Uvsw9btOhZjmwdbTz4
-rzdz3eGk5hAV7mezZrIbFF8JdEzmIb5guDD5IOIzEEP/jP9hxe1ZvveV1a1s0jPy
-18CHn435wFilRLUdQT5U9x6vuy/hsp7CrSyFPZ9lD6dUpe5SZz1omvXPEy8lky6T
-bXGN5Ug1R+u4BQHzXO4uj1xnF+BKSUJCW9HdUzG4ASLeR+ZUhg65l1LCG++/2ZD1
-HjGU+mSmJ6ob8X9//W3cTyHPMLrTgtfrrTnPCVAwdLyW4oMdVnonIZlpysRA8tmK
-ATp2I1QiXrCGkgJeDFT3hQ0Is6Em+TNzWQrNsEak4qAtRcpvoW+zE9mUW7a3zCXn
-nXg9kfBYvY5GmpPpWkTPLqSUeHqoKnEg9361PZ4Zwpxa5eX79jLqHMDzrWdmbkG2
-6//wNVND0+eMhznyB2RRr9uUjEGmlU3piVmASvJ1Ahe88zIi/9VDl4/FGJFzUHoh
-OpIphHp1w9rkvgBtOa9rEObGL6KEbd+jgaWrt1evMiq5mnGJaApjiqul
+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=
-----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 6d478aac1..0c67b0606 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 fa196e54e..d55fddb43 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 1ef5e1e01..948ae0620 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 fa196e54e..d55fddb43 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 21001bfa1..751c57aad 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 c7b3e820e..4c4aab6b4 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 c7b3e820e..4c4aab6b4 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 6f4b6027c..20678025b 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 1708125dc..2830522ad 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 1708125dc..2830522ad 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 c38a9af5a..d39843fc4 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 eb4f41bd2..e27f2ae22 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: C6 68 7F 28 99 08 18 A8 DF E7 DA 8E D1 60 FC 31 84 CE 22 4B
+ localKeyID: 66 8C 1C 3F C0 5A 2F F8 C3 67 79 59 F8 C5 E5 26 10 F3 AC BF
subject=/CN=expired2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMTIxMjAxMTIzNDA0WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAlZdym0qw/GF7
-n4Vq0Mp/Mg+/OLcbQUczPFRqxebHkZMMYgFYg6GttP8NoAFdnQhfNeNKSE7cuNKa
-jvUw9H5kEkjsrxHmciNcjM18slFm0VoJRhNs9wJSyB47e0gJnC0FM7txUq+UdiLS
-R5PF8xU1OTymmgP+6Itd9f8kx85ipRsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTI0NzQzWhcNMTIxMjAxMTI0NzQzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAr28Am9j3sJUs
++nHJTkavLJeJr3vh/0Zi0TNCRO9fmRUaxS8f5Xxc1oumtkZKLRWmb4BKte7+zYHB
+jwZAYpgd1jF5/xH2KmQNtgcD05DQknxH3DX4Tklob+PuUCQeTOdIFVeZ5VM1w7s0
+9qK9Ip13csvt6hBmxtd+SxeF6p+FIEsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQCpO1ztM/B+QWkJWCTaFrBLOJ44ZQEN0jhKb0JVZ9wlW3T6d9cN6a58ptjBvsc3
-EmbB1iBaKGLiPRlZKzfiPBMN6djS1/VGDxXiwiTklI41Atd4p7mnoWA5fRp+b4pN
-dgj+FC2LTfl0s03MMe1xhO8kAL1lU7ueJDkHhicOsHkEjg==
+gQBTVY+g7wU+4a2PQ97Ou+6KsC+q2ZM+v0zIxlI394bs9bzk369dCSExdjF+OF9H
+cVPvXgljUAyp7ub0e4hv0r2VTR8C02unZqm3bj7gyiKdo2qxt2byX3U7BtdLOJxh
+BSgiHUfF0dvlzl40wBDVxqhTg4dIFVsYJUxGiOmDzuA6pg==
-----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 89d27555a..a2b5539dc 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-----
-MIICXAIBAAKBgQCVl3KbSrD8YXufhWrQyn8yD784txtBRzM8VGrF5seRkwxiAViD
-oa20/w2gAV2dCF8140pITty40pqO9TD0fmQSSOyvEeZyI1yMzXyyUWbRWglGE2z3
-AlLIHjt7SAmcLQUzu3FSr5R2ItJHk8XzFTU5PKaaA/7oi131/yTHzmKlGwIDAQAB
-AoGABUU5t3jxNWMl3N/xfHu18YiWfyQMZMdiaby7qk9QNrPMmuNbQAABQ8A8tad2
-qeKyoA5q/pMwuZ5J7cF7wRF26xQ2WlladjWLSPgCYn1fHJTj7jtfYHeKMMmdbtOw
-ZBrBDQ4b2GvMGP59LHjuO4Ud5DTy3sopCQY5a1oYxiZTeSECQQDF1V3CUPHVTTy7
-I5fY+Rt1HL4fG5CkV3N5jkRAWnmElpstFF9KooWG7LZJBnU0v6R8Kw3fQp+kRsmh
-RFBYXFprAkEAwZL8o2xOTTqbNZDQ4SJvRP3sl1dLNozBpol3NeSZDTIxUWU1EbwU
-d0p2yElA+FyZbRl0vxYuJ3UESQTqbDLsEQJAUL4wsipPSXtomgiA5TFmn3nHrvKV
-Kj33B1mlSY6johXF57Q04EVMsjDShSN5mrnM7FC2LLUIawfpK0Sydh3bWQJBALpf
-hgTmk2FCCwwA2UvZ9p3LiY6RCqaD0TNB6VgnN8D/0YIX2oevuVi9hi4CcZ5usX3c
-Y45Tka6FuNGA/R+dy7ECQGYdoHCbptExaOs/ET7qwI6nHXkmbk8HcTrlKtFm39xd
-+3MDN12RJLmWDpt2OS4mEzQiH7Cn70IbuBzKsObklNY=
+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=
-----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 9447851c0..ebf98795d 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 fef1020ef..3e855d958 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3kwC9CHz
-JH7sEDkHMdZRq8+XpV7l/hEqfv2gPvT3mak46dWrI/T3pJOqyNvUZV/LJ/gx/0uw
-9pmCg6Y5zNCN0qAGY4rSS/sbEOLYIw5wJbFnYfHtTwe3ZAdG+5WqKMBF2lHNBM3b
-PUB/kweoLhNLwserKHwMDC3sksfrwH29rpMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAzXt6KHIB
-qOJfZECgwhAWipxVR0BXek0hAfyTWl7q18+mWKYydQW0Z2VMN4Bq/ZUlOg+EM8NU
-1n9PJ4+I2QgAwVVXN4+cz7zgZ6XRZc1OkE98NyK504bVpJpan1gsx3I5GLJUgP2t
-B/WwqoFO+ANhT2margZSM6avJfaIh8gEass=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
+ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
+NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
+ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
+bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
+zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
+Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
-----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 b5a81a847..075439ad1 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 e6ebd8e85..62a499e84 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 4e5064d0f..aa13e1f4a 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: 57 06 4E 14 FC DC 71 C6 63 79 23 6B 37 E6 62 C4 FC DE 8A 12
+ localKeyID: A5 4D 11 B8 D4 DD F0 E5 A2 06 2B 05 17 63 D2 F2 18 A5 48 0B
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClVUp0vfMtcek7
-PsuUAGg48vVKkml3MA71SPxgfjTb3RZFrIaezkF4AJBeT3l4VHNMU7tDqSnvqOgT
-CH2+32Ezjqbod5KtRMLstKUk1h9YZyWZTvqGTHXb+uVzRe8TQZTs8XIcNdPjTXTe
-g0Pd4tQzioM7+Outj0M3V+dK+BYh8QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjQ3NDBaFw0zNzEyMDExMjQ3NDBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0uXUo2Ea2ruUG
+JT8eHDpXgbSS1W1/msvT/eASmBQdo8bccj35+B/ZumNF3eGANYXRw8tGgDD16F8B
+9OShHYPJLtPiAO0I7a+Gw/rtUUdeMYEZAElCarkinWb1/PPGuARAEFb7JNx3L/Y1
+huIj1phHmOpZjrWzPsSdQjNTOlG9uwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AH9kBPA4F7u2PcjLNm+AYRWQv2bnOBLmrL/qBpfwFxJ0Ptt/bkPW8TpvQJwjxc+o
-gnCwZVL5RIUr+Q6UFar1UKPC+fPC0m5BuXDZNTXShlQdUrNoIvvqNjvBNFiKJVLj
-bALzz44mI44mpEAJiuiQcDdVFcD7s3o0knDxvy8ReBCr
+AJlkk5AMm4WI0oDftBsNUur6cljBxyFegsg92AeTxPpBW2NzLo33UiBO2DcFIuv8
+Odg7pKAV+iq5hnfqjfCEbfQm1fEaNIIXGwtD4MgU05DZGb2svyWyloU0xuJx2hOp
+7Mqw+eHceg6MCEB7X+tcEQeNx6eGRIJ4hZfJQNawtEVX
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----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 c67310cb7..420b6891b 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,21 +1,22 @@
Bag Attributes
friendlyName: revoked1.example.net
- localKeyID: 57 06 4E 14 FC DC 71 C6 63 79 23 6B 37 E6 62 C4 FC DE 8A 12
+ localKeyID: A5 4D 11 B8 D4 DD F0 E5 A2 06 2B 05 17 63 D2 F2 18 A5 48 0B
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIf9OSVB86sHICAggA
-MBQGCCqGSIb3DQMHBAiqIV68HjGNLwSCAoAdEXi9V8dcsC6EEfsQYOTicEAzPxhv
-lGIqP+vwr9q2By1bV/L4gZEHX7ok+ZVTaf5YsRQONNhxaiZzoKoyb3cfWMg9kaH/
-jOctkpCHzt5g6denofUtx2Qir9ktmu1bIy015yT2kNdEBR8RIgyWkYkbcuPqnfJU
-4g9c0t7Pa6yBkSau8ilLd+USV/BRLW9f2HxMtWmZTNWcK3mpsALamp7Wabka/S0G
-fhJawgdhqvDQXd/f5byKykQ7lqTR1s33eipa1EOEFmwDePHzS5SDnZ5wze+FfOsF
-9SZSdUjuRv85hV0jJg1XgeoV0Ax8Fo+35xRvIEQswkzV08/9i4A3cHskaya7jMGX
-l9bs+/rZWHsbIIp5SFrFIqbIvWreebH2rmgyKjk94GbioiijnY8xRHE98wG4lGB4
-51NPMKmnM1D+wXsqDgR5tkz9/U1V5bX7VvDr+4mfm9X9YbUiUy9VBfWa88bqou3T
-cRtPyEX7gx6dtgsAl4QUCycdsPpG+PjbtRwZq2Ox0MxS4bsmYpvowWCk+cZNzsXq
-FdSqiqG661AzEVqUlgU1MuPH10HCpy1mTICr638Gq7pQrHhR475QowZ+yvxL+VdU
-FuC3s+7RBebWzyswuALv5zOC41TqynAFVnoV8yKxFutdvi9DlvScyXKZ+0wb2hJe
-Je1GXLsGqZ1ArPrLtxrcA7MuSfM+IVHO3jL0qCOM76IV8Mbm874ubkyTnIL6FPon
-4G5ZZ10KAwRolBTrPwbyC058s+XxyumGLVgZ0FfVqF1MIU7G8hgreQ4vyXsiOT5p
-bkv01MyCdnUZQO4XlT2lndRnL9xrQIIsjLZYHjDkkmXmO6sVBu2bWiMT
+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=
-----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 df02cbb38..908a62640 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 7d9b8a383..c8b077aa0 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 0fdc79a07..ba799effd 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 ae516388e..6c9548bba 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 ef8dd3045..cc770eae9 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 af17e90e3..237de8850 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 0f88626f6..d8be11dbc 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 2e5c57439..b2036fb85 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 7fd640deb..372f68e96 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 2aa919492..ca1a8d066 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 86bcddae0..00c41d6a2 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 f938b6878..02daea60e 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: 57 06 4E 14 FC DC 71 C6 63 79 23 6B 37 E6 62 C4 FC DE 8A 12
+ localKeyID: A5 4D 11 B8 D4 DD F0 E5 A2 06 2B 05 17 63 D2 F2 18 A5 48 0B
subject=/CN=revoked1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClVUp0vfMtcek7
-PsuUAGg48vVKkml3MA71SPxgfjTb3RZFrIaezkF4AJBeT3l4VHNMU7tDqSnvqOgT
-CH2+32Ezjqbod5KtRMLstKUk1h9YZyWZTvqGTHXb+uVzRe8TQZTs8XIcNdPjTXTe
-g0Pd4tQzioM7+Outj0M3V+dK+BYh8QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjQ3NDBaFw0zNzEyMDExMjQ3NDBaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0uXUo2Ea2ruUG
+JT8eHDpXgbSS1W1/msvT/eASmBQdo8bccj35+B/ZumNF3eGANYXRw8tGgDD16F8B
+9OShHYPJLtPiAO0I7a+Gw/rtUUdeMYEZAElCarkinWb1/PPGuARAEFb7JNx3L/Y1
+huIj1phHmOpZjrWzPsSdQjNTOlG9uwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AH9kBPA4F7u2PcjLNm+AYRWQv2bnOBLmrL/qBpfwFxJ0Ptt/bkPW8TpvQJwjxc+o
-gnCwZVL5RIUr+Q6UFar1UKPC+fPC0m5BuXDZNTXShlQdUrNoIvvqNjvBNFiKJVLj
-bALzz44mI44mpEAJiuiQcDdVFcD7s3o0knDxvy8ReBCr
+AJlkk5AMm4WI0oDftBsNUur6cljBxyFegsg92AeTxPpBW2NzLo33UiBO2DcFIuv8
+Odg7pKAV+iq5hnfqjfCEbfQm1fEaNIIXGwtD4MgU05DZGb2svyWyloU0xuJx2hOp
+7Mqw+eHceg6MCEB7X+tcEQeNx6eGRIJ4hZfJQNawtEVX
-----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 fee960ce4..1104c9dc6 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-----
-MIICXAIBAAKBgQClVUp0vfMtcek7PsuUAGg48vVKkml3MA71SPxgfjTb3RZFrIae
-zkF4AJBeT3l4VHNMU7tDqSnvqOgTCH2+32Ezjqbod5KtRMLstKUk1h9YZyWZTvqG
-THXb+uVzRe8TQZTs8XIcNdPjTXTeg0Pd4tQzioM7+Outj0M3V+dK+BYh8QIDAQAB
-AoGAEaS5Mh2eMJSWJOQl4fisJp2o1wkqV5WJlxvvkNWPCwJ8MLnBUPumSWnX/jSB
-fDmY50WNN6J7DvAJuhQ/JQoeC3BN8tIAjbgxFEa3hDAnO7qPhire0R56qhnBbx97
-hBvc1w87mUb1qvTX3LZHMv3k7R+oYlA3ManFGfe+2XKY5/ECQQDOx9Ntet4jngjf
-MaXPC75Pe3fbqHzm6mU31Lecx57jYehlm7MLZfgOtwNjFLFAG2e4GXLdQnNKJNQF
-00NrXqC5AkEAzK/eEi2P57qQu0vEEzkNYB9PdOBvrQ8P2jmwN0O1p+T2XAbbIWiR
-kuIAIJltHEAhTHEgMdod6Ys4umpx2Zc++QJBAK1rwdJr3aoZfG9UAC+pNa8LafZ7
-VGWF5+XvLR77/DHPh0zQTFUe6+/LZbfPPuj5Ev+/uCoA9RgV0wwfpseB0WECQDID
-IqKUaV34ctagq5b60K7U16g6Em9Zh8kNYWYPcDpGsn9H2ZDvKOqXt+o/Mq69aKVx
-2qjzn21p7AF4crr0vpkCQGNfEwTDUbdYMv0nuVF1J/GBCAcaUwzF/LUAUU0HjCRl
-ANzfeChglO4b/4UZQWrtJr8Ut2GFFxad7ClzI/9xnqc=
+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=
-----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 fef1020ef..3e855d958 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3kwC9CHz
-JH7sEDkHMdZRq8+XpV7l/hEqfv2gPvT3mak46dWrI/T3pJOqyNvUZV/LJ/gx/0uw
-9pmCg6Y5zNCN0qAGY4rSS/sbEOLYIw5wJbFnYfHtTwe3ZAdG+5WqKMBF2lHNBM3b
-PUB/kweoLhNLwserKHwMDC3sksfrwH29rpMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAzXt6KHIB
-qOJfZECgwhAWipxVR0BXek0hAfyTWl7q18+mWKYydQW0Z2VMN4Bq/ZUlOg+EM8NU
-1n9PJ4+I2QgAwVVXN4+cz7zgZ6XRZc1OkE98NyK504bVpJpan1gsx3I5GLJUgP2t
-B/WwqoFO+ANhT2margZSM6avJfaIh8gEass=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
+ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
+NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
+ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
+bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
+zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
+Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
-----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 ca5847ed9..29c9c0553 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 bed8d0958..fd80ea9b8 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 cd6072437..059e0aa76 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: 9D 94 B3 78 78 92 F0 B8 83 21 D7 C0 CB 0E 1B 33 EF 39 B6 17
+ localKeyID: 15 CA 25 01 42 68 1E D8 78 42 F5 0C AE 62 0C 96 9A B8 4E 09
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3Se+qbZkX/Fl
-i5PBS0yDe8c7so0Ze+yVeuM0NBZY0h0K6ahKb8NuFQ7jpL7BtQRlFGoU2foVLdLd
-/zSg5802qaTsuDISGnLxX0Fpr1gm+OvQkGdJt8eeVZEpNLph8zvp3eFtG8HE9l6R
-QbsEDTnJGHYlHNscnW1CMB3p6NyzMXkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTI0NzQyWhcNMzcxMjAxMTI0NzQyWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3AV2vAw+R5p
+2mK7x4XyEGX+hrsMI4ftU+nNjemcx8mprhwjqOqpybd8a72f2KxhsJX792n/25f7
+ZyFG8+ADgBPA9w4w8UOwbQ1yeRQEe3pWpPMT3YzLH7I/tixjteZ0gahvsj9WbKvV
+ZRg1zvlDg+ANcMCu4gvKqnW0A06kuaMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQBomN+m0L4SwIi+CoZOyIQTjKiKZU2XuripqrazQflD4hJoWqFxod6gGrrLBhSS
-481+/zt26E0+49e9f6rU4FLnkjt6rr2hoJk8Sw9/MRUQ54HroEq3Gk6fPJjIlZd6
-DXp1rbYTRkJKLZcdDtDjUqENU750mQfLIl7zQ9CGweKZpA==
+gQAqXyFF/xJYgRgLAU8wZV0dzOWU2ypbEiMMHMrXuG3Ts9rDRMtcLGAz4Qleumsb
+kS7dNe6qH7hXyFwseeXpFnJa0knbYifF3CEyP26jWuh+5f4f9oVZZzwRe56/kE+h
+8sOz5tNp3JtNHKandvqfZ6lKtvRbk2pirVajYYfpV0bXEA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----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 762dfd421..fe4574cb5 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,21 +1,22 @@
Bag Attributes
friendlyName: revoked2.example.net
- localKeyID: 9D 94 B3 78 78 92 F0 B8 83 21 D7 C0 CB 0E 1B 33 EF 39 B6 17
+ localKeyID: 15 CA 25 01 42 68 1E D8 78 42 F5 0C AE 62 0C 96 9A B8 4E 09
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIsyCJhTC8O8oCAggA
-MBQGCCqGSIb3DQMHBAgbxjkbvtYrXwSCAoB4294psQBogCZpAG8qJhEpCNl7jtD7
-Y7dZTMcifXZUzJhuWk68qIOAoPdxswrszif/+mry+ebEVPIKFRSdXudYoghI44bM
-BKm8eX6zy1EMZDJk5u1A/+U3ny21xS7avh4jHzzBWgDc3qXuE2oaTms4BNg2L++L
-Xj/6UA0+t3ieXRbTaDRehofuSZN6yWbCBpf/xpjOPiy6O0hsGdzSv228ok3RJNcH
-j83dtsQrDQqRKhx1ElfVgE68QuR+6LGYtjaxXi28SEKVdIA1JDDvTQyxw9l+cyzm
-awbVmYX4kzTP49VBe8y0QhVlZ4qKIIfsXz8Z7lSJxnYgoRqgXtjaqZ02YkKZhBfe
-EHXkofxtgDpIHs/vHQRtFwkHI7hPnTrKYCUkQzAysVVGMbfcqtfqTB4Cg8onrJHt
-vOXyKhDePYEt7D2JK/hJM+Dr5SbAeBOFD31ZYOxp4/dgT3kKuy3f7SKebAw+wgTZ
-qiGYAN9VLyyjqGs+PB8AtuMlyUCyOELZEJpedTp3bqun1C4zamvgZezXNN+87mUT
-uLVmEfAQ97Wkr1HwFq5QQ17bgEM58gwgGjGHySaLrjfeGqOIxT4/3LXTLYwnbR7Y
-lF+2frBjGxWxgljxuKwimUr/OQ/2HnBB24i7A5N2IVzDkGarxd2v6bkgQElxsNAc
-XwDZvP7wIzp3vpb3beWPG37t70PR+eWAJYNyGMRupPDJnXvnY05o0Gn2dKYPeGsI
-s21+elEFUMYvv3CCf8q+AfF5yXVkJC9/DOKIQR8kTHOlOPRJdhdE0NDUU0/2f+nY
-83Uvgrppv+N7Y6ADFTf73KlOTnn5MQStavXoduJYL1s//+T/BAImh4oe
+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=
-----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 7a098d604..6850ff92c 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 2e7255f88..2c9f146e5 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 018d3b2e4..ebc1ec517 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 2e7255f88..2c9f146e5 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 6d4f33027..ed07962f7 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 758da1405..ebce09554 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 758da1405..ebce09554 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 f41b3d2a5..bf40ea79a 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 9705c9547..b473656ad 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 9705c9547..b473656ad 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 2b6f862d1..035917e30 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 15393cf86..b6e01cbf5 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: 9D 94 B3 78 78 92 F0 B8 83 21 D7 C0 CB 0E 1B 33 EF 39 B6 17
+ localKeyID: 15 CA 25 01 42 68 1E D8 78 42 F5 0C AE 62 0C 96 9A B8 4E 09
subject=/CN=revoked2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3Se+qbZkX/Fl
-i5PBS0yDe8c7so0Ze+yVeuM0NBZY0h0K6ahKb8NuFQ7jpL7BtQRlFGoU2foVLdLd
-/zSg5802qaTsuDISGnLxX0Fpr1gm+OvQkGdJt8eeVZEpNLph8zvp3eFtG8HE9l6R
-QbsEDTnJGHYlHNscnW1CMB3p6NyzMXkCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTI0NzQyWhcNMzcxMjAxMTI0NzQyWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3AV2vAw+R5p
+2mK7x4XyEGX+hrsMI4ftU+nNjemcx8mprhwjqOqpybd8a72f2KxhsJX792n/25f7
+ZyFG8+ADgBPA9w4w8UOwbQ1yeRQEe3pWpPMT3YzLH7I/tixjteZ0gahvsj9WbKvV
+ZRg1zvlDg+ANcMCu4gvKqnW0A06kuaMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQBomN+m0L4SwIi+CoZOyIQTjKiKZU2XuripqrazQflD4hJoWqFxod6gGrrLBhSS
-481+/zt26E0+49e9f6rU4FLnkjt6rr2hoJk8Sw9/MRUQ54HroEq3Gk6fPJjIlZd6
-DXp1rbYTRkJKLZcdDtDjUqENU750mQfLIl7zQ9CGweKZpA==
+gQAqXyFF/xJYgRgLAU8wZV0dzOWU2ypbEiMMHMrXuG3Ts9rDRMtcLGAz4Qleumsb
+kS7dNe6qH7hXyFwseeXpFnJa0knbYifF3CEyP26jWuh+5f4f9oVZZzwRe56/kE+h
+8sOz5tNp3JtNHKandvqfZ6lKtvRbk2pirVajYYfpV0bXEA==
-----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 adec37e32..89d36944b 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-----
-MIICXAIBAAKBgQDdJ76ptmRf8WWLk8FLTIN7xzuyjRl77JV64zQ0FljSHQrpqEpv
-w24VDuOkvsG1BGUUahTZ+hUt0t3/NKDnzTappOy4MhIacvFfQWmvWCb469CQZ0m3
-x55VkSk0umHzO+nd4W0bwcT2XpFBuwQNOckYdiUc2xydbUIwHeno3LMxeQIDAQAB
-AoGAG5Ysm2DsDme/QfTxZKIruJH2qWQebK3rS4Px7BlphPQoe1MJzf0zyx6rWM6O
-vTTKIwzEgxhF8gxessnu1Ftt2OoPPBkSjEW96fK6U0zdyBQbCjLmHA2gGOeo7wLL
-mp1pVMAXZofrn2aJYC4rXrJ7EYrge3GoqoympofijIpOobECQQD6v4IEQgA8lytu
-Kv17vrRcgkSkEkofePe2+J/8L5QJPry/TPWeLG9KasZ1SppUZkM66CffAGAQEHvi
-C21RUXWdAkEA4cmP+w/5Ypg3P+4+5cyaTcKHEzd2Drqo7ANXV78Go3+AqX7beVzc
-0GxKn4S/94ZX6RkfYYE5WIWfXH8tgxPyjQJAO5kzNQHe/ofLydasAzKTuf04hWrX
-dV2SO0oi9JT2cbAYurt3Ec5r8Vspqo0921unFSRC/c0gCBFy8IpYxGBBPQJAMrr8
-C7fyG5IBz+5y2WUYQmJzwQCUGQkdjTHO/Rshnbi3Kt4i5+jSgE3kkmTcUPwxYmFP
-qLPFM7uKK9kzW6EuvQJBAIYFifaV0eG2nrhOoWW5Kgelqw3aXn3qvhnIRwXU/4xB
-gihTV/prnLLPWx/+AqlXFEeHGC/lOQmZSkClu56JIW0=
+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==
-----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 fef1020ef..3e855d958 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3kwC9CHz
-JH7sEDkHMdZRq8+XpV7l/hEqfv2gPvT3mak46dWrI/T3pJOqyNvUZV/LJ/gx/0uw
-9pmCg6Y5zNCN0qAGY4rSS/sbEOLYIw5wJbFnYfHtTwe3ZAdG+5WqKMBF2lHNBM3b
-PUB/kweoLhNLwserKHwMDC3sksfrwH29rpMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAzXt6KHIB
-qOJfZECgwhAWipxVR0BXek0hAfyTWl7q18+mWKYydQW0Z2VMN4Bq/ZUlOg+EM8NU
-1n9PJ4+I2QgAwVVXN4+cz7zgZ6XRZc1OkE98NyK504bVpJpan1gsx3I5GLJUgP2t
-B/WwqoFO+ANhT2margZSM6avJfaIh8gEass=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
+ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
+NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
+ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
+bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
+zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
+Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
-----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 4743f74b1..e6c014326 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 adefd178a..8b8e73a6c 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
@@ -1,25 +1,25 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 50 2F A4 71 29 E1 8A B0 EC 68 30 74 B4 8C 03 81 45 2F F7 17
+ localKeyID: 43 43 15 3F 39 3D 8C 8F 7C A6 0D EC 95 D8 71 0A D1 01 06 4D
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANp87d14zXozAbdw
-wD0AfnhqecV/D5GidUy4QnTVfSBMWjDkcjd7rajPnRHiM+NQFLkY5DKXuqpqZ0+W
-kH5dJrs2ZE5abmyfOzHUwai5IGVUIvOnBH4pXPLBcDQ6IAOEhpsaQaauHn/NpP7r
-X8n8WB/S3zmRk5Q92K/maQ8cgRt9AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjQ3MzlaFw0zNzEyMDExMjQ3MzlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOB7RZXhsaIRqU/q
+VwdMMHLpYyNq5PYy5vv9LKRKdyYKrdneevar7XSRhtgTijk0bGHLjOkb9IsbO7lD
+rdhec/O7arQjFvaxzitS9p+na7gXlY2mSwRD8ynEm89akIFy9bLcAm/Sjsjx+5Ai
+n/I1CDG8+fRIwvYdkH8XeHBSdzcNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCImFs
-dGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBs
-ZS5uZXSCCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQCv5vsWzpkMj5OL+V3g
-bgXzhu0K05aOK5pv85sT4UGZpqrhLSTDjGvd5kFXLQwUH36CAzrqJOOV3vrWugrR
-/iR6VRcwqjq9Z2jT+XeSF6Immo5rnKjOl9Mor5mBwAHVW8Ojk2Ce3ww06AodpqaD
-yNB7Kmo3G2o63vGcVUg9gB+ohg==
+BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUubmV0giFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBs
+ZS5uZXSCCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQBPkSiLv66UTJZKIjhK
+qibpeuz7QzX/Pog2uJwF96U+an8ERd6CoQ5Rrqg3xsEBbVd7y2MY6oZr5zbx/Bep
+7oW0zyNypM/xQhqQBLWS+GjMupw214keT+lfpg6/RU2XlcBjfT82vfuSVaNL9CUm
+Smh4/woDuJ1/RawGmzIpIIn3NQ==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Signing Cert rsa
@@ -27,17 +27,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -45,14 +45,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3kwC9CHz
-JH7sEDkHMdZRq8+XpV7l/hEqfv2gPvT3mak46dWrI/T3pJOqyNvUZV/LJ/gx/0uw
-9pmCg6Y5zNCN0qAGY4rSS/sbEOLYIw5wJbFnYfHtTwe3ZAdG+5WqKMBF2lHNBM3b
-PUB/kweoLhNLwserKHwMDC3sksfrwH29rpMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAzXt6KHIB
-qOJfZECgwhAWipxVR0BXek0hAfyTWl7q18+mWKYydQW0Z2VMN4Bq/ZUlOg+EM8NU
-1n9PJ4+I2QgAwVVXN4+cz7zgZ6XRZc1OkE98NyK504bVpJpan1gsx3I5GLJUgP2t
-B/WwqoFO+ANhT2margZSM6avJfaIh8gEass=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
+ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
+NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
+ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
+bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
+zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
+Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
-----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 2dcef1d2a..0598da52f 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 2321af905..b8c8e79c6 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: 50 2F A4 71 29 E1 8A B0 EC 68 30 74 B4 8C 03 81 45 2F F7 17
+ localKeyID: 43 43 15 3F 39 3D 8C 8F 7C A6 0D EC 95 D8 71 0A D1 01 06 4D
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANp87d14zXozAbdw
-wD0AfnhqecV/D5GidUy4QnTVfSBMWjDkcjd7rajPnRHiM+NQFLkY5DKXuqpqZ0+W
-kH5dJrs2ZE5abmyfOzHUwai5IGVUIvOnBH4pXPLBcDQ6IAOEhpsaQaauHn/NpP7r
-X8n8WB/S3zmRk5Q92K/maQ8cgRt9AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjQ3MzlaFw0zNzEyMDExMjQ3MzlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOB7RZXhsaIRqU/q
+VwdMMHLpYyNq5PYy5vv9LKRKdyYKrdneevar7XSRhtgTijk0bGHLjOkb9IsbO7lD
+rdhec/O7arQjFvaxzitS9p+na7gXlY2mSwRD8ynEm89akIFy9bLcAm/Sjsjx+5Ai
+n/I1CDG8+fRIwvYdkH8XeHBSdzcNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCImFs
-dGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBs
-ZS5uZXSCCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQCv5vsWzpkMj5OL+V3g
-bgXzhu0K05aOK5pv85sT4UGZpqrhLSTDjGvd5kFXLQwUH36CAzrqJOOV3vrWugrR
-/iR6VRcwqjq9Z2jT+XeSF6Immo5rnKjOl9Mor5mBwAHVW8Ojk2Ce3ww06AodpqaD
-yNB7Kmo3G2o63vGcVUg9gB+ohg==
+BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUubmV0giFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBs
+ZS5uZXSCCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQBPkSiLv66UTJZKIjhK
+qibpeuz7QzX/Pog2uJwF96U+an8ERd6CoQ5Rrqg3xsEBbVd7y2MY6oZr5zbx/Bep
+7oW0zyNypM/xQhqQBLWS+GjMupw214keT+lfpg6/RU2XlcBjfT82vfuSVaNL9CUm
+Smh4/woDuJ1/RawGmzIpIIn3NQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----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 0e5f497dd..4a11a5c38 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,21 +1,22 @@
Bag Attributes
friendlyName: server1.example.net
- localKeyID: 50 2F A4 71 29 E1 8A B0 EC 68 30 74 B4 8C 03 81 45 2F F7 17
+ localKeyID: 43 43 15 3F 39 3D 8C 8F 7C A6 0D EC 95 D8 71 0A D1 01 06 4D
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIF5UpLi3LhbgCAggA
-MBQGCCqGSIb3DQMHBAia5QVJXajfbgSCAoAgeXf3jyr8o71Ul/fOMeq2Ye2cUkx6
-4ymZg/Pnjj/vkOPCMsByOADVDGf2NVza8pUqU2FFiGxetfMSM/VzimsANaLr5pdP
-eM4bitqaLCJEP7cJq+Zs+0cvkpPf4Mv9RpZKso7B/ChEhEdvU5YevfY2FVt7ZQIk
-Jna2XnNSI9uuAxQrC11rkbbaq3/5grv0bIB/5K8Ut4ViVNI7hPlK2nTPizyIhOkk
-vGdphf1Z3uvoW7uYuud5r6NJf0Cf2n41CTKQ6zNZ/HH8igysPrej/GGIO5a8FmSt
-cHraE6tSw5MbCNtcyGq43pWVvBDeHp4uCcghPpXAnfkR/svrgnxDrDVniZ6VMA78
-7QL8o6VnsuUJONjWh9GeVusM+qZH6/9s5rg7l6gNlPlMpIqZqiDOx6pDXhoOddHW
-yEiHysguCHZa04O8zqYkhx7cPE2VNgJm6sYC0CwyJFC0KgrxMGgjPGY+MEqMWX8v
-qrqPOrPURFlHmFEndFdInK9sA1LW1rDw1M1t4IdNliC90EPwauXSpWzzkNo3Ygt+
-3iTAPScE67z19DY4pbrRLs6uF7emI9pi84lCTDVbby2ZkB18e5vn6kHE8M5dfkdd
-8qcsFU9bBuI4wu1S9CJxXeT30JjFOu6Y2Jb2erimIQe+JS/D+CkNuYx9gGuCEedn
-Yn6CM+CxjuxxMQX1nu+Cap1vAbFYfETZcdxtbIwpqPVLHXi0/F5CJMj/XNwQ1rUD
-x8L76n7kaYMOiNfmgKwXWEOJ4Bx2bteRK0OdnsrhABmjc0ENmX4y/WNF4YVg2Yml
-wHn3xhuoJkNoMjCNWOFB8GYELc09aLzRnOXQChRqAmEZY9JBUAFE6xvi
+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=
-----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 6704e1343..5d29f5964 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 db2cf4eae..c9aac7124 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 6bbcfb8d4..11c93b9e3 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 17cd00182..85f79c5c8 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 abbda91f9..29ed5dbea 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 0e2c4c0ea..d82a753e4 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 48561ad02..6d03a4534 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 f03b4ff2f..c90b7b935 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 b11114ea4..a0a1972ef 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 a8cc12542..fd42d722c 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 6b5c704a0..a835c2320 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 57c62b1a7..d6aa725d4 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: 50 2F A4 71 29 E1 8A B0 EC 68 30 74 B4 8C 03 81 45 2F F7 17
+ localKeyID: 43 43 15 3F 39 3D 8C 8F 7C A6 0D EC 95 D8 71 0A D1 01 06 4D
subject=/CN=server1.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANp87d14zXozAbdw
-wD0AfnhqecV/D5GidUy4QnTVfSBMWjDkcjd7rajPnRHiM+NQFLkY5DKXuqpqZ0+W
-kH5dJrs2ZE5abmyfOzHUwai5IGVUIvOnBH4pXPLBcDQ6IAOEhpsaQaauHn/NpP7r
-X8n8WB/S3zmRk5Q92K/maQ8cgRt9AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjQ3MzlaFw0zNzEyMDExMjQ3MzlaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOB7RZXhsaIRqU/q
+VwdMMHLpYyNq5PYy5vv9LKRKdyYKrdneevar7XSRhtgTijk0bGHLjOkb9IsbO7lD
+rdhec/O7arQjFvaxzitS9p+na7gXlY2mSwRD8ynEm89akIFy9bLcAm/Sjsjx+5Ai
+n/I1CDG8+fRIwvYdkH8XeHBSdzcNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCImFs
-dGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBs
-ZS5uZXSCCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQCv5vsWzpkMj5OL+V3g
-bgXzhu0K05aOK5pv85sT4UGZpqrhLSTDjGvd5kFXLQwUH36CAzrqJOOV3vrWugrR
-/iR6VRcwqjq9Z2jT+XeSF6Immo5rnKjOl9Mor5mBwAHVW8Ojk2Ce3ww06AodpqaD
-yNB7Kmo3G2o63vGcVUg9gB+ohg==
+BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUubmV0giFh
+bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3NlcnZlcjEuZXhhbXBs
+ZS5uZXSCCSoudGVzdC5leDANBgkqhkiG9w0BAQsFAAOBgQBPkSiLv66UTJZKIjhK
+qibpeuz7QzX/Pog2uJwF96U+an8ERd6CoQ5Rrqg3xsEBbVd7y2MY6oZr5zbx/Bep
+7oW0zyNypM/xQhqQBLWS+GjMupw214keT+lfpg6/RU2XlcBjfT82vfuSVaNL9CUm
+Smh4/woDuJ1/RawGmzIpIIn3NQ==
-----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 1795c9aa2..b03d67831 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-----
-MIICXAIBAAKBgQDafO3deM16MwG3cMA9AH54annFfw+RonVMuEJ01X0gTFow5HI3
-e62oz50R4jPjUBS5GOQyl7qqamdPlpB+XSa7NmROWm5snzsx1MGouSBlVCLzpwR+
-KVzywXA0OiADhIabGkGmrh5/zaT+61/J/Fgf0t85kZOUPdiv5mkPHIEbfQIDAQAB
-AoGAWGGJ3PmFcQWaD6jp8qM1BaPYn2XvF9PWTFMK+vTzOTH5l+aJN11t2agmGvpc
-T/rwbxGdGcQby9zf7qdyytMGm5uS05HHkOtayKc8V2xSEsPpwY6xGnXklT9wHEl8
-IkCTHNtEBchIMSPvTMhY12JsHi4LXeerkwJt6VlhDwENchcCQQD/jhYZWSNChAic
-WBoEHCjeUPUae+6EI5AEzxjgHBczAaAGGxVUcBaNPVLdECPKVzkVLC8R8RL1SbVO
-3y0g18ibAkEA2t5R+TLPPwZB/AF9+b4Eig4t16jsb2wZvOkluga+0JOrRzS9ATBc
-L18TXrNieKzKsmLjJdQ9RbXpUYKbj8OxxwJAfWibvaq5m+2xUBAIDFZJU/gEoA+L
-V/sftMxwl6IRXG2CuxxVVk9/MaaTYHqIJcax84rwOmzEcezO9bqdqc1a2wJAKQmG
-VTMxqJ+Dv7yH4ku+jiQadFU3/6xFJyaP7FFXdcQ6WR+KUK7AmiE5gIgh7n53gvsH
-nBAvbOKu3JmgkVQgAQJBAN3Vx7RLrLr2BjJiCBNflSU1dUOaqa/IybkHX29or5kH
-IvATeI8ptmiphSil/uy79c6jzYuyiuRtrgnUh/WrKeM=
+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
-----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 fef1020ef..3e855d958 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----END CERTIFICATE-----
Bag Attributes
friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
issuer=/O=example.net/CN=clica CA rsa
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3kwC9CHz
-JH7sEDkHMdZRq8+XpV7l/hEqfv2gPvT3mak46dWrI/T3pJOqyNvUZV/LJ/gx/0uw
-9pmCg6Y5zNCN0qAGY4rSS/sbEOLYIw5wJbFnYfHtTwe3ZAdG+5WqKMBF2lHNBM3b
-PUB/kweoLhNLwserKHwMDC3sksfrwH29rpMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAzXt6KHIB
-qOJfZECgwhAWipxVR0BXek0hAfyTWl7q18+mWKYydQW0Z2VMN4Bq/ZUlOg+EM8NU
-1n9PJ4+I2QgAwVVXN4+cz7zgZ6XRZc1OkE98NyK504bVpJpan1gsx3I5GLJUgP2t
-B/WwqoFO+ANhT2margZSM6avJfaIh8gEass=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqUbZOpBd
+ho8+PCDJzR3Vt9Gd5BN2ksXxsaRUWUQ4jiinEybMZJuNtpd33GBGkma2WE7s/vk2
+NB7RboWSS6eJlZSV7kx3rY4nqUuvASwNmpUlyGwrwQcNb/f2qgOC7omU7q9Uetgv
+ScgZcCmIwrYOB9fdSJfkpYyLgYFG8eYv688CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAoAMBtsN/
+bPkiFkYMmsd68OSTYSPIeQMUdqqFrDZj5h+QMv5c3EKBT8yVArefz2+Q9f9ZkXa6
+zLLLQTzLFmCZuVZJ3fIRNyZGv6QGPPIETJzZd8YEWvvsXBie4QXi2qYRLez7PusK
+Vvo58a2rNCWicht+9HTPH3XcZUrCZ/2z2NA=
-----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 5ee0f8149..0c2c70b2c 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/key3.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
index 8e7bc550b..a9844fab5 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 4fcf7ad88..964ea125a 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,35 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: D2 9B A9 F4 48 0F EB D4 1A CA 1B 29 7A 49 FB 09 0B AA 4D 02
+ localKeyID: F5 18 BC 7C 70 B2 E0 30 3D E2 84 11 C8 38 AC C9 40 A9 2F 1C
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjDCCAfWgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJyy5Qho3LBb3L
-EbQZgsrtkPAqRXRhTME03lUdXHmtEkhGGe4zCrZ7RemAJADhR8aguhAebrVYno5e
-nZ+KS8CvE8z6eBJqQ5VhaKkb3JvCb5PyoWyXm3tMPufYtJ/1C13VT5cupGW4rJg0
-BEsRqlWl3qbfHmhgyDd1VWgLn6+X9wIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE
+MTAxMTI0NzQxWhcNMzcxMjAxMTI0NzQxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGjmPu4xUrJQMW
+VFMlJbm6ZU8hVq1AYMQI0NIumzEN6l8g8kABcZusFP+FBN0OcvPAuVZNITtJiBZA
+CvDIa+ZxjWrwDP9AVNLG2I9fjzM+TQNLOPv4O+QxTqwZZBgF3uP8BNFaYvxcSmZ6
+LlgzcyciU4npp2LMaTxuWEd/i716vwIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB4G
A1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEA
-YfsNBKmjTjfIZw0vSzK7pq+ouXe9KAlCDZU/mgKMp0be6RYd9BRvAn4R2J452W2h
-AtBVl6vRqaqpMzsUIfwPe1lOb3at/ESz7CwtERTAfHPj6STDXLDyAF2Eg0B7xf1W
-9ag0Vwa1/6UPAALHQ5juuKAFsZSDVms2uz0x1oh9y+I=
+Z/TviUZC/prVkYrqbWpICiZM9erZaj6rhfDvpN8McbKa4qDQecD+pkan5QdWF30n
+HpDbs4fM8VSA1cjxbqh0ey8RioQa9F9PcoHpYaxR82gKZBakd+3odg+Evui+cXT2
+P77KWgYTOAejGpArL+E2XSDtbJXeUgzUWPbYzLC2quY=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwM1oX
-DTM4MDEwMTEyMzQwM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczOVoX
+DTM4MDEwMTEyNDczOVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALMuDick/uNCkK8zWtdko5eynjJq0y8NVNlhSFkbwfjbxOQycuyMhMlYNnvs
-ESWZTV5ckpsvoDrFQLFk6ZB7RVYHUoOHNfANm8JWC9GR5zqbquibA/MMQ4h2Xlkz
-zQz12AzPpouZUyYs1+SjwlgfBRVhtxApDR2bPEDzI6s9VUdXAgMBAAGjWjBYMA4G
+AoGBAJ6XqBCKF5vePcuUluX5oj1mm0WFX1YFjfu11yorh0LKH+/d8JDcux+EsIK+
+mQGStFJNz2FJmMapEOR6yUq1UqSmsaDMDp0XPXPzQ2Zje/Qr9n/CP/qyeQCnrJi0
+8PGSMJKJXu1o0uCVjGucBT5EmG2B3HNW/3Xv9YBn0yD1aophAgMBAAGjWjBYMA4G
A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDCXkPeCURjOJwCBgbLERuNghPiWLqHPopm1idM2A032jDgbRXD9/DP
-1xOPgSLEW59EiJac0RNae0D2KyhnG90NZLccXK0a9Uu1iaAmdcJ7s4a0x0ZH9Kza
-hqz0cr4oStUOHxG/AtPKuhZ9PkZ7GDSPDW0k/z64WYCm1fqSWkbVig==
+AQsFAAOBgQCoTReynfDwmZuJyl7/D4SDHlTgRTsHBS6855k1QZpBHxGGKc6TWjGF
+ytoa+C7WXoVZpKs7e1DmcpGPYHXpPGxsJWHTWTPbTpfkVvWylgu5GOg4OwMpn5qg
+fBzNCS5Nmqv9hjLa1O4NS7NQ59jUH75SKwU4SGLpvAZ2gS5O+YqXBw==
-----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 94275d88d..0c0af94e9 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,21 +1,22 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: D2 9B A9 F4 48 0F EB D4 1A CA 1B 29 7A 49 FB 09 0B AA 4D 02
+ localKeyID: F5 18 BC 7C 70 B2 E0 30 3D E2 84 11 C8 38 AC C9 40 A9 2F 1C
Key Attributes: <No Attributes>
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIB9bHTJXCqmUCAggA
-MBQGCCqGSIb3DQMHBAi6w8GSieGl9QSCAoAZsxqDNKfVkeE7n0BKx6DmbVE1ZpS2
-bnVSmvRxkevnEmevvplRPzpVEt2zHCQ3kBaUFk+SFf3dZVJ97veK94knyKhQ+mFQ
-QUpa2D840yDIJHeXyYc5zNo6oPOMHI4khd2B8Wmfaht1N+EUY+He4rpdYFX4KHhR
-HGxhnPwT5F48AaDZ8LyG92Q9onffGcMFXnO1GC/8zYvsff89K9udmMn749plYXRE
-ISZpF1e73Mn3Cr/rPk6YUX39K+pg8SqcKd2cT8VqOVnkw6EB4XxmfEsXX796Zif1
-qDxKtYguVbOzE3vJKQP2WM1nRh0rPttNyB3O3MyCF5R6h2Gyw7EtPvFUquGqbw94
-SAUOCFAUbP965xQfhMvXKAO30p2dJxqRFZp4hKsrnpx0AnxgaXKN2EvRLtzCSolS
-/nphNhLCqcZZmFQliL/TbHN4r9xdCpvqTnsByVFCWsdVVrW+ThgO69OAx7j+rVG0
-JC9kJzVnl6WAYA68DiyRVxr5L+2bTQq9ehBmkUT4RikU1X2cTNgc7DdbWp+/gna5
-9LfBfZ6NwDXssbQJLDlE7YTgfLU423q/fDtODDZgqg3dVqayOGqLOZfQD45wIqzW
-9owGO1Ncbtp2duYWIHYzAJIlrWuwkBHlqfk2AZcmId+T5y9cgGHaWeB/4OWScFgq
-8ZAo7USCv8TSCvJB+zKiOzvT+oMzYs7gWAZZVlpaBbeCbnNpDtp2ItvKe+ScCBtc
-dGwLbDGwt9rC3GkUF7+IsCgpq6xQjIa4NU0o42MqjQw5z3qkxnEgO36Iy6xu96JA
-I1qQ8aOqaEaFnhxDWh5TTUb0nortQn7KmEsPpdg1lhoV3Q3Y3DQfzZ1J
+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=
-----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 d3f0f45b3..e75b9d74a 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 475f38e03..84a84e606 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 b0f894083..d5e951d15 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 475f38e03..0a0bdd2d9 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 9b8ca8936..5db10e4ee 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 a6cb1068c..f91271ac5 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 a6cb1068c..f91271ac5 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 d5f1d2bd4..7a86399ec 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 56825b59a..eea20a776 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 56825b59a..eea20a776 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 21aa30fbe..375836b3a 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 f0cfdc467..307e5fbd1 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,21 @@
Bag Attributes
friendlyName: server2.example.net
- localKeyID: D2 9B A9 F4 48 0F EB D4 1A CA 1B 29 7A 49 FB 09 0B AA 4D 02
+ localKeyID: F5 18 BC 7C 70 B2 E0 30 3D E2 84 11 C8 38 AC C9 40 A9 2F 1C
subject=/CN=server2.example.net
issuer=/O=example.net/CN=clica Signing Cert rsa
-----BEGIN CERTIFICATE-----
MIICjDCCAfWgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJyy5Qho3LBb3L
-EbQZgsrtkPAqRXRhTME03lUdXHmtEkhGGe4zCrZ7RemAJADhR8aguhAebrVYno5e
-nZ+KS8CvE8z6eBJqQ5VhaKkb3JvCb5PyoWyXm3tMPufYtJ/1C13VT5cupGW4rJg0
-BEsRqlWl3qbfHmhgyDd1VWgLn6+X9wIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE
+MTAxMTI0NzQxWhcNMzcxMjAxMTI0NzQxWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGjmPu4xUrJQMW
+VFMlJbm6ZU8hVq1AYMQI0NIumzEN6l8g8kABcZusFP+FBN0OcvPAuVZNITtJiBZA
+CvDIa+ZxjWrwDP9AVNLG2I9fjzM+TQNLOPv4O+QxTqwZZBgF3uP8BNFaYvxcSmZ6
+LlgzcyciU4npp2LMaTxuWEd/i716vwIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE
8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB4G
A1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEA
-YfsNBKmjTjfIZw0vSzK7pq+ouXe9KAlCDZU/mgKMp0be6RYd9BRvAn4R2J452W2h
-AtBVl6vRqaqpMzsUIfwPe1lOb3at/ESz7CwtERTAfHPj6STDXLDyAF2Eg0B7xf1W
-9ag0Vwa1/6UPAALHQ5juuKAFsZSDVms2uz0x1oh9y+I=
+Z/TviUZC/prVkYrqbWpICiZM9erZaj6rhfDvpN8McbKa4qDQecD+pkan5QdWF30n
+HpDbs4fM8VSA1cjxbqh0ey8RioQa9F9PcoHpYaxR82gKZBakd+3odg+Evui+cXT2
+P77KWgYTOAejGpArL+E2XSDtbJXeUgzUWPbYzLC2quY=
-----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 6a6b032fb..0f28eb251 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-----
-MIICXQIBAAKBgQDJyy5Qho3LBb3LEbQZgsrtkPAqRXRhTME03lUdXHmtEkhGGe4z
-CrZ7RemAJADhR8aguhAebrVYno5enZ+KS8CvE8z6eBJqQ5VhaKkb3JvCb5PyoWyX
-m3tMPufYtJ/1C13VT5cupGW4rJg0BEsRqlWl3qbfHmhgyDd1VWgLn6+X9wIDAQAB
-AoGAXpuZ3TsYY2UPtJNaQtOlXHglgUwK4ktgEe9jLF7c1R3LMMKbgOa241jFvsQi
-fXxvTY+uWvZAo4nC6e0wjWAyt42LG7zyxeB6U20MA1IXhsOP0kDcC8grqcJ7f6dB
-o3xXm3AElUKbNQC6s2KGPL18VXUjwD4JGN75Q6brvVnKOCECQQDkOC3tQXXgjX21
-AfchkpajQwCKHsg5o6/YbiahGEQradrZIy8wBV/KvQm6l7k766wpTHJl9moXVieb
-e8oFGP4fAkEA4luEI6YW5yuEQkvf+fuu6dbBINU6cVxJHYd1XXz4XGtsbUm+1zQC
-VUCxxJRoWOA6URzbyK5LVynEgGOhdKp7KQJAVKeaMaXUieUyOhBukV+EzS6vZoyg
-jPDw64GAhsUvlEMB0QXCHTgBHn0cvMBHD7kN9YvL65KKK/njW0OB3n401QJBAKX/
-URdHjRI4YoSv2fAcd3h7CiSG2pYZhHEITrShmg1Epj47T53IQVG94N/1qdRLk9i6
-Hh+8Wfnw4m75IYVKJIkCQQDdEuPXVKYWrzEkgmM1+gGjjGRrBgrrMQ39hza+jq7C
-vYZM+Ulld9tBSaCmn3g3BYw+RNGGgxb46IZCS25RWQKW
+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==
-----END RSA PRIVATE KEY-----