18 files changed, 74 insertions, 73 deletions

diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem
index f262d8f92..21c59228d 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.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/revoked1.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.db
index 611eb8a73..1e10ff1e1 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db
index 6525b877c..7db14417a 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/key3.db
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem
index fb82c3630..055198064 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: revoked1.example.org
-    localKeyID: 27 6D 8F 54 63 7F A4 DA F5 52 64 C8 BB 3A 42 49 78 4F 50 38 
+    localKeyID: 22 08 09 F6 9B 2B E9 2C A9 49 17 12 CF 18 A6 A7 3E 53 05 EF 
 subject=/CN=revoked1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKeZLx6cvfgQqG
-2GCqCtIPzKd3WI/iZ5QLIbQCxVwx0R6O12kUPALt0c1cWNgYuTr6PZob7jshFAX0
-/L0i4mMLFA7yOY+ykCllZ5vUSqXm40RNoA3PNdYPBFCy3AUfPDdqtXkIm4CQVub+
-r2UC6lDNn+T/QGVNQC8/ddn+tUdi0QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjQ3MzRaFw0zNzEyMDExMjQ3MzRaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxwu9UzcObq7ZR
+Y9OoedmDtHAbuVm8Jzf+eOvT95sB9//xIEwX3XEQO3F514ww4dq9OwcQ/X1umnRq
+5ivIqtgB+YCYQhafWH/suQ/i+LaAeI8FJlSFf9quipwTiWvwLe7y3WFahy93IL4a
+p7roMK0E/sQuD2SpjZX1/pxlLD3UQwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
 A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-AIxvZgTdJEcdez/AsP/RrWPPW13ceqq82D/UGCWfiBynDwvlEObWB3ec0h2Mccza
-sRiVwtexp7ssNUH2GCNM6B6rUrEOHGwZ6SHAesOZZnOCiRC039G6gzCWfcOhKQ/N
-YJN3nAJXWR2sH0uYi5OSey/aifbL7PxbbjU70JOotDq+
+AASWTS+chBoxSWyy80C8g1glgvjI8hIJaIWjtpUk5TTS7iCl/Zls/xtRM8BkzRAH
+trzP0TRUq8kO2uqN3b8e/XJrKQmeafDirM3N/TioHJNKNNrcohk1YEoOxpQeIdVz
+3SCxW0BvjcglewRkoESFMsJKsLjkyQstZOgb9pckvdr6
 -----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/revoked1.example.org/revoked1.example.org.key b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key
index 88b64d0ff..7d985d257 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.key
@@ -1,21 +1,22 @@
 Bag Attributes
     friendlyName: revoked1.example.org
-    localKeyID: 27 6D 8F 54 63 7F A4 DA F5 52 64 C8 BB 3A 42 49 78 4F 50 38 
+    localKeyID: 22 08 09 F6 9B 2B E9 2C A9 49 17 12 CF 18 A6 A7 3E 53 05 EF 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIoExh6ojG6u8CAggA
-MBQGCCqGSIb3DQMHBAgf4iFQHuI4XASCAoCPI1ItB5BFCIf5IyU1CTjbtm7bR79s
-70Q1bE0MTWMZlBhgBdqrNXfBklEBkq1xm2bv3h7TCblZd+VGvQyX45p1bYeTq3FO
-S0j+xt2YbLqKmYhKjix912ZOkpk84tWx6RYRz4uR178WHvfKBkxkOmCGIiHQteQj
-N9j7ZDfKJjm+eftEa1Wz+97sDowWNo4s8iNXuxfvLPwWVCKQtWrB2naoCnokhgFv
-SQNdNRTAPyDegMDR73DU4WEWou0Z7SaqV2/VDmQLtFGkl3kWMSH5eVYJoekyHR/A
-jjcTqz3ISNoMhjJk7u4ZMgImn2cvH7nYiRKO4UVqT/ln8DjUok39uw/l6CgdcLym
-2bEquC2MVMLSbltSgF1qMTciQEcXzD9mqCs3tkAby5posO4B1G5iIBRmY3xtiAVE
-LlK8mRi+0MosPSik+sQvVr0gAFxJYnXMM4x8Fso4iRDf0BY2KbaQ+RaCVgHN9iyl
-/QJu/OBtd7syFczUe7s8IClEna5cHfgiJOdb3DNVL76BOda9h4eHYDih4eiKLVx7
-HRbeHcNAOxYaz8xR1U/rMPCw8lVmqVXwrqPllYsmksfqbM5bDYv4+rOz0iVxjZqH
-kNtnjpsR0WWVXEi6pMXs5HJ2qHxczNvOsYJlxJjpcDOTnUKmV4HV0ML4GU287Vhy
-wJUBp7k4NacXKxsFKwF8BOZrqG4410iNpcpSu25oQ4upwb4tBwT6Xn4TKDAY63fx
-uK3MSfv07AH3mVyKmdmFvg76Hrjn7CvD0yi8/F/wSN+ori4ieJTZRo4UHrhcojjP
-aa4tUnoCdHPJIieBk4VJNqQpHVoXvQDRdQTcsrchrsYER3Fn12eXtUr8
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIodIJyU4ld7wCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECI/iwS4KiDHaBIICgA69+ZBpsOtT
+zF9rRUbgSfNYCKtseMgKzpArH4ZUX3xYsf8hoLh2bFV6sPFaZtRYqABY7/RgTPU7
+hvZAbKNGnL46L8eXWrDa7sq+GROr3oGppAc6WW62uYXS9usP3SMjh9aKlKwkZPmw
+vt/1XVJBLhGuSIjnnAqRgIltmoHs9TW1crkCiwMZ+KsbSLqwr1wl1CcbvTGgrun5
+f2fBUhsVg8GHs0F2Bo8szzmqHXkEGr6rl/ntA+LQC4CvRjqDEWH++ZZSpUGjUwpQ
+aEmrE7WDYMAycj5AgUqKL8EssxWklxCCXwnD8M+M7IhTkhv6jMutJ2qu2puk4r0r
+5Vxo4OiHezsy9ZLPgBqid5YFRJ1sLPlir9GHJxU7XgV5MfGmsRGzX6yHecM0uPCS
+IpmBjZ2DPINbqj6E1ordbwim02rJ3rhYFv2WJfpTv5pgZo0w0c96ws6LhYELKz8w
+zU4Qx76So9Gs/d3hf4wgCLNJiyH8qeNJckLAMm+jiFV28xRbrCCCyeQRh8YT8AaY
+UswnVhYsQq/aE6F9YLA4awS4enBggyPYxraEvayu6npWoLFYfMZmX4fHKarK0osk
+zYnrB8yBIaA5AeIzlFPlu50H0MWUakhgMgMsamlv2wkMRtO3/SzFmSk1ACBYmnmy
+menzbB90/Qrssxe7Cqpi22C2YiwbMc2ITEV9hW49iG4jMcWxgm7cdQERPUtncW63
+ri11KkpytPIxj75Fdiy8ytHBstTlVDNSzMLy006IonlK+GJ7GMrQJr7ntTeGbPO9
+wB6of/l9FqlQMe8s/SaD6FupK8MD01sScQKjMBAfwWZoNXTxRb/G03e5VG4mSGbQ
+5Te0ha7Box8=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp
index 5d60d6bbc..e6899fa43 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp
index dcf4cb0fd..02bf52063 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req
index f78d2f561..bb58f8d4a 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp
index 892d80b52..7822aa614 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp
index 4c38f33a2..ec5d55786 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp
index 5790e5ee2..85ec56b76 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp
index 143e1c864..34dff9c2d 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp
index 3e1c4ca8d..e9a3cd4ae 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp
index d39b0e6f6..ea1c69fb9 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp
index 2f29f04ea..403dd8657 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12 b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12
index 20a77d2c8..5a635d2e4 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.p12
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem
index 91b8ca3e6..8fdb5c841 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: revoked1.example.org
-    localKeyID: 27 6D 8F 54 63 7F A4 DA F5 52 64 C8 BB 3A 42 49 78 4F 50 38 
+    localKeyID: 22 08 09 F6 9B 2B E9 2C A9 49 17 12 CF 18 A6 A7 3E 53 05 EF 
 subject=/CN=revoked1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKeZLx6cvfgQqG
-2GCqCtIPzKd3WI/iZ5QLIbQCxVwx0R6O12kUPALt0c1cWNgYuTr6PZob7jshFAX0
-/L0i4mMLFA7yOY+ykCllZ5vUSqXm40RNoA3PNdYPBFCy3AUfPDdqtXkIm4CQVub+
-r2UC6lDNn+T/QGVNQC8/ddn+tUdi0QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjQ3MzRaFw0zNzEyMDExMjQ3MzRaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxwu9UzcObq7ZR
+Y9OoedmDtHAbuVm8Jzf+eOvT95sB9//xIEwX3XEQO3F514ww4dq9OwcQ/X1umnRq
+5ivIqtgB+YCYQhafWH/suQ/i+LaAeI8FJlSFf9quipwTiWvwLe7y3WFahy93IL4a
+p7roMK0E/sQuD2SpjZX1/pxlLD3UQwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
 A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-AIxvZgTdJEcdez/AsP/RrWPPW13ceqq82D/UGCWfiBynDwvlEObWB3ec0h2Mccza
-sRiVwtexp7ssNUH2GCNM6B6rUrEOHGwZ6SHAesOZZnOCiRC039G6gzCWfcOhKQ/N
-YJN3nAJXWR2sH0uYi5OSey/aifbL7PxbbjU70JOotDq+
+AASWTS+chBoxSWyy80C8g1glgvjI8hIJaIWjtpUk5TTS7iCl/Zls/xtRM8BkzRAH
+trzP0TRUq8kO2uqN3b8e/XJrKQmeafDirM3N/TioHJNKNNrcohk1YEoOxpQeIdVz
+3SCxW0BvjcglewRkoESFMsJKsLjkyQstZOgb9pckvdr6
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key
index 0db850532..314903f81 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked1.example.org/revoked1.example.org.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDKeZLx6cvfgQqG2GCqCtIPzKd3WI/iZ5QLIbQCxVwx0R6O12kU
-PALt0c1cWNgYuTr6PZob7jshFAX0/L0i4mMLFA7yOY+ykCllZ5vUSqXm40RNoA3P
-NdYPBFCy3AUfPDdqtXkIm4CQVub+r2UC6lDNn+T/QGVNQC8/ddn+tUdi0QIDAQAB
-AoGAAtRnTethI/RDJVEjAWAJ1q/a8PjN9/wlGPEQDuWFt+ou2xBedv/YtaH+lKlm
-3xTq+AIs5BzfUC4eCty5DaKsKijZ6TfIjJr3557uKieFxvDD4qhTvQYd8ActA8ry
-LKF/c/rQSAaG0AcAOGYzt8T3sDcmFK+J3rSs/wHDYtrEtQ0CQQDuMV48z9gYKNxn
-Hm4869hsGc1qUf319TPmX/YfKmcqwYOQwbL4HCWA2OvSfLjOJ38nYDHjNJzIUFDY
-wAFo21ylAkEA2ZyfCwu4+GIyK24SgA/frwuLWpZKFMaoop8nqG/Jyq06JpOOhhz3
-YmN9QhnK4pKUscfECYip+vhun2n8skJ5vQJAYiU9a1lI9UuA5YyIZ9nWJ1TKa1C1
-kC8k33wS8eyK7fcmuvLVR55xZZH8OZLioy9rGVJtu+zl3TQa2/Thn88jcQJAD0Rz
-zByYb6TEDFP+rElw0iEnN8XPkMGXV0F/UMv3Bmc86zPzDem+WYLNaPPSTi8mi4qO
-cHTMKDWB3WFcP012qQJBAJm1ylDMwcttP3b1yEKkW25uXGYJqLsYsLx+tPrgAsiP
-QleA68sgn/R26yQBichKZS6enLIsDK0QQVr/JTkjOyU=
+MIICXQIBAAKBgQCxwu9UzcObq7ZRY9OoedmDtHAbuVm8Jzf+eOvT95sB9//xIEwX
+3XEQO3F514ww4dq9OwcQ/X1umnRq5ivIqtgB+YCYQhafWH/suQ/i+LaAeI8FJlSF
+f9quipwTiWvwLe7y3WFahy93IL4ap7roMK0E/sQuD2SpjZX1/pxlLD3UQwIDAQAB
+AoGABGXr0P/UTqY1eRcMthbptFIDEhSIbVjVEFVClHiEW8ychwVDDLYcZYfq+1ZD
+cDQuWs86kgeLknB83+Y5ABqGBJ/r9oOkIjWPktSAnTU1r7aLGiqYRvguuVT7yrRb
+WmKIwxF/nromH3u46TdaFGezXiwkpqNPV/NtE86c6a5I4qkCQQDfZwlEobf6AkJK
+C1sRDBNLM/wof1xdMw/o150BwWu6SnEGIH5G3C7CTYQb770YX8RHwVjFsfom9N8V
+JSs/L9lZAkEAy7MGzazQ/6Pju0gmDE9r9PF10VHf4tdgKH9IU7cH0w6V2au1XuYC
+iDchR59RBTv8MaGxiNoxStaS0Qntj4BK+wJBAJZqq6TYNiVRLAzqxHAf70WtRNSH
+nErsPIQL2Jz7/Gq8AImdiyhuy9TrmE2vB2TH5kJh/kFt6f4c1a9JDWtH7lECQGfK
+a7AG22M2rcXyiDiDi11+XuruDeb2mO9pk3/cZec7qk0D+eFFz4p6lMF6wvyoyOK9
+Icm6a51XYe2TYnFZDFsCQQDYVjUQ87u/JmZrq5rDP/RAwi6BPsoFSkphhkugfdhX
+6KdSxqkGSD6KpXnNUxDyASWpysW7akRX+VRkFVBqu/iM
 -----END RSA PRIVATE KEY-----