Testsuite: regenerate certs tree

author: Jeremy Harris <jgh146exb@wizmail.org> 2017-12-16 20:49:28 +0000
committer: Jeremy Harris <jgh146exb@wizmail.org> 2017-12-16 20:49:28 +0000
commit: 953bcfd724f6e8ec985701f65cc375201ed2bf69 (patch)
tree: 23a9fb7518ce15da7bd26b2e07c46679004a7a3d /test/aux-fixed/exim-ca/example.org
parent: b66afe222257742c497fc2c5b498434b9e52b6b4 (diff)
131 files changed, 639 insertions, 626 deletions
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
index c4327b8b2..b938b3f9c 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/CA.pem
@@ -2,12 +2,12 @@
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
-D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
-KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
-BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
-d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
-OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
-BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
+DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
+8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
+/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
+C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
+GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
+pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
index b54773370..e4000a623 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/Signer.pem
@@ -3,12 +3,12 @@ MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db
index 5a975259c..be7295937 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.org/BLANK/key3.db b/test/aux-fixed/exim-ca/example.org/BLANK/key3.db
index 5bfcda075..87f70ebcb 100644
--- a/test/aux-fixed/exim-ca/example.org/BLANK/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/BLANK/key3.db
diff --git a/test/aux-fixed/exim-ca/example.org/CA/CA.pem b/test/aux-fixed/exim-ca/example.org/CA/CA.pem
index c4327b8b2..b938b3f9c 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/CA.pem
@@ -2,12 +2,12 @@
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
-D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
-KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
-BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
-d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
-OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
-BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
+DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
+8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
+/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
+C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
+GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
+pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.key b/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
index 9e77717f7..75e37685f 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
@@ -1,20 +1,20 @@
 Bag Attributes
     friendlyName: OCSP Signer rsa
-    localKeyID: CC 96 CE 2E 01 43 FA F2 92 30 54 A1 BD 3A 04 00 0F 75 4E B5 
+    localKeyID: 95 A8 E3 50 07 95 4D FA C5 F6 1C BD 5E EC F4 46 6C 95 9B 18 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALqMz/iuUILGHemE
-SJqNRbxrVHXfH7PUZQFxfbgmFTa5HGPYga6vzcfbYRtPloxzkBRfYkA5zDsf3Irx
-MY1Ls+EjYCyrwCDM4QQUcebafp0kWBpJYiguRDfoOpnMEiIGDqjSA5VnhARJjAxI
-1oHZTPmIxTr177BzcRbJ9J6ysv3lAgMBAAECgYACo2yHWPiswNAdtgkFSFY3fKbl
-X260dmWoMubvnj+Zq6T/XkmjsUlHG+RMz0AEuWWwfPYyjJB+qgTq73pYJ68Mr3Dd
-2b/ivUSOkVD0+19CCfYaCGiZzosPXAKxrruVm1H0feclsUYbz+m4S9Le3BZe2d5Z
-g5TByATsI9hmtalngQJBAPIROIbgNPP8f1hYBtFp+WRwnu0f7yC0b9Um08n9fIjr
-qSQZqmJRRH8qOKRVyJwv6MIYyI5Jn+H3JXh2gmCpS5UCQQDFSZBr9bKSUf9mPo6f
-BImihw+/8VS5e34wVsIdmHM3qDyqRP1BZt1OeFr692uj4r6Wts5N23Q2gbGFRHKo
-ytURAkBQ+JWx+Bl+a72lLXzKW+qCQHHI29+/TtwBrsU1UcdwfXPMkZE+5fRFnTfp
-MJC0PgpbsrKTdek3StaL3whpkPepAkEAuzMkkOxgdyrLN09gsU7y8n9J2I28IQwn
-HuMT6lU/7q36cm5oCOj8UXsuiTjAsI903Tm05He5/AZwVc4vJi7goQJBALx05qNy
-hxYA76vuIWNQgq6ParirZ4SJLP4Voq14jRsIDF3/SKSRJzZ8tA0op30XMUCQ+QZm
-CNdP5Sf5e33I8Vc=
+MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBALmhgvkIMKMexi+A
+sERDMlmzPrHLpCIRg4kR1R8858UX5QZB6L1s25CLWphziYg0M9wQxvVD3CilIGXw
+w7JaaTNXKn6NgSY1NHsKRckbb1XmKgDep1AHFygek+jSANH2uuW35vJ9DcLAkxbK
+JwmP7lDURAIhhcq+UAnvRzHRl+63AgMBAAECgYAkSWE74xD24g4lvQc34NbX2AUa
+Zk9oZXoL8lNx7srzqS8Y4Qto8/2brNIB2Rv6ZxH4I8NwsFo6C8VgiAcJN0k27bpT
+cT0o2b45lCXw7qrozlffIW5TekUP9zMbvQLy9rCz7Ad8AnOPkjbekQ6p+EUnEdUh
+NgEpQQsnlwK1uBNo2QJBAOJnFXCkOt/NGsNcW+y+iA6+eua8J1dvU2cCbIcdaDnj
+yMOB5EVbJNPrdF86E8FR4/eAIImZpz0bsILkWQWFK1UCQQDR5fABah27dGDjljdl
+fJl2IUwxKQcQKW9Rp4ce7q8QtwIpvaN9lhS6EcmgHYSV7/JZEwhHC2L8bi/bFcIu
+TmnbAkEA2r5uYJ7Mo18v9IFP77VHD7fKVxSDjl7pXiVhZkprYUNLvlnJi5k8Q+TC
+Ux9x5t6QO5l31nq2srwGFvE5cbPw4QJBAIJ7o9DtS+Btf5Hbn0Jqy+fA2WGyNJ7a
+c0Zak8gp7xDABAs4xbrborTtO99amkKvcIPpLfskW/u67+sNQrKQsoMCQQCB3Fkz
+u/ZFU8OAHtaFCFCUWAs2yZFmhzKs9chjyVZAPr+HwTt7zYAHavulAOh0Q2t4WM+9
+JTwMV7KF8XloUC6t
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12
index 87293808c..ed113dcc6 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
index b7f08d8d5..df87993d4 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
@@ -3,12 +3,12 @@ MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
 MDExMjM0MDdaFw0zODAxMDExMjM0MDdaMDYxFDASBgNVBAoTC2V4YW1wbGUub3Jn
 MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBALqMz/iuUILGHemESJqNRbxrVHXfH7PUZQFxfbgmFTa5HGPY
-ga6vzcfbYRtPloxzkBRfYkA5zDsf3IrxMY1Ls+EjYCyrwCDM4QQUcebafp0kWBpJ
-YiguRDfoOpnMEiIGDqjSA5VnhARJjAxI1oHZTPmIxTr177BzcRbJ9J6ysv3lAgMB
+BQADgY0AMIGJAoGBALmhgvkIMKMexi+AsERDMlmzPrHLpCIRg4kR1R8858UX5QZB
+6L1s25CLWphziYg0M9wQxvVD3CilIGXww7JaaTNXKn6NgSY1NHsKRckbb1XmKgDe
+p1AHFygek+jSANH2uuW35vJ9DcLAkxbKJwmP7lDURAIhhcq+UAnvRzHRl+63AgMB
 AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQBI94iIVZQAID3eyShKfxq3FWf58piUJMFQsMxDZweC
-j2zVsLHUkxlpUHe3TjXnVZZwm+wo2gLx5GOpZkryWXh/PuI181SWY26s50CZ+uAo
-bQGDqkF1jLwiYLuvFAPVKDWa7H4X5fqNvowOM1EP1HUA/1naJNRL399Y/D7sliS8
-ug==
+BgkqhkiG9w0BAQsFAAOBgQB8eubSeqqS4xk8iy/0kjW9A/9qXAzenSVPHWHVVO0t
+H5i0T95BV7zmKtHp/ckR/jEV1pN4PxmEdxv4+kK1LeQ8wsQn9ZOl56+hpiMf9u5U
+usuuqPOlVtosaOAKcQmy3aiwQ8V+fd8rgbJVhNlOunC5NUaYuyP9xqmzu3y3a66e
+WQ==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.key b/test/aux-fixed/exim-ca/example.org/CA/Signer.key
index 08e0eb2b1..0b193648d 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.key
@@ -1,20 +1,20 @@
 Bag Attributes
     friendlyName: Signing Cert rsa
-    localKeyID: 1A 38 55 FF 5A 14 AE 47 1C 03 74 AA D6 58 DE F7 6B 14 D6 E3 
+    localKeyID: 83 64 4A D0 4D 26 C0 9D 37 E8 63 A2 00 FB E6 21 BA 71 2A DD 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKrshuM0DdH5ARXd
-VQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oRevGDyMk2TZ997csWFLkX
-PGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQKOHj9vWEXeaTZOvWchff
-GO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAECgYArkfOogyJqvfC65BrC9wt63B+g
-7R/ZEEDB0XduEqNg8tjETkEeUv6q4kgV85LFcfSC5ibPW0h8lnpd3EB2v91OwYMv
-pz+u5+ZO+C0FZVPayhgEgdb+DL7wByKUnC52sHDvmOBq0HIVgfmZB6nv+T4aa25f
-Jdijf2lCzPggxFIH0QJBANF1hyBzafWIYZVb6bOnaP9dO3A8kmmP+3QH5VO7MaBq
-RQjbDvz1qyEO63Rx/j18ckLwTLj+VthjDKeybnrQtTMCQQDQ5wnVm8hDbxyVPmt6
-HAU74DrSrYzpH3x9zTfbdUabg535YYCQz/JnIH/Z07f7Z8N+rpaEHm+9yVy0nA5b
-ymGVAkBPDQoohyZwUj5x/jRfZ0lLR0aNf27KhFqkWe6FAVsjbbgMNZCci6NAYL8g
-PX10eyksdkCeeO8Rz6ARElh75ZTdAkBlNtur9EuGaKpXoSOfyT278ftuIgo41TmT
-FkAvA1ZPeOiscFJDV41h6/wmBQ+KLo8orNxebQTE1nAlTcsjLB41AkEArDtyK1ER
-ZnDLpHOYgLmZ3arFE23ictKRMsih8/3fNKeDRn6Ob54aqpsHO9tEGvOcdIbddCcE
-Nx5Ono2x/KL2oQ==
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAPB0NqiM9gODja3Y
+IiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid6D9qkmMGqwWoA4tIkk/K
+R6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNcbztvkmAdyaOfU2NH9l8P
+8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAECgYAUrLliZrRkevQ8pV/Sgz0TxXY7
+BG/WwU3XYLshYQHjXrHH7YXDE8IX3VvjWSh2A3DQyOr9koOzfyrtZ2QfcFd2M/pq
+rsa/bPyo6JU/QfMhr13v4oGYMmqENbB7NL78hUydQrklndCzNUvAceyw7cW404/m
+nW7guLAF20Bs6G1sIQJBAPk/kdIHwTirZvjivfxZgqmxE+HEVNd4znnNY4rjgWaG
+cKpRl+4isfLwNYlObIbeGXNVUcFjL8TX5Z7eSogWdWsCQQD296ilrs5FvifqaY2P
+xZHsdSabGpoI6FqfydP/DurcJ8I7hpFlN16xy267KGpVLG/P84ybwPSinEz7Jper
+UefxAkBNivZt1lXJsKGPitM6gAqDioC5+1+9zWrHQBvY6OCoKelBQ7M1tfuQriSp
+vAlNiCl41TFjLd19qwFYBKZBYmNTAkEAlX6u6LQbCt6jnOMOHQR0Y5U6rFL7AP9d
+tDHhERj/lArBKXU41/MfcDJ7sfEyBKLkgBWmfLXdn/1LIBBpaPwokQJBAOCvULJL
+fQkIRbpi6/i6GoK4ygejfOYmbiVLCg4PbvfOJLwyjrP7o6tPB+kqwzb3rr8OANkq
+EQ6bPyZ+3ciZmWI=
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.org/CA/Signer.p12
index 81b769bc0..7be751ccf 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.p12
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.pem b/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
index b54773370..e4000a623 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
@@ -3,12 +3,12 @@ MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/ca.conf b/test/aux-fixed/exim-ca/example.org/CA/ca.conf
index 57b486796..4d173eedb 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.org/CA/ca.conf
@@ -1,18 +1,18 @@
 ; Config::Simple 4.59
 ; Thu Nov  1 12:34:07 2012
 
-[CA]
-name=Certificate Authority rsa
-bits=1024
-subject=clica CA
-org=example.org
-
 [CLICA]
-sighash=SHA256
-signer=Signing Cert rsa
-level=1
-ocsp_url=http://oscp.example.org/
 ocsp_signer=OCSP Signer rsa
 crl_url=http://crl.example.org/latest.crl
+level=1
+ocsp_url=http://oscp.example.org/
+signer=Signing Cert rsa
+sighash=SHA256
+
+[CA]
+bits=1024
+org=example.org
+name=Certificate Authority rsa
+subject=clica CA
 
 
diff --git a/test/aux-fixed/exim-ca/example.org/CA/cert8.db b/test/aux-fixed/exim-ca/example.org/CA/cert8.db
index 35f307697..dd53fec3b 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/CA/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty b/test/aux-fixed/exim-ca/example.org/CA/crl.empty
index e64683cbb..9338c32e0 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
index b1f47aeed..b76bfd547 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171216011707Z 
+update=20171216204807Z 
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
index e9516f3f2..a8be9ecd5 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
@@ -1,8 +1,8 @@
 -----BEGIN X509 CRL-----
 MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcx
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MDExNzA3
-WjANBgkqhkiG9w0BAQsFAAOBgQBptRy3E47znC529PtvDyItQJuM405ktb1AZgCi
-bDXKuUBTYg52TB7Ibm+cL84hIMY31XZs3SLN9VkNcZAt3NpJIlqhM34SYlbqdiqz
-zH9SDRyzJCl0jaWnJ15iQcSFle6oB3J8ee6JJlzHOn+i81GgB8AQ7rnKcJoZBs8Q
-LuLdqw==
+HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MjA0ODA3
+WjANBgkqhkiG9w0BAQsFAAOBgQDjsuP9u7xkvCxAoWnq2RaVKknivvGvhSnO5XAo
+5ZcRxJc+VTuhpQA95fGiu9o7u/aDvwPB05NdcLb4r93ru623kLDpNHH51EQwQIyv
+43RWt1U0y4GLfojHZ/rtzVNjqYJrvoD01AfaeDxYw+GMM11gna7gvImyIXXvwHfe
+mSR8nQ==
 -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2 b/test/aux-fixed/exim-ca/example.org/CA/crl.v2
