Testsuite: regenerate certificates tree

The OCSP proofs had become out-of-date

18 files changed, 134 insertions, 141 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 fde8b8440..ea630e470 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
@@ -1,49 +1,45 @@
 Bag Attributes
     friendlyName: Signing Cert rsa
 subject=O = example.org, CN = clica Signing Cert rsa
-
 issuer=O = example.org, CN = clica CA rsa
-
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
 subject=O = example.org, CN = clica CA rsa
-
 issuer=O = example.org, CN = clica CA rsa
-
 -----BEGIN CERTIFICATE-----
 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
-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
+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
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.db
index 509076430..6a81724c7 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.db
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/cert9.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 a14a1a159..666cfa01c 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,48 +1,46 @@
 Bag Attributes
     friendlyName: expired2.example.org
-    localKeyID: 5E 0D A4 8A 7A B3 32 7B 67 E8 48 43 FD 1D 4C 7E 1D DA 20 3A 
+    localKeyID: 02 20 D1 08 3A FE 2F EF 1E 3C 25 66 95 53 7D E6 9C 02 04 B9 
 subject=CN = expired2.example.org
-
 issuer=O = example.org, CN = clica Signing Cert rsa
-
 -----BEGIN CERTIFICATE-----
 MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNTM3WhcNMTIxMjAxMTIzNTM3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7WA8L3
-Io9uXvTeTr5NDRVIjx9/holJ4CPd1v9t6ci/Lg0pD72zWdXZ+E7m9/j4idcCzybb
-i8LtqbDq1boucCqVMVjlCda0BC4Kh7zE6LyYhXehQnl2bXrZfW69NkB1WJEZNl++
-BzG8WYLeuUOK0IvCdJMVvEjyIYltgnZzrhHWS85lpjVgu7jqkhBzV+5AmnejNjjp
-u/9ccWnusaP8O8qa1rCO+bl3QdQapY5fUvdMwptVjmSqU3BiqZszMY/aqt5L3npK
-9jJvEVQuUsgkY0xswmAcIO0lhazZdYaWnF2TLo4B76+DM3mocysr5HYR0zrxzx0F
-1idD32kqyxP2UT8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
+MTAxMTIzNzAwWhcNMTkxMjAxMTIzNzAwWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkwW6Hj
++v99C4FzJbiSCXjpYjRkKNFaeniNYYnyfv2vrj0M/cfCWegS8jumijAOtyx8OpaF
+g+dIrDMeR+XdAYiyFsJ5zOOPqOZWK3vRMMLqqhnbL7m9YAo4M86+nLaAZjj2Y+77
+zlXtM703hoYJuxqTdDzu0o/H6NSuroWTWNnSXBCRDkXKe51gScXhWc5PvDOazytG
+pjhfiHIamJ5XKjv8mFVZBPMv7S4jD3kPgwTbFBJpg3hYa/ZCEMz73iuBglWfPkhs
+yliijUJT+N+O58RGt4Qa6Gz/lLnY9mkumgxUIfhokagHYBGR04rorQN5c+3UGp2Y
+G0bXNZOwvFEqzJcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
 BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
 Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
 KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAU94mx7anOL09
-DgqdcLjgbLdAO1e5obDnJwyvIgqpaMVEJ9crp+uDytIIBl4EQXrH6J1etBeflgVd
-w2VKBc7PTpgyoN1xfJE/8lF2e//sNWJuHBFzOmi7+OuBIhS0N9G5CL7tG6TkmlYx
-B2JWly3e0o/Z3nH8XFwsZ90sJFSwbrMQTNkN689tVezdV2/H4ESWYjsf+NAP7EdL
-1C+aOnEQXta5yW/aMSOQ2oe5wTlE3SeO6WFuQGK73/hY68WMSsm+MCJGQI1Hv/n6
-RGLfy8RV2Cpr+0yuV87yjKwxq9m1fqbPKUt1oFhBRtwG650HDtaB/E8vYVr4OGUu
-Nt5NtFVPkA==
+eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAgwzs6ES1kFpM
+0lXlonr0EwnuRhyHH6vF5f3ZQhfoyz8k+LZVvXkyYYcvRzjIuL+214zYawaG7ejq
+AoZN/HgezRsYHCbvUgYJ3KIMo1rhZn1NDNVilsFpIw2O9vNvJw5WQr1CGcBta5KM
+x1XOeqWW0W6FDtLYm1RMBV+F3DG4oPuqRPZe9GXFa704q7DHdeu8iNoOSgHAqOO6
+CXe7S199nAyrSlWU2f/Oo4NaB4NRqfTc5ixaX3HlmO8zVaZgxPaCuLUluBfMNuNa
+Dyz9jt6k0hwrnUZyxGd2PNunDqUSuaC5bWo12VvbRuwZzHd1f5vq5tOML2RzKNVY
+CIuaojP0Wg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 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

-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

+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

-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

+ggEKAoIBAQCz3PscJ1OyIh4nk8O57PcZUPmXyzho/Lmp6x+hYp2ride53caP9K13

+oqO/ePewy8eoFp9CrI2bJgQsiAyjnwE81XKfchgNcx2VPWpU8L1QOpVsfnMY9Zle

+ITANrpy/jRFtFd8n6tx+Z52Vei5zKGeO+mxy/xGATiwtnFBcMfQaQEEJSCVZx5/B

+CccRXzq07ocQ15igChsDdLx97d0WqI3q8cprZUnax0lsdokg8ayNNKWILo7vPzdS

+/xvGGufA6TbUYaxkypUtJjyY2WAZTuc2GmI7Fi1I93z3L4lvnpYtSTavcO9/HrFI

+Bp5viKbO/AFb6wliv7k7oMy4cZ/UcCOPAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB

 BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G

-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
+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
 -----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 b2b76561e..925264e9a 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,34 +1,34 @@
 Bag Attributes
     friendlyName: expired2.example.org
-    localKeyID: 5E 0D A4 8A 7A B3 32 7B 67 E8 48 43 FD 1D 4C 7E 1D DA 20 3A 
+    localKeyID: 02 20 D1 08 3A FE 2F EF 1E 3C 25 66 95 53 7D E6 9C 02 04 B9 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIvY1tMKm0wYMCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPtnBBM5FyScBIIEyBr9qAgCEAK3
-BFu19YYqK4S0wRQmlKobotifQ3U5f5DAMNyTzthH5BKBEApwXQ/84uQYC7NaiGUf
-TjjPr2x+uUvzfLtHj+I8la/YDTZQbPEK5q+8GahrSpghviR1MuS1g+smB6AV/k8O
-l3NKX3RbjuEix3t3EulTjs98nrQXJaY8eQcwCwNYki/DVJr2dgL+75CJXq/oVZQ2
-I5B1RQ6SBrLZwng9gEcGtx6EJA7sV7SpiFGVonFlfr4Tdt0uuozH329aWkpr0NYp
-s+CIBcaOv6cXzN5yYf/FsAOHpqvWCV5R01fHQgdphEf2XBqiG8f24bDkIKHOwM5o
-+kqvVltKAECIAe7tNQcrilEkJJsU6YbuGzMm2Lf8vsDrGJALR6CKBic8nRB9BChU
-ELbgoKhQpo6hewvgghA+K4OKP9ZUjEY8WrsCXkx5Aski2zS4ox6P/qiYCY1vrenD
-aTFTXE/fdDIMZCQGM4GwMaS8s1Q3OR9SCdveOO0wJVJ7Opzjy21HhBoCec9fr1m8
-KEZFcplnx5QjGvLn/ibI8Lb5DAFphwzUxVqyAotxsYvBzoqa9AwcXb6BLpL+SmVW
-+zTPdOG0iFSP1YIVt99F0+14wGifkutL+WewhWVX4WjmwU8cTlGVMBI/AGTd4hOo
-7H07Gwgk3FVPkNyDWiwzENsOkyPN/HQTwtVIAImaNcEyMgK5OYUhbK8mVDQpSs4j
-sAd/6nGJvcXnajixdx+jynk+cvdbVkm+om1pdaAbpx6rsw6LZp4PGdiAxtdaRsdx
-Vqqej638t019rH+OZa+m7rjgLSkiS2+t0Yd0vJxx75xcxHDw3ClfCb1/Kvzy+gxs
-ZM0h6JHRo9GJ65W8EVFlfV+qG4mmMzLOZWeOyvkeQbO5sHSzFpO63860ufRVCO/Q
-jN20Z9aCgRj7V0u9wY4ag0gPlp3UtZ+OpaqUxZQC033QYVmNJOgbbwvmsfJX/k/o
-72mcEN6WZ5QGWXCyXUX1vnI8ZCx5MVw/xFamOglf8NZ3JGKuGKaojdd7jjz2XUB3
-8PE4Y9tRFjCMS8X+D1oxI75Teis3InE4dvRE9d6S/mWvn9+IDgki8YD4kFxL9ymG
-KG+GFjijkaGeZm+Ue/grzhVKbHaE++ZEzeEzIvPkw+KG5GSXkWQa3n4DoE9RRu42
-0PwIXQYyu6/aQMeEW4M+o5e18SO31+hw9jQQG7/gfnZL2PH179mwSVIoSR/EVHN6
-OHNyspTFVy9DaVLoa3HQeP36jEcL1s027i7MVJ+HZTQnvVScrHsIK/9KqDfgIkXR
-VESlJ5n/NTu6I7nwoJGojXKCMDJZXllzg0lmixan7yoG2FYzx/he73jB4ghc3yvJ
-zhWAJcAOcAPiuaHCMmARMIPDggl/owRbqF7uxrblC4tB9QluoVFVf+F02ieNWuvN
-fpTcdO7NotTfJKAk4DmJUCrPiJI3j/+rLjjBcT8HgJ4SG1WeQlEgt8vLF8Pbu3RY
-NcGcpnnqfBSmJof9s5tczv25GnQEhhsrJ+VPC/QIMsE3Tjgjl7h9RIkZMsxB+sIF
-BbBFl9XmC3ILsUXZw0MBViTShW0etVq75x9wm9pxeXWiOFo5tHGiRqEK31uFpYpK
-vBV2VnXvD96xGatTbDXGAQ==
+MIIFLTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIRiuZZTOIuX0CAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBDyWWjPwvoUlaRa8BupWOVtBIIE
+0CPOnp77H7689m5YbvhAARf5kmz2mp0uJBDaKEtYKjBgljo4Lq9Gl0Jno7U0Wx0L
+BbyldZ1zVQBQ/XhNtiySgBx+UPohOIAkTXgldD2s+ZDUf6pruUqY9CUPaSatL6+A
+YrvfhInoJDbWSJwB3ueU/IJa5/f3H1WUM7krF81vV06Z2rzCs+IIKFOsJ5lq1I7C
+0iD8Q0iMEWNHC3gP1wt9syLGk5HzNwIB2NQr/tDIjR9t570eJszO0LxVi89/Tao5
+XY/q0K1inqXjKNlhO2od+By/n9zG7WKUjZILbuK8Df8bRlttTToIuaBgHy8Twgxk
+QyytYr1VluEwgj2YFke3CpsVCxjvjJLVNR6xxpTL49wkqH7Ou9MBa7/Veh0TLk8q
+jX/VMbVBc1jIDaNYUZpbL/B52ozLB0jRsyWB1KIgNjpv6/tRh9VIsP1UlVrIbtGT
+KeIGmbnUcGEXpnhRg0mskUXbCNrJJWKtS8bOtzzXCGpCFfF1+UsHZ7n/YlWyP3k+
+KJn74/PxeEkoUJsPsWOCCO8PigrKizj+U9bfE62VPRllfVJF+b+6U4OSLFH/NxJ6
+jeto499DwLTD36znSWdh9kM339eE7e4T1rrImvz1BEsjOpl7LBXPjAJnqeRgBcaB
+6uzUc+xojRxLrHsCYqBwOKwl3dKHnne9TG457Z6jgFCMxBni7dMs9PMz81/O5uTz
+jVt1zQGPxKwelbgXqgn3wv3hDkbgifQs5shWGgTnl6I2bm1Lo0xqAmRTaoCbSLM0
+w0LLOb8xp3sVpvi94wzcEYZ0REp5nKNw3YJZn9KYyybnBj4nCY4XAni426ip8dwv
++Ke0bl3aOEfohRWWiO4pywULYN5QTdnVTh6mDyWBEdB/NLKLhmfmSjtHNu0opT4H
+t96L4ulQ5CgdRKncNHB4sUv/mWCKkskVKy1Dg5huHggRQyhR8eHLbBFH/8UWdsPJ
+TAFKqe4IcGIjy3Yck8TVccDH0la/0lj6KysFfw0a56ADfySOKacfmY8Bl/+0Ljxf
+rHA++VbLsF1Ah1LHi9dTVdSSPfhfxHqgkGY6/NX78jQeCdhumx+1tr1d25XE6pI8
+kGVyhm9ae9Mibh0CPU5HILLULwnoEwTwd1W5Av1Yeid7lgxBb8EyJGVkiPLyGZEw
+iT3UGL1agnjyw+TMwjphefeamQGh5gtKRKtHa9ssvZ26X2bHmifGp6NW+6gvKBsQ
+WyMzsX9ft+5vTq+Q/fMTy6omUCux6fDL/5f5nKwARlawKgYgVm5kcfMdqcx8is0Z
+amEUBfDcMbOS/2rVbEOjHmUa0TlSo27dWoYWAHCm2Tr2hG8Z+IKVJ5OW1yd5EiMS
+WMxBO5VI/ZJ5hOuLJPnhoeP35rCwJmcLocT1KZhRWjWX+eIcKyHoj3DnU9eY4UDo
++ytVBaxOItkIwST+3HQmII3cbg6xXo4F5ik93uw9ULdooHC2djMyXY77PsIEv6Z+
+tSwR8h0NOoCI2KD7GtG8bQNjtfZk8mIC3uECBM6y9oRIRKanJp1aK57KI4SAspS/
+Mg1bU8QSkWMJJWRsxYLR2fyqGO5C7fWZApd8cwagr1ZIHSJP+mA9x3JkllNMoD5X
+VVYQFsx6KmOqii/Ioh5VB8OUCye+SsjyqqgkHEF12Fvc
 -----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 97c99e3c2..5c3a7b69d 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 292737f3e..7ad0abd2e 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 0495d77ff..27edf3a4a 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 292737f3e..7ad0abd2e 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 5610d1e52..1f3691d47 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 8477fbac8..df3e2d2ae 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 8477fbac8..df3e2d2ae 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 a99ca0d04..0f8356664 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 c0c65654d..ca11848dc 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 c0c65654d..ca11848dc 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 f0a6f06c5..75b37aa40 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 8d694e0d1..e406f6ab8 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,29 +1,27 @@
 Bag Attributes
     friendlyName: expired2.example.org
-    localKeyID: 5E 0D A4 8A 7A B3 32 7B 67 E8 48 43 FD 1D 4C 7E 1D DA 20 3A 
+    localKeyID: 02 20 D1 08 3A FE 2F EF 1E 3C 25 66 95 53 7D E6 9C 02 04 B9 
 subject=CN = expired2.example.org
-
 issuer=O = example.org, CN = clica Signing Cert rsa
-
 -----BEGIN CERTIFICATE-----
 MIIDkzCCAnugAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
-bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNTM3WhcNMTIxMjAxMTIzNTM3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7WA8L3
-Io9uXvTeTr5NDRVIjx9/holJ4CPd1v9t6ci/Lg0pD72zWdXZ+E7m9/j4idcCzybb
-i8LtqbDq1boucCqVMVjlCda0BC4Kh7zE6LyYhXehQnl2bXrZfW69NkB1WJEZNl++
-BzG8WYLeuUOK0IvCdJMVvEjyIYltgnZzrhHWS85lpjVgu7jqkhBzV+5AmnejNjjp
-u/9ccWnusaP8O8qa1rCO+bl3QdQapY5fUvdMwptVjmSqU3BiqZszMY/aqt5L3npK
-9jJvEVQuUsgkY0xswmAcIO0lhazZdYaWnF2TLo4B76+DM3mocysr5HYR0zrxzx0F
-1idD32kqyxP2UT8CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
+bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
+MTAxMTIzNzAwWhcNMTkxMjAxMTIzNzAwWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkwW6Hj
++v99C4FzJbiSCXjpYjRkKNFaeniNYYnyfv2vrj0M/cfCWegS8jumijAOtyx8OpaF
+g+dIrDMeR+XdAYiyFsJ5zOOPqOZWK3vRMMLqqhnbL7m9YAo4M86+nLaAZjj2Y+77
+zlXtM703hoYJuxqTdDzu0o/H6NSuroWTWNnSXBCRDkXKe51gScXhWc5PvDOazytG
+pjhfiHIamJ5XKjv8mFVZBPMv7S4jD3kPgwTbFBJpg3hYa/ZCEMz73iuBglWfPkhs
+yliijUJT+N+O58RGt4Qa6Gz/lLnY9mkumgxUIfhokagHYBGR04rorQN5c+3UGp2Y
+G0bXNZOwvFEqzJcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/
 BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
 Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYI
 KwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAfBgNVHREEGDAWghRl
-eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAU94mx7anOL09
-DgqdcLjgbLdAO1e5obDnJwyvIgqpaMVEJ9crp+uDytIIBl4EQXrH6J1etBeflgVd
-w2VKBc7PTpgyoN1xfJE/8lF2e//sNWJuHBFzOmi7+OuBIhS0N9G5CL7tG6TkmlYx
-B2JWly3e0o/Z3nH8XFwsZ90sJFSwbrMQTNkN689tVezdV2/H4ESWYjsf+NAP7EdL
-1C+aOnEQXta5yW/aMSOQ2oe5wTlE3SeO6WFuQGK73/hY68WMSsm+MCJGQI1Hv/n6
-RGLfy8RV2Cpr+0yuV87yjKwxq9m1fqbPKUt1oFhBRtwG650HDtaB/E8vYVr4OGUu
-Nt5NtFVPkA==
+eHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAgwzs6ES1kFpM
+0lXlonr0EwnuRhyHH6vF5f3ZQhfoyz8k+LZVvXkyYYcvRzjIuL+214zYawaG7ejq
+AoZN/HgezRsYHCbvUgYJ3KIMo1rhZn1NDNVilsFpIw2O9vNvJw5WQr1CGcBta5KM
+x1XOeqWW0W6FDtLYm1RMBV+F3DG4oPuqRPZe9GXFa704q7DHdeu8iNoOSgHAqOO6
+CXe7S199nAyrSlWU2f/Oo4NaB4NRqfTc5ixaX3HlmO8zVaZgxPaCuLUluBfMNuNa
+Dyz9jt6k0hwrnUZyxGd2PNunDqUSuaC5bWo12VvbRuwZzHd1f5vq5tOML2RzKNVY
+CIuaojP0Wg==
 -----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 4940c24ae..c9eea38b5 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,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAvtYDwvcij25e9N5Ovk0NFUiPH3+GiUngI93W/23pyL8uDSkP
-vbNZ1dn4Tub3+PiJ1wLPJtuLwu2psOrVui5wKpUxWOUJ1rQELgqHvMTovJiFd6FC
-eXZtetl9br02QHVYkRk2X74HMbxZgt65Q4rQi8J0kxW8SPIhiW2CdnOuEdZLzmWm
-NWC7uOqSEHNX7kCad6M2OOm7/1xxae6xo/w7yprWsI75uXdB1Bqljl9S90zCm1WO
-ZKpTcGKpmzMxj9qq3kveekr2Mm8RVC5SyCRjTGzCYBwg7SWFrNl1hpacXZMujgHv
-r4MzeahzKyvkdhHTOvHPHQXWJ0PfaSrLE/ZRPwIDAQABAoIBAAg4Ii6s2OmMkL0Y
-hhO0MIgQzqPwqNQTlnp0/ORA0Pzlybn6DBouNgRRQFya82XfGTC63OkziNrQbv/r
-srYzdylJBmMUb6QLr30RfwnRAU/TfIwhKe0eqKsjNZUmGRwVnHGYwGVx7dAP6LBg
-9LcarM4YMKUqc9LrJX6hyiiykCC8eFhmSNiThSyqae0ND6jRw32yb6cx/qnMZt0K
-cg9xF60yz0Sg7Cv+eQ3ZbCBfE0BgP/vW3eXxrYJlaJT5KaxnGvCbCUHxU/FBErcz
-VggwDQr1oFh0Anbr4MLYW4TzXW1WHDwR/+nn1W5wKsWWDhdZTJ0nQ6wcdv7azBdj
-yyZiqMECgYEA7aXZTrYxCywYqyELAd7tWYnet8/HPkdIjA744lf1T5p35uGw3ony
-xouF4LGcjpC4+QbExGTzD1LCVt80WRenUenr1c1DGwVBfdWzLBso+Nto9ZbbPzIE
-W3mkKVquV+gJAq4uoglqXdgJC9WKT+ly2n59DzsCvvOhf/lwWyuzFncCgYEAzZK5
-dIBcwdNbZs1l+WGL8I/gEDhfgtESv1/rnNIW9vwIp02zlrBONjSlRw7GjNMXzknR
-Fb7wJppmIS47rE9/thf9bmgcPhn6yj+nyCenYbQg4psmA3H/snpz9uvL/znYJaFY
-kKZ7kfLcXIi1MxOhJtQMMdoEvmIHMxmjtu9apXkCgYEAoC6f0MxBNnSclAyLrNEk
-Tqv9cQweEj5eCfm1jGsZMHS/yOHrI7T77RPyQ0e0bOvjogcL7gzVQEjaMU/1qu+k
-mjQAAHaAeuAKCtVWFa6g6UyK7K6oTWpbQYU2P6Gdzibam/HoANQz29lYD5/5wG9s
-ORX1GaT+7tKs0uPA9dL4vXUCgYBCbH5wHmnaVyjZdtTUV6iX+mUz2INECbo9DAld
-iqTQ+W7yYDD/J8idyzT8WNHe/vZaOY/Nrvx5/LmzTvUJIEbr16ST4CAAEPTwFNFp
-4yY6c7GMhwUpZ9RvHxIJXvdzaIVm41NyqdiTuB1r6OBjuJwBp9Ko6QFPYu1gnZBA
-s+ZeQQKBgQC2Ma9Oyt7lJRSxJ2UrZQHgC7V5KHrWMm5BaU2Xuk17vrOOkKY6IH0C
-cD6DQOu9Waxl1SA8n6hOdIO9FhFr1CWSBa9/G5CIFzdP8Mltx3l5UQSDs27bSafh
-fjAU1twD+hK3xtbdtLuIV25TqeBY76XTC+EN4l4+Rtgl67EYaxCQ6w==
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCpMFuh4/r/fQuB
+cyW4kgl46WI0ZCjRWnp4jWGJ8n79r649DP3HwlnoEvI7poowDrcsfDqWhYPnSKwz
+Hkfl3QGIshbCeczjj6jmVit70TDC6qoZ2y+5vWAKODPOvpy2gGY49mPu+85V7TO9
+N4aGCbsak3Q87tKPx+jUrq6Fk1jZ0lwQkQ5FynudYEnF4VnOT7wzms8rRqY4X4hy
+GpieVyo7/JhVWQTzL+0uIw95D4ME2xQSaYN4WGv2QhDM+94rgYJVnz5IbMpYoo1C
+U/jfjufERreEGuhs/5S52PZpLpoMVCH4aJGoB2ARkdOK6K0DeXPt1BqdmBtG1zWT
+sLxRKsyXAgMBAAECggEAHAvYJM4WHaQs9BiSeDY9O730eZrg6VOGWdWWBbgdNRCa
+YaR1rVeab840OY8x+SV3V/h//dPEOeLiKNcsM/6e8noTK8nlHRQDe6ttKelTm/wq
+ln6vOqsZ8JfAftU6RUajq22sw0Eaw0O+/+7kbfPPAGjRLAiq/wq0ng0XAS2b3P+t
+Gk6pnDrgB/RFgC8nyOLqcMe2/tPqOt7aBiMU7zYgXKXBErLqX0nPLk5EuDJif2LO
+KnScRRJd8OlOtHvwPiz6UsYxwyKMbGdNObA1+tCBbSdu/GXgQ2y1JHqbM+qdo3AY
+IGTv4snYSri+8BO0Cj1vQ2OuDDAXeHNgJ3Ddc2V0gQKBgQDW7FwnHGXyN+K2ZyWj
+ZP5Y9GfvmamrACEAJiHrutaJa0hYG4NBkjIq4i0QXTL2CMAzb7BvFmck6HzwbzBP
++ZTXROkRc6zDzIffmcE5QMUF9OM7/UGWqHf1rKZdx+KdjkVaSEGslDzbCdQNd0Mz
+eohx2BMzU9yjwXyw/MilsQrl/QKBgQDJhlU8HNhfGlx1GmHK9VGvsiP8chAjNoWs
+wCnOA0n4OD3rMjNVnNb2IoxbtGOmlKzYB1K/UuTDxZZiZdbBO2pk8ciK3hL7Qt+i
+s5E/jIngW27iXUL3EAGTVfgqMlB5VWR4H9IOvrstc+xMFvo1V4QzdLHJ4hgg+xta
+G5hru5Q3IwKBgQCnqQkWhaPNueUFMB//gAie8kKmejQOrvIPgK/TihRUbTmpagUR
+wO+b3ocTDfF0V01Aku+LKWnbM/ZLRiHlMaj36cz7jUaIE+Um/HXsqOdKB0jBAocI
+9XFnWIEMBaN2D4dwr490BswWf2tJ+fCVlxAb51jLIK+tm4IfO4N3Jk5/LQKBgQCR
+ieRQj3xr4nvXToBFtTmTK5H1pOKmq5+KjRUj5RgsnWGKVCzirWxJQdYf/HzjNwhE
+07Uc216/TBk5YtbfomtKD5uHPq5yq28a75f8TyDb2OyRqkzMZNDeeP3Ka5/WoKb4
+YfKwF2rSfp+urAFzOIsPJj2n0RMf7nlob/l6BHQcBQKBgQCwyy09c11kPXxsX9Xa
+Lo33fjBRrS3OjHItC6UMgFSJ5oksRn0A8+EGwf4ERBkEhECfhnCjiejq4B2rStV1
+ySH6KpIsOaaQFYu8gAONSFrogEI+RtbDnVt5C1/iqhVjCEWGM6Y0rNzqGHguWaJg
+Wr+lK4PLXv1BjUxAQT29GUPO/Q==
+-----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db
index ea4bd0ae8..a1e9626b4 100644
--- a/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db
+++ b/test/aux-fixed/exim-ca/example.org/expired2.example.org/key4.db