18 files changed, 81 insertions, 81 deletions
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
index d08cdd2bd..2e4e703c9 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
 subject=/O=example.com/CN=clica Signing Cert rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDcyOFoX
-DTM4MDEwMTEyNDcyOFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
+DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALPyjRYPpSD4NwW1ob59fooPyIt6MZfZHCytw6pHuCqSoEGtgV4MiQv5FCo1
-8D4KjDqiH83F1m3rskdoe+yrhHs1qJMbuHiMypO/bCJnZxgVr77b0r8oYO7t7pMV
-artp/FBD6JcclozW1hXqni73KHTI4Ynh5u8xg3oXON2ksuq/AgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDL4M8dgA5BdOwSjIc78BoTA+l0/X/rQpGfetSpeQ9CfWTvf5GSh/yl
-vmWYIaC00cvcUbetcy0LQWouFv79tGkyEi2wW84nIovv5SB1eBhhYo04ew8Fehy0
-SmKDL0/L4V1mb4aEpBhuehn29RLcNfwfo7CDmdjq+HbPu7eJR0QqLQ==
+AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
+j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
+ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
+rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
+12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
+9wxD7gNq579mfo3O
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
 subject=/O=example.com/CN=clica CA rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDcyOFoX
-DTM4MDEwMTEyNDcyOFowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0BR2FQ8j
-dcW5AtTKe2JUaz8GCllSSbS94yoQsJ6C1BnosrULlUAqSVQV6wPfDAj6OrVkq0TB
-FCRrxKpp7u+90HBfO2F1jlAj368CqkVCUmrixNhgUvWCGBDOP99yGjhy/cipBudd
-tnQ/00DYVplqGWHZ1/o6/NgUSRStofoW1NMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEALmRb2kK6
-T/in3+m2nk+nSZE5Dox9z5kNshwbum13H/g38YN/vZO5uHXlRjnUdA2C458kH0JX
-h7sMUx7SI/Gfz9A3e3dgXH6CbvqQjDEzEJm0dAlKsDBlvXF5Uxb5e0E4w2x8t7h3
-nBMI8FRo68MiTLvUMFqIVeooqDZvqrohR4g=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
+DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
+6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
+NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
+mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
+SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
+Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
+0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
index f43cb97ad..4de477317 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
index 64e428698..0e9a65c83 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: expired2.example.com
-    localKeyID: C8 92 E3 6C C1 B3 89 9C C2 5B 4D B4 7C CD 4E E4 D5 00 E0 2B 
+    localKeyID: 13 D1 1B 1E C4 8B 1F 00 8D 23 B0 BC C6 9C A3 DE E8 54 52 4B 
 subject=/CN=expired2.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0NzMyWhcNMTIxMjAxMTI0NzMyWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzTkuXlg1oivf
-F0WSndp83SPk4D1tHNIfyUUcU02rVV2qWGkcjsNOu0q5xD+Qzqt6a2aIMBtB9OWi
-yX1M3IWV2LiUO4IPkWMc/Y+rsxk/PCithwsclCEhsX6IBxfgJToiZo6HtUOo90MH
-FbT9IJCS8i+qJ192D6egolCwv527FT0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA2WhcNMTIxMjAxMTIzNDA2WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/p1KbCGmXvd3
+2CREQzw5ICHJFqRf7TeGu4U8lnG1aDpag6CnC5ni8lKDDQq6B6TsWMqdsN9hU0mm
+R4YsHRCoHwBvqmG3Oq/9IHVuJ3YJXIE0BaLOzWeyatgPfGgJx3CT+vitKIofY69K
+bGWpWCIDdyCmSc/ShmUCPb/pPKwCyckCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
 BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQBhkA1vkUH7t0NeD1kQkT8ZDc3NQGUqKYu+GnuuzAXur0pZO7ugiGMEOnRJBd2m
