18 files changed, 74 insertions, 73 deletions

diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem
index f262d8f92..21c59228d 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.org/CN=clica Signing Cert rsa
 issuer=/O=example.org/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
-DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczNFoX
+DTM4MDEwMTEyNDczNFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJXe07nxVSZPJ3rVBHQp+m5gWb5/JkzXwcWKEvcmMnJzo2ydVfHBBRmTpzpS
-ST3js2awNbhEdOU7AeBtAvyOtwlT/yp6SHhOlI8PlgLwL9/xedeC0Ex412VOeaV/
-LRbvj0j+WutuglAFXfD5IlwnRoDUB1Q51JFtYZxlxvOqbLb9AgMBAAGjWjBYMA4G
+AoGBAKZv+bgWOI9qjQJd3Y95xvMdMNmF1EWjAVry+Q6w4Jtrjvo3fsYJu/KFLkML
+zfATGPgmf2YvlQITw4gCVXquKmlkjH8ZDkVYTQvBv7UzrlksLL9gTtm9UoouG/tA
+WByDkFPGvNVOIgUXIGLzc8kjmp6OJmQENS3FlP53YotrEGppAgMBAAGjWjBYMA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
 oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQCf9uWkJrIlu9DvKwiiRj6/vMFydd9kLq11COjAovfD6+VbRLeX1lpC
-XpHDhUlrAKOV/5Virl+iXao5YnfnCm1oud0jRGcG8x1JPqUKW3REch4vR0wkjaBS
-5eI7DiydPL1yts588Z6gLjHZBaR0cuXS4e1k9rcXuBC9tZjv7rYskQ==
+AQsFAAOBgQAeIGkSmwyU57tDZKA9tjO0/GKD9b4SvDsNs3oDy4WGwQ764s0byh8Y
+ASGoOOAamb842slg3XaooCEYbLFeErKL/KApWQvmVjZgYwckXj/SERpjLKxISMjO
+ZWcKmZiaARIPYzZJKG66BUGLD51qpRMCAsDnE/kf6XPWV0JaAdrZYA==
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.org/CN=clica CA rsa
 issuer=/O=example.org/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
-DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsOI8xlyV
-2kpju6cf0E8/c0QwaOBvUGzkTdCau/DyQrwFPToVpVW8mzDQUOnoUXLl92EJa4Td
-a4uN/uyiyTcjUQWrlZKdFn9HaLB7+rLUox6fZF06jsWgC0Qfr3HHWsrMINn6bucC
-9/eZag5ADPyO5XYnCW4pIFnuFVQ+w3Qr060CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEALAPJGCfj
-ldkldb3pxmUf8V2luI38AVKNZokjATe3tyv7ikhb2g20BRi92fMHOqfAMUfoJKAu
-lT5vLep0SUETmAXdr3+WfFeZu2KZ9t5lhxyUGnHhxDc3k8TzobZSpFS9+ZnR/4GY
-TwGhx36iRUIFRZ/PUQrkRniedLSkO+H+Xko=
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczM1oX
+DTM4MDEwMTEyNDczM1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsGboLNgO
+VK5xiqFWxJI61S430vafiz0ox7vNv1JtKox2vvqrIdCbhWzq7+MxG5mAx00s/Z/X
+d3EH6KhDtv0F329n5Xynw6eJlhEazuEEdrlgAczGop5RXw5BIdKpRNiUVP/QVCtw
+yHVgxmEXO29iv3p5SfU5kKdL3HNrDNM58WcCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAbPEgbXcX
+qnBzwKZ1d4EqwXAhQhDgoSoMUyiYraJPe+RNF34MdNDqhHkU2IIgMtz5ylnsQRHU
+vnAnbnX6ndGvOy+OyBwlXFuaS+nR37surhjxBYCsUE0OOiNONiLHeSCJIR4zTjIJ
+c1nvJsbTO2EI0ttp4/9VRHSl4IkYz0Ed9oA=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db
index df32fcc24..04fb776a6 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem
index 6f578b3e3..aeaf65c18 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: expired2.example.org
-    localKeyID: BB AD 3B 61 9B C1 5F B5 67 B4 E6 DC D0 B0 CD DA DF 58 AF 9A 
+    localKeyID: 04 CE 42 41 A5 C8 2E C8 69 53 E9 A2 52 CF B6 97 97 D4 13 33 
 subject=/CN=expired2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDAzWhcNMTIxMjAxMTIzNDAzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuC3gS3mRxtQs
-p4mpWah7L1G1/XIVVKxVRhfI2UGEOsSKZNOP5R0qZoknOR9aMKIlNLlG3N50yzbi
-1MnPpZspxORknzmixiLWk8JcB2sAHWkFeZiCzlEQRAfAc3ky1tPNq+SvYOKRtP4Q
-WmMioidONvkk6BXVoIkzK2UlH3xCmp0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTI0NzM3WhcNMTIxMjAxMTI0NzM3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtLOTRwT07JC0
+Hi9av7Q/zV/Tr6VSWPPNUmZGNyx8Z7Q9KxKaUq0qMV4e70QyghYZBmmOy0639mPW
+cm3dirhhKEOfnUIxGX6yBp/B3/gML3vlgYfs5/h6ww49euP4ojQajuUkjJ8snEyS
+5SJjYsB6yDmSRVILRyqOUALuTAz6XfUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAf
 BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOB
-gQBNWz+6NypcliTvDdbksywD8VXNkGaK4FjJeb9nSqFWaAQdIT9sBeHQEusBWdJv
-cfX/Ik2JHtjCpuGCcfK0thQllovsY5dXrSW92F6VBuQvls+ETsNnRqJKz3CtJ9mO
-mC/FGMXIStcSIH931F7afUyw66QLJILUqXcot8HZtn/lUg==
+gQALD3bBrF5GsLm0cZvJs/0BfgOgUAd5fHbBP+0MDc99svl76+FvUwvYPrCflfGb
+poAla/kjuaXN0Lp+OS5XfD01jf2d2HI/1tSf+WygM7O9YVtjvv+hP3RE79zPP7GZ
+6X4M/L2Xnkkzj8rxnKW0IHaNV+6Hfagu0W08vZK2Ni8Atw==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt

-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX

-DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT

+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczNFoX

+DTM4MDEwMTEyNDczNFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT

 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ

-AoGBAJXe07nxVSZPJ3rVBHQp+m5gWb5/JkzXwcWKEvcmMnJzo2ydVfHBBRmTpzpS

-ST3js2awNbhEdOU7AeBtAvyOtwlT/yp6SHhOlI8PlgLwL9/xedeC0Ex412VOeaV/

-LRbvj0j+WutuglAFXfD5IlwnRoDUB1Q51JFtYZxlxvOqbLb9AgMBAAGjWjBYMA4G

+AoGBAKZv+bgWOI9qjQJd3Y95xvMdMNmF1EWjAVry+Q6w4Jtrjvo3fsYJu/KFLkML

+zfATGPgmf2YvlQITw4gCVXquKmlkjH8ZDkVYTQvBv7UzrlksLL9gTtm9UoouG/tA

+WByDkFPGvNVOIgUXIGLzc8kjmp6OJmQENS3FlP53YotrEGppAgMBAAGjWjBYMA4G

 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al

 oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDANBgkqhkiG9w0B

-AQsFAAOBgQCf9uWkJrIlu9DvKwiiRj6/vMFydd9kLq11COjAovfD6+VbRLeX1lpC

-XpHDhUlrAKOV/5Virl+iXao5YnfnCm1oud0jRGcG8x1JPqUKW3REch4vR0wkjaBS

-5eI7DiydPL1yts588Z6gLjHZBaR0cuXS4e1k9rcXuBC9tZjv7rYskQ==
+AQsFAAOBgQAeIGkSmwyU57tDZKA9tjO0/GKD9b4SvDsNs3oDy4WGwQ764s0byh8Y

+ASGoOOAamb842slg3XaooCEYbLFeErKL/KApWQvmVjZgYwckXj/SERpjLKxISMjO

+ZWcKmZiaARIPYzZJKG66BUGLD51qpRMCAsDnE/kf6XPWV0JaAdrZYA==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key
index 7cf237255..21f8a23e1 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.key
@@ -1,21 +1,22 @@
 Bag Attributes
     friendlyName: expired2.example.org
-    localKeyID: BB AD 3B 61 9B C1 5F B5 67 B4 E6 DC D0 B0 CD DA DF 58 AF 9A 
+    localKeyID: 04 CE 42 41 A5 C8 2E C8 69 53 E9 A2 52 CF B6 97 97 D4 13 33 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIhR31sug2jNUCAggA
-MBQGCCqGSIb3DQMHBAjmdQ9DQshYOASCAoB/PWWnLSUdq0gZinlHkq5wBMm1yEwT
-xxYLoGurDsSDN6j7fbHW/ZDTfHAMrf9ecXfODIPn2wntOF8SDifq5YZDH4+zaHvR
-Rsz/2I5/xQ/+WlDOXrxpNPC2NqkK0N5R/VXfAWCSs1MaE19w56tYuPuzBtRtcw5x
-Ln2uJkjJl1SWh1TOiIfpc2Ld+7g6IpTR44JLz9k7GNtJWFUg/NDYGMy9vEDLQv4e
-lPPmol8ipjR1GXymv22abNi9aL6RND6olOnUZQk1Gr9ugMxAUEAOWFhsrtY6+Ul0
-dPAhgOsmXlUuwDIpewRw++gbkr4+rIKgWveHG8uZy+Z+sjlgqjqb85onnWCGU9xz
-HtarbkvVp2FKa8frAF6bCG7yRaImIFBnyNJQn1qYQtfJuu60RmrKYLhvM2rGTqKX
-V7BQ72GrJ4VeG77I1uvYKNwiSELYaWrKnTIZR/KhJJVCN1/XNSXJzb+zpZDIo2xW
-seyvfsoKIX+RXtOjtx9OhBT24DREiz1F7pV12e0q4z8VUMxpV16fmVA8SH+3v251
-5TTRksGSbFm43z45WWnylOhzJj+bkSOPoRGPBTDU9/Xvem8ni2ZCAoPxBewkLs99
-JsYHsjPGclynF9Lglsb3plN2unhPwH+kIsJ6hi4RMRJAzsWV0LWtRx49UBEinnDM
-1udwIzveVAaZzcM3qC4oQf7L1yHjBdj+eh6sj017uAPdptIDLjsCT789zJUj0qUq
-kEia++A+ks0qhhuBCPMUrkxEwF7V5x5aBCYwLLES5gtD9xn3ruYrZVnXGtIRAK4Z
-YZu3G+qVXwjBlbECSmnVSgR/dC31+c2s/F4TBjQ0pKlxt272agIdNjBE
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIDR4R2r6R/zoCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECKjFa5GoV+LtBIICgPJ+fWF/wXHp
+owAFBRWgDTlNW5HOjH+PzkooDWHt1Kb1kR8mVgBiIOCMc5MSdlFAAobpei9cPM9n
+3Q+zwKTzhb/8svZ5/rK7MxvAhFn4M3mINwlcXlqK3PmlS1GkLhimMSIhWddlGz1I
+DSOqDbz2LQsICx7TuxYPN1taBH9GNBP6avKVNVO5ZFa8LYUZSsqAWoPBJVCUTKfU
+EE2U6HIJy2JNZWKFEWwaB6EnH62bi5pJMV637tvugJmpsc7UL3CcCT//OTeozF0v
+25nuajB1TOXfkTD6Lv4zoCgOu4vcfqHK/eIKjzeRzsywHDzx5dFKOeWWszbh9+Kj
+T6ko64R7++z2g35+/XyZwKAftX+uw8f7NDUJrl4pVYVMRCjKlVY/uRt/SCCQMklN
+8tyfuJ0+7VWzJxG9mA2fpOJPHJ2W7lpy7w4fycOpSA2jBsCq9s0FcaswfjZ1wvrI
+AIDUDqcyK/WMZEW2Um4cFWOOVTBCogmNv6gAc7WqLADSIqaPDTB6tWsFPI5G0mE4
+pQZwT3DRGPzIW0hvHdvLUP0qkpZ2plOsbXJKuCfV4H4yhCWuLLpsF8AO7WgYso//
+CdkjgFozli8Yt+3bvO+nMIthlnEWTTH+bkUPU9NGPrpw8QbTQIEtnedp7DzM92Tj
+WdqoO2DC298hbqCuQi4fLa0rHXXBXSxhmrDFvOuVIm3O32lAEAQ+tXcnbju7wQmW
+sRsOpj+3p3HCeszC8yKraVKTIIUI8X8x+Q9Uhb7fPC1MxIrxDo9w4UzI9lrgrH3v
+lkP2P1z7TAbPOzZx889h/55Lmy7F/yatdPOvc9N2aU1vhln/pgA2Mqw9JNJ8zxZL
+w6ayNrGMYs4=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp
index 6db1fb1a0..49d1d0a9e 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp
index 8d8d1d62f..0bbd61532 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req
index 359deeb9f..80d6cd340 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp
index 8d8d1d62f..0bbd61532 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp
index 297300c72..1817a6088 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp
index 3e4d296fe..82c8148d2 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp
index 3e4d296fe..82c8148d2 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp
index 23c7542ec..9f4d78444 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp
index 089e56efa..38a0b258a 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp
index 089e56efa..38a0b258a 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12 b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12
index 05237d5d0..c97b84fb9 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.p12
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem
index b40e4a1fb..879dfbd88 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: expired2.example.org
-    localKeyID: BB AD 3B 61 9B C1 5F B5 67 B4 E6 DC D0 B0 CD DA DF 58 AF 9A 
+    localKeyID: 04 CE 42 41 A5 C8 2E C8 69 53 E9 A2 52 CF B6 97 97 D4 13 33 
 subject=/CN=expired2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDAzWhcNMTIxMjAxMTIzNDAzWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuC3gS3mRxtQs
-p4mpWah7L1G1/XIVVKxVRhfI2UGEOsSKZNOP5R0qZoknOR9aMKIlNLlG3N50yzbi
-1MnPpZspxORknzmixiLWk8JcB2sAHWkFeZiCzlEQRAfAc3ky1tPNq+SvYOKRtP4Q
-WmMioidONvkk6BXVoIkzK2UlH3xCmp0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTI0NzM3WhcNMTIxMjAxMTI0NzM3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtLOTRwT07JC0
+Hi9av7Q/zV/Tr6VSWPPNUmZGNyx8Z7Q9KxKaUq0qMV4e70QyghYZBmmOy0639mPW
+cm3dirhhKEOfnUIxGX6yBp/B3/gML3vlgYfs5/h6ww49euP4ojQajuUkjJ8snEyS
+5SJjYsB6yDmSRVILRyqOUALuTAz6XfUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAf
 BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOB
-gQBNWz+6NypcliTvDdbksywD8VXNkGaK4FjJeb9nSqFWaAQdIT9sBeHQEusBWdJv
-cfX/Ik2JHtjCpuGCcfK0thQllovsY5dXrSW92F6VBuQvls+ETsNnRqJKz3CtJ9mO
-mC/FGMXIStcSIH931F7afUyw66QLJILUqXcot8HZtn/lUg==
+gQALD3bBrF5GsLm0cZvJs/0BfgOgUAd5fHbBP+0MDc99svl76+FvUwvYPrCflfGb
+poAla/kjuaXN0Lp+OS5XfD01jf2d2HI/1tSf+WygM7O9YVtjvv+hP3RE79zPP7GZ
+6X4M/L2Xnkkzj8rxnKW0IHaNV+6Hfagu0W08vZK2Ni8Atw==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key
index 37f00cb47..d30d3dc64 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/expired2.example.org.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC4LeBLeZHG1CynialZqHsvUbX9chVUrFVGF8jZQYQ6xIpk04/l
-HSpmiSc5H1owoiU0uUbc3nTLNuLUyc+lmynE5GSfOaLGItaTwlwHawAdaQV5mILO
-URBEB8BzeTLW082r5K9g4pG0/hBaYyKiJ042+SToFdWgiTMrZSUffEKanQIDAQAB
-AoGABlqm01PFYLuvMrSAIDS80zwZcD4AWGR9qKZnan9lJXXkZGgcHcZs0Q7ISKM5
-RFZDvFbsB/CwzNX+62JvBIKe5ToSgpF2DxBeIiMCIqDYeD2RYEcozGaV1KIjxpMJ
-ZZlwTKcgx0f53QbNK0jpfJu/7kS4afFmjp3iPDVxqSIkMqECQQDgAd08lz5Jd61/
-X7OLK9HVYHD44WbgYnSQcg/oYoOxPw5Rr5VPc2ZSoemITs0uZtsbc+y2Qb2TDbJC
-zuHV5foVAkEA0nvSLsru8rXpanhZbKtMXXQjZaaphQh6cCBzxyonHABlQNzgNZQs
-ZpGk0MbAkK0o12MCMBSB4OCCV3QuDBzoaQJBANu22GIq0qxK14D8xGU4KMuKmaRz
-qW1jBIP9bL75icQbXhcfCmtwfCeGqkHJURU3S6gEr2Qg3SnUoElJFFeyB/UCQBtS
-XU8bona47EqYwqrbdXcwCyQ3xQtytUn2vHCe5SK6XmpUAXqS+Ex8HVPIaNie0Y1b
-2b3Z+53wJpsphoyl9/kCQExmOpZ5BaPGbzJ0MfJ+j9JBXs8mvQ/PEwNZc6COagvX
-WlV64tajDOtGMZt2l5Hy/0Y0gxbyINm5jEb3boG6NQw=
+MIICXAIBAAKBgQC0s5NHBPTskLQeL1q/tD/NX9OvpVJY881SZkY3LHxntD0rEppS
+rSoxXh7vRDKCFhkGaY7LTrf2Y9Zybd2KuGEoQ5+dQjEZfrIGn8Hf+Awve+WBh+zn
++HrDDj164/iiNBqO5SSMnyycTJLlImNiwHrIOZJFUgtHKo5QAu5MDPpd9QIDAQAB
+AoGAC7jDYr2+UpMvb+7T9PARHHYtIe14Okd0Z/Y081LKLiL5vc/K3XaYsFOh75Tt
+rtUWof0ac3NDiTLgQBOC5cMAoFNHqIirppRnFEhXDe0Fzuyr9TBUwmStyyjJdOKL
+kFSLqJEBtRiJJLQ6gms7ZYG2ggHQ/jp4fZiOa76ZmjQXW7ECQQDoc+pV3nm+0ola
+oiGg7kXAC/dthFLhBRTASAeznmbv9FsISqSq7Ofqb7Lo1BQt4wXYx/cDE50mXyQ8
+D/5ubydxAkEAxwGeN/XA4YpFMn8Y25TYjtRDhpuLBiLJO2PF9TTzA3np0LNrvZ35
+0mpVmmp0VmeKt68o/aU8v6uyqbecNOdExQJAXElg+LR5+1OU6qHB3iWbFZLqqdVG
+HkYpJemy/RHfZlbKKXGRDLc/n+i2zA8e79TZBmblX5hS5OAS/7GN3wRMUQJAEbM2
+JFoKVsUalHwzdMxPWpzMiLtq6RfM+ChOohmch7GfNz3OFmZnouxsQri3MjwxXVcJ
++U1qEs4trOS00wvC1QJBAJayLFu9/0CN10JWKk/e8rVxj5TXg9Kp2QFO/a4ogAI4
+NseNd91TN6AEz6YijJ9EptCF/r69GBK2TNkXU2ZKPds=
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db
index 72fa289f2..017259ee7 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key3.db