index 9083e8d45..899222830 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
index 1c243fdfe..9c5883f64 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20171216011709Z 
-addcert 102 20171216011709Z
-addcert 202 20171216011709Z
+update=20171216204809Z 
+addcert 102 20171216204809Z
+addcert 202 20171216204809Z
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
index dd6987a7c..d13c3d66a 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
@@ -1,9 +1,9 @@
 -----BEGIN X509 CRL-----
 MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm9y
-ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYwMTE3
-MDlaMC0wFAIBZhgPMjAxNzEyMTYwMTE3MDlaMBUCAgDKGA8yMDE3MTIxNjAxMTcw
-OVowDQYJKoZIhvcNAQELBQADgYEAc/MOgAaI/ddSlc6XnXGiNFQH7XwpZ5wrRHFk
-WtEg4S39T8njOhKdAiqinD7yDE85KjUwQxJ6lHsDlKrw3YN+Tqe3F3laL6THCa4F
-sYeXlBAvB3b+a2KH771golTiSat+yFmezljPFu0CIQxHc/xxq4VjMnRkmbqEcZk0
-XG6i/RY=
+ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYyMDQ4
+MDlaMC0wFAIBZhgPMjAxNzEyMTYyMDQ4MDlaMBUCAgDKGA8yMDE3MTIxNjIwNDgw
+OVowDQYJKoZIhvcNAQELBQADgYEADKsvXEqBQVOC98wFJxuWM6hokSQm+8PKir56
+QtFTCDBc6Y3AXRw7NMlhaPSBTlDq2xQOdqd+PMY9q9SU3DsA41zGHLz70U3F/zhE
+8O/GKvDo3S1IJPPKUFQRJF8a2SseKXRPqSzKTE17QjuQCrZ8UNedQtGLyyVv7CkM
+e54b4MA=
 -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/key3.db b/test/aux-fixed/exim-ca/example.org/CA/key3.db
index c4d3cb4ec..7be58e43a 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/CA/key3.db
diff --git a/test/aux-fixed/exim-ca/example.org/CA/noise.file b/test/aux-fixed/exim-ca/example.org/CA/noise.file
index 104c6cae4..9aa2551f5 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.org/CA/noise.file
@@ -216,36 +216,36 @@ power management:
 
             CPU0       CPU1       CPU2       CPU3       CPU4       CPU5       CPU6       CPU7       
    0:         75          0          0          0          0          0          0          0  IR-IO-APIC    2-edge      timer
-   1:      36953        740         73         30        658        400         97         40  IR-IO-APIC    1-edge      i8042
-   8:          0          1          0          0          0          0          0          0  IR-IO-APIC    8-edge      rtc0
-   9:      78513       9414        672        193       3930       3366        885        184  IR-IO-APIC    9-fasteoi   acpi
-  12:    2901234      64831       5457       2075      45248      28156       6890       2620  IR-IO-APIC   12-edge      i8042
+   1:      28375       2779       1798       1410       3672       2918       1756       1165  IR-IO-APIC    1-edge      i8042
+   8:          1          0          0          0          0          0          0          0  IR-IO-APIC    8-edge      rtc0
+   9:      26818      10583       8549       6845      19392      10669       7595       4844  IR-IO-APIC    9-fasteoi   acpi
+  12:    1652948     206933     138126     121080     313548     214279     144993     102413  IR-IO-APIC   12-edge      i8042
   16:          1          0          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:       6192       2656       1995     638948       3343       2724       2207       1782  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
- 123:         28          1          7          1          2          3          0          3  IR-PCI-MSI 327680-edge      xhci_hcd
- 124:        260         59         40         24         12         13          7          1  IR-PCI-MSI 2097152-edge      rtsx_pci
- 125:          4          0          0          1          0     141134          0          0  IR-PCI-MSI 520192-edge      enp0s31f6
- 126:          0          6          1          1          0          0         12          0  IR-PCI-MSI 1048576-edge    
- 127:        388         49         69         20    1292852         24         72         40  IR-PCI-MSI 32768-edge      i915
- 128:         13          8          1          0          4         13         10          0  IR-PCI-MSI 360448-edge      mei_me
- 129:         31          2          0          4          4          1          1          0  IR-PCI-MSI 1572864-edge      iwlwifi
- 130:        472        177         79         17        234         80         20         64  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
- NMI:        517        909       1870       1479       2860       2448       1487       1879   Non-maskable interrupts
- LOC:    6817458   10420741   18558647   16007809   28146012   24498558   16314487   18887302   Local timer interrupts
+ 122:       5099       2645       2048    2132883       3083       2651       2210       2042  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
+ 123:         17          3          7          1          9          3          5          0  IR-PCI-MSI 327680-edge      xhci_hcd
+ 124:         75         17         21          9         93        164         15         42  IR-PCI-MSI 2097152-edge      rtsx_pci
+ 125:         18          3          8          1         11     307513          2          0  IR-PCI-MSI 520192-edge      enp0s31f6
+ 126:          2          0          3          0          1          2         16          0  IR-PCI-MSI 1048576-edge    
+ 127:        339         56         54         23    1527287         37         26         18  IR-PCI-MSI 32768-edge      i915
+ 128:         14          0          0          1          5          1          0         27  IR-PCI-MSI 360448-edge      mei_me
+ 129:         18          2          0          4          8          0          4          7  IR-PCI-MSI 1572864-edge      iwlwifi
+ 130:        216        116         11         70        193         65         78         49  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
+ NMI:        368        382        365        323        340        333        336        355   Non-maskable interrupts
+ LOC:    6159085    6209195    6078202    5760089    6020169    5956690    5959405    6072770   Local timer interrupts
  SPU:          0          0          0          0          0          0          0          0   Spurious interrupts
- PMI:        517        909       1870       1479       2860       2448       1487       1879   Performance monitoring interrupts
- IWI:         58          3          1          1         16          2          1          0   IRQ work interrupts
+ PMI:        368        382        365        323        340        333        336        355   Performance monitoring interrupts
+ IWI:          0          2          1          1          4          2          1          0   IRQ work interrupts
  RTR:          6          0          0          0          0          0          0          0   APIC ICR read retries
- RES:   12074515    1391703     533454     177021     287023      72263      62627      48496   Rescheduling interrupts
- CAL:     180651     143204      98858     104850      41109      73748     113286     111987   Function call interrupts
- TLB:      53360      51502      31573      33734      16524      24420      38918      42708   TLB shootdowns
- TRM:    3945331    3945331    3945331    3945331    3945331    3945331    3945331    3945331   Thermal event interrupts
+ RES:    2766828    1298190     589638     442284     433478     428557     274011     316854   Rescheduling interrupts
+ CAL:     346137     329328     331788     336751     344858     333233     332730     336387   Function call interrupts
+ TLB:      99586      89298      89373      92699      93689      88839      83746      88759   TLB shootdowns
+ TRM:       3458       3458       3458       3458       3458       3458       3458       3458   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:         91         91         91         91         91         91         91         91   Machine check polls
+ MCP:         87         87         87         87         87         87         87         87   Machine check polls
  HYP:          0          0          0          0          0          0          0          0   Hypervisor callback interrupts
  ERR:          0
  MIS:          0
@@ -253,41 +253,41 @@ power management:
  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:       16293504 kB
-MemFree:         9525580 kB
-MemAvailable:   13821608 kB
-Buffers:          437968 kB
-Cached:          3580964 kB
-SwapCached:            0 kB
-Active:          3760216 kB
-Inactive:        2483432 kB
-Active(anon):    1520068 kB
-Inactive(anon):   327828 kB
-Active(file):    2240148 kB
-Inactive(file):  2155604 kB
+MemFree:          168640 kB
+MemAvailable:    1949468 kB
+Buffers:           25268 kB
+Cached:          1903356 kB
+SwapCached:         8840 kB
+Active:          9042412 kB
+Inactive:        6508168 kB
+Active(anon):    8606724 kB
+Inactive(anon):  4972988 kB
+Active(file):     435688 kB
+Inactive(file):  1535180 kB
 Unevictable:          48 kB
 Mlocked:              48 kB
 SwapTotal:       8212476 kB
-SwapFree:        8212476 kB
-Dirty:             10128 kB
-Writeback:             4 kB
-AnonPages:       2224764 kB
-Mapped:           672168 kB
-Shmem:            328916 kB
-Slab:             326532 kB
-SReclaimable:     238596 kB
-SUnreclaim:        87936 kB
-KernelStack:       12416 kB
-PageTables:        54128 kB
+SwapFree:        7958268 kB
+Dirty:              9764 kB
+Writeback:             0 kB
+AnonPages:      13614236 kB
+Mapped:           390384 kB
+Shmem:            322816 kB
+Slab:             237152 kB
+SReclaimable:     127616 kB
+SUnreclaim:       109536 kB
+KernelStack:       14308 kB
+PageTables:        94556 kB
 NFS_Unstable:          0 kB
 Bounce:                0 kB
 WritebackTmp:          0 kB
 CommitLimit:    16359228 kB
-Committed_AS:    7095508 kB
+Committed_AS:   29508876 kB
 VmallocTotal:   34359738367 kB
 VmallocUsed:           0 kB
 VmallocChunk:          0 kB
 HardwareCorrupted:     0 kB
-AnonHugePages:         0 kB
+AnonHugePages:   8423424 kB
 ShmemHugePages:        0 kB
 ShmemPmdMapped:        0 kB
 CmaTotal:              0 kB
@@ -297,14 +297,27 @@ HugePages_Free:        0
 HugePages_Rsvd:        0
 HugePages_Surp:        0
 Hugepagesize:       2048 kB
-DirectMap4k:      247272 kB
-DirectMap2M:    10100736 kB
-DirectMap1G:     7340032 kB
+DirectMap4k:      427496 kB
+DirectMap2M:    16211968 kB
+DirectMap1G:     1048576 kB
 Inter-|   Receive                                                |  Transmit
  face |bytes    packets errs drop fifo frame compressed multicast|bytes    packets errs drop fifo colls carrier compressed
-virbr0-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-  tun0: 13292850   17711    0    0    0     0          0         0  9359951   16745    0    0    0     0       0          0
-virbr0:   60189     494    0    0    0     0          0         0   548231     726    0    0    0     0       0          0
-enp0s31f6: 66806972   75165    0    0    0     0          0      3744 18375796   63291    0    0    0     0       0          0
+ vnet0:   46917     481    0    0    0     0          0         0   324941    3668    0    0    0     0       0          0
+ vnet7:  502731    3695    0    0    0     0          0         0  2163732    8494    0    0    0     0       0          0
+ vnet3:   32162     252    0    0    0     0          0         0   291681    3407    0    0    0     0       0          0
+enp0s31f6: 191736257  170884    0    0    0     0          0      3921 42691408  129900    0    0    0     0       0          0
+vnet11: 7303439    6454    0    0    0     0          0         0  2342884   11285    0    0    0     0       0          0
 wlp3s0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-    lo: 2832452   10497    0    0    0     0          0         0  2832452   10497    0    0    0     0       0          0
+    lo: 2455626   14797    0    0    0     0          0         0  2455626   14797    0    0    0     0       0          0
+virbr0-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+ vnet6:  256893    1947    0    0    0     0          0         0  1206225    5922    0    0    0     0       0          0
+  tun0: 112492141  104254    0    0    0     0          0         0 30576219   80423    0    0    0     0       0          0
+ vnet2:    8030      34    0    0    0     0          0         0    42770     387    0 1709    0     0       0          0
+ vnet9:  126812    1140    0    0    0     0          0         0   686279    4608    0    0    0     0       0          0
+ vnet5:  139304     988    0    0    0     0          0         0   787341    4715    0    0    0     0       0          0
+vnet12:  133857    1141    0    0    0     0          0         0   815338    4630    0    0    0     0       0          0
+ vnet1:   71961     671    0    0    0     0          0         0   421084    3844    0    0    0     0       0          0
+vnet10:   85763     802    0    0    0     0          0         0   485818    4053    0    0    0     0       0          0
+ vnet8:  445523    6298    0    0    0     0          0         0 15036621   14089    0    0    0     0       0          0
+virbr0: 31683192   82555    0    0    0     0          0         0 119317464  123862    0    0    0     0       0          0
+ vnet4:  283261    2105    0    0    0     0          0         0  1389417    6420    0    0    0     0       0          0
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem
index 3f3530a13..fa992f144 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/ca_chain.pem
@@ -7,14 +7,14 @@ MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -24,12 +24,12 @@ issuer=/O=example.org/CN=clica CA rsa
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
-D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
-KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
-BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
-d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
-OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
-BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
+DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
+8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
+/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
+C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
+GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
+pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db
index dcea58492..0c60a9fd4 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem
index ea9d00d41..31f6e1b71 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: expired1.example.org
-    localKeyID: 65 A4 F4 F1 86 96 ED A4 F2 0B A9 1B 29 E4 F8 D7 CE DD BE 71 
+    localKeyID: E7 84 FA 98 F6 B7 DC B2 C2 3C 24 22 3B 4D D7 09 F7 20 4F 40 
 subject=/CN=expired1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDlaFw0xMjEyMDExMjM0MDlaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5JUL3GdXWt7WC
-EJu1CxEiKSWcdVig+oWVBDcFKFyZGV/b/XQzArTJj/PzDfq85nwHMZHESXfelDPn
-mihlM5AzuOc5UXsHL+IFBAXsP6RkqgrB0Iq9CQJ9DOFPTGdviv7IR50o0VBmOG7B
-deRYYiI7OSlFbnT1kZ0RQI8146eFXQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MDhaFw0xMjEyMDExMjM0MDhaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDaBoTFNAnUtbJO
+LDBleZhRGtgL08bCBj7wv5JqD91CKGxKCt6rZxs1gIBu2NAfdep4tC/H9oOKrRZA
+nZd80XPu4Zqp3TH+CJFiMNv9sAK5ZI26Vc/8MbNbwJnWokndIAmH7BTCwNcelfFg
+kDkq9mojMA4VphLTU322Jji6x6/y8QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
 A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-AFgj1Z3sDIPTMbFQcrqbtDKmjlh0x3F56nL5deLRvYcLU5hbZ/bTCpbkhqGIaJGr
-I4YBlMbKdxWbEEifkxIEM3oD0WARN1WMnFoJJ9W/iXFcVWia8u4WuuhA34xQW6EM
-ZMw0HxpAADiXFwJz65RCLcL6n3/R96KBen/cGcxc+7+p
+AFQhEz5n6ZoYvoU0QHevvBpsjFMHxMFMkEPsB5CLWxyvOLnKHurd8RHAcW9b7KiS
+XX8Bp4cpPRg/CcJzrsSR4QIMccEBPInuvAUMei/LmMqlI1Vq2Kr5cKaVdLSDo+Z8
+Ti4q6MjoFVxEVKVdrWiSbnEy5bnf9qmuji+liviPzUgg
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key
index 0c806d699..264fc586c 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: expired1.example.org
-    localKeyID: 65 A4 F4 F1 86 96 ED A4 F2 0B A9 1B 29 E4 F8 D7 CE DD BE 71 
+    localKeyID: E7 84 FA 98 F6 B7 DC B2 C2 3C 24 22 3B 4D D7 09 F7 20 4F 40 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQILNa75fYCFIkCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOtAYoeqzZcvBIICgIfhIuHzKuzR
-8F4glrBt1wUq+R5dJe1GlS1xgATTGk44bBU/JMvn5jZRqE2SfTQlEK7qpRoY/zfP
-5jo716Tg39zw1NwEGjkm99kolgmsjcNKAOUDE6Iu1eik7lp/wd+PkqqIpYHjW6p3
-dS3dKtV0SZs2HRFNqnZZDWakf7RgwOz46YY6bMhsIIgO9XZ9Ry0L/x/PB4x9z6u3
-qPoLu0qDteFRvI5XHGe/ydAPr1qTwjBs4MaTzA6CSeY01xmoJ8tFNfQMjD74ncjJ
-2WKgE2zFLIT9QFfanee3lwHMiFm/A4NmnlOWQDpimp9dFgdODIIqKwaIfuKnYGVj
-wEprhMnh4WZXon6D65QICdycEl93o65GBfVPRUmAt2ylfqKtf1qgzeYWnc7O28ND
-E1k7lcPKhLgCytdYS4kWVRReXx77yPJWiA4HBgSjhVoiEKTynNj1QVoP8KrWLC/V
-pMXPSedmhJQqkCCu6fCx3CAi1uWNkhNsMr/98xzGjOjU9qxlArTIri2w7rNoHi2R
-e1pWJXbTpj1o/P0vOkWLZb0hmTVRugx5BPOGH9Fd4ahCIxMOWA5tn2teFeJSyTu2
-PMIOxByWR1M+yw4/R2h+EJcnssDOJZQ0OTzR1keQNKf504THaeihUsLU6vMoPgB4
-KermBoHn4QZKxZJr6tlDMVJQTxdKRZRRPXPasChpJQyKmn6wTjsMmDGpUsvZAtk+
-T5jjCrD8d/neiEVM3woXOk1usyU4vudNIV/w8NIl6hk2rUdX+FHoO7nCtJJa3m/d
-B/HuUAGUP2qJLP/zv5zv+7YhxOF0FHpsMHJr9yqN2qqLy3UJZRTCbzgfp5TU7o5E
-7MuV9eTpOm0=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIWDp+nZ+C3VECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPJb6giMa6zEBIICgOfaLlc5lPqq
+zyVbiGuZliHmGHSiQKskHAKcRtLM5P8h4/grOSzKM2q6eSjoWDIl4nfCm2FvKoFf
+G9NK8tS0LNwElcRhEVqSfHQvrJcISSObdFbwO98PvcEo/22rj4NKyEToFEk5cJbc
+SWVQWExJUfmMYewcbPoTJrFZOwEaX2NjAh3Ji27gyfcUU6QKKTLXKD5S3npcZ4aX
+fXAjPHq9PZrGSSj2SQQJ38+jlZpj4J+e4B8jS0/kLVU+5zO2dc4sIbwILVfECbwC
+yT+J1jRAT5X/ByskZL7F2AaAkvwGSEQxnGxiXJxW9V69SaNkBzAc+N8Gek0Hk92O
+ed2/NgETYdGZYz0ZKzRRAfLkuGTs02Iuferoad8e9dy9PtxANPqBd1FrAXIexjKQ
+WG2SDwfeADDnjRu5IdcsRkxz8COx5/NuP1qJ9z3AGcQPkuYhHGBrOy1djTFaXAtQ
+bNnbFXhBX8Mku20vSW4pV+jROWbvA2Ws9+8bYgtpv+JG7Ja8fzJ6tXEJZTqagVDW
+PsCYqlTnvD0sER3ocK466wrSE+gU5Ymjt2HBruCLgMEBT4nV5QO2/hP2Ly0BQhc7
+0YGfMghk6Nahz7WBFINkk4fOZQGk93ztU2rIbhpcTIATb+dcQDblW00bPlWmDLYz
+dALbRjbSNKbRxhPuRlo1BqU36HHJzCkskQSwQ1YNcGujZFdqtNQOy0RlCn1jrFOk
+dUu4fcI6hzGkVjradaSDytT7MfAio0gvOA6A9jwxrhxmX6UICCzZIAiGyVEauzGn
+bl27i4D9akwwsBh9dfqkIa2aQ3KgOsi7Y/idhHhYQWj4vQYGfAuKOxYSJqbZJeqX
+UwpPT33eXKc=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp
index c46a178fb..43cd7d7d8 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp
index e1aca993b..fd92b85da 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req
index 0df56df0d..d5382cc3d 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp
index 710079311..19c69baef 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp
index 6d6de610f..baef0b341 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp
index e23d6b8ef..13f45c612 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp
index 57cc7e37b..f4879c609 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp
index 4afb549d3..a89d39830 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp
index fe095c1fa..9c85297f8 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp
index 9f4135ad1..2dda3a2af 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12 b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12
index 73a116653..9d0ce538a 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.p12
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem
index 29f1f6b29..cd97df798 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: expired1.example.org
-    localKeyID: 65 A4 F4 F1 86 96 ED A4 F2 0B A9 1B 29 E4 F8 D7 CE DD BE 71 
+    localKeyID: E7 84 FA 98 F6 B7 DC B2 C2 3C 24 22 3B 4D D7 09 F7 20 4F 40 
 subject=/CN=expired1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDlaFw0xMjEyMDExMjM0MDlaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5JUL3GdXWt7WC
-EJu1CxEiKSWcdVig+oWVBDcFKFyZGV/b/XQzArTJj/PzDfq85nwHMZHESXfelDPn
-mihlM5AzuOc5UXsHL+IFBAXsP6RkqgrB0Iq9CQJ9DOFPTGdviv7IR50o0VBmOG7B
-deRYYiI7OSlFbnT1kZ0RQI8146eFXQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MDhaFw0xMjEyMDExMjM0MDhaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDaBoTFNAnUtbJO
+LDBleZhRGtgL08bCBj7wv5JqD91CKGxKCt6rZxs1gIBu2NAfdep4tC/H9oOKrRZA
+nZd80XPu4Zqp3TH+CJFiMNv9sAK5ZI26Vc/8MbNbwJnWokndIAmH7BTCwNcelfFg
+kDkq9mojMA4VphLTU322Jji6x6/y8QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
 A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-AFgj1Z3sDIPTMbFQcrqbtDKmjlh0x3F56nL5deLRvYcLU5hbZ/bTCpbkhqGIaJGr
-I4YBlMbKdxWbEEifkxIEM3oD0WARN1WMnFoJJ9W/iXFcVWia8u4WuuhA34xQW6EM
-ZMw0HxpAADiXFwJz65RCLcL6n3/R96KBen/cGcxc+7+p
+AFQhEz5n6ZoYvoU0QHevvBpsjFMHxMFMkEPsB5CLWxyvOLnKHurd8RHAcW9b7KiS
+XX8Bp4cpPRg/CcJzrsSR4QIMccEBPInuvAUMei/LmMqlI1Vq2Kr5cKaVdLSDo+Z8
+Ti4q6MjoFVxEVKVdrWiSbnEy5bnf9qmuji+liviPzUgg
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key
index a9b83b757..b0c224ed5 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/expired1.example.org.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC5JUL3GdXWt7WCEJu1CxEiKSWcdVig+oWVBDcFKFyZGV/b/XQz
-ArTJj/PzDfq85nwHMZHESXfelDPnmihlM5AzuOc5UXsHL+IFBAXsP6RkqgrB0Iq9
-CQJ9DOFPTGdviv7IR50o0VBmOG7BdeRYYiI7OSlFbnT1kZ0RQI8146eFXQIDAQAB
-AoGATSkjVHo27YqYocEsM3KOTG9blm4tZsGhxG4CRCsDFGdH1RY3RD8fe1V8NNKh
-qfJgxFq7RlPcGi4nx6EurqajtMUkU2Uja3ydzp49jLn+ZDK+0ya+SKT2EiQjs2vs
-MsY0px1qPNFt0hxlM9BOn1fQXS7vV7YfRViLIkZmS4Sqgr0CQQDbyn29fEo3Y1ux
-sD3YkZZC9Rr6cz8MphOWXea6Uldz3BcII0P4ipi2MV+gXngWYpBSHgZVS/Zo2KvR
-lN3qNVXTAkEA16Wgj69wLcRknkzEnHNanAgNfdVJyUW6kGSmpn/+eHyv72Qz+ay3
-TXCQsYSRNpjTnYJZrN3efybqa2bJu5XKDwJBANVvjC+oNQIYkIC7HzPiHUMkdnBj
-3gRQepD42whw0dAHGK6kYGtJXAcBZ1V6p69FQ9UapxfJzp3+WswJfn7kEFUCQQCI
-t/tZ3XKTsaXRLv6f6gqSThCvrKABOXIUxZtaiF9/aB3q+m5xZu037Zvu0At4v9+6
-RsAv9uJvXu7UdPCFO2xFAkBPq4tTiyBP4VZPOzFqx4UlAm5Bc9xkT1CyB8IlyRYS
-x04Wy7szlAcgwPL8MXVBU5we3tTNrdqs4txiKwpZw4E4
+MIICXQIBAAKBgQDaBoTFNAnUtbJOLDBleZhRGtgL08bCBj7wv5JqD91CKGxKCt6r
+Zxs1gIBu2NAfdep4tC/H9oOKrRZAnZd80XPu4Zqp3TH+CJFiMNv9sAK5ZI26Vc/8
+MbNbwJnWokndIAmH7BTCwNcelfFgkDkq9mojMA4VphLTU322Jji6x6/y8QIDAQAB
+AoGAIpffMCUKHEh6EqI7SZaJ/vBp8DJ5emagTPWwhwieXDVqvTLNUtfovsv1VOEs
+4JkGi4FXhXxNMc811SnME/9ty+G1/jk4zygoaMJyPKbOwb8TPzVlD+Z0WN11XmDu
+tAUohYuKaa9Ct0J0hw7LHBRs0Z+WTFqdvAS93bYyqCqR9YsCQQD83fEGFS7yMrWv
+DWzvboWXrd4vNIg+Lr5gbOoeVK+hcnEImafLcWDIOrQsmgBcqvgeboFlVh1G+isU
+2aViqKG3AkEA3LoQltTpjbVfGKv8WSUL6NEuGo/Zo6w3/+wISl88vK2ZMfFFSVzd
+pNnztvC+jzypfUis/BXHdH6oU21g0kvwlwJBAIQQljULEz3DZkhKxr42Bue1Evms
+gguX9i3+NDgrGp9DWe2X8p66VEW/AyLYO6AqWvPp2wLF+vx648077ricQfkCQGhA
+kZlMEsvVwIa8pMHOF6PtOONe0iLWMtTzvK6z8NIFBHhsRpdx/1Xfg5cCel7Y/gyo
+iNu/xacmM4bEAJkTOR0CQQCt9p3t7LYVpEqsLBP9QHHyzA3Lik5C9CIp/wQbq+Gl
+ixcIG5h1TqM/LtJ93tPPH8nKEFmEEKE2S8HDjhezwwkf
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db
index 40a6b1dd1..666d2f049 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db
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 3f3530a13..fa992f144 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
@@ -7,14 +7,14 @@ MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -24,12 +24,12 @@ issuer=/O=example.org/CN=clica CA rsa
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
-D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
-KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
-BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
-d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
-OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
-BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
+DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
+8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
+/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
+C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
+GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
+pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
 -----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 f5f541257..cfa09a365 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 72163dde3..30655e5ed 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: 2E DD E2 B3 B8 CB B1 C7 69 49 B9 92 47 CE 70 04 13 5D CA 3B 
+    localKeyID: C3 07 E9 78 00 0C E8 96 30 9D EB FD 1E DC 68 E3 4B 7A EC 35 
 subject=/CN=expired2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDExWhcNMTIxMjAxMTIzNDExWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1MhhnD3UeLhd
-/EUfjgRzszyreP+UNFpcSr7tKZ6dW/5wPLTbeqyMH+SNW8Vuyodtu5JVixFcKiLx
-C4cuZ62l32pCegbvAIdiHWFU9nvdvr8WrtqL9Yb1tktTy4svgkjIi+qmxONL8Ywp
-hP7yiB0Q99/o0tgCxfICHjJr4bGQ+xsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDEwWhcNMTIxMjAxMTIzNDEwWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmm5VvjClKLJr
+pZTi4vufH4b+DYY2mv1N01zebHMfJ7z84zTZq8pkczQOPLux1zQyviKXpbpGYh0O
+XURZ5QMAGz/23RFG5mGkcIjyJegJnhbzrMXb5H/d8WeEl8su855p2DT5KvMtX7lz
+YAdnRon7VbVl3tX7onucNYdWcRQeEPMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAf
 BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOB
-gQAU//Qy8xq85e5h0R6p+1zuPqUrLmtLcBqUFTKdhdD1ocW+xZQx+k/81tFEPpEp
-G4E8gw9j1eNVkFeIEt6sWCTf4EtQKteUBExIicZxAHdYvWtubwekkmRpj22nf7Fg
-vr7VrjvQsOE/lUDyY8PxBrxyoxwvUkonPZK5Yr9HaHX0Qw==
+gQDuDYF8S/064WXThsw+KL7tfhYxG9Yntr2OmcGAHhjesHzqA663oUKLIBFD1OEJ
+cCzMOZDBGuMrT+DpjGztUZnFEY59ORXfhdBcJBqdGw6DCfKHID9tLuYWY2j9jjo/
+2TKfwKAV7Z5jO6RYDPClPFnwCN4OQfdte3RNjRZv02K1KA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----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 49f0a35e2..ee20870b3 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,22 +1,22 @@
 Bag Attributes
     friendlyName: expired2.example.org
-    localKeyID: 2E DD E2 B3 B8 CB B1 C7 69 49 B9 92 47 CE 70 04 13 5D CA 3B 
+    localKeyID: C3 07 E9 78 00 0C E8 96 30 9D EB FD 1E DC 68 E3 4B 7A EC 35 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQItqiuPxPxupYCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEA01y2WO9RzBIICgM5lf/hz0XMs
-I/8421RGtABym7c8abM5xANv5y4cSsfwlRTsCWCH2Rh1n40XPDBa2UOO+dy37dzz
-akwf1XZ6fne1zs81seTbxX4N7vbXJeTv+tVPkUTXrtEPMJpl4BWFBjLonWvul+Uh
-xprWOgbW4RYUHL7m/+2FLUxlgbxvE9BwAr8Row6L0pyguoNNhP7onIH1BiOLCjqV
-w+XRYnb+3w5k0iWBsSZoGDOyHucnMhV05hdoRf8gacOERWSTvmSSuX/1LVjhJw30
-+CuEsApk9Hx5VsmLgNygr6KHQRs8voGEVZTUznmKbnWriSlXGElDevutPqshUm8/
-o7GQTEbDl69A2s20KRe4Zbxka4Ed37jHB/eaDLim37u7IYd4nrTCUiTytIi+uj6h
-1C7GdjYaWyPMfaK899pr1N3+89r7dUHnx+m7GAEirRX2HIEGywvK7r9DGpTaQEhk
-bbHBvK4XmxgUauv5QLYAkQVRNBfqqboFEe3HauaVmk0IG6SaNosNx5yszRl1E6wX
-ZJ+WiqCHdUfGhUoETF9VPEBauXbveEG3PphE4gBEgYVeN1WiJwb5t4ylK//3i9rA
-Renz0AhcN8lAQISAsvubmY5dgqCwvbCqNiI8KWio4fo4BiKf3d9nBo2eShartBdf
-JMYC3W3vIm7aRZm35jbAiREyWhFUouf5+4PwVlDTAc23cAETDBljPSx2DUNb6B1i
-bwlFL5c43tLVxFY4TptNLHeAgwEydGdbDTZtOr8F/H13lYncVHPwTToR9p8tHcQw
-NXU1yQ10C4eSoUoyn8M9FjQ7XRNZX10AKAeijhD0eSBN5aLGZrUrrcluohy/uTxC
-bHoVJV+IwPs=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIVm7NH2uvihICAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMnDZ3aq0vNbBIICgKv2ggIipZ8i
+PYKLRJtoq5zuoyyXjy3mysy03xsN3dJWu8N8FM7dJBK0PJpotmOh4CGp2egyVXBG
+VUMk69qONtulOo/ZF7J/eBAuLph5L0w5mB3zHBnHQU1q+X8hEpkpm2coXXjVsh4i
+ODQ6brv9MHiNe+cvBLuhs5E5vKStcLMJEw5Y0zP0eEvGTL8JbYerD7ntyfZ1k/FG
++LisMD97j7ARk7zQzMWhgCEPxFHZrxVsKLJNfkTInGVr2dVLj1JnpHUI0/tff674
+BsRmmW/QtHfNgGANnP+r1JetiiHHj6m/f0/xc6egMfs7bl1cvi1kQ3yerkOPNeTU
+BRGWNwaJHZCyiRUex173sGHftg59auHSVn1ZHksNMJM+W9H8x1ZVfUHxrRkKI3Ku
+QHbtiHwHbyayksp+RtcjcBQOxm/5PXugtYHYRiBDAjyltmlmWDiQb9RmQ0bsRT5I
+69asfi7qODvK64Y0Gl3f9jLpmAxsgbiIpOERAy8htk1Ffgi+Yjiok94jmpnD6kk2
+hdksPRaPta8JcJNNsNmuAFpt8XWcbwVvX1SwOwq3byo/eTQBDv/BH7H56MPp3LPX
+RvSvhRo02W2vUNojBXXu/Hf6O6L+JRQHQ/3Q9o4zuhgJkugzi/Cpgmi0WosTiArw
+956HYqWtuvBcpcqrwlzRvSQ470FDCW7A+gOoVVyHTLnVm8ZR6FS7HBR27mr/rSVO
+OZGWNlh/Qw8F5pTqTLhhsqDgvuNq+jMb/+E8Kk74VjvMcy9qw9mI0TAfp9OMSAIp
+p4HKq2gu1URpQmXoalDKHnOY/+PZlBVDRReYpnqdcmOrXrnTj8nnwcJUv90VT4V5
+jRsAevjBaFA=
 -----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 f97ef1737..e54ee3c0b 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 2f1d629e4..a10981d74 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 1e66cd3dc..960c6a79a 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 2f1d629e4..a10981d74 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 541413e71..3bfd11369 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 ccbfea8f3..ed3df2f25 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 ccbfea8f3..ed3df2f25 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 21a0f895a..3e66b96a8 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 4050be06e..7d51c5f03 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 4050be06e..7d51c5f03 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 5cb856f6e..c6b41c5d4 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 e4209e31f..ebe9209f9 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: 2E DD E2 B3 B8 CB B1 C7 69 49 B9 92 47 CE 70 04 13 5D CA 3B 
+    localKeyID: C3 07 E9 78 00 0C E8 96 30 9D EB FD 1E DC 68 E3 4B 7A EC 35 
 subject=/CN=expired2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDExWhcNMTIxMjAxMTIzNDExWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1MhhnD3UeLhd
-/EUfjgRzszyreP+UNFpcSr7tKZ6dW/5wPLTbeqyMH+SNW8Vuyodtu5JVixFcKiLx
-C4cuZ62l32pCegbvAIdiHWFU9nvdvr8WrtqL9Yb1tktTy4svgkjIi+qmxONL8Ywp
-hP7yiB0Q99/o0tgCxfICHjJr4bGQ+xsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDEwWhcNMTIxMjAxMTIzNDEwWjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmm5VvjClKLJr
+pZTi4vufH4b+DYY2mv1N01zebHMfJ7z84zTZq8pkczQOPLux1zQyviKXpbpGYh0O
+XURZ5QMAGz/23RFG5mGkcIjyJegJnhbzrMXb5H/d8WeEl8su855p2DT5KvMtX7lz
+YAdnRon7VbVl3tX7onucNYdWcRQeEPMCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAf
 BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOB
-gQAU//Qy8xq85e5h0R6p+1zuPqUrLmtLcBqUFTKdhdD1ocW+xZQx+k/81tFEPpEp
-G4E8gw9j1eNVkFeIEt6sWCTf4EtQKteUBExIicZxAHdYvWtubwekkmRpj22nf7Fg
-vr7VrjvQsOE/lUDyY8PxBrxyoxwvUkonPZK5Yr9HaHX0Qw==
+gQDuDYF8S/064WXThsw+KL7tfhYxG9Yntr2OmcGAHhjesHzqA663oUKLIBFD1OEJ
+cCzMOZDBGuMrT+DpjGztUZnFEY59ORXfhdBcJBqdGw6DCfKHID9tLuYWY2j9jjo/
+2TKfwKAV7Z5jO6RYDPClPFnwCN4OQfdte3RNjRZv02K1KA==
 -----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 d6388e370..0900ae89b 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-----
-MIICXQIBAAKBgQDUyGGcPdR4uF38RR+OBHOzPKt4/5Q0WlxKvu0pnp1b/nA8tNt6
-rIwf5I1bxW7Kh227klWLEVwqIvELhy5nraXfakJ6Bu8Ah2IdYVT2e92+vxau2ov1
-hvW2S1PLiy+CSMiL6qbE40vxjCmE/vKIHRD33+jS2ALF8gIeMmvhsZD7GwIDAQAB
-AoGAZYLxOkovDqaaQ+swKh8KmYREo9V+PVmsdQZP+46NsOEaZ4O6v3QI54AwRgtT
-FzDz00v1HoLaLsn7qA3GQDUSD7xJ49befYOKyFMtYM9CBykpZjX7ZF5WykUK9kn5
-MgbN4a4ObLkMpysnzxE/cvGnwIAZBRqZlkOfh6sEiwFBdskCQQD2hozKvsb9EoUf
-A0h2Ex/dcppCA29yO11gtHrA2+V2o3AhAgeJrXmz7he1dkE3hi3wwSMXBG2KKdc3
-/GCutZLZAkEA3PXZ6d5Ev9IdncjsyDUNXi7fA9K3RKNqhql9kAEJhy5YPFKrblTY
-MZZZGWbSric57hgyiOV6zB/L6LgfYkidEwJAXHu5kc3kRMiP3ESVCIbAK4l0yVMU
-mhwfOco7SuKzwMArrpZeUY4c3B10E4VbjgLudSVfjqEAnxZ3QO+TLbe8cQJBAIGo
-vsPOivco2/ov4kolX3/J71H1/1cGscbthGHRSf8KQfq75B7tKKQIfqY6QRyypfrC
-Nj1As8s+SVB5YukwhQMCQQCUFU+cY9NAZUeeDD0gKglZ6mPgHzcdBEj8FUs1tJDY
-2ya8e2Cf7qm8QaEHImG+oJzz9okxqfIDgCzgyyZQvXc0
+MIICXgIBAAKBgQCablW+MKUosmullOLi+58fhv4Nhjaa/U3TXN5scx8nvPzjNNmr
+ymRzNA48u7HXNDK+IpelukZiHQ5dRFnlAwAbP/bdEUbmYaRwiPIl6AmeFvOsxdvk
+f93xZ4SXyy7znmnYNPkq8y1fuXNgB2dGiftVtWXe1fuie5w1h1ZxFB4Q8wIDAQAB
+AoGAGRlgpyop1az18PH7VC/YI1wh01niaxtLOFSKM+8b+63sHhNbY1/gJpcpzzYk
+R9lMe/mMUxusz8pwKLlwsNdlf0eqrq9XcAzSvVbvQUHYW5lWCWhAIh6RUmtPWYaN
+y5WR9xjhWZAbcMmrhGFUcGDw3H/1P3XtlwclbkMCkG1kgRUCQQDHleEEt3CgFDSB
+NDRmZTLPTZnmcN31mFymMvTBKCOVszbqh12Xp/AfIC/k/SWPk6JQaTG8IeRw5y5f
+mVz85vTlAkEAxhUNWmRhnwgHZzo7Q8/EGwOVuEoaEzhNcU17oBzApLS9RTHAoee8
+/X6g6yDX9xg4nsiDD5xcMWpIrH7bArQo9wJBAMaJsKqJdE65arVwYgPN/Wo8brDO
+a+3IX7mwjMqsjCF5glJwz8hx9apw0VQAAmI94UQOMLxOFrm9LuNIYzjs4oUCQQCW
+GEWyBPZkBzV05w8ZZ0n2HlVI+/2eKr+j506SGLdxFvOEhxqslGkEvPs6r/x15Aij
+aNTG83h4iUzgSI+0EMgpAkEAgeE6sU3Xrj+rJneLQigvV8FM6F4sajFiNAq/ce44
+TsQq4i6maVlKUVzLZNn7fdNpKiwj2ncZQvEcN8E4wXKnzQ==
 -----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 882ff0e47..4379241ea 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
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 3f3530a13..fa992f144 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
@@ -7,14 +7,14 @@ MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -24,12 +24,12 @@ issuer=/O=example.org/CN=clica CA rsa
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
-D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
-KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
-BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
-d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
-OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
-BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
+DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
+8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
+/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
+C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
+GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
+pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
 -----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 ff9dacd0c..d0b3f8100 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 8182fbea5..cd6564753 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 76dd5aa3e..64d862b4f 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: CE 32 EA F1 AC 4A B9 61 CB CA 10 AF BE 41 69 F0 54 80 94 2B 
+    localKeyID: 60 8F A9 50 BA 92 BB C5 5F 06 71 53 83 DC ED 89 D4 D9 0C EF 
 subject=/CN=revoked1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDhaFw0zNzEyMDExMjM0MDhaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChX8j6G/lpFx7E
-ceaeTU+ezsI81rstualSaUqfvpPv9GzjeZ4EuTwvX+vMlahWFZl59IPpXuMeElYR
-79QsrTxAVP2DESa20WPgag9EhDr4gf0MrSIF725bKR29sAACmZEFjY4ev+bJTLgj
-K7zFYPa7/HgPHE+Czg3pjC8P9XTuXQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MDdaFw0zNzEyMDExMjM0MDdaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjW4ZKyjdV2kqE
+zkrEEXlmiBXd47WX+x++mSbaYUkiGyKUPQJNK7StYDu0BIXBQMIMk/XWhOUJAynK
+Mhk4AVpNRtt+YbtnHwIRbB/PQi2UlNVBrHZdIFytGlB02aHkKxI8rdGFzzKel637
+MAIuwBAok336fQ7xKSnMEuWZsqMvUwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
 A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-AFuTBSk5Ztty9PgRRclVViFjYZMu/Z5cCpbSMOiVVzA/8LWBovPAwkz587hUFIvL
-ByeAav+pVcHZ2BM1uMrhhCJKcj2FsLF33mCALe1DOcgL0+M+TZcgVPl9SIQMrXEo
-wK0y81B01y0CshLXz06nswO9n56Cg04PoBIifjX9bFis
+AD5EaCV0JaKAr7rhKrFHoeudV3hXeOuyXRTw5eRUzfnwDxX84GBBIeLAh1ngY6+f
+FtEEqm7kOkW/aDtqqEnVBQKlqtgL8mnHYDxewyclm8HOqNjpX56ry9Dl0DsJJk7o
+JdW5mUZeyvynA0gy5aSD/VTPbaX0uOB22rUP+qdSzMmF
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----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 1767cc892..c9feded80 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,22 +1,22 @@
 Bag Attributes
     friendlyName: revoked1.example.org
-    localKeyID: CE 32 EA F1 AC 4A B9 61 CB CA 10 AF BE 41 69 F0 54 80 94 2B 
+    localKeyID: 60 8F A9 50 BA 92 BB C5 5F 06 71 53 83 DC ED 89 D4 D9 0C EF 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQINDT8GP90EyICAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEysMOn1CAtCBIICgCyfQbHj7AFR
-hYH0JwsbrODhx4Wv3mGliYHOBu+gPp0nCMFPzctsLh5xf+gqCc2i/NAbI4zMjyUB
-pIC7bm1LjkTqGO1gPrGcSdbVN0E9K9GUk50fGYb6oKFs6Trevgkq4lLP1v9wI4vi
-qEHK6kfBSogO7uw2YVaCVORDbo1ARAPi/HRMoZi86fFe76rQtknGrJSmHnqQVfLA
-ep75CvCuVHaJdxJ9tUyeoh1X1uuiyMvECTHH5HIis11/VjphZX26jcMdks19aoAm
-MRp30DEQ2hkTFBviLyMguxOu4Gxaw1Hcnx6WsGDo7OOoqkf+f89tTNbhX+SjmIKB
-ixkYjsBXEn8q8wpkFhyKQSPec0z+pYbgbYx5NOXDCWEVsw478lF/m6nlqlrCUAQK
-4h/d94q0+MOTkysn51kQLYn55Dni3ycTQX//ocVs1ZS0l1kCij6a+kXXhF8RAulF
-JkrJiHUoxRtF2v6r6vd9S5l6QVDfYWS4fxwVSICOxcLMUBPd6BEJECBYNcUMe1Nl
-36HEXo5JLwUpxT74KvoY5IJfeSjBDOYTrRI87GbkPkflOuqPzapMbimXfGc+C7pr
-KlNJl9+bNWNhNtu3hlJGcRgfz9AXmMMSfOTK08XxB/FdbX16433jOWj0/rfQIjlY
-xqmDpP1ngzYhBF5SDQXsLM1WcrY4mm4U8+FN/6EO+atlj3GznlXNVFZNVFsHpP8W
-VLdQocPqjJKibkgLUx6o5GczQ+T2YOw0n2Uzbo0/zETS/TD7rVssp1J7U8POhtfN
-/WiKyxy4lR3SRK2n7ZgGtHFTSsb/5FC2ab2illmp9j+ZITGVeQ/FqV4ry7+qhBS3
-ZHXcbEGeezk=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIRxx6wIvMbXYCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMQsgJ5Pme9iBIICgH0F7OllXY+i
+eY/6k5yABbjpWOjcplZvx4opcoJAhIyqJwdZX9Pay4vF4k8vrKkxNOsP8je07x2p
+bWFaUyhRGRdBoL2KISbS2Wyu6hmXfCwXHaYze0hiuKjbjbthDXX2OpUjid8g/asB
+0mVvdx5HHgT0nARqqk9q3UsVgYXKi1zT18vf4QtKqcx9vSVqxW2GtjgQHxTqzpm2
+uNME2K42AUfhwP6XV1m20xfHvj/aHjFbBKze0yecwSZxoAzQfy3hkA25HK0SNHH/
+WliSOqCZ43ANiAnuhWG3+PFro4DONhcnJ02r7xMwhsb1ENhtGMrkRICw2qqOQrd7
+dRkqhgZ2Bbv9yTNNcp6No1xN8Sx4SpmaQWqhAC3rplBiYaH3IEneBajASzyfspo0
+oubwH+t/GazJKmbzq+aQq+tJQjkhYpY32V1deNsaPc+ZCm5/ar/RML4Z80qnYp8v
+TkmSkZeXl442IPZpW+dq177VE0fKGlEThc2ZO+6/mG5YOSn2df6p9HDWwMNhwQ+R
+91oTKuhTI/qKl9/XfUwcoUe6o7x8Sqosivhz0kuJZgtSRdilFxBvv7TuOmzKY74a
+KOlZqr9wS/VC2gT9RFmb+Ge+0FfH/eenHYKr7L/QKaCYhPGJVitdu+hLOBPHBkz5
+cPa7EHW46DQ2nLu2AqNMHNAPveCGlwsFEX5Zg/RDgXfCxN5VoA8iKyKL+xd6QIHd
+LzFWtlnPT5kxhsmmlwvQmuVQEvDq11QxxUBncfuzmNbdj4hEk9Ai7DJzC7Dq9YQJ
+7AqR2cVAuo3I4yFcVRzmKpxXnQ/6RnunzkenK+y/7dZImzWZP+LtsrAs9c4dpSWK
+JtnRus2p6bs=
 -----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 18a004a9a..9a2d88ac7 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 c23a2563a..2ca8b921a 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 a0b11dd30..65c2e25e8 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 6577a4a5f..b0f076ff5 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 6dc123486..1e638a659 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 76f8e9338..2b8e328f3 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 8ff93e771..39ded1781 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 3e9870d93..6213733b6 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 782cb3cba..4009f2333 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 30e1765f5..7db974a4a 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 09bef388a..b95571698 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 0cf1a59ca..985abb240 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: CE 32 EA F1 AC 4A B9 61 CB CA 10 AF BE 41 69 F0 54 80 94 2B 
+    localKeyID: 60 8F A9 50 BA 92 BB C5 5F 06 71 53 83 DC ED 89 D4 D9 0C EF 
 subject=/CN=revoked1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDhaFw0zNzEyMDExMjM0MDhaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChX8j6G/lpFx7E
-ceaeTU+ezsI81rstualSaUqfvpPv9GzjeZ4EuTwvX+vMlahWFZl59IPpXuMeElYR
-79QsrTxAVP2DESa20WPgag9EhDr4gf0MrSIF725bKR29sAACmZEFjY4ev+bJTLgj
-K7zFYPa7/HgPHE+Czg3pjC8P9XTuXQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MDdaFw0zNzEyMDExMjM0MDdaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjW4ZKyjdV2kqE
+zkrEEXlmiBXd47WX+x++mSbaYUkiGyKUPQJNK7StYDu0BIXBQMIMk/XWhOUJAynK
+Mhk4AVpNRtt+YbtnHwIRbB/PQi2UlNVBrHZdIFytGlB02aHkKxI8rdGFzzKel637
+MAIuwBAok336fQ7xKSnMEuWZsqMvUwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
 A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-AFuTBSk5Ztty9PgRRclVViFjYZMu/Z5cCpbSMOiVVzA/8LWBovPAwkz587hUFIvL
-ByeAav+pVcHZ2BM1uMrhhCJKcj2FsLF33mCALe1DOcgL0+M+TZcgVPl9SIQMrXEo
-wK0y81B01y0CshLXz06nswO9n56Cg04PoBIifjX9bFis
+AD5EaCV0JaKAr7rhKrFHoeudV3hXeOuyXRTw5eRUzfnwDxX84GBBIeLAh1ngY6+f
+FtEEqm7kOkW/aDtqqEnVBQKlqtgL8mnHYDxewyclm8HOqNjpX56ry9Dl0DsJJk7o
+JdW5mUZeyvynA0gy5aSD/VTPbaX0uOB22rUP+qdSzMmF
 -----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 97ccae58b..61ace9ce2 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-----
-MIICWwIBAAKBgQChX8j6G/lpFx7EceaeTU+ezsI81rstualSaUqfvpPv9GzjeZ4E
-uTwvX+vMlahWFZl59IPpXuMeElYR79QsrTxAVP2DESa20WPgag9EhDr4gf0MrSIF
-725bKR29sAACmZEFjY4ev+bJTLgjK7zFYPa7/HgPHE+Czg3pjC8P9XTuXQIDAQAB
-AoGARcWDwDu7HOhdqaLziqszix6rFaHkAROedV7H4ISGMv/T2pBZNYKfVn5bFbP5
-OesR1gxVwl9/xB86bnvqmTx3aUtWohswzxMEt4vpfRY2dfT5/8h5T1717eG/8hTQ
-6UM1SQ7LpoJ01bj2Sua33XejS0XRG4SItPR4mMzkLqXlPiMCQQDSrFeC0ZzuYSWA
-HA3eEUr0OzcQpTFoT0uyV0dTV/+HB0mxBan/366FHsIg03oJ55s+64YUTGIoIGGH
-L42+aSmfAkEAxBgag4hGdeWqTE4QwZGfwQLIJmQV969s/jpkMgyWyX9RrVIh+69E
-wZvrRZ7J7IL74ySdwoniHRETVU1kHrwegwJAXnuMg88eYoqPFvV+Aqoew4oLGBv+
-HJnziPg7tNUydIyAMDQqGednjaxNxAsUIH0O0xkt+MyI+RYMp2RcXZksYQJAE73x
-fWiM33W9zWzWlwZYNRBYojTVWVhZ+sZaLAfEbojY6kAol7QvkeZmq12vKpaNUXLw
-RxOmphKABciC2e1KjQJAK7Xaj4WJJZq6wpB8n7ahYgOl1D879fSrNVONZI1k3suS
-DQAnggiFQH/n1L9QyzYf/8WDETapop4RTR4s34uu8A==
+MIICXQIBAAKBgQDjW4ZKyjdV2kqEzkrEEXlmiBXd47WX+x++mSbaYUkiGyKUPQJN
+K7StYDu0BIXBQMIMk/XWhOUJAynKMhk4AVpNRtt+YbtnHwIRbB/PQi2UlNVBrHZd
+IFytGlB02aHkKxI8rdGFzzKel637MAIuwBAok336fQ7xKSnMEuWZsqMvUwIDAQAB
+AoGAO9WI9KLeSD5gMS5XV91fbT/wPUqhrmM9GfyVUJCc3hh1E70wn12auawjWj98
+cf0YdJX182RbIHGQLHHd2DLm8ANw0QypmAoSUWx9Z2RS+qG3M//UpWnhb9F5Iq5x
+3oC08Z7omkJLFo2TUx5ADSImjY2xZ8SCWjcw5b5JVwI0XUECQQD0RKMr+OqbeAJ5
+RXa9va/KxPHlIHNhbt5PbkSIoq80ZH3cugso5e/CYI8elMOIeLUQHjoaM+Kk5fVG
+6hDkt90TAkEA7kb3JtkajKHwvx0cMW5X4maci3U2d626kC5lfUHWMQ5SeXT4kcgf
+8n4S4IK8FbPwVj7NHXTrqGmslNNjSejswQJBAIstNH+QczQj+9zXLGHN24TAFEeF
+5tfkELzXSitD7mn+vAvw4PzrjmGFHObCwmpWxGurnVVirMdh0xAVu4xmCosCQQCr
+sRjvtipKQXoOy7P/7kmHSnbsiiYYMGeo8rWQfvsO2AoXmHBv4ysZ+Twy6CEM5l58
+Vr5HxnL0JEkF6Be4Lw1BAkBSr6yhMJq4N8fl8BuLbN87E130AHQB/zwJUA057Y+M
+3KBmzlqLHcGRqVzswAFrJQXyRhWcrAF7xsDfu+xauRnA
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem
index 3f3530a13..fa992f144 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/ca_chain.pem
@@ -7,14 +7,14 @@ MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -24,12 +24,12 @@ issuer=/O=example.org/CN=clica CA rsa
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
-D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
-KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
-BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
-d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
-OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
-BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
+DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
+8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
+/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
+C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
+GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
+pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db
index 8a5e75637..eda8eedb9 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db
index 06b1dee2a..f4e7cfbb1 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/key3.db
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem
index c1d613545..27652f16a 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: revoked2.example.org
-    localKeyID: 87 AA F6 0C CE B3 C6 1A 6F 2D 24 D7 68 32 DB 08 D7 AF 0F 2A 
+    localKeyID: A9 01 86 99 E9 BF FC 22 09 51 3C 3F 37 30 CB 46 BF 4F F5 F8 
 subject=/CN=revoked2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDExWhcNMzcxMjAxMTIzNDExWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAux1L9R5Iv8NY
-gL1Pt+3pQGaDC9UxXIR9fFTYDb70CbVVuFnRM/VuS06Jl7AchZYn4I80d7fxtbqe
-BtfJrYEEb/LztHq3dMI/AJ6iXxKOWkAR/cP45HMNp6DEw3qQfLG1a7dL+y+qrb2E
-YwwG+iTaFXwq4lbKTpFATvEwKgUKpmECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA5WhcNMzcxMjAxMTIzNDA5WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArfgTWodQnPwI
+g+/1F3ITxXaQd8mNfMlN1i7rkhxqVyCw+D6wA+o0kz8cb3U159XHkqTODgYqANz3
+/x2nKNiadnat+du53Qdwl2pfvpeppP5AtYmGUJ4zmUyzwh8aBuYs6P1wPxxeti0R
+uaYl86THcqTWF38h8ftXT47skdOvfrECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAf
 BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOB
-gQAnDS6hZo179AOQOOeLXWbWQNgw3/INaHy0oJDKnuNZImWVZMh1n7ceE5UtFX2W
-XjFj4pMLGTEYfoxDtdB+un51T6QLirYgQevfY3ArQ1+7u48EuRkiDwnpKIpI1ECJ
-q33xXNccmT5riz3M0rwmOJCc2CHVU6pTM7IR2euCqIn0lA==
+gQBXBx+eQiOLd3hDuqzoutgTAl4+oO70XaTR83NQRsoLxNUmqrnan7LIY8CEm909
+rcumDOQ2qDTEyFwU5KE3ZOlsb7y3SXWbMJu1SQha4M2CZlTzFi+drRpB4IIgw+CO
+t69ALCWK7x9eMmi3ujRehQ3dfOf9Qu9Q4QVoN072EfSO9A==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key
index 9fc98028b..34f3d9115 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: revoked2.example.org
-    localKeyID: 87 AA F6 0C CE B3 C6 1A 6F 2D 24 D7 68 32 DB 08 D7 AF 0F 2A 
+    localKeyID: A9 01 86 99 E9 BF FC 22 09 51 3C 3F 37 30 CB 46 BF 4F F5 F8 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQImuxRF4BV3dECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNVEMVXbxJiZBIICgFz/EoMQyrya
-2+pUidFpLZxwBbkRfltM5auV3Vr9in2fjVlz2je43UMFet5XBtz5uTZsy+9o7ZN1
-gz5YpIeORvBGbPPm6CAWgoaFiPvQDaPjCgbA71B+XMv8eDCPNaDYO89SaE1MDITu
-gQjM8unR5jC18zVc6Y2R3gJTwrENYbT/7jiF4/tAwLkSJlCPE74BTyCpux8NjbSM
-82LW02TupIQvNyyzFCqEKN6IkmIZmW/DJTBAeIVgqWDKkQ+xQirnmJbUrthnmDIE
-fnySnAUsPV8b6UdgttyS7HeZfXumuIvncnJMz51TOBlxJ1CaWl8zaIRVJXYv35Ga
-rkjNk2nTxAUpbBfl3EgR8KQORqntzbciTkJz8/tZo6fHs+laL9lf0qUz9sik9dVN
-5A1vujQyc9N35cCNJkty8tDTX/Ekz/PylScwC+XuDdqnPEVJHXhHKcxzfgBAQ20Y
-34m5aR+93ZABWVQKVeFY259/iGtEVXvNOYEs7nvGNBD8P4gOrr/dvRSc18Yw3nCW
-RVJLm98m6nf0DXXmX4v8h5+IO3cOULd505FC3g7W/ppFcobLFlYhVWnxPjSe7pSQ
-5LF3khkRERmALpDsRUdrojdBkuoREvwUetg9L15GiPQfuHHc5fYWrQ0eKK1vGkP2
-cnTj+KYK7W76n+GZA3yJ1AzsB9PmsOojcyk6/9MTxAHrFQX6fxp26/C1AW9ZttWM
-6fmsF5sxA2qMfWwMdh/PSIKmvReKy9CGH+VQcj861buXLEyNyElRYWqN2m76wwtV
-Le+Ev59DDGVaiA6dc4Fvn4nHkeZ/JE2dolWLfv9w1PM/JL8TuQNs6pIy7iD52NN/
-e+KbbEoyXKE=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI7VglOxJSmRICAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHbnnmmkcGHxBIICgFaKLGmiFPu9
+aH1lFBz27LDkG9NPRAjD1Riedi65ebhyEYCU8eNLGCS5JDB77g6dmz2TnnRiIo5y
+ljw2WmZXAW0xt//8K1LrKx+o/KMNVYvMSiSG+NgXF3sFYTJ1bHF71+l/HO+H+5Lm
+4sA1RUgHKt7gpirWLEGM4bD/J6qUOEel++7pQFA2gD/zy/dlEkVGO70v1PPDfOMq
+Y5a11iEfNWhFSHLk7eBeLzQ08NLDe9jn2FbZ2rzrHcQGJCxaUdcal39vbIWCQw9Z
+BBCFZvHO+i8c3vp1XVieq8bsfE78o5zsnLfkVjUslWrYmsZuNdKjb3zgoDL7MUxn
+VWrkPEI74L7s7lMhfuTVxa2NworoqGREv8o4TSdsnizRRC0xA4/3+nyiFZxyyLUP
+y4UpVG8r8fOKK1VJZMvO0yhmS2HWhftvX5jWYiji/nl5FNoks9wLpxq9LLHJuMnB
+nJEWD55sB0ClFrsLuMKKjqcRauAhHFefoZUnJGoAFRer5eYMxXo7Qv2yHT61/6cG
+RVpNnbfVsm002u+VRO+IQ0VzgQEjw3eyI4YsWLO3uZlJOI0aPZV8gLntC+rUuu57
+z9ynzXufgyNvaFu6Cwep4QjC2MPQIriv1F3bOJPcvCPse1nj3vI2KwhEc47oU4gH
+dIG3vU2kxlkHSaZ3KhJhOPHRhXA5JGCO2LpmqB4SXNwG+zXZMVw0ZaXlcmq7rLrJ
+iCm8rTFJVaaLY/N3+8jImQ2JmXVd6jTlx9cMmT0O494DWP5lCtDs08G4WfXke4nW
++kNW/veooECZ98f1JutLWsO2dY18UPk85lsf73Y7THpAGpgL8DXILawsOzq6YG/9
+JzjWmvNc3P8=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp
index 20a9d05eb..5899b68f9 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp
index 9876c2503..bb456d39b 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req
index be03652f8..6a075df23 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp
index 9876c2503..bb456d39b 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp
index 246da7f0e..4e7f48c88 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp
index 147627430..ed255ba7f 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp
index 147627430..ed255ba7f 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp
index 9acea19ca..8d4cb36fb 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp
index e193d9f53..cebeff6b8 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp
index e193d9f53..cebeff6b8 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12 b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12
index 255c4e6eb..a002b1b12 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.p12
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem
index cdd9711cc..1663cfd79 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: revoked2.example.org
-    localKeyID: 87 AA F6 0C CE B3 C6 1A 6F 2D 24 D7 68 32 DB 08 D7 AF 0F 2A 
+    localKeyID: A9 01 86 99 E9 BF FC 22 09 51 3C 3F 37 30 CB 46 BF 4F F5 F8 
 subject=/CN=revoked2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDExWhcNMzcxMjAxMTIzNDExWjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAux1L9R5Iv8NY
-gL1Pt+3pQGaDC9UxXIR9fFTYDb70CbVVuFnRM/VuS06Jl7AchZYn4I80d7fxtbqe
-BtfJrYEEb/LztHq3dMI/AJ6iXxKOWkAR/cP45HMNp6DEw3qQfLG1a7dL+y+qrb2E
-YwwG+iTaFXwq4lbKTpFATvEwKgUKpmECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA5WhcNMzcxMjAxMTIzNDA5WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArfgTWodQnPwI
+g+/1F3ITxXaQd8mNfMlN1i7rkhxqVyCw+D6wA+o0kz8cb3U159XHkqTODgYqANz3
+/x2nKNiadnat+du53Qdwl2pfvpeppP5AtYmGUJ4zmUyzwh8aBuYs6P1wPxxeti0R
+uaYl86THcqTWF38h8ftXT47skdOvfrECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzAf
 BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOB
-gQAnDS6hZo179AOQOOeLXWbWQNgw3/INaHy0oJDKnuNZImWVZMh1n7ceE5UtFX2W
-XjFj4pMLGTEYfoxDtdB+un51T6QLirYgQevfY3ArQ1+7u48EuRkiDwnpKIpI1ECJ
-q33xXNccmT5riz3M0rwmOJCc2CHVU6pTM7IR2euCqIn0lA==
+gQBXBx+eQiOLd3hDuqzoutgTAl4+oO70XaTR83NQRsoLxNUmqrnan7LIY8CEm909
+rcumDOQ2qDTEyFwU5KE3ZOlsb7y3SXWbMJu1SQha4M2CZlTzFi+drRpB4IIgw+CO
+t69ALCWK7x9eMmi3ujRehQ3dfOf9Qu9Q4QVoN072EfSO9A==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key
index f8d89dde2..aadb4117d 100644
--- a/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/revoked2.example.org/revoked2.example.org.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQC7HUv1Hki/w1iAvU+37elAZoML1TFchH18VNgNvvQJtVW4WdEz
-9W5LTomXsByFlifgjzR3t/G1up4G18mtgQRv8vO0erd0wj8AnqJfEo5aQBH9w/jk
-cw2noMTDepB8sbVrt0v7L6qtvYRjDAb6JNoVfCriVspOkUBO8TAqBQqmYQIDAQAB
-AoGAE2+iHbaFGQI6FblUaAca9PkRALAm/fS3Mix/+sGMiNugqVMPE4YZbFIeobaF
-5+xmfQFzEkJ1pYpactyEUvT1WFwYNxgYE9O2ax4X9XHGj3FMTTwLLj+muXCKBsP+
-RiAKNQm97bMK1DaCX4SzJGcKtawS73otYpYbryenWdkAPqkCQQDhCLqPTEqzQRNv
-URmESCzr4xhX6GRAL+Q96ZLdgDpfo/9hvanCzPxZDN9JzPfVpYfMVOCGw5VFq+w/
-TqLiBNWNAkEA1NzF5kKcEVoRCpLt+3sGBHzewMFi7decffia1Grdgcu8swHOmLaJ
-MrrwwXfsOl4ZfmY9yg1Z7X/EjPiK3YYtJQJABGirXwtbm093FgM8wL65QpXccDx5
-WliV3DCrU/OjMSSBaGTS4qIpf4UlCskdQe5QTsyK6ZkDX64Sntrnjg4SMQJAS37y
-AbTmPZFAMgvitCrx+21+Y8czG0A5lMQzxdsRLRPhnWuqpqc3CfMbqMKr2he92wLQ
-L3WEy6NhRs5wEhmgsQJAU/wuCfc7ba28hV4Jo59yP/Q+XnKGOwLTkczZ1ANQWr+/
-YFB41wv+1c+rec9l9qZLUaqPhoCJHXmSE+KZzuQiTw==
+MIICXAIBAAKBgQCt+BNah1Cc/AiD7/UXchPFdpB3yY18yU3WLuuSHGpXILD4PrAD
+6jSTPxxvdTXn1ceSpM4OBioA3Pf/Haco2Jp2dq3527ndB3CXal++l6mk/kC1iYZQ
+njOZTLPCHxoG5izo/XA/HF62LRG5piXzpMdypNYXfyHx+1dPjuyR069+sQIDAQAB
+AoGAA4MNiPdQVkr0NQ2kCfwgkAzrr69e7tT1gExkLwfp0aZ0TB6f2QRiWVKd1VYt
+Z2e2ZqxzCG9xa6EKVJkZpcZxn8gQnJJOCWXujl8dvZeWgg0tAM2s7iSU/yygsL9K
+Nf9ho6D3rA+WkFy9deBzlR7tkuklWUNS2rFweywEIL+WsQ0CQQDbgFI4rXLre0UM
+QBtVfYHdLkiX6xwDDM9gARybPaNAkYtuOUk1BqZ/P6gsCdsHma4YQIrjSYGovX3Z
+KU3Fu2fnAkEAyuWMwbJ+oFIkkljGzIFYyi4Zm4zr8c/0X6msSpfVsnK6g+75JI/+
+Av6ltvknzTnLw0tcGpClq/bGMoMRzKixpwJAGGLUP6m9d731ONwybTgJYnpO5Fnh
+fdFBhMf61qBtb7H7zJ4erP51JvP6ihH6PIjtV5JsG75B4m5S+fplwo8EhwJBAINr
+FbWseKo9KmUETZfOvAUQwRNovra8vItt6iPSnt7bwwWLtyJAhgXIjOusDGS4Z8vS
+NxEZ2cU9rPiwvsmyBocCQBUiMzey8u6O+wg3Wn5c/MQZ1AzW0hLLaQwkLNZOTK9t
+MTIl847n5ArBfdJxiJq34lG6QOLrh68dJHfsbF8g+Vo=
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem
index 3f3530a13..fa992f144 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/ca_chain.pem
@@ -7,14 +7,14 @@ MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -24,12 +24,12 @@ issuer=/O=example.org/CN=clica CA rsa
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
-D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
-KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
-BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
-d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
-OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
-BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
+DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
+8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
+/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
+C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
+GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
+pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db
index 042879cf9..1b4f253f6 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem
index 76aae68c0..1cb06b7f5 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/fullchain.pem
@@ -1,25 +1,25 @@
 Bag Attributes
     friendlyName: server1.example.org
-    localKeyID: 12 0A 39 38 33 A6 EB DC F9 AF B2 1E 63 95 92 28 A0 E3 07 A0 
+    localKeyID: 4F BA D8 66 C6 A8 25 B3 58 45 27 29 D4 D9 1E 2C F7 EE F6 3D 
 subject=/CN=server1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDhaFw0zNzEyMDExMjM0MDhaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAZ9Z10Vl3Sb8Za
-OsU3P+xrghydsWq7SIeESTpyL2uzNeCNJ6xLwLYM4FUuzg8o7/rAmjQ3mtC566Rw
-lKIc00mdN3NxL1qF2n0REZcQbjpTD2Qx/D/o3iV0DbWn1pd/cjXLsBP4RsT9JcdR
-i6SA4uKhCQcLkAPGNUXMmAHniRrxAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MDdaFw0zNzEyMDExMjM0MDdaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMXju0iisV9cwFvt
+4Jd46lER6tfACU+41kD+V0H8uU9RjM5Fdhdb+pm6bTGjk0Ob+DQFIU8wCc4tTcxM
+3Rwme9n5DlFlRJWxxxw3lpTDewn6wFBU4CpvD1JnKSBSYl5AzwiRevMblaY0m0QG
+JafHF2ecxa58yX4Ui3ROnao+L8uNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5vcmeCCSou
-dGVzdC5leIITc2VydmVyMS5leGFtcGxlLm9yZ4IiYWx0ZXJuYXRlbmFtZTIuc2Vy
-dmVyMS5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOBgQBaXznx5aTY0OKIhexw
-rtNi9jnp/KWtzhvI9OyOILi8D3JASSyZoXSBy/SOMyjsYMxmaekXDH0HmiVv6bZ8
-3fW2u/2EjTe4NeMKP6UYWgo+Y5SM5VEeYLtKRXcc0+vJbboJfLV27oKc7plKYxCy
-exDjATzn2yZYqdi6A3N3Z4COpg==
+BgNVHREEaTBnggkqLnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5vcmeCImFsdGVy
+bmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5vcmeCIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOBgQA1vRfswKO7IGSk4W0Y
+he9M1IclQJqvFnHb+xi8RJ6U3vArh27eTfBLGGFnRayxe7tJwhrg1XxDxkVy541A
+e6NfivD6UgmvgXwoA5I+A+gYYjelp3ks5Dib4Aw1dTIysqdo/ehZMjviBoGLTTIf
+ILmJeBO5PBULTgRzZHc6pKdmUg==
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Signing Cert rsa
@@ -30,14 +30,14 @@ MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -47,12 +47,12 @@ issuer=/O=example.org/CN=clica CA rsa
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
-D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
-KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
-BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
-d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
-OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
-BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
+DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
+8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
+/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
+C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
+GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
+pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db
index bdba76937..fc51b4675 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/key3.db
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem
index 1986aee5f..a229baf0d 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.chain.pem
@@ -1,37 +1,37 @@
 Bag Attributes
     friendlyName: server1.example.org
-    localKeyID: 12 0A 39 38 33 A6 EB DC F9 AF B2 1E 63 95 92 28 A0 E3 07 A0 
+    localKeyID: 4F BA D8 66 C6 A8 25 B3 58 45 27 29 D4 D9 1E 2C F7 EE F6 3D 
 subject=/CN=server1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDhaFw0zNzEyMDExMjM0MDhaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAZ9Z10Vl3Sb8Za
-OsU3P+xrghydsWq7SIeESTpyL2uzNeCNJ6xLwLYM4FUuzg8o7/rAmjQ3mtC566Rw
-lKIc00mdN3NxL1qF2n0REZcQbjpTD2Qx/D/o3iV0DbWn1pd/cjXLsBP4RsT9JcdR
-i6SA4uKhCQcLkAPGNUXMmAHniRrxAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MDdaFw0zNzEyMDExMjM0MDdaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMXju0iisV9cwFvt
+4Jd46lER6tfACU+41kD+V0H8uU9RjM5Fdhdb+pm6bTGjk0Ob+DQFIU8wCc4tTcxM
+3Rwme9n5DlFlRJWxxxw3lpTDewn6wFBU4CpvD1JnKSBSYl5AzwiRevMblaY0m0QG
+JafHF2ecxa58yX4Ui3ROnao+L8uNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5vcmeCCSou
-dGVzdC5leIITc2VydmVyMS5leGFtcGxlLm9yZ4IiYWx0ZXJuYXRlbmFtZTIuc2Vy
-dmVyMS5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOBgQBaXznx5aTY0OKIhexw
-rtNi9jnp/KWtzhvI9OyOILi8D3JASSyZoXSBy/SOMyjsYMxmaekXDH0HmiVv6bZ8
-3fW2u/2EjTe4NeMKP6UYWgo+Y5SM5VEeYLtKRXcc0+vJbboJfLV27oKc7plKYxCy
-exDjATzn2yZYqdi6A3N3Z4COpg==
+BgNVHREEaTBnggkqLnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5vcmeCImFsdGVy
+bmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5vcmeCIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOBgQA1vRfswKO7IGSk4W0Y
+he9M1IclQJqvFnHb+xi8RJ6U3vArh27eTfBLGGFnRayxe7tJwhrg1XxDxkVy541A
+e6NfivD6UgmvgXwoA5I+A+gYYjelp3ks5Dib4Aw1dTIysqdo/ehZMjviBoGLTTIf
+ILmJeBO5PBULTgRzZHc6pKdmUg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key
index a1f1973e2..b0dc648d7 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server1.example.org
-    localKeyID: 12 0A 39 38 33 A6 EB DC F9 AF B2 1E 63 95 92 28 A0 E3 07 A0 
+    localKeyID: 4F BA D8 66 C6 A8 25 B3 58 45 27 29 D4 D9 1E 2C F7 EE F6 3D 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIpCkkQWS0L/sCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBPQ3Id/9N6JBIICgF6AiF1eO6ZN
-Fdk074PB7C0NpLYFeZi4k7D/3kerb9yw61+WsgNOeFL353ylIoVmfmE2xzve3sQL
-FqvLFVlwUrsEvTO/bzkEPp+7pXXmqRDhaxbMPI8OJNZDRlXPAh27aA4wDjEnv4Do
-6TFpmvSdxpRKst/hpBIFKfTlXWL8co0co6zIMyZiq6zw3zCRscTvIRzUueJXMGuy
-dPPKCGnAgQWvp5KGAEnErOFm/JmL+rADyA6aNuoI+06f6mWMxGlE0QA9+/wboN16
-1H80DsCfLNH12M5hORpp5/g7n0lnttC1WG5TafO2T3mi3nMvUmPT7zF1TxQEAefd
-xeZLe29h/03yVWI4SR5DkmNTJzeiZMrUgd+B3zA+vY4h97YatNnv1+nHBEY8SJYU
-EZCeDobjQAySCVmhD99EONuPSbD+S11Dhj6jA8buh0ZeXXQ2BdQ8ZKSRSV6Bzi4F
-jwA83G6SZBcLPuX2HdnnQKyBOiCqbO74cBwNAcQoO4/E44Xe91Wn6iA5OgaD4VaP
-DuyQGEf32OBO9hRYa2U5Wegncd7Ze8iHWamCJpBfcLjabREE2vweYHcQQ/tJtiaU
-bK9mQx2oucBzf+S3NVHi3StC6cllJMVdlC6YsdWPuvVViqqtAbesjUgBp+rZBhSZ
-OI5z4sGrF2gGAhr1/Na2Dmrvu4Gxl4uulEQYJVOEBLVDBB246cMgiFoEJI7Mtsrk
-eiwj1EGX1rOIy+h0m4VtQRpi1QR+IQkjMTm4uaqZeFOoyTT1kyBo5U1c6rowdeLN
-b0lLBIbRQrbga5fNKtlO+jzSmUAtkSNniVSEOOKKWTtc0gK3Mm46G975sVltJJbx
-IHDwamW5tFI=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIa8Nc5qi1dM4CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNxcscnF3ppwBIICgAyZ6KWm1s3e
+VExOBcnzPEPOWyYoiPlZlJSRNTgd7lEwq0ee76bncSgWwgF+RYPacoky5fuSBAQ3
+hWk4j+UHcdHGatSbs4BFxoSQf3tIBc2YlQb1ExrM1BN3NiPW+3xTQn4vBmIcW2No
+SYyxqqQZDCvcEkiCzdYgYRdbvoWFha7l25W6hsJdwyGD/IyAGY83SW0sWli4wwmI
+EKRt1sjOr19GvKJJZl1+dNcg+YrcG85XZ2OtnIqzXG2abQC3j+MQp+8JbdVlU4QV
+5tVz43rCkVH2g+zhRl2W7fFursA3jryfAdXL2pkX+kizEvAUV66EkjB3+Ds5R79c
+i95yQEdJtIA5jRtNezikDG7TmLDYPUsUs+6+erB/NRSoaY5swT9KHmQIGqIDIOtJ
+hVmH2CZUy25M4bEC38mNH2AhcUGzUkG/bldO6z01x+g8FvLEiYvvfEvIXNiyppYv
+UmQdBbFpO6CBVzoxAztUCyTpzETej592dzLAqatAzdy17zLy+0Q4z+FFhchGc5UZ
+glU6+6Ad7mhAbtu43z2rpOyg2tgF6jhTsvzzJpFvrTAag5+qffZVn/VE8TIWknzO
+azfE6S7aDZxF1jlDgSjneBAgHUwDIHerxIzI3uMO/qlNNQjIz16QhrtBFRTNEQYX
+Fcz1lkUkr0t3pcqcX+QeVhh3i+PwAbenEQvRGcUMokShXMutnQF7KF7QbVRhUVX4
+3IN+fm0uTA4Yhj3Z1HBZX34zJnQm7Twli0IGe+1mF0mUSjU0ZVqFvCGp3c9GVezm
+EZVWouBPoHI9BilJ7pmp9Mp+lNNbTfKCf753j2Ak0Yl47+eR/hZHQhpDJ61v4ZZ3
+y/Y6NoIGAus=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp
index a276e9632..433cdf6d0 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp
index 2f92cc4fd..2d1b726b4 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req
index a42eeac32..e8100c1ee 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp
index 86ece92a0..1a11a942b 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp
index c657f35d5..95ebf545d 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp
index b5177d3f7..4813385a5 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp
index 923552a96..137b55a69 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp
index 0fba61bd8..a52d28b82 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp
index 6ac0649e2..e8f4a06e0 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp
index 847faaba1..0baea5837 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12 b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12
index 0a51c8b75..0dae73e3a 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.p12
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem
index 26f1632da..fd9ba1736 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.pem
@@ -1,23 +1,23 @@
 Bag Attributes
     friendlyName: server1.example.org
-    localKeyID: 12 0A 39 38 33 A6 EB DC F9 AF B2 1E 63 95 92 28 A0 E3 07 A0 
+    localKeyID: 4F BA D8 66 C6 A8 25 B3 58 45 27 29 D4 D9 1E 2C F7 EE F6 3D 
 subject=/CN=server1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDhaFw0zNzEyMDExMjM0MDhaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAZ9Z10Vl3Sb8Za
-OsU3P+xrghydsWq7SIeESTpyL2uzNeCNJ6xLwLYM4FUuzg8o7/rAmjQ3mtC566Rw
-lKIc00mdN3NxL1qF2n0REZcQbjpTD2Qx/D/o3iV0DbWn1pd/cjXLsBP4RsT9JcdR
-i6SA4uKhCQcLkAPGNUXMmAHniRrxAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MDdaFw0zNzEyMDExMjM0MDdaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMXju0iisV9cwFvt
+4Jd46lER6tfACU+41kD+V0H8uU9RjM5Fdhdb+pm6bTGjk0Ob+DQFIU8wCc4tTcxM
+3Rwme9n5DlFlRJWxxxw3lpTDewn6wFBU4CpvD1JnKSBSYl5AzwiRevMblaY0m0QG
+JafHF2ecxa58yX4Ui3ROnao+L8uNAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzBw
-BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5vcmeCCSou
-dGVzdC5leIITc2VydmVyMS5leGFtcGxlLm9yZ4IiYWx0ZXJuYXRlbmFtZTIuc2Vy
-dmVyMS5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOBgQBaXznx5aTY0OKIhexw
-rtNi9jnp/KWtzhvI9OyOILi8D3JASSyZoXSBy/SOMyjsYMxmaekXDH0HmiVv6bZ8
-3fW2u/2EjTe4NeMKP6UYWgo+Y5SM5VEeYLtKRXcc0+vJbboJfLV27oKc7plKYxCy
-exDjATzn2yZYqdi6A3N3Z4COpg==
+BgNVHREEaTBnggkqLnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5vcmeCImFsdGVy
+bmF0ZW5hbWUyLnNlcnZlcjEuZXhhbXBsZS5vcmeCIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLm9yZzANBgkqhkiG9w0BAQsFAAOBgQA1vRfswKO7IGSk4W0Y
+he9M1IclQJqvFnHb+xi8RJ6U3vArh27eTfBLGGFnRayxe7tJwhrg1XxDxkVy541A
+e6NfivD6UgmvgXwoA5I+A+gYYjelp3ks5Dib4Aw1dTIysqdo/ehZMjviBoGLTTIf
+ILmJeBO5PBULTgRzZHc6pKdmUg==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key
index 1818fd661..d77a39cc0 100644
--- a/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/server1.example.org/server1.example.org.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDAGfWddFZd0m/GWjrFNz/sa4IcnbFqu0iHhEk6ci9rszXgjSes
-S8C2DOBVLs4PKO/6wJo0N5rQueukcJSiHNNJnTdzcS9ahdp9ERGXEG46Uw9kMfw/
-6N4ldA21p9aXf3I1y7AT+EbE/SXHUYukgOLioQkHC5ADxjVFzJgB54ka8QIDAQAB
-AoGAAheQ8uzdJJc1YTHmeWUGlbEMe8FojkgQo0/YqlAAz6YtJvnyj35L7QiD3ZYR
-Ek+G/RXvxjPq0m02lQe0nq48PUFOANtgpe+L9xXj+0Z4YZ14u400alRA5Jdj8NIt
-fpW5R54QSXitoldIWXGxmQeegktRXMT8H+nlAuH1S/X+yJ8CQQD2fa2AVGqui34D
-p6JisPPE4RnnV8dcWa/3jckqm0JQpMtG3ENXTS5QR8EtW//N4P79F6Do6YI+G/4g
-UUNzEDuHAkEAx4MiuRkdpIfcIe808KhDFMLvoITf7bNc0J6JCCDQylcMQudj9dhn
-TJee8dsX5e0tLDnmvPY/7PSYSbaztZXDxwJANFq9X2SOxEQcn+obM5siK88kEV8z
-mQnztkEHWWVg0IAwLPzb0M8z5xlWjqvbyX7gqiE6rD3szARmFbcs/GOWQQJBAKPt
-g6JCmLCPULgxK3ZxSmzMnsdtZfCQ5zoiiMU88VDPpStzpBZj8Lxl+BsQwdoRvoQQ
-Lx4j1vKDJn2quI4CuBECQCqq2dnPHmnjQ82qQlY8ixdt5dSj/4dwkJCsGhpEmKc1
-BANS8bbRY7eVeP8WiIlL4i5sprwJdyVEBlZ5SJLsjk4=
+MIICXAIBAAKBgQDF47tIorFfXMBb7eCXeOpREerXwAlPuNZA/ldB/LlPUYzORXYX
+W/qZum0xo5NDm/g0BSFPMAnOLU3MTN0cJnvZ+Q5RZUSVscccN5aUw3sJ+sBQVOAq
+bw9SZykgUmJeQM8IkXrzG5WmNJtEBiWnxxdnnMWufMl+FIt0Tp2qPi/LjQIDAQAB
+AoGAPl9bqfbBolWZOcB98DBH5pqXoz4fkTWorl6cQSu3etUw5NkG8jDnCWo1vZYZ
+tg8kibzuNUfmZ0pnQZQegx9sHIcULKx22AfCMV04P/kdIeavKHi86+S/XrxOkKZk
+vsReBagqV9xL0FytbtX6ehzU+eaqwKJYnuc52kTXC0e93z8CQQD1g8fzDJ6b3xMU
+AD0lZSQmTNkSSBoRs7IpX9dzOmf0KXSjXYeRbKUI/Fle+97pbjgkuss/dqmCiMin
+MhZcD2ObAkEAzldDXGZyJ6go33RLty4xxxP7Bp5Tuc06dcZlx4LdO5cVbjRr6OXU
+3WXAulgQ3dIl8vy/3j76xKCUFgA1LvGj9wJBAObraQBwqSoAWghg5SIsDCE9/JmW
+WXa25mbF73ZAxA/BgiQ5z033uw5Fk6WkDxjNg18AljR93peZIekoUiGKk+sCQHH3
+BpBxUNmQakrI68zX6cxfv8TvC6VSsdg85RglslVoZADDWVqAHmrN+X2yiFZL7IPh
+j4OL22tgmYnxQW6VLg8CQAvX5GYiDBGDDbG0kEBZmRgJIx4g9zm6ZZLB59MeYro6
+YFGcUJPSWgLkYc/InvqtlLASDBfe9+XyrTt3O5LUEWU=
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
index 3f3530a13..fa992f144 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
@@ -7,14 +7,14 @@ MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -24,12 +24,12 @@ issuer=/O=example.org/CN=clica CA rsa
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
-D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
-KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
-BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
-d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
-OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
-BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
+DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
+8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
+/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
+C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
+GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
+pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db
index fd452222c..1a99f85d4 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem
index 20db6f945..70c7d3bdf 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem
@@ -1,24 +1,24 @@
 Bag Attributes
     friendlyName: server2.example.org
-    localKeyID: D6 D8 A5 A7 2E C3 B9 09 69 A2 D5 6F 5D DE 84 B5 47 D8 4C 08 
+    localKeyID: DE E9 04 15 7F A9 F4 16 A1 CE C7 72 FD 17 AB B9 B9 B3 69 7F 
 subject=/CN=server2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDEwWhcNMzcxMjAxMTIzNDEwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDZLK3PjPzFgBS
-40KJ3zHJe1pCeHKIKt5FZ3VLgbCc4XMhyeC6xEkZlk3rigbnWpKW/rrDVzqC/CDT
-HnLhSMbhv1dDrDPxONKrUMDqeGjXYqyg4LN56muchPYCsmjQ+p6eRVV5lHw++jv8
-fIJAFRFnPfREm/MC1lXzUoJyrCVx4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+MTAxMTIzNDA5WhcNMzcxMjAxMTIzNDA5WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC3HBl8yHAWIsGc
+qiFnTrpwATMNaBJ6svAp3o5+iDB9uau/WRvzlXYy2eA+m2qnFRN1CcDAr1Abm0Iy
+mQu0MCi51r3QPtcAnqL23unxaQZq8b7JOA8Cs3pBrZtXU9SWpK7kMay25gEYDYaz
+8T6RoCl3UWJA3vngxNalAK9EwD84GQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
 QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
 BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
 GGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEAKqkkZmviHSf2
-as+cofud5lEZ8B+FPxJuwnrB96nZ2xnCmKZMrx6HrUKEgHO5hapooA/uE4oEqwCf
-5Q0ArOkyOBKbSKZCpBu+EapDGY7E4wrf/JSq0X3afserSbxKJ2nypE2dFLrReSeW
-imlIU4YiSgPTJdsip2jB54MgZkUDSew=
+E3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEA1npawHPmQQSZ
+w9emGsKopPSqAR3GpTCMn4IHItwaA0YeykZrLE9gmeYo+RSQiz4k3yKyXeJvN/Ss
+eNFNzxEnMET8imv83PB3xRi7l5MMxLJLEoav8c+yrCVjm+MX04JXFwL7HG8wi1iH
+nETS+y7/qyGWC1R6tMaHEicvUgrl6wY=
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Signing Cert rsa
@@ -29,14 +29,14 @@ MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -46,12 +46,12 @@ issuer=/O=example.org/CN=clica CA rsa
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
-D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
-KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
-BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
-d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
-OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
-BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
+DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
+8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
+/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
+C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
+GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
+pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db
index cb590629e..bce31e99e 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
index 1a1990539..5a9ed89b2 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
@@ -1,36 +1,36 @@
 Bag Attributes
     friendlyName: server2.example.org
-    localKeyID: D6 D8 A5 A7 2E C3 B9 09 69 A2 D5 6F 5D DE 84 B5 47 D8 4C 08 
+    localKeyID: DE E9 04 15 7F A9 F4 16 A1 CE C7 72 FD 17 AB B9 B9 B3 69 7F 
 subject=/CN=server2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDEwWhcNMzcxMjAxMTIzNDEwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDZLK3PjPzFgBS
-40KJ3zHJe1pCeHKIKt5FZ3VLgbCc4XMhyeC6xEkZlk3rigbnWpKW/rrDVzqC/CDT
-HnLhSMbhv1dDrDPxONKrUMDqeGjXYqyg4LN56muchPYCsmjQ+p6eRVV5lHw++jv8
-fIJAFRFnPfREm/MC1lXzUoJyrCVx4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+MTAxMTIzNDA5WhcNMzcxMjAxMTIzNDA5WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC3HBl8yHAWIsGc
+qiFnTrpwATMNaBJ6svAp3o5+iDB9uau/WRvzlXYy2eA+m2qnFRN1CcDAr1Abm0Iy
+mQu0MCi51r3QPtcAnqL23unxaQZq8b7JOA8Cs3pBrZtXU9SWpK7kMay25gEYDYaz
+8T6RoCl3UWJA3vngxNalAK9EwD84GQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
 QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
 BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
 GGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEAKqkkZmviHSf2
-as+cofud5lEZ8B+FPxJuwnrB96nZ2xnCmKZMrx6HrUKEgHO5hapooA/uE4oEqwCf
-5Q0ArOkyOBKbSKZCpBu+EapDGY7E4wrf/JSq0X3afserSbxKJ2nypE2dFLrReSeW
-imlIU4YiSgPTJdsip2jB54MgZkUDSew=
+E3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEA1npawHPmQQSZ
+w9emGsKopPSqAR3GpTCMn4IHItwaA0YeykZrLE9gmeYo+RSQiz4k3yKyXeJvN/Ss
+eNFNzxEnMET8imv83PB3xRi7l5MMxLJLEoav8c+yrCVjm+MX04JXFwL7HG8wi1iH
+nETS+y7/qyGWC1R6tMaHEicvUgrl6wY=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
 DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
-evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
-KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
+6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
+bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
-BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
-XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
-jy6Z4hMSt9SGKbnR
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
+bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
+RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
+MCjrBA4uMYWHJsge
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
index 81dc4281b..e98ec4ef7 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server2.example.org
-    localKeyID: D6 D8 A5 A7 2E C3 B9 09 69 A2 D5 6F 5D DE 84 B5 47 D8 4C 08 
+    localKeyID: DE E9 04 15 7F A9 F4 16 A1 CE C7 72 FD 17 AB B9 B9 B3 69 7F 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIu7ltHZm+aKcCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIpK8LPcynoCBIICgM+TWaNwAglY
-jXslsNJPmQA4ccY2Hf7RKovBEdPvUBzarTRnc1w9UfArUqP2kGh5NdsZ+triNobT
-Evm+02ZzKk+Lj/z3Ti/BrFSEZec+UnRQpBtqgSzMOIrgGAxZewJuT8xlunFIxk1H
-Hemjxdl/6PWhy/dYZtDN4Joe8LdiL/6QpmGwT5KYHIAIjunubofa+iJ/afFnbR6t
-Ci0ta10sfe133PCWGmuYpURiGi/u0niUVlLAeXpYWws8j3fyqOUkMaPyJqdSIreW
-OSazZh0iMiO0bo7hfvWP5SOO0xcF1MXw6JtCSDG72CAl3E50a+16dOMzzphYt6Ha
-tL97jZU7IAndCnrWcGM1DS1XQAQOPTe7sAgTtfNhoKFBHE0o+ZaIYPAP2T58ix0M
-9XvZk+u0u7QIJ8G6P5Hw4myZkaPj6A8/eYeFa5aFOVLZwgpT8nDOLLwpvyh0D17M
-Nlg+tgdtWOEds/0kuQ9dp2VR1oiow8pNd0RDWblTH4xSQwNJBIqrp2kLC3+dl0pK
-468ERLSK+WRTBzP2ciO+o69m9+dW5+KsM4bO0eXlnVmZJqQp0+y7+oIwkaM14xMB
-d0Dsnu9KZEOF48CNy5FNwXFqBpngObmHhzDBVw/U6CZq/HCUjo3/iPceiplG213r
-OSTcnUJIDzLGD72wbTyn/YO42Zm4tw31DP2vQGZCH2AjD1PuePn1kYAKmSMqAxTI
-weTnnb22X+1eztTijTfDD4GDyPV2Q6Xtn46xgR4MHmJnoVOH8GeUrzCsO1ylvPQH
-yR/nihERqpQM7ZuJGtElnGfhQySQVEG6/JhTHz7+l2NACLTsIwdFPKH4ekhbGlTm
-qVxMidiNb3s=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI4j9vobP105cCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNdQY4qHvu6pBIICgNiTj0z5862x
+a9d9c7oTD3jLE9g9GfK9ChZ7HAYsfNudUP1iY0w3zkhkwj5AEx72kY9GmSDS8OPr
+1VSR3lK8qxra0tWv+yE0ecuNfhH/AHXPSsLNHvfZcYS0CyGIezRrbqmF4wCML7Lm
+N4I9qZGrXCPgScJAstzzfA+otoBH2Y598jTydRe78KMw7OkWbMfm6su5k5HWiSyA
+fadjt3P93gmUI58Ejcc3NXk7uTzGHT6hs4uicpYM3+bZLVRXXAVRu//oNoFOI80g
+yrTBZL+s54jtkkx5vF1Fbpojk5JPvsnQzXCEXVhwhfoWpSe1V9y5Ty96TEBXHcBT
+3l2aAJfSy8XWWeG57ZdXsRvC1wF/38g2NLlOTwcqK8m6VCtGFAXpDwJ5NlcjEVrJ
+4jQV/bMdSoT9Q7m55o5u7YLJurTLL2slyNxyGahOXQW+rH04ERdI7RoeSGx8u20f
+S+C/UR/PYXuM/P0bWlXj18ibdqgGJh82ZQ3Fi+bkDPXa1inS61DP93NoOFRC4YLc
+PGYBKyn0E0Y5iyTny8GxZrEim3bvTT56BkHFeBF4aoD2rWxIbDYwrpCt5qYK8Zz3
+lCOR2PW3eAIZz9E0liFVFwPK/9YqPx/c2ypGVFdp4/w51oO58sN3+K2dhO/Ui9vf
+dDTbHfNSQXhZs5iMzDccTTikeJwxhEGpXc62Vb4/LoftM/0KTpuaU8KBilGrgyc5
+eapVJ5U53I6FEa0sA997exmXLcWsFKJfjqaDWoY0GSHGjsCFGs6tbSQObIU5ZppB
+W+EE+Cb6Rk//EpX1KjeS49B9SajaRZ13exTSoHR6VO3906Iy3z9Xb0CZniuZfEvW
+OdYXjdHA3pw=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp
index 94b5449df..0c0ad5d7a 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp
index aa95bac76..619900ae3 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req
index 293d137ad..124569666 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp
index aa95bac76..619900ae3 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp
index 4f6d4763f..978fbd13b 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp
index 8480225e8..96eafd507 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp
index 8480225e8..96eafd507 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp
index 2b40c76fa..cccc2adc2 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp
index 37ee3c231..5ba370f2a 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp
index 37ee3c231..5ba370f2a 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12 b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12
index 80f79105a..828be4d04 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
index 3b183a1c9..8d130bd00 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server2.example.org
-    localKeyID: D6 D8 A5 A7 2E C3 B9 09 69 A2 D5 6F 5D DE 84 B5 47 D8 4C 08 
+    localKeyID: DE E9 04 15 7F A9 F4 16 A1 CE C7 72 FD 17 AB B9 B9 B3 69 7F 
 subject=/CN=server2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDEwWhcNMzcxMjAxMTIzNDEwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDZLK3PjPzFgBS
-40KJ3zHJe1pCeHKIKt5FZ3VLgbCc4XMhyeC6xEkZlk3rigbnWpKW/rrDVzqC/CDT
-HnLhSMbhv1dDrDPxONKrUMDqeGjXYqyg4LN56muchPYCsmjQ+p6eRVV5lHw++jv8
-fIJAFRFnPfREm/MC1lXzUoJyrCVx4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+MTAxMTIzNDA5WhcNMzcxMjAxMTIzNDA5WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC3HBl8yHAWIsGc
+qiFnTrpwATMNaBJ6svAp3o5+iDB9uau/WRvzlXYy2eA+m2qnFRN1CcDAr1Abm0Iy
+mQu0MCi51r3QPtcAnqL23unxaQZq8b7JOA8Cs3pBrZtXU9SWpK7kMay25gEYDYaz
+8T6RoCl3UWJA3vngxNalAK9EwD84GQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
 QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
 BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
 GGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEAKqkkZmviHSf2
-as+cofud5lEZ8B+FPxJuwnrB96nZ2xnCmKZMrx6HrUKEgHO5hapooA/uE4oEqwCf
-5Q0ArOkyOBKbSKZCpBu+EapDGY7E4wrf/JSq0X3afserSbxKJ2nypE2dFLrReSeW
-imlIU4YiSgPTJdsip2jB54MgZkUDSew=
+E3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEA1npawHPmQQSZ
+w9emGsKopPSqAR3GpTCMn4IHItwaA0YeykZrLE9gmeYo+RSQiz4k3yKyXeJvN/Ss
+eNFNzxEnMET8imv83PB3xRi7l5MMxLJLEoav8c+yrCVjm+MX04JXFwL7HG8wi1iH
+nETS+y7/qyGWC1R6tMaHEicvUgrl6wY=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
index 72b4ea053..991226eb8 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDDZLK3PjPzFgBS40KJ3zHJe1pCeHKIKt5FZ3VLgbCc4XMhyeC6
-xEkZlk3rigbnWpKW/rrDVzqC/CDTHnLhSMbhv1dDrDPxONKrUMDqeGjXYqyg4LN5
-6muchPYCsmjQ+p6eRVV5lHw++jv8fIJAFRFnPfREm/MC1lXzUoJyrCVx4QIDAQAB
-AoGABPJ1ryuqMm5ZHKAkBxQ9aSbYMaDFsxaFRUv12X8fjPBNG0LWj5oAyQ7f+w3G
-CBloJt4tFb0tlkOKk/fUVCmE3gbh+Gs4sGlCbnZxG3z+ijySZqcK4A/p0SMeu2i2
-ZGP7xo0EUhWWBxHFTcNO1AptRRCHchq/c7Y8S179t1v+3VECQQDuzPMlO8xVtYiN
-bbIbfadrAdfutcEskYRKVHLiZ6WvLAm0jo5pDlo+Mq3HjBFRVxLyKNwOty1w3KDx
-Jf2lo3cxAkEA0Xdlx1rwwgGcUTRRI2WEA5BoKX+8OewFoO4Fzqp+4sfwxUp3R9aW
-a4CISNrIWat2OH0UpqSMWC0F7cC5YLBZsQJAeGaHVUeQH8q2fbBIM8on5jD4wVeM
-fT8lNyDbB8IAbJDEl++kZ92frGp66fh6JsvDNqtZQGYlGBl1YACqoaAIkQJAZVPj
-2V9FriQHUUUEpyHZjbvSl5iiHkbtph7ekk3p2Zys/VN7hjXpSBHCW7PyTWZjZwoi
-7kYVWiZVguDDDGHi0QJADq+ZkveZpdOcNJyhmQSpFicx0gqnb+Gj5NkxqffUumSZ
-NlhyB//iJ4D9yK495gPbvvF4qv8FZcedoKeAVN/8xA==
+MIICXAIBAAKBgQC3HBl8yHAWIsGcqiFnTrpwATMNaBJ6svAp3o5+iDB9uau/WRvz
+lXYy2eA+m2qnFRN1CcDAr1Abm0IymQu0MCi51r3QPtcAnqL23unxaQZq8b7JOA8C
+s3pBrZtXU9SWpK7kMay25gEYDYaz8T6RoCl3UWJA3vngxNalAK9EwD84GQIDAQAB
+AoGABbKY425cOIAb3KtZjzyepgIPi9z/aDR9rxvW/L5xndPjcXiNG1r8+s+XP/N3
+kdvgx11Gk2hRGo7N9EOZXuG5vqMh1hzQPYrrH6acDeZs0T/b45d/EiKCon/9Zhst
+ADA0kcq2TIQw6DEgjMkJ2J/JQu6odb6hicJFwLlUB0HPriECQQDgDwHHuSyqMtC7
+YC0uzoNmSpumpjG0T/B1L0Rw0AuyqpzPmD5g6zsEFvsnD3iF0TTwKmLpSWysSINo
+7E8ke/LJAkEA0TarO8mke256F+Z5UPHNSRcpaIblszaeWMq3VH07TE7I9sw6MTyb
+KEm6CLdI2lXo0dZ+knLcQIl8oLy0CSzy0QJBAMN2tBHdjIaKQChG1gPwaxdQ3Qr8
+D36DAn3ol2dnR909FAHSihCZBeoidkX0LCtpgCpIf/OOd3yw4dsl1EE61GkCQDW/
+qsxIaKaBYoKjZoWCKbBeb/f3uCmLnbDIG8NsDQD0uLKXE1g07tOx5UZ5+BCHw7Gt
+PoVXVviJmegdss8sqhECQG7+tnzsd/DpzCudSCFcrEEY3XA6jVOVamR8AS09D6wh
+005a5jn1LAiFnC7cuv8wLxoaefFoH7v4nh+A/oDqT0Q=
 -----END RSA PRIVATE KEY-----
author	Jeremy Harris <jgh146exb@wizmail.org>	2017-12-16 20:49:28 +0000
committer	Jeremy Harris <jgh146exb@wizmail.org>	2017-12-16 20:49:28 +0000
commit	953bcfd724f6e8ec985701f65cc375201ed2bf69 (patch)
tree	23a9fb7518ce15da7bd26b2e07c46679004a7a3d /test/aux-fixed/exim-ca/example.org
parent	b66afe222257742c497fc2c5b498434b9e52b6b4 (diff)