-VubUXZTYt/OI5mFUufffWhHBlLMEWxG2DYAVemR30MdAGpck+F5qIqasRyA3nych
-/hM7sol1/fVvJCxKxbBS2lRM4+YSsFGuqsTkogB5n980eQ==
+gQChwUeDpqBL4BF4lviDt4Y2sFXti5lGLMODt7p2MQvXpcWMwKRsgnFvoNsyWkxI
+xOyp3X584xuq71OUl/UnKOjyKNZfHuYsGGq59CYtYqk6PHXBBL42lrdLX137HPEm
+IHJTA8Ktv1Ap1KaQ2z5PIMQmgIsXHjRHWj6FyuygrHrHig==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDcyOFoX
-DTM4MDEwMTEyNDcyOFowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
+DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBALPyjRYPpSD4NwW1ob59fooPyIt6MZfZHCytw6pHuCqSoEGtgV4MiQv5FCo1
-8D4KjDqiH83F1m3rskdoe+yrhHs1qJMbuHiMypO/bCJnZxgVr77b0r8oYO7t7pMV
-artp/FBD6JcclozW1hXqni73KHTI4Ynh5u8xg3oXON2ksuq/AgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQDL4M8dgA5BdOwSjIc78BoTA+l0/X/rQpGfetSpeQ9CfWTvf5GSh/yl
-vmWYIaC00cvcUbetcy0LQWouFv79tGkyEi2wW84nIovv5SB1eBhhYo04ew8Fehy0
-SmKDL0/L4V1mb4aEpBhuehn29RLcNfwfo7CDmdjq+HbPu7eJR0QqLQ==
+AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
+j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
+ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
+rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
+12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
+9wxD7gNq579mfo3O
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
index 2dc443ee9..0bdbc616f 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: expired2.example.com
-    localKeyID: C8 92 E3 6C C1 B3 89 9C C2 5B 4D B4 7C CD 4E E4 D5 00 E0 2B 
+    localKeyID: 13 D1 1B 1E C4 8B 1F 00 8D 23 B0 BC C6 9C A3 DE E8 54 52 4B 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQITQUL1WIAZ8kCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECII4JyptIrBoBIICgDRf7C0LRcst
-QQ4XnZUQGH/PG+bL4Go9G5pR6jlQrswdaKnUaPv7Mu0BPj51JILUO7enhT+Q6zYW
-s0kLovzPwQ5Eh1/htptrs6TiFPnkbfoCXoLE61d9Ksq+euYQRF4JvsWcDCmWZRFV
-TIR7f4wQHNxeUusBo67SHCekkHUMHxnyjMoEJQY2ZTngO+BPnx1yhFpGziBgj82E
-C6b9VX5pWPhZPMpRIELU6CXFslPCQvcV6O688R8TPaVc6drWCc0PtxxCUdhwS+0L
-StiJ2tL2OuSk6A/CMH2rBp52n1ToiRpeHwoVLkZ5cKsJVP05isdSSPAIugHtKuZq
-WIW/BFhX1ZngpF++2W8isFfPfSTp6ckuTkR2+ADCpV9zDf6HUG1FBblD6E9Uo2sh
-AXTvRMJLeUAR5qcGEFXIF0fZFOv5H836qDqBO3mkZa3Fb62hty/1IXhQNjBmd0dS
-p8oAf/ImpT7HXXDBFF8YgExQccfkAFL2hu8KgJ2NCl7ZABE7Mci8c8SYbHAvNsAs
-HauVVLxy00aYcu34mzORVDZ7cFp5DPgNCbxaHth40VxNpAR4amQwtBWZPzTyLeG+
-2xS/9N9Wzdp4NeKeNR47920vC7pR+jFGXtZ46YIIZx0FBNYcb04fTILoIFoPTSNC
-dkcy7i4VqkpU5B0GM3726TMDpplFlRKa/ybJvSFGo473xaPvspKMZ1MWoE09nhlN
-JGhv0KHMZUbT5W2xpq48zzf/nHOhiSu1ZdWYTJcZRilFOGbEU2TywCITZxy/bWCX
-uM6996SkGDZDMC4gWvJ6ND6SjvlPEMDaJxYSbPNaXtAU3UlzUI62xF09904vfO6A
-5TSEvdUyXr8=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqNmMZNmbK0wCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLYtdzXd+xBxBIICgEU6YBe7vPwh
+3zXWczIjyiE8oOZrYa0jOgJkLhP2pMCFsd6FoGqL8+uzSKyGkb+I0QFQgxZ+7x/D
+q2+cDZwGT4c4YYUf5WinvCvB5QL52ICxvY+iShtHoOXUc82Q4EHbvbksH1CPC7Tt
+39hHoPI5fVdOC2W1NV7a+p2lWFElA6xoNHlgIh7SUU979Vv9+JPIdo9h74NwQ2//
+y0FD/FvTsq3APAjGqU4SpEE3niD0JUmFAtvNpaLXKojbBbwBz43NXVZsEz/IF8OY
+EQ9wI0lhyAIHTKmi1gV1ZcW+ltmrYUbVybkd6DD1vyKxZFHnpf3sB2CHCLtFtxEJ
+149zcBCqFtM1Qp/IRGtIc2025tJWEVUQ+J17wRwgV3F/le4qLdqc2pkPdetJZjQE
+7XaJmvPu0u2rADczofmSF166lzIlNmvugYV0FaLnAcJxFs/uI7BUROLu7AQXQCVB
+GPkQUBZOwLxFyHChG09s1c/M/3rsClniFcWHaH2iIYeK2C4uRHUGCk+F2lQKCkld
+UAgXNtGK0rOSkLKSQQOkZOacCqBJufxGDFwkZC3WJvO8ixUyOBDF9iOrcnOwA/jB
+zdsdIhsCeMtt8lPwM210fuM+CXh8S1j3QULLhk7Z/+FninRSQH4bBKduE1TEHT3m
+X/fwXXQZgE+HeGJwKwQQnYoDX48w3Y/rfAPQUlWnZnNLMRT6Ukh3o+BqjG12WrfC
+zAFUo1xsBotkTW9Atvt2sU9J5VpNNih+Eu8Qcx9LDnlmRP7nyOXukz2sb4Jt9BID
+bAh/Dq8YpPkPZ76nFTjwGt4mLiIOEVhjEA/6lFYm1h8HD+d5XFFPfRFO3QeERRxa
+f8a9QA4M/cg=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
index 29bd41c3e..82e0adff3 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
index 813fdc129..ff4b0edee 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
index 2e5bb6e0c..f470c4b28 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
index 813fdc129..ff4b0edee 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
index b85a9fe22..26926e913 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
index 647b771c9..0da2cffc8 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
index 647b771c9..0da2cffc8 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
index e94b01653..04cf310e0 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
index 151bc0f00..21d2ff3c6 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
index 151bc0f00..21d2ff3c6 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
index 0606934d6..2ee1350bb 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
index 00a39d09d..a0264a069 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: expired2.example.com
-    localKeyID: C8 92 E3 6C C1 B3 89 9C C2 5B 4D B4 7C CD 4E E4 D5 00 E0 2B 
+    localKeyID: 13 D1 1B 1E C4 8B 1F 00 8D 23 B0 BC C6 9C A3 DE E8 54 52 4B 
 subject=/CN=expired2.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0NzMyWhcNMTIxMjAxMTI0NzMyWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzTkuXlg1oivf
-F0WSndp83SPk4D1tHNIfyUUcU02rVV2qWGkcjsNOu0q5xD+Qzqt6a2aIMBtB9OWi
-yX1M3IWV2LiUO4IPkWMc/Y+rsxk/PCithwsclCEhsX6IBxfgJToiZo6HtUOo90MH
-FbT9IJCS8i+qJ192D6egolCwv527FT0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA2WhcNMTIxMjAxMTIzNDA2WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/p1KbCGmXvd3
+2CREQzw5ICHJFqRf7TeGu4U8lnG1aDpag6CnC5ni8lKDDQq6B6TsWMqdsN9hU0mm
+R4YsHRCoHwBvqmG3Oq/9IHVuJ3YJXIE0BaLOzWeyatgPfGgJx3CT+vitKIofY69K
+bGWpWCIDdyCmSc/ShmUCPb/pPKwCyckCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
 BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQBhkA1vkUH7t0NeD1kQkT8ZDc3NQGUqKYu+GnuuzAXur0pZO7ugiGMEOnRJBd2m
-VubUXZTYt/OI5mFUufffWhHBlLMEWxG2DYAVemR30MdAGpck+F5qIqasRyA3nych
-/hM7sol1/fVvJCxKxbBS2lRM4+YSsFGuqsTkogB5n980eQ==
+gQChwUeDpqBL4BF4lviDt4Y2sFXti5lGLMODt7p2MQvXpcWMwKRsgnFvoNsyWkxI
+xOyp3X584xuq71OUl/UnKOjyKNZfHuYsGGq59CYtYqk6PHXBBL42lrdLX137HPEm
+IHJTA8Ktv1Ap1KaQ2z5PIMQmgIsXHjRHWj6FyuygrHrHig==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
index d8e87972b..81e842218 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDNOS5eWDWiK98XRZKd2nzdI+TgPW0c0h/JRRxTTatVXapYaRyO
-w067SrnEP5DOq3prZogwG0H05aLJfUzchZXYuJQ7gg+RYxz9j6uzGT88KK2HCxyU
-ISGxfogHF+AlOiJmjoe1Q6j3QwcVtP0gkJLyL6onX3YPp6CiULC/nbsVPQIDAQAB
-AoGADfRGZkN1miPriAfC0v+8bJKSCUe3KwK3bWMV0vnXNyqNEg5Ln88N6m3hUpCT
-7K/71sbimb39iFGY9deSqcGRKuUhEAvqddIVRR8UyxrTnkCysxO2LSQACPF/i68/
-l52ELYYG64t87AwTh6ALzFgqnqC4L2wFaO4yqmXH/Yz+es0CQQDnwcl/No4Y1/qu
-i1AEtU9VNUH0LsR/urJhHm16cFfBssI//p3JBmfRaJ6YSxtpDm6LO8nroPrvUY8q
-+cfmb3qnAkEA4rDZ49HS8fGYrwllqgvGr3Pe7F5NhgMzdyQoaH/rO9oOab2LHCng
-j4E62biarqM0C7jSMrInwf6uqBCl4FuBewJAUSk9Tm6ljq+8W3nwOOXh9X4kLcZf
-DDgulfJY9qL3KJ9YhZ6+VRMIMn7H45+R5tWmAt6aVQlYN41BbRRyXBG4SwJAP/W8
-FI5wITmUZdaV66uU7I4Z2MEmyGgAzl3SVOG6wlFc/bKwHEsog/TnYOS4KAv+NEx6
-ajlgBFlSeDLySmInHwJBAIis0eQycpPVFiLFyrY4kFICcd0WRe4BSrlZoBYYpu86
-wwI85ASp0Dqwf1eV6InG8yj3ew9sHHM/6+plzML5qWU=
+MIICXgIBAAKBgQD+nUpsIaZe93fYJERDPDkgIckWpF/tN4a7hTyWcbVoOlqDoKcL
+meLyUoMNCroHpOxYyp2w32FTSaZHhiwdEKgfAG+qYbc6r/0gdW4ndglcgTQFos7N
+Z7Jq2A98aAnHcJP6+K0oih9jr0psZalYIgN3IKZJz9KGZQI9v+k8rALJyQIDAQAB
+AoGAN45ims2M29PrloHzUyhk3poAoqwjMkOXZntgCQOurZtt/KKlUGa3mmBesA3T
+Ia/e0lEDr4BOYDoFyj2AiqcDx7CKLY0yw5Q9bPJk+uotxLwxKqjozKZ12MukgW4O
+F5c1VUCs82nGVOUL+RG1O+VuKR5HD6ZEfmzo8128h1+RXsECQQD/XalrSHVY97LM
+60Xua+Nj3bG1wskfYMdWHKKqzisFJrHGr2twnTocrL6+5VWC1Qww6BUzmXidBMzi
+Mb6Aw3QlAkEA/z8mth9qM0VII3/+QoA0aDSe7zRykpqMo0t7hz+pyYD4UD34RV+H
+Grpa/DmQACyCoYsdPfvQ9ebzboLE6pJb1QJBAJ8tL9S6xsLdK2vGX8HdKFFwuDw3
+HYzck4RetxrHBlPgqcHSSKNargV/vCpb43B5Am9dyxFt4ZvmiRuZrEixDK0CQQCf
+tbUUOf3qjMxBokHG/I9OMLbN9+RExT2Ao6dsjjI/6ln1Y4Eob0iLOdXagm4PHcqz
+J+epNBqg8tyY5mwuVlvtAkEAgj/L2N9aHS/5xT+PTYsWpbKD13a85gvmrzZZVQnw
+obQMq5awOD9y4u3xqNSr8i/Hhx9biSDteQdYl2JZimHosg==
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
index acf918d1e..24cc6078f 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db