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
parent: b66afe222257742c497fc2c5b498434b9e52b6b4 (diff)
426 files changed, 2311 insertions, 2259 deletions
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
index 08b225b7d..c61f0a873 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/CA.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
index b0b33020c..e29a8fa73 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/Signer.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
index 888d67249..a3fc6acdb 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.com/BLANK/key3.db b/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
index 5acb883c5..92bfe0306 100644
--- a/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/BLANK/key3.db
diff --git a/test/aux-fixed/exim-ca/example.com/CA/CA.pem b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
index 08b225b7d..c61f0a873 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/CA.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
index be678766c..85facb4bc 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.key
@@ -1,20 +1,20 @@
 Bag Attributes
     friendlyName: OCSP Signer rsa
-    localKeyID: 9D B9 DC 07 39 38 CE 97 63 85 2A BD BC 4B 89 44 F3 8E 51 2F 
+    localKeyID: DF 3B 91 55 C9 03 92 D8 CE AC 64 2C 3E 70 97 9D DE F5 53 2F 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOg80b5o3UgoQfGv
-VMvpQMeZQkxcwWiXjP1LXkUuD7VotQab3zWIysbLJjfCkfAFj9KyYpHYjDMZrRUE
-DOqNqB+eFXq22AJHRpfL4f8seMjfeuw6n0b8CiwXWsztyZy9LHOx05RR/LoYikDC
-dk6jhl54WvrM8cuxJPL5Vg4TzwCTAgMBAAECgYBN+T2i5KqHM50QfIHIBQTO/1IX
-OX1mlJut38RDDfgQPJurIGKNIuSSYlruldFR+UwUvfgCZ+aKsbA/QiDkD7PGZh2C
-lQusUqdjK7jhK0u+rt3JXcIDmOustLpnXdtUS1H2hyucBqv5LjdTkvvZsn1/qlAN
-S9/RLhex9qJ8RDYqgQJBAPRRJcy4dVTipAqPzgSXQ2AVyOcq0kgVFogKjArC9YBQ
-jr89VCgjkV9BavEziSVJWLEuismC7jFWWe6IYHoWXJECQQDzV8yf3tkluV9zvkl+
-GnWw85XECPx2uSAqYpaDCQxU8FletsoSlGz30wd991+kmB3u045zD/bLDBKR2Ttp
-8izjAkEAm80X3tqOsEgrtjSIe7L+m0qpKInNOXyBNtYLAl3bcy1sKpZwkXxFG0q7
-aP+laOrCLZNxnBnrzfi0NwIvDAwwkQJATtXzBRg9YWtc8TKEvMX1uw4vRwNiR1RS
-h2jJOkqEJEB5s6WkccCETQWhN74czkY57FW9oKlbWwzeN0IZbYl34QJAcVcT5+KV
-p6WL5pDk+Qlu9AS9kLV5T1MRNFLIOum3cQHLbMarkyUCLbPi+a6GGuu6uBCF53Ps
-NU+q/tBQcjNWDg==
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALKfGMF0qs9/epeA
+ylHhb2RK7i9Xxoa+jJLH/haqgP8rSOiWeIF9o6rA1iXwK37EVBa+wMA+qM8eMKUL
+51w319bJgJKMrNE0iFgjyQzVkzA4gdMbb/Bhar1gtRO+5VDRhs4BQlnKmSa7lO6G
+Wz4tl5HPIVQDLGM5f6ks3Y5qVnaVAgMBAAECgYABYFp3eyepy6itLC/i66LJGg61
+zK5Z8XPx2ZqqoAu4a6P3Ltmk3cv6D9xWlIAxTN/9AOFJWfJBDlF/pBTXUBLYsIyp
+Ay0zCCYe4F+ggjdZfg8V3GOuipqdbWYMvQIiQHb/PuSwPz3QY++DBQcdzSD295Nb
+PMsjB+iMshK1kdIybQJBAObjOhyuG/0bVO1ImEhjn4N/2l5tXIHTl3hLZqpPRnUQ
+iLPq4pCSQkdrArG2GefdQFtrCzL1YddSa7nHVCdB8pMCQQDGDJXb3SUSV7Vm6XMc
+Nk2VysG/xst9rGxdRZ1WC4Q6XxlBNW4jLyBmBPAelob/49aAOKkN3uNzoAHSsQXH
+geM3AkEAw5gVX7yDi2z/CjDoiNKUjFLgTAQ7TORSOh8uLvMPjhZeqIRAQRcWPOhD
+lQbedVUysv9Asn+7zixNhEl/We59LwJAclOBjtIyPEx1Y1sQIBEY6IeLIPHZNkr6
+oz00fh9XzXpoUcRON/FUepAPLRkoBT+463vJ2z/3fR+47a9S7sCEMQJAXZvvvCTy
+EdqRRFW3137xSTC/MXgo+cpkhYsGR1QAzOr9y9SdQ5l2WcxG3i2pS/ASocWiPhqd
+yMmb3q+SLS2FEg==
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
index b8528d0e2..78f1fed0b 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.p12
diff --git a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
index 054f81a96..563800185 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/OCSP.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
 MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDFaFw0zODAxMDExMjM0MDFaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t
+MDExMjM0MDJaFw0zODAxMDExMjM0MDJaMDYxFDASBgNVBAoTC2V4YW1wbGUuY29t
 MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAOg80b5o3UgoQfGvVMvpQMeZQkxcwWiXjP1LXkUuD7VotQab
-3zWIysbLJjfCkfAFj9KyYpHYjDMZrRUEDOqNqB+eFXq22AJHRpfL4f8seMjfeuw6
-n0b8CiwXWsztyZy9LHOx05RR/LoYikDCdk6jhl54WvrM8cuxJPL5Vg4TzwCTAgMB
+BQADgY0AMIGJAoGBALKfGMF0qs9/epeAylHhb2RK7i9Xxoa+jJLH/haqgP8rSOiW
+eIF9o6rA1iXwK37EVBa+wMA+qM8eMKUL51w319bJgJKMrNE0iFgjyQzVkzA4gdMb
+b/Bhar1gtRO+5VDRhs4BQlnKmSa7lO6GWz4tl5HPIVQDLGM5f6ks3Y5qVnaVAgMB
 AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQAgKpH+d3LGfaVfh4F2MmEEHwsQLswpgKjElBxKw9zk
-dKaIBL1W0ioLZgw4fdHdYa1W2RuHbSLTC8vFQ9m8JsFdwZafqnL84/R2cKjBc19X
-lyYZ3/1ewJWz4KtT0Q+LCQiNkSkGZcuSZ65uftq0wiosELoK0KwMhpDA6R3Urg6T
-Kg==
+BgkqhkiG9w0BAQsFAAOBgQBk2XcYM1PNgjFFHo9/iQz2sTbCYEZYdqop7BAJwye/
+RxS0oYR+2gdMJmmYX8i+a0sx96p8T0SlxP6R9knoKC/Mik0UZ55GHKDBdVbcNC99
+koM7V4ZpTXVKFU6eC3gfninMVtA60OTYVhJ/h6tJZbZ9fiZjzkS17HznqDnCBX2G
+Cw==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.key b/test/aux-fixed/exim-ca/example.com/CA/Signer.key
index e7650a518..7f200a309 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.key
@@ -1,20 +1,20 @@
 Bag Attributes
     friendlyName: Signing Cert rsa
-    localKeyID: 23 A9 CD F5 7B DB 40 BE 50 90 50 06 38 F6 03 19 60 4C 85 E6 
+    localKeyID: 95 31 34 2C 0D 37 D8 46 7B 8D A6 54 EE ED 0B D0 41 AB 50 96 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKT1/n//U4ydUw51
-j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGPj6USuvXTnlbr0zS57GmF
-1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTVViWCJSZ+8P1iGO93uFFy
-A97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAECgYAA9q0S5iZGhBaQBbIj+2pjsCq5
-a6TZPgxTXwznYEjOzkM8INeGNs9lf18xOiz/Q8J4ugrn6uSMqx1bxp7QaIWQYp5O
-rTzJv7mszZ1rX78ZI8rfx+rOqvWEt49N1tlHYO0HMVQqBlZD697fTyftp5tH1REi
-g5u9zShGDVIpNZawIQJBAM/7n9gAfn0O2/LReyXY/FHCCMYArnhFxZvrFHh8QKzu
-ZIFEI2FuWvJLfCq59w1SXUza2N4Z+Rb5rHWrXPsEKJECQQDLC6YW/0Izvk3fiPF5
-lp/3HuLmU8FNyhDoSX0aYtSV9c/qxee18J+dwj+1WQxVOh+NCwtqP4CqO6T6mZYY
-qGYDAkEAx491oQlgVNiEHOn5Uqhv+nbGek4/GfJAmMmoe68lU4jucMYTeLItm5zo
-SArlzSeBlHPMcNfVFMF+Q+2oKsajsQJAacspAASCFvnKE3WD9AlSUe1K5h2vs3tc
-cduQjoX+JCCO89GoGHlGgWlrzm6WaXW+aLvfd72cqZYoMNaDiVd8xwJARUinlpxr
-tCgnxupjcFX4eLdofst1y3YobKk2k7TtGHAifMUmy6zAoelmRz1OFy/jNvdLEfGg
-B18UhH2toSUa9w==
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANyxIVDJpsgkZguC
+YBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype4sm628Hh5oUruvbXGzVj
+rp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWlhkgVecG8RDoYpjK8ymJp
+GHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAECgYAuzPltsnXF98IUKr/KTSt0M39a
+WWzsatb9LjW2zEWpYxcWu0Ch1ou8cMn9+EVL1m6H/Snvj8iEVDWW6t66zZZxT671
+DRJnmg9EKc/XoYOSjask8ktNaCoUeBtSh3vhsjQ42Pf+IhwdpzjAiVqpQZnJBt7g
+MgMR4CRh4JjxD4NsYQJBAPwUWiMIKadKi2D1f9luim/0mSAD6u870PVj0d3p9uCi
+Rur1v+2wTB/Msi45S2bF+1fhkop53bo0QW8GaPInRJ0CQQDgH88nXbe1Q3k9BOXH
+G1qLQsO5TvfeVz2CAd9OEYUTSDokSo1JKiTigBGrW8z6n5U4rU1JWPT9mP7ZCSGa
+fwUFAkEA8mH/ab/njVw4OLrWfBO2OYBP3GDn/bDec5XPrjnRkJ1442P5cGscR1dj
+3N5qih/EVfQoG86iTPECGedn8a+gYQJAV3/TrjjGafwHryzkUFF7jfbo1sXfu2wv
+1TvJ5H6uh5KhMF3yvue3Mr5xJ4dVhVscNN5j2AjkzMUYab9I4TpJyQJBAN4187c+
+G2URrWH5q4lyUS7fXjAnApaUrXJRFZn1kkD/eFd1bb++drkuDQmo4m6fpUJFAVbQ
+8IPh2p+4TAkx0xc=
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
index 0316d7307..5ea575259 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.p12
diff --git a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
index b0b33020c..e29a8fa73 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/Signer.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/ca.conf b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
index 8cf1c3ca4..4714ac9d0 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.com/CA/ca.conf
@@ -1,18 +1,18 @@
 ; Config::Simple 4.59
-; Thu Nov  1 12:34:01 2012
-
-[CA]
-subject=clica CA
-bits=1024
-name=Certificate Authority rsa
-org=example.com
+; Thu Nov  1 12:34:02 2012
 
 [CLICA]
-signer=Signing Cert rsa
+ocsp_url=http://oscp.example.com/
+sighash=SHA256
 crl_url=http://crl.example.com/latest.crl
-level=1
 ocsp_signer=OCSP Signer rsa
-sighash=SHA256
-ocsp_url=http://oscp.example.com/
+signer=Signing Cert rsa
+level=1
+
+[CA]
+org=example.com
+bits=1024
+subject=clica CA
+name=Certificate Authority rsa
 
 
diff --git a/test/aux-fixed/exim-ca/example.com/CA/cert8.db b/test/aux-fixed/exim-ca/example.com/CA/cert8.db
index 3201cd679..b8bd19e69 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/CA/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty b/test/aux-fixed/exim-ca/example.com/CA/crl.empty
index 80325b15a..c8ef20944 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
index b1f47aeed..b76bfd547 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171216011707Z 
+update=20171216204807Z 
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
index 0999d7486..10cd31eef 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.empty.pem
@@ -1,8 +1,8 @@
 -----BEGIN X509 CRL-----
 MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5jb20x
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MDExNzA3
-WjANBgkqhkiG9w0BAQsFAAOBgQBEpFlJHql9ydgBqK9/keokpRs3Lj92Z/rcB0pz
-P6tYYp/KfV5rZfVwqmkHQGniZJCIY9QzAnTnYzzG/oH5Hso6dI3AzUUBdku0ry6T
-0nlGKfE7vADr3k7T54pKdoS0eO0BjtmYy3C7J+I+W+jB1uHlvcP44rHlVRNXdg6I
-jdU/YA==
+HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MjA0ODA3
+WjANBgkqhkiG9w0BAQsFAAOBgQBTbxmeT+nrX3IfCUxXg/bFXePgbbzm4LQDgYkq
+ZHjUik8ApIdPemifTEd5uQNY/ZCc6rOpxdHrgGnu/Xs7ddVyrcmV79Wcld62yK5M
+iEYGqb3t2u6zlePtYjVZe4uK2gmkhQ1p6Py1BByzWtuUjP9rqgBOqjTVX1uvspqw
+fJ62JQ==
 -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2 b/test/aux-fixed/exim-ca/example.com/CA/crl.v2
index 625362a57..ee154f5cb 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2
diff --git a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
index 1c243fdfe..9c5883f64 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.com/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.com/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
index 00048985d..f55983a04 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.com/CA/crl.v2.pem
@@ -1,9 +1,9 @@
 -----BEGIN X509 CRL-----
 MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLmNv
-bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYwMTE3
-MDlaMC0wFAIBZhgPMjAxNzEyMTYwMTE3MDlaMBUCAgDKGA8yMDE3MTIxNjAxMTcw
-OVowDQYJKoZIhvcNAQELBQADgYEAg1GFKMUGJNkmmzjkIunSVFANV9+V6gdx+Nyv
-8pCP8U3Lo5ly1HvISuITVlIvvFmKpXbs+FHsBmCWrJbug20ook8OF1mloDSijTBu
-i4pUuupwnX3QbKzXWgQPc2INk+w1+8+p5OJwgLARrQlF2FRB4mIWRV+db7Px9heu
-RKJnHx0=
+bTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYyMDQ4
+MDlaMC0wFAIBZhgPMjAxNzEyMTYyMDQ4MDlaMBUCAgDKGA8yMDE3MTIxNjIwNDgw
+OVowDQYJKoZIhvcNAQELBQADgYEAMV/oPx+JnEiEgVET3bHRDTTV6+DW3iV4Xx7V
+QIwo7s19nwDDyboB+mKzJdiuD997/o/c+aFxk5MD8uqFr5qGTpdbOA6eVT2vtzzr
+yYX/KUS7REOJ5y3i7t5tAKiYRGB9jOkWEhoE01AvYT06/LY7R/T5ZaFfblADwMsa
+Zdwr97U=
 -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.com/CA/key3.db b/test/aux-fixed/exim-ca/example.com/CA/key3.db
index e6994fa90..dddce8748 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/CA/key3.db
diff --git a/test/aux-fixed/exim-ca/example.com/CA/noise.file b/test/aux-fixed/exim-ca/example.com/CA/noise.file
index 935c0e00a..c59fde484 100644
--- a/test/aux-fixed/exim-ca/example.com/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.com/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:      36954        740         73         30        667        400         99         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        890        185  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:      26824      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     638987       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     141147          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    1294229         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        910       1871       1480       2860       2449       1488       1879   Non-maskable interrupts
- LOC:    6823662   10427827   18565212   16014399   28149496   24505820   16317964   18890424   Local timer interrupts
+ 122:       5099       2645       2048    2133111       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     307592          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    1528642         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        366        323        340        333        336        355   Non-maskable interrupts
+ LOC:    6161920    6212526    6081033    5762738    6023262    5960201    5962068    6075752   Local timer interrupts
  SPU:          0          0          0          0          0          0          0          0   Spurious interrupts
- PMI:        517        910       1871       1480       2860       2449       1488       1879   Performance monitoring interrupts
- IWI:         58          3          1          1         16          2          1          0   IRQ work interrupts
+ PMI:        368        382        366        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:   12075155    1391873     533941     177453     288321      72324      62935      48758   Rescheduling interrupts
- CAL:     180655     143208      98859     104850      41110      73752     113286     111989   Function call interrupts
- TLB:      53363      51506      31574      33734      16525      24424      38918      42710   TLB shootdowns
- TRM:    3946042    3946042    3946042    3946042    3946042    3946042    3946042    3946042   Thermal event interrupts
+ RES:    2767495    1298498     589870     442469     433571     428645     274117     316937   Rescheduling interrupts
+ CAL:     346261     329432     331889     336862     344974     333357     332847     336503   Function call interrupts
+ TLB:      99587      89304      89373      92699      93692      88842      83748      88761   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:         9526140 kB
-MemAvailable:   13822508 kB
-Buffers:          437988 kB
-Cached:          3580108 kB
-SwapCached:            0 kB
-Active:          3759780 kB
-Inactive:        2483068 kB
-Active(anon):    1520104 kB
-Inactive(anon):   326648 kB
-Active(file):    2239676 kB
-Inactive(file):  2156420 kB
+MemFree:          171892 kB
+MemAvailable:    1950708 kB
+Buffers:           25332 kB
+Cached:          1901368 kB
+SwapCached:         9076 kB
+Active:          9043816 kB
+Inactive:        6504992 kB
+Active(anon):    8606972 kB
+Inactive(anon):  4972924 kB
+Active(file):     436844 kB
+Inactive(file):  1532068 kB
 Unevictable:          48 kB
 Mlocked:              48 kB
 SwapTotal:       8212476 kB
-SwapFree:        8212476 kB
-Dirty:             11660 kB
+SwapFree:        7958012 kB
+Dirty:             11804 kB
 Writeback:             0 kB
-AnonPages:       2224852 kB
-Mapped:           671936 kB
-Shmem:            327736 kB
-Slab:             326440 kB
-SReclaimable:     238592 kB
-SUnreclaim:        87848 kB
-KernelStack:       12416 kB
-PageTables:        54140 kB
+AnonPages:      13614364 kB
+Mapped:           390544 kB
+Shmem:            322816 kB
+Slab:             237008 kB
+SReclaimable:     127500 kB
+SUnreclaim:       109508 kB
+KernelStack:       14304 kB
+PageTables:        94668 kB
 NFS_Unstable:          0 kB
 Bounce:                0 kB
 WritebackTmp:          0 kB
 CommitLimit:    16359228 kB
-Committed_AS:    7099712 kB
+Committed_AS:   29520640 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: 66808197   75170    0    0    0     0          0      3746 18376885   63295    0    0    0     0       0          0
+ vnet0:   46917     481    0    0    0     0          0         0   325097    3671    0    0    0     0       0          0
+ vnet7:  502731    3695    0    0    0     0          0         0  2163888    8497    0    0    0     0       0          0
+ vnet3:   32162     252    0    0    0     0          0         0   291837    3410    0    0    0     0       0          0
+enp0s31f6: 191749422  170921    0    0    0     0          0      3922 42698749  129945    0    0    0     0       0          0
+vnet11: 7303439    6454    0    0    0     0          0         0  2343040   11288    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  1206381    5925    0    0    0     0       0          0
+  tun0: 112501735  104283    0    0    0     0          0         0 30579473   80458    0    0    0     0       0          0
+ vnet2:    8030      34    0    0    0     0          0         0    42770     387    0 1712    0     0       0          0
+ vnet9:  126854    1141    0    0    0     0          0         0   686477    4612    0    0    0     0       0          0
+ vnet5:  139304     988    0    0    0     0          0         0   787497    4718    0    0    0     0       0          0
+vnet12:  133857    1141    0    0    0     0          0         0   815494    4633    0    0    0     0       0          0
+ vnet1:   71961     671    0    0    0     0          0         0   421240    3847    0    0    0     0       0          0
+vnet10:   85763     802    0    0    0     0          0         0   485974    4056    0    0    0     0       0          0
+ vnet8:  445523    6298    0    0    0     0          0         0 15036777   14092    0    0    0     0       0          0
+virbr0: 31724349   82897    0    0    0     0          0         0 119520165  124442    0    0    0     0       0          0
+ vnet4:  329164    2446    0    0    0     0          0         0  1592232    7002    0    0    0     0       0          0
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
index e92a5e210..a8952403d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
index 9eadfc635..c64c3925d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: expired1.example.com
-    localKeyID: 3C 2F 34 1C 37 30 74 2E 1D A0 19 C4 9A 5C FD 83 83 9A 0B 2C 
+    localKeyID: AD F4 6B 62 35 0C FE 8E E9 30 CA B0 EC C1 3C F1 43 84 2F 8F 
 subject=/CN=expired1.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
 MDExMjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbljWa9bDzYPhQ
-CwpvoYRJooGwY2iAmHIJFMfwlfcaSwGPQ1J9LcssEt7qSRWv7+eDSu9gsbjjKyEx
-nUbZLONVyqjPHJva9ZboLk9hjF3jX8+IuJ6I+hnHVNytcwBWHvxpOtF0Q4W01ChR
-4hfFM4FLCcYVlGB+qw6iMcYEvqF57wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDnaQ26HUDEQ88c
+DPS4+dms4X+6ImuFtndy7sppq+5wjXLHgwpsA1oqkKOUOB7jwxq+yw8bifZnH43F
+TTogmOLlKdVMr6gAH/oXMpKt5HOplAAYvfCx/r0OseA5OiHTCkpPz/fJoAkIhHop
+CZC2aGMbDq94g2vxZJjYlyOUpRVqWQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
 A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AAYNczj7Onk9/UhfTTTrbqsxXSaAYYLeLFBAKJL647RBph1gYeZNS5mPOS3oC8/s
-IdCytpThCFQFRtk4XNRUaGFAY0A8EYjf4V0EZ2uOn5CcO0hvpIHBgjPaUQwt0+1W
-YkCHHbxtWzSCsxv23eac+Wfbt/nYIrpEslqpiQmQOSQ9
+ABpmRoV6fqW6E7RVQAJS3uE/ZWBdJUe9ZK6iauMGgFNvJmMVDEie2ty4/mlht4Aa
+Hqtendwy1UZ7VBvli/yzieoYv3ufaslcRuw7fOe0b4ES6EBRmjlXMtE4ZQj8q4Hf
+IQz7iD3gDkVR9TAnL0YgzTk7IojNHbqe5F4bDdLw/WnK
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
index a4cffb882..e2eb3369c 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: expired1.example.com
-    localKeyID: 3C 2F 34 1C 37 30 74 2E 1D A0 19 C4 9A 5C FD 83 83 9A 0B 2C 
+    localKeyID: AD F4 6B 62 35 0C FE 8E E9 30 CA B0 EC C1 3C F1 43 84 2F 8F 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIPsRO/2Sha3YCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECByeXO36+nRMBIICgH2QuCe5OW2F
-LR964e0swiW9/O5ysKTf+jZKdmB5cVOoSOF9MpXPFaqsOp4PaX/eLaljaW1VCKU1
-PyjEc01oX1qq3VdA6wvN99Sgwh0K15UOOz/TI58FOinuW7JZH/d3DFUYQ3EiZjqT
-/IwK3lixVUESnI2hbR/Z0wV5uEaTpIB6JPMOPhkCQasl3o3rKVmNpLOyMvYMHGUW
-p2UUZbiR/K0SjEaSWD/FduOoSKCky3wRmfjkqOHzVUjUPgUwjW+Ta7p7Hr/r0Gzg
-SBkTm7DYzlKEnUMx2UsTZ+6CQYAzSf0WbjopMcsug8M3Rx5T617TuoZe4zccorwX
-m/rcTGLeXed6CjAe0vJvA/+42p6NI4i5EiZceLSIAq9NvR9wdB2grI2v8VFChxCJ
-h184sXodLrBf8WhetxOeGUrXGwNXbMtfRHrragToXMokD+2qsQvnWASIQNpHK6Ww
-Gc2o0w1VPuJPF52+jQ8JXeqRof4wJNy/LQDGXrXm50F6rZdg9XMEXIDjFiH7Jgcv
-+a3BEeeobh5p+QAS+CUJK/M5ApJMTgwi+lcGfOaOinQs5zATO0gtkYqR6eyLQh4w
-vmzCCIjf08KUzfOseNM1K1QYb3Z3hVUxyusQZWy+tk+Amue58opdE2O1bzjkgbOV
-X8HqJBwGueb1pnkgoGzqq7VPiOwT/ZsuAMT4NWrIHAwzTsRomk6201V7GPnWn7Zm
-2svPUM2Nlu1iWFhYx+9NslFBQ7agmb0dNXO5aS4aZBR3VylEm+3ch3VYces7r1Iw
-KDfumSDXRNIxpR7mLNOGGVCOa4qaAmanSf//m7kmsri1/zSffG9MeG7ngeWWXZzw
-qFsEMtkMiJw=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIHz/E+ZQWUDwCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIuDF3aUa8FxBIICgE5pLTn269gs
+FVitYmlCIimgsakralzc3xMQBDFDSiBdsz9NbNYsC9wtxBP65Zu8lJC/h5oBFjAM
+lF5brGIbmbU+zi1Cmrm4nEzGHKOG51aR4zGcN5UvUKHUA566zfHpJRm0tERvsMbJ
+m+FzxmszxuCp6hNHlIQppc48ndf00cpZXIxCfng6AyG5Ukv3QnfJldEoCusfW5Jz
+TOxoshU7CKtAjbQGgpYcr3HY/OfqaLhmtTVeleXXYwSguOTyr+F7nD6x1m3r0y2B
+nNegjonvq2Sy8+MQdugbRAyKCfE/1ZV/GhyD3/BVz/5rPYq5brkSdh0Daudv8pAC
+cTtQEBCaD77nacJuTw1aB3AwmkZpg59q2R4VlsXak963ay8KnWzCiReDJ8EznDV+
+kkKdCfYzo/TlnYdmUc15Xuiq4lZI4IMJ7d2+gGhWyVEJ4ZlGpfXntt8WcJCadLpM
+kXJRiXhkBkELjo4zu70nStxtRm5L6S8Ha7+ayPAzN3Q58M8HFqUFWSu+dZDCwkAG
+dgU3b5EbJUWbBwuVr0qXVqTTfNrgmphfzyVnUCq15jeLhTf2Ixt1UGlKSttRv5ME
+rhjJPKciCAGEqY0e34OX202OhiD/5UaHyFz46mGUo9uF1UrneeFHb2e5E2M82A4l
+d6L5E5YIWxAqeSpsiHpWiIGT4YwNre42vXE7QFyAagPgfCxFxGijEo3b5VPzbY+q
+evawq7KoqYeL5nOm3KP3DMx3lvB51nCk4R+JqjJUNLHwfcIdevEa0UekdJnS3qma
+wnTTkCoOqVj4Df3Nha/whbAqysQZ8yjrNS54SBcS9KQKT6Jd4AH2LZp8WCCFlNiO
+vA/svNspt1o=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
index 681ec081f..e47dc9a6d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
index 251b7b2ef..7ad2d9dc2 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
index 6c23b0b93..3fa180b26 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
index de039bde5..fee9d2b96 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
index a4a9cbe2b..011600550 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
index 9a3f2fb30..d0e8d009d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
index 0042694ae..7e74bbafc 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
index 95cd82a46..53205d953 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
index 67254bbce..5419108f8 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
index 5455ca1f9..3a564eb2d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
index 8a06a10b7..2beab07f6 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
index f11c00f17..04ae39886 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: expired1.example.com
-    localKeyID: 3C 2F 34 1C 37 30 74 2E 1D A0 19 C4 9A 5C FD 83 83 9A 0B 2C 
+    localKeyID: AD F4 6B 62 35 0C FE 8E E9 30 CA B0 EC C1 3C F1 43 84 2F 8F 
 subject=/CN=expired1.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
 MDExMjM0MDNaFw0xMjEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbljWa9bDzYPhQ
-CwpvoYRJooGwY2iAmHIJFMfwlfcaSwGPQ1J9LcssEt7qSRWv7+eDSu9gsbjjKyEx
-nUbZLONVyqjPHJva9ZboLk9hjF3jX8+IuJ6I+hnHVNytcwBWHvxpOtF0Q4W01ChR
-4hfFM4FLCcYVlGB+qw6iMcYEvqF57wIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDnaQ26HUDEQ88c
+DPS4+dms4X+6ImuFtndy7sppq+5wjXLHgwpsA1oqkKOUOB7jwxq+yw8bifZnH43F
+TTogmOLlKdVMr6gAH/oXMpKt5HOplAAYvfCx/r0OseA5OiHTCkpPz/fJoAkIhHop
+CZC2aGMbDq94g2vxZJjYlyOUpRVqWQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
 A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AAYNczj7Onk9/UhfTTTrbqsxXSaAYYLeLFBAKJL647RBph1gYeZNS5mPOS3oC8/s
-IdCytpThCFQFRtk4XNRUaGFAY0A8EYjf4V0EZ2uOn5CcO0hvpIHBgjPaUQwt0+1W
-YkCHHbxtWzSCsxv23eac+Wfbt/nYIrpEslqpiQmQOSQ9
+ABpmRoV6fqW6E7RVQAJS3uE/ZWBdJUe9ZK6iauMGgFNvJmMVDEie2ty4/mlht4Aa
+Hqtendwy1UZ7VBvli/yzieoYv3ufaslcRuw7fOe0b4ES6EBRmjlXMtE4ZQj8q4Hf
+IQz7iD3gDkVR9TAnL0YgzTk7IojNHbqe5F4bDdLw/WnK
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
index 0d1a69838..170ef172b 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDbljWa9bDzYPhQCwpvoYRJooGwY2iAmHIJFMfwlfcaSwGPQ1J9
-LcssEt7qSRWv7+eDSu9gsbjjKyExnUbZLONVyqjPHJva9ZboLk9hjF3jX8+IuJ6I
-+hnHVNytcwBWHvxpOtF0Q4W01ChR4hfFM4FLCcYVlGB+qw6iMcYEvqF57wIDAQAB
-AoGAAQ1VMGrg8CmUxv1mjWZeteObb3bqd0NDuJtq4dI2HuAhH8iYypS/lnR4sPKs
-se0aVNy1DOeNFTmNrSktv7ihVjOd+6/J5ImIQdk1/ZJkqQqb11rajJbZFoapIq7o
-/m+WlskAQ4GbvlfgsrZ16qCj2jvt9+3rMz4P8YOfMNE/rqECQQD5kooyrIJtkXZB
-ZlpvvtNtEKR5CUXZci/YdijoIBnmFAv7RTDD+xOl/x9Ks5lgtonm8BfpBD0vCRaa
-UgzEjUmZAkEA4T34doHU7HgXDAW9bFSEUJlrBPXrkW1mxg1fAIpZGRdYsNU50a6K
-qTxIeYcoG8bH1ginV0e+AmR2v6SHG+nkxwJBANwGd1Qphmt2nJ0X0Y9G2zsCOx6C
-MFR+OPRLZ9ENzAdtkQqbe1yslCv6eenv4L7E71rsPQgvtokrKAQxZhQ6w7ECQQDL
-hybDVs/imSUiLPGcOMaS2f51Lg4di8CpR53HrDuUS59Nsm6bhN8wyxMmFTXt23Hp
-ekpTuLT+Dm+q/e1EENYzAkAEP4mueYCQfr587d/FLNJUVdn3Gniv8wRv7DycGvE1
-GkcAl/IVc0JqkUecyReS7Js+wY8EJBRDjtPhm9tBMObf
+MIICXQIBAAKBgQDnaQ26HUDEQ88cDPS4+dms4X+6ImuFtndy7sppq+5wjXLHgwps
+A1oqkKOUOB7jwxq+yw8bifZnH43FTTogmOLlKdVMr6gAH/oXMpKt5HOplAAYvfCx
+/r0OseA5OiHTCkpPz/fJoAkIhHopCZC2aGMbDq94g2vxZJjYlyOUpRVqWQIDAQAB
+AoGAD4U8vfRTUTaJEAUQbs2XG2C+a9H+KygrR8KbQc4dvl/GSHpR+x+Ybw1nYzwG
+WllOFGjTGRI+O/liTU7aLLCEWyCt5Ig9v8eqs6UUp/geR7bO8NQUIpbmfXvwyeI6
+3pOVpKetIqGpeKB7BdLuSVf98XOsOxbhvpRWgI0QD/5thL8CQQD+sm+k4Ljs/tGq
+rl8VxCRInRicSzTMF6t266RmK/olKhWkEZZuOqz5Qzw0CR3ggpanrxHsHzG0cg/y
+/kyVq6GjAkEA6JgewnwHbgKe+R/qPNWttXbhyVrI4WUJoUUF35gIGjM6pd5vmkj/
+Q112k+KcciLi81LTfu96Ov6ELLcOblEb0wJBAIQaeN3D0SbbZFRq7NaVTVx8Xu9x
+8oiJHl4oCrUTykLMeT0IAkZaGK2QugEjWWPBV/LRUzJtW5KENtGKJJ7czpECQFZL
+kiYAFFWZfVfaonJdqOxJpi2plBwj+3WtASfa5S6rURgXNfrdGG/q7kKh8f9auC8k
+zLksqoHWyj040Y7WYucCQQCY7EzjAZi2R9EAYbzsDjSbOz6SVb3gCFipoGmPjmRU
+MCGIZFOVpC0TboveTvfo8TRWMJBUI7jJ8y+Hn4XDHY+1
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
index 2cf2fe369..fd5fd172d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key3.db
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
index 4de477317..8de4b60b5 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
index 0e9a65c83..6606b9091 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: expired2.example.com
-    localKeyID: 13 D1 1B 1E C4 8B 1F 00 8D 23 B0 BC C6 9C A3 DE E8 54 52 4B 
+    localKeyID: A2 4F F9 05 E7 72 D3 FD 80 22 C6 85 C4 29 1F 6F 1E 07 10 45 
 subject=/CN=expired2.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA2WhcNMTIxMjAxMTIzNDA2WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/p1KbCGmXvd3
-2CREQzw5ICHJFqRf7TeGu4U8lnG1aDpag6CnC5ni8lKDDQq6B6TsWMqdsN9hU0mm
-R4YsHRCoHwBvqmG3Oq/9IHVuJ3YJXIE0BaLOzWeyatgPfGgJx3CT+vitKIofY69K
-bGWpWCIDdyCmSc/ShmUCPb/pPKwCyckCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA1WhcNMTIxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtEiZCx/bGg/3
+SXMnj0a3qxH99wydD4UETBIbXfxLHebuRqYdCSbsiL+BBhvu6r+dC6GU/v6hc1XI
+Oi20JtAaBBBh1upsh/bHE+VUn30LL7Z2MXiXqYcwViIWrSsEIsnKHq0Z9QMpGFCm
+IcoMoxb1yc/mV67uKsfEOd99/NUkMp0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
 BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQChwUeDpqBL4BF4lviDt4Y2sFXti5lGLMODt7p2MQvXpcWMwKRsgnFvoNsyWkxI
-xOyp3X584xuq71OUl/UnKOjyKNZfHuYsGGq59CYtYqk6PHXBBL42lrdLX137HPEm
-IHJTA8Ktv1Ap1KaQ2z5PIMQmgIsXHjRHWj6FyuygrHrHig==
+gQCfKqCaO2IhuzTt2Cswu9ehHV21Qss8Jda5WDD1HGghNWxPns+5yYKbcmiG/weN
+SRj6CedFALiRZ9M6wH6mr9Rq3U/W6HkbkoGdLLtWI26VKL0EdqF2oIqLe5SmD8tJ
+lEVFgrI7biJegSMqVlV+x+cOSydJmsYZE/7St7XrjQG/OQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
index 0bdbc616f..d64d64573 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: expired2.example.com
-    localKeyID: 13 D1 1B 1E C4 8B 1F 00 8D 23 B0 BC C6 9C A3 DE E8 54 52 4B 
+    localKeyID: A2 4F F9 05 E7 72 D3 FD 80 22 C6 85 C4 29 1F 6F 1E 07 10 45 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqNmMZNmbK0wCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLYtdzXd+xBxBIICgEU6YBe7vPwh
-3zXWczIjyiE8oOZrYa0jOgJkLhP2pMCFsd6FoGqL8+uzSKyGkb+I0QFQgxZ+7x/D
-q2+cDZwGT4c4YYUf5WinvCvB5QL52ICxvY+iShtHoOXUc82Q4EHbvbksH1CPC7Tt
-39hHoPI5fVdOC2W1NV7a+p2lWFElA6xoNHlgIh7SUU979Vv9+JPIdo9h74NwQ2//
-y0FD/FvTsq3APAjGqU4SpEE3niD0JUmFAtvNpaLXKojbBbwBz43NXVZsEz/IF8OY
-EQ9wI0lhyAIHTKmi1gV1ZcW+ltmrYUbVybkd6DD1vyKxZFHnpf3sB2CHCLtFtxEJ
-149zcBCqFtM1Qp/IRGtIc2025tJWEVUQ+J17wRwgV3F/le4qLdqc2pkPdetJZjQE
-7XaJmvPu0u2rADczofmSF166lzIlNmvugYV0FaLnAcJxFs/uI7BUROLu7AQXQCVB
-GPkQUBZOwLxFyHChG09s1c/M/3rsClniFcWHaH2iIYeK2C4uRHUGCk+F2lQKCkld
-UAgXNtGK0rOSkLKSQQOkZOacCqBJufxGDFwkZC3WJvO8ixUyOBDF9iOrcnOwA/jB
-zdsdIhsCeMtt8lPwM210fuM+CXh8S1j3QULLhk7Z/+FninRSQH4bBKduE1TEHT3m
-X/fwXXQZgE+HeGJwKwQQnYoDX48w3Y/rfAPQUlWnZnNLMRT6Ukh3o+BqjG12WrfC
-zAFUo1xsBotkTW9Atvt2sU9J5VpNNih+Eu8Qcx9LDnlmRP7nyOXukz2sb4Jt9BID
-bAh/Dq8YpPkPZ76nFTjwGt4mLiIOEVhjEA/6lFYm1h8HD+d5XFFPfRFO3QeERRxa
-f8a9QA4M/cg=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQILhsbSE8C8IgCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAKs9izKzbcyBIICgC+m3lJkJ5K2
+wj3tw0GbIbSRMxv0jCyOGI0NTWAeLUoeSOgUmiFe52AkD/H//MPIBMJInqAyQgZ7
+9jK8/lkv52hhySxtBIj6Al+xi+SUMpGGZh8ap9N1uNLDazqF2lHTkcNpDOFY4aSZ
+IWVH01z2ArbuO8ZRCW22F5SmGd5pK8W8ChX9VWSQ2dL4tB1HWj+yx1DW8ogA4g6p
+iFpyZg/Xjh3ngCgd9jE8uByvHB3ahvzB4Rg4VdfRPdVHBRg2ECFGx/hXxuoE748i
+wxeKyUWHlPWOayBapYZU+AsgTlUIPSxnYTGPU2K0rJH97eHQlaA5db40/j1BMxjH
+Z2Qj1DWDEa/kaFomBbzThES0iS3iVPETLC22Hu4ywXsIUR+7nSXSIJ1H34pdRitN
+okzzjf4EZl+UgBtgLsQ6IlkNUZh/oYvL2CUEXq7ntazDDbd0o9/6oOK3TTiYfuDf
+f8yb10MEftq6wH+NpjlKF3yMRnEDAn4nJkZWKvrcUja5+6IfQcDNnptJQMnvjCGh
+nJe6Dv0idST1FLEO1qnNGfz8Ba58cZDScALTi2v5vLSpGTaXtZK5m1NzITXlOHRW
+QeVvrLJS4fwL2qw13d8f6+kPSknPX1Fe+FLdxVZr/CVEVqx617v9+/kLL9RZ5Mnx
+LZbQpCgtFblv6JLuOBFXqFcfBRfPwP9z4y3vqWWgKRmYLgih3nW3gkOcR+4fhHhC
+LKstjLWox4cqxVPYPkOBktzARbqJCx9Sl6TRLmq8oOO+N5Gn6FquuKLYdwAERRe0
+dAMix0STFYw4daxpKrMfvh5TzItlO3Bi1JiffLwTLHqkmV9ORfC6G9QI6aNY8kGC
+KnCFrjVaOoE=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
index 82e0adff3..3cd9154bf 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
index ff4b0edee..ad0fb6bee 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
index f470c4b28..22ff01bde 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
index ff4b0edee..ad0fb6bee 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
index 26926e913..6c18969cc 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
index 0da2cffc8..e39a591d2 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
index 0da2cffc8..e39a591d2 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
index 04cf310e0..1daf7b555 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
index 21d2ff3c6..6b6ad20fa 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
index 21d2ff3c6..6b6ad20fa 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
index 2ee1350bb..91f205686 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.p12
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
index a0264a069..5b75df462 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: expired2.example.com
-    localKeyID: 13 D1 1B 1E C4 8B 1F 00 8D 23 B0 BC C6 9C A3 DE E8 54 52 4B 
+    localKeyID: A2 4F F9 05 E7 72 D3 FD 80 22 C6 85 C4 29 1F 6F 1E 07 10 45 
 subject=/CN=expired2.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDA2WhcNMTIxMjAxMTIzNDA2WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/p1KbCGmXvd3
-2CREQzw5ICHJFqRf7TeGu4U8lnG1aDpag6CnC5ni8lKDDQq6B6TsWMqdsN9hU0mm
-R4YsHRCoHwBvqmG3Oq/9IHVuJ3YJXIE0BaLOzWeyatgPfGgJx3CT+vitKIofY69K
-bGWpWCIDdyCmSc/ShmUCPb/pPKwCyckCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDA1WhcNMTIxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtEiZCx/bGg/3
+SXMnj0a3qxH99wydD4UETBIbXfxLHebuRqYdCSbsiL+BBhvu6r+dC6GU/v6hc1XI
+Oi20JtAaBBBh1upsh/bHE+VUn30LL7Z2MXiXqYcwViIWrSsEIsnKHq0Z9QMpGFCm
+IcoMoxb1yc/mV67uKsfEOd99/NUkMp0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
 BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQChwUeDpqBL4BF4lviDt4Y2sFXti5lGLMODt7p2MQvXpcWMwKRsgnFvoNsyWkxI
-xOyp3X584xuq71OUl/UnKOjyKNZfHuYsGGq59CYtYqk6PHXBBL42lrdLX137HPEm
-IHJTA8Ktv1Ap1KaQ2z5PIMQmgIsXHjRHWj6FyuygrHrHig==
+gQCfKqCaO2IhuzTt2Cswu9ehHV21Qss8Jda5WDD1HGghNWxPns+5yYKbcmiG/weN
+SRj6CedFALiRZ9M6wH6mr9Rq3U/W6HkbkoGdLLtWI26VKL0EdqF2oIqLe5SmD8tJ
+lEVFgrI7biJegSMqVlV+x+cOSydJmsYZE/7St7XrjQG/OQ==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
index 81e842218..95b5bc4c6 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/expired2.example.com.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQD+nUpsIaZe93fYJERDPDkgIckWpF/tN4a7hTyWcbVoOlqDoKcL
-meLyUoMNCroHpOxYyp2w32FTSaZHhiwdEKgfAG+qYbc6r/0gdW4ndglcgTQFos7N
-Z7Jq2A98aAnHcJP6+K0oih9jr0psZalYIgN3IKZJz9KGZQI9v+k8rALJyQIDAQAB
-AoGAN45ims2M29PrloHzUyhk3poAoqwjMkOXZntgCQOurZtt/KKlUGa3mmBesA3T
-Ia/e0lEDr4BOYDoFyj2AiqcDx7CKLY0yw5Q9bPJk+uotxLwxKqjozKZ12MukgW4O
-F5c1VUCs82nGVOUL+RG1O+VuKR5HD6ZEfmzo8128h1+RXsECQQD/XalrSHVY97LM
-60Xua+Nj3bG1wskfYMdWHKKqzisFJrHGr2twnTocrL6+5VWC1Qww6BUzmXidBMzi
-Mb6Aw3QlAkEA/z8mth9qM0VII3/+QoA0aDSe7zRykpqMo0t7hz+pyYD4UD34RV+H
-Grpa/DmQACyCoYsdPfvQ9ebzboLE6pJb1QJBAJ8tL9S6xsLdK2vGX8HdKFFwuDw3
-HYzck4RetxrHBlPgqcHSSKNargV/vCpb43B5Am9dyxFt4ZvmiRuZrEixDK0CQQCf
-tbUUOf3qjMxBokHG/I9OMLbN9+RExT2Ao6dsjjI/6ln1Y4Eob0iLOdXagm4PHcqz
-J+epNBqg8tyY5mwuVlvtAkEAgj/L2N9aHS/5xT+PTYsWpbKD13a85gvmrzZZVQnw
-obQMq5awOD9y4u3xqNSr8i/Hhx9biSDteQdYl2JZimHosg==
+MIICXAIBAAKBgQC0SJkLH9saD/dJcyePRrerEf33DJ0PhQRMEhtd/Esd5u5Gph0J
+JuyIv4EGG+7qv50LoZT+/qFzVcg6LbQm0BoEEGHW6myH9scT5VSffQsvtnYxeJep
+hzBWIhatKwQiycoerRn1AykYUKYhygyjFvXJz+ZXru4qx8Q533381SQynQIDAQAB
+AoGADU5/d1X8WM3dYX89qAJe+6I6FdJJRHQ7tzat7O+6hqQ9KZtIsNx94HEMH6yP
+o6WNfKaKRhD6zzXBb+PgNG4vQUY90hZ/j78a0rTD99j2vidsB2ifUdTWKbis953e
+CdseIpj0iKTZxNQpXXoYU/hm6mlo9yOR9in2L8+eFz3pYuECQQDmwDMIXsxAW+9U
+vec3RrfYE4c42kFDeQvSaCWcSbL+BxN7zVdstoxnmXa+R5OUJ/8xRwkuSXAzn94S
+rTjFGkB9AkEAyAK1lP2KCS+TP2+XPTqZOkoDFbhvXHHCliNkyGtArF2y34bgzjgj
+DD76HU+K3IbpVlLAYHzW1+rX/k2oUV10oQJAfvqFGrYP79qneRqHggOIZ39XihGQ
+mHCj8MUe7UIhHWkHb7kvwsMxwFDS5yK8M2tPIu7UPoRrGf1/Vwe7lbs8gQJADsJE
+a+4ZlXvxPakaW+ZLEEYN3Dhz3zp1xWZvNWrUpuNzI5NsW0tBKtIq2qbX9FXwOfJ5
+R6VupRgrQBSy6u4egQJBANS8nesnNZRXIf2dEr1iZKGtpY8SxeHfZQ08rF2MIpP3
+pOZWoAXgpbocfanxzhHovc72kNLOYzQR2ANvHDlNpVM=
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
index 24cc6078f..edbed3495 100644
--- a/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/expired2.example.com/key3.db
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
index 43d488100..8fa5aa8ee 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
index 1a803eb2e..c286669a4 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/key3.db
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
index 720780a6e..7998daf24 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: revoked1.example.com
-    localKeyID: 8A 34 51 BB 11 BE 62 85 03 82 CA 26 7E C9 12 A5 8B 49 59 5E 
+    localKeyID: 85 0D 82 74 34 7F 88 F1 44 08 3C 66 B3 E3 F1 F5 6A DC A4 A1 
 subject=/CN=revoked1.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
 MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDIJRW1rC3Ox7eq
-hhuz8jjMATaEQl9sbQ+fOBRPLkQDrlGfYfZnfv95oIAIbep73y+K60+iFekBscQv
-55T5TpHtryJf/nAzG1uaB5/knqT+25D5x/qZaZxDP7UF+S7OFq+7hLs4G+IY5np1
-aCBFozLcegFpCcr6/I7vE6krlX5fzQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4nO1XVJJxn0ds
+Cwl5r8NnrTCCJXZPU+YW8L7XqT0WwRbZJzpISpmeuNvvSEI5kzzDZrY39+kZxiz6
+lFRKN06WFJjagD6uJX9dBsbmCoDh3b5oIb6MynCg6ai7TugSCF2hDj+Mwy8ddtAH
+oEmPe0Pgjbu5Px/hBDB8S4wafn3VgwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
 A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AKNP1gs2Y0HWDH+b1/LpJ2JuCkhB/hylW/iBfMRfHbFyezuADJP7K49dp1SB91x7
-d3D6XELyDLSwgr2Gdnr22Nu1QY09QTGTgcSDESsteSBhUzrcYOnZA7e7/5nfw3nM
-t4UJSYRLh9nrYbwVAXrYvBx28NwAUjoUXSvA203Wl5+e
+AMY6qxBlHqWITeZeakbOrhhY3SuuY8AUiY6HRUCdfX28cjK8HRE+F653N+LkEVJA
+rnYnMSuieO2eH3G/IkE8FqZZ0nZjxgwslr9fA7QpPm+8GK0xGW5JAXDUnBkPvw9s
+ORhPlSQWj9PNPzRdf2fL+O7vTPoaKXw7jhUeT22/5jut
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
index e4ab068cf..e69e24253 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: revoked1.example.com
-    localKeyID: 8A 34 51 BB 11 BE 62 85 03 82 CA 26 7E C9 12 A5 8B 49 59 5E 
+    localKeyID: 85 0D 82 74 34 7F 88 F1 44 08 3C 66 B3 E3 F1 F5 6A DC A4 A1 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIyoXRU6cOk3MCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGu7EV66JExqBIICgDlNDQVVwRJZ
-/8ah743MkJPD2gWSTNdDnwCKuyaCYPwC3CcwcYkzHS8xeHrd05eRGfDoerNryyB5
-eU/OeGdUtkmFOZV0V4WsXgCucNRD9g5OLBnOlbd7GbQUaRq1C+1+OWerXYH0lLgc
-o1eiL+ar30tHVnk8u4i5iuf1xdSVrcApHsZLCC5LDAzTgWs7sK+VpBW6MEHkb8Yt
-FslDfiWWzJYJAu0+laRDPPhNnMhuKWGP+CFFDaVYRQNfmtUwB5tvUXJSWz8+qzQn
-VLSk/UoOfTpJ6XvdAmVl//4WlHz3js4QZSGgIqUk37aYItLmospPWJm4S8qiubLm
-Z7R0EncIXqUt+9KwxqFyzT7t2hrN8UV4pDUu6NNfOgNDEt0uHE9olmj2g4zsvhaV
-5LAnMGB/2DeipER1MZdMkm8OuLkMjUfNe4ltO+4uu9P8mb0iOS/9fJXKI/IPRs+t
-E70bLFh1lazqgf1hZT7cCvrxIvW4MphyGl70ar/y/A4AwPfbRW0aP+Bjw2wybXUu
-hKfa6jgt5PGZNFDkYZVeHwnFcjddOre4dmOIoMOIWiflzt+oZfDHBC+Kf+pSBDWx
-ThI+4OfVSQnA0uL52VV6RzFNICf/Gn5jRxG+UYKLmGTxHMwrm9mscm38zi+R2IOy
-1ascmUuoi6Qq11lc8fBzU8qsr6P73W+6eezw+VbUATz6eeVn20/idOMmI6KBGiHI
-1beSvx25KdcUcrp8nrgEPQT2L5JFIsAMpJ+1i2fCSAY/Tu75Z7zSu0Q7Z09ODuq1
-d4JgD7Cs5FHktoyKA6mlvrhm7i51zKXitzZ5a3jy3LbhG9hIOVT5D1flMs0iPzI9
-mYRFt5y30ao=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInLsSpU2Xj+UCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECA5GDv2oPJteBIICgJVtnMuDMFK1
+Y3nSohYbrUOtRaqI9WnSPgneNXZjiLIcbqiGhsvcNKKBWqgVWJi4F3GaWpkwAkzn
+0QmmYali9iUBqmFwa3Aw8HIztZ02Uos8uON4eCdwaW4BsL82Mp3vrvcLulWE63/H
+Vrqg3I7Wk3wuEDc/G6K3JkwiuPzaTCwASvLtedeNOuR/xNd85PbcmNnFnpbOCiS+
+mO9szSwsiKFs4f1iynOscVRau7Syd1g+Q9VWKX+TVq9pWq7BltYSOsIJCSf7ECPW
+OMiwNO/obv2ADBzNStdAlvzXdFdQATglam39UKVK6/M8x204sVQ7rNmwLln54nhh
+wpGG3OlS0NNQu1iY3uJlCZUnIfFVv60nsOwRrjxLq6GnHExkQMVXcdiFp7P6zepT
+DEDp/wnnRfEMx5KltrTLQydPqGb9RW6dVMajep05tA9F0Rui6+6WU4SQ5WBExJKG
+5qhlWaPFwfXq6M2vekK5hpU+r11RurbqWDbXIt6WgwfJU1+OB8tttWgvlQMR+gyv
+825J9H8/6mdYRDE841G2Bb0Z5EjEEcSwVmtJ15/OKG0Z3/hBffMg2WlDLnl+/U3F
+OqVuoTlWNVj2S6lJneWUCVJp+pgrjVpKwSWp7CA9i6k40bmwzUmloLRHtvQ/Wr9X
+SahoYHHg0AnPiXzZ2+cylCixuIv/n7Z3T1DnGawIsqkd/wu1llZiYVKJ+1xp/vV1
+mVqy+PkzW0UxPXwHMGkCVVGhLbu1c4KHuTgGa7okvimIuJskgDfWArlFjIvrmtfy
+gwW+yT8XZAMT4QOMEe6kllV5qI2Nyh/InrBY5X13jC+foYBXyM3yvf9sZDoI+8cL
+lw5Pl++GU2I=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
index 6c212d796..2536bdc9d 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
index 7dd1d63cb..fcb27a1e0 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
index 0f771de74..eb31be9eb 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
index e46b04bc1..76ab2b378 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
index 835a82518..3fcede254 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
index 6285022a1..d2d117a3c 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
index f5587ed9e..f3a7d8409 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
index 85d605abf..5726bf5e6 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
index b36d86296..de05f022b 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
index 6f1090b9b..49e9f19c6 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
index b3ddaf548..8cdb2787a 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.p12
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
index 61c555066..9e5570c71 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: revoked1.example.com
-    localKeyID: 8A 34 51 BB 11 BE 62 85 03 82 CA 26 7E C9 12 A5 8B 49 59 5E 
+    localKeyID: 85 0D 82 74 34 7F 88 F1 44 08 3C 66 B3 E3 F1 F5 6A DC A4 A1 
 subject=/CN=revoked1.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
 MDExMjM0MDNaFw0zNzEyMDExMjM0MDNaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDIJRW1rC3Ox7eq
-hhuz8jjMATaEQl9sbQ+fOBRPLkQDrlGfYfZnfv95oIAIbep73y+K60+iFekBscQv
-55T5TpHtryJf/nAzG1uaB5/knqT+25D5x/qZaZxDP7UF+S7OFq+7hLs4G+IY5np1
-aCBFozLcegFpCcr6/I7vE6krlX5fzQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4nO1XVJJxn0ds
+Cwl5r8NnrTCCJXZPU+YW8L7XqT0WwRbZJzpISpmeuNvvSEI5kzzDZrY39+kZxiz6
+lFRKN06WFJjagD6uJX9dBsbmCoDh3b5oIb6MynCg6ai7TugSCF2hDj+Mwy8ddtAH
+oEmPe0Pgjbu5Px/hBDB8S4wafn3VgwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8G
 A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GB
-AKNP1gs2Y0HWDH+b1/LpJ2JuCkhB/hylW/iBfMRfHbFyezuADJP7K49dp1SB91x7
-d3D6XELyDLSwgr2Gdnr22Nu1QY09QTGTgcSDESsteSBhUzrcYOnZA7e7/5nfw3nM
-t4UJSYRLh9nrYbwVAXrYvBx28NwAUjoUXSvA203Wl5+e
+AMY6qxBlHqWITeZeakbOrhhY3SuuY8AUiY6HRUCdfX28cjK8HRE+F653N+LkEVJA
+rnYnMSuieO2eH3G/IkE8FqZZ0nZjxgwslr9fA7QpPm+8GK0xGW5JAXDUnBkPvw9s
+ORhPlSQWj9PNPzRdf2fL+O7vTPoaKXw7jhUeT22/5jut
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
index 133a96488..498c63892 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.com.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDIJRW1rC3Ox7eqhhuz8jjMATaEQl9sbQ+fOBRPLkQDrlGfYfZn
-fv95oIAIbep73y+K60+iFekBscQv55T5TpHtryJf/nAzG1uaB5/knqT+25D5x/qZ
-aZxDP7UF+S7OFq+7hLs4G+IY5np1aCBFozLcegFpCcr6/I7vE6krlX5fzQIDAQAB
-AoGAD+lULgLCYNzjfvTgG/CxpOpNxWWqGhUbjQATgUNU2JQRsiGYH3HrE+YiIkls
-FFf8esdVUotPtbjxDLvqTd2ktS7WFIFjR+l5irXL7eGzdzTeza4rYv/VwUjiJGAn
-ikc6mJ+8qUTGZcTU4WiepIWiPNdYeF5lQ9bagaTP3IJiuhMCQQDruZTuBkinbFpT
-SicpbyRljtTG7VdspbsaHNYVkELM3C/LO/OyY7ZHM3jhbVIV3ZxqgWfs54yOA1fk
-DLP6LYajAkEA2VwRIbxsPvpR06KT9yNiHRL2ZrMzsgc9bCwBGSwOK4ZMAU07QGiu
-krt/YUv7jj7g+P08+URxyq4wkaJ6hrmWzwJABRM6zKEgAVLI4xAupaq56uHXXO0R
-O8qZq6dBSLeRaJ24/bQtvAJ/kyrdiGT1Jnld+8ELfsNBeHFD/Cn12gYO5wJAJKAJ
-1vhr+PSvAw07B4KzzphaYpXBmTb1F5wWl0pAHP9lITcFS+YXvGvRm/B0s9ROjkYF
-ly78SZ2uW2vYX4k4KwJAaG7SKONSuyz2sHAqcU4CMZBX7792a29kQrfVQTkiNbVS
-9EI27wI+gzgHVVc7y2PlTOBcVXnLVjk3bhZEyaK5qQ==
+MIICXAIBAAKBgQC4nO1XVJJxn0dsCwl5r8NnrTCCJXZPU+YW8L7XqT0WwRbZJzpI
+SpmeuNvvSEI5kzzDZrY39+kZxiz6lFRKN06WFJjagD6uJX9dBsbmCoDh3b5oIb6M
+ynCg6ai7TugSCF2hDj+Mwy8ddtAHoEmPe0Pgjbu5Px/hBDB8S4wafn3VgwIDAQAB
+AoGALT4gGD/cp8XOHhdSWiUN8VGLSsndhbFc+RBE5NtP4kytycgIS4EkxrYtCCYg
+PLXttUFttKen064yhbJmOc32Dv0r1sajVnSYVwmPcsVkwgXQed+kkbA6EuKtCFex
+WLnalhh0xOVw9woYCwSJlORbEgua6ZihEOL2bDgCImqkraECQQDbi/DPFikMcruN
+INDqxXPF9fyXixjKJnIxdKqUnBo0aNTLOGsqJD11Dzp7zKjAqkZtf3F9DUutSdM2
+WhogIOrTAkEA10QYZv3A4xEBBDuOK0ODOB2as79cx+qgAO92bKVRFZ7zM2CwK7/X
+ZhLGaCwZNZ6d1DjRevkar8XzReZlF5dckQJBALTJnOf6uJyukfDaGA9rvzVBpdno
+yeYVGK3PA3TSwuVreedKszyFkTIm8yLk2gWlcc9TRdITM8Ej7NByC9dvI88CQAXn
+Cxg/2vse6z03eNV822s9fJFzLNMaftqntkKSYd/K5PZCr3Hzp69X0nLmyqYqvD8m
+c7AAhpfNQLdo8tqrvtECQEudSCAJ5S8FWqIPxgtCZoBYStMfHxif98Wm3gM6Muui
+dnRB4kiANzdWKvkDsFZiW0EYwy92EjONTvWTHkwEr6I=
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
index 91b218906..f516d77b7 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
index 6cf4e0527..c66b8bcfa 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/key3.db
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
index 7e8dae8b3..f447ebc47 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: revoked2.example.com
-    localKeyID: 1E 26 24 64 59 2B B0 1A 1F 01 FF 7F 7D 52 77 D1 05 2B 32 39 
+    localKeyID: BA 27 4E 78 82 C9 F3 4C BD 33 51 9B AF 9B 94 C0 5D 91 EC 6D 
 subject=/CN=revoked2.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
 MTAxMTIzNDA1WhcNMzcxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz03DdRFm1crB
-Bss+6xEmZjh1YoqwLaz7MIk/dRkjr3XyC0Veikt29a8d1MJxtJJoG+hviqh2+jiu
-3Q8U60F9UT50WVStjjGRMqCf1Wygs9ZV96j/0cY6MF9DGMOJHl0/22M8Bq7liO4f
-ItJInoIPgYPG+i6VkNZyqRdFsqb+2XECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2xIP+NrPGCWl
+/68YfwY3aL801Jj7lww+6s9R/8SQ4ol1r4zhENWGJSFh2GNjm+5aiaow5l286XFM
+58zcGQd80cpv8S9c8tS5AH2X9oYXqivpuqoQap2NgfiDduOQhJEErrb/eWM12Dva
+bn9ZB8f/rUpfJ+VOL49tT3s0jiSKqTcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
 BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQALBranFij7NmbXdmW95Iro+91d20r8ZBFKlVnFNC5wTJBse/8P9yHZX0mEXcJc
-Vw45CDlqOW5LA1Ee9ppdhqnEUpzyAXCm0YTvVe/MA60LmyS42gPZEuO3mJuO7vK5
-MxNaUqW3LEvoYAZtFJEjxoIabDSkzFAqVs4SDydrA+hwhQ==
+gQBISb0ax1uir1EWMzng835JZUlHOHfZHQBf2t1kwkj2PuRY9f4oUjU4LtDlBa5c
+TIp81tUEe1eVo2ke7gX4bpmmcbPVh9MKzGCjW6jqXWzoshB9koVFQV6aYxJD8Yif
+Zi7RqhgGYEDxVcbL/Q+813Qcmuouqd1DEmgCZj1UMVKGZA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
index 4b147a9f2..cfa249803 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: revoked2.example.com
-    localKeyID: 1E 26 24 64 59 2B B0 1A 1F 01 FF 7F 7D 52 77 D1 05 2B 32 39 
+    localKeyID: BA 27 4E 78 82 C9 F3 4C BD 33 51 9B AF 9B 94 C0 5D 91 EC 6D 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsuPEGYdb66ACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECP4Poeo/NVszBIICgP9fLkSfURP8
-5M2EDj5ldAyzlsDOyXnz6NzF/Rlvau+87++wuY8kxorWNZW7onOw0jHmf9358uV5
-qpDprlGSYEzwJaW9zFXYO+sVHxCa/DrZWgwgFNniTpiowQJXtJ2gtV5/dHDlRDKV
-Q5j6sc5gRYh/A6MxouMdJRz8gcFYJ6JidGvESqN3bXWHdrfTNtGpEg3yS8nk0cas
-nItj5LKgrnApM7h84Pcd1wRxzTe1EDGHcMKcJexallUIwzmTk8/G4/PVqi2oNxvC
-SiIT8rOenQMiMLdJh/5Jxfxfhd3pEA+5nJdjVry9kZP2LHXkmPvW22N+w0QTOd3k
-NWt0cl7L/yspsxOI1ywk7Ug4EUb/pwA/cOXPh0oMx3sTVXNFvm4QlY+4nPphHwrZ
-UqOoE/kOpthpc+qm49VGu2F5q/zBXCb+f8mJts0g8c+Z6TRR9mnzpEwy9ybCPRDj
-rv3Em2TcRdyitryld/NVgl4i/GE2Q/qtZxzrWkqL+GZ49PesGy+gdzJfFM85vqzD
-uc6rhhQbtpDcm0cyH3Af/8j4SYzdbsXmHdrVGHWbiq2xXPgBJdsT2lB3PuPfk1OD
-lmtHDpjVtDBsldd9q5nZARJi6RglMFxjEgTS7KQiVQ6k1rJMPQResziOuACwgYJQ
-JL6s0q1ZzwnX1GfuzuNKqmA0MLCT5sPCVAjoIeEAa/PGOQGh/Q29J1wJQLiGbYNl
-Fl0MmrxntdlfpAtWmrVLkVsNmowP0VqXkfWknhj4jQ9oCKKk+hGXCoPPTSHrke8R
-/t7z4Eyi9bJr4n1avJAV4fQzNj8YsLOyB6EPbBTrBrfDRfbGliyMZxis1GXr5m3y
-jfZrE6L1DAE=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsKlWIybFEskCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMPAmEGlhE+aBIICgPfn7Dngph+T
+uFyT3yWkawts/mPHbtn/IiZm6ys6mErCVFPXsQx6gCHwr/9UBf4RpeYjcxRRqYsF
+Y+vVFV035AYJv70vh6hscBSrb/xPEMHRFOLKnB1amF/SjieARj+iA8VjOaUs12f+
+Q/QeT3wLvQbY5Me0AIRm7pt/kxHo3wpqLQKWkyPiZaGgXP8eiRB0Me3N6s7IrKU/
+ogmaggZw+8j9XxrDzUlPoi7jIzzCCf0OtvmyL9j1EVMBtKJPBOCuawODeivHsxE7
+BmLgZjLXik3ckcA7Hs7Vy6kBSTvGrHgHAf1MZ3oNC+tzaakZYhd6SWwnTePsjVU6
+I7PTVIhMRaPZsF0gtIAgGP5i8CtQnqPn9V9FvJiDHiwUhsE45KuONjuIsSJvkvfW
+M7aKFNAV+Vg4hko1ZywdMsrKa913q2VJ4HU8zaYdaAQGAt0HWIUxl15gdgSW8KkQ
+aG5DfX/KtLoPsAOTW0mV+YsLLj/O5B0AwxUD9YGPaK/HSlJ3QhU5wFeO44U5acZ0
+zPLxD1RAPA2zO8SSpyiDyfMAsdsIp7wf0dQcONvsHkQA9esXYKeYYs/Wh6QEIUll
+dftAWi7EvlzuGqZuTfEeqHG6UE+1ixx4U8tSayUYogA6IPddt3+BMuUX+zzoBQO5
+2D2pbF8ctXzxg43q3bgjiXz6miNHrT6OuYuXGyZRiy0MF5yBJ8UmGKN4RmEd6VMl
+QQREio67aiD5P0LOdj0X3qd2lcMmcxQ2SpejkmpZiafJ2WU4K3QHp8Xksgi0nkim
+0zUIkL5CCgsAaEztGPgNlHDKboI6miP4KhzDM4cTv8RYerrllv3DMN+tV1+w2fCB
+VWBlIfzZL2o=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
index 2eca41023..97f86aa29 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
index 368d3fbde..46464d0e5 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
index 4301dc38a..a5ccc39bd 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
index 368d3fbde..46464d0e5 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
index ae6195745..83323f388 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
index 25d7a3a37..7e3d7c1e4 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
index 25d7a3a37..7e3d7c1e4 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
index 4d855d1e1..b985962c7 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
index fc29e866a..41d1b4278 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
index fc29e866a..41d1b4278 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
index bea62e2c8..178da41bb 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.p12
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
index 1350b3807..9b77e6597 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: revoked2.example.com
-    localKeyID: 1E 26 24 64 59 2B B0 1A 1F 01 FF 7F 7D 52 77 D1 05 2B 32 39 
+    localKeyID: BA 27 4E 78 82 C9 F3 4C BD 33 51 9B AF 9B 94 C0 5D 91 EC 6D 
 subject=/CN=revoked2.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
 MTAxMTIzNDA1WhcNMzcxMjAxMTIzNDA1WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz03DdRFm1crB
-Bss+6xEmZjh1YoqwLaz7MIk/dRkjr3XyC0Veikt29a8d1MJxtJJoG+hviqh2+jiu
-3Q8U60F9UT50WVStjjGRMqCf1Wygs9ZV96j/0cY6MF9DGMOJHl0/22M8Bq7liO4f
-ItJInoIPgYPG+i6VkNZyqRdFsqb+2XECAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+eGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2xIP+NrPGCWl
+/68YfwY3aL801Jj7lww+6s9R/8SQ4ol1r4zhENWGJSFh2GNjm+5aiaow5l286XFM
+58zcGQd80cpv8S9c8tS5AH2X9oYXqivpuqoQap2NgfiDduOQhJEErrb/eWM12Dva
+bn9ZB8f/rUpfJ+VOL49tT3s0jiSKqTcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzAf
 BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
-gQALBranFij7NmbXdmW95Iro+91d20r8ZBFKlVnFNC5wTJBse/8P9yHZX0mEXcJc
-Vw45CDlqOW5LA1Ee9ppdhqnEUpzyAXCm0YTvVe/MA60LmyS42gPZEuO3mJuO7vK5
-MxNaUqW3LEvoYAZtFJEjxoIabDSkzFAqVs4SDydrA+hwhQ==
+gQBISb0ax1uir1EWMzng835JZUlHOHfZHQBf2t1kwkj2PuRY9f4oUjU4LtDlBa5c
+TIp81tUEe1eVo2ke7gX4bpmmcbPVh9MKzGCjW6jqXWzoshB9koVFQV6aYxJD8Yif
+Zi7RqhgGYEDxVcbL/Q+813Qcmuouqd1DEmgCZj1UMVKGZA==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
index 037d74032..8f88e937b 100644
--- a/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/revoked2.example.com/revoked2.example.com.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDPTcN1EWbVysEGyz7rESZmOHViirAtrPswiT91GSOvdfILRV6K
-S3b1rx3UwnG0kmgb6G+KqHb6OK7dDxTrQX1RPnRZVK2OMZEyoJ/VbKCz1lX3qP/R
-xjowX0MYw4keXT/bYzwGruWI7h8i0kiegg+Bg8b6LpWQ1nKpF0Wypv7ZcQIDAQAB
-AoGAEZHbL4heiV8qVfuS5RRqhz5gwI3VmcFv9rCjNrb/PcdG0Oq7tQfpWLBTXG1w
-eqfv9/GOxpc5okJ8m5LEKJ4/0yRjYDmQA+r+ilIi0YacBs85uA2+UQwZwqp3MOme
-IIOvcl8bDlXFSjsDNAIfrL6fTuVWQMC8qUh6GSqKOLClZ5kCQQDrZVqg8WyKeKu/
-6wF/7e1JSdjFPoich2Gu56AqHyGWgmX654YnmUibfK148JM/N2g8EIAA1GF3D6LJ
-UpFf0/gNAkEA4XLu5X/q2k1mMVUMRXxlA/pi/M9r8M+N8mLT7tZzgnYcUMg16zZn
-tvkO5tP1rYmEPtV3wnDf3PYKic0YnpIJ9QJBAJuUMnEa/6UJmmJO/X/DDkiZETdU
-XFAwPkSufDI6vyVN6/8H1KgJbG6v2auMPZXTlgXU1fU2aXCamfm7o6+VVmUCQQCg
-5nszlgDSPo0hxjYU3Xvmw+ujzJGX8zm2dOwWuD0GLi91Q/6fWVvaDZSiD0J20P9u
-LMHlJtPOilbpFFRuz4GFAkEAsjDnEH7r1waxjphF/Oy66EIe0Nz5ixCQhWsaTvKI
-zcO5soZU+pjqac9MS8i/wcq/JEb6utlM0eT/mi/EFUluLg==
+MIICXQIBAAKBgQDbEg/42s8YJaX/rxh/BjdovzTUmPuXDD7qz1H/xJDiiXWvjOEQ
+1YYlIWHYY2Ob7lqJqjDmXbzpcUznzNwZB3zRym/xL1zy1LkAfZf2hheqK+m6qhBq
+nY2B+IN245CEkQSutv95YzXYO9puf1kHx/+tSl8n5U4vj21PezSOJIqpNwIDAQAB
+AoGAIwkP+d4l9GLXr1JgSgxYoeLBKbuvskKt8J1TLA2n7ZBLUdXnjBWCByqAEfx5
+3+RuTAmmbr6QvwrfivYrQGt/TWg2DVWXDdjzE++PEfU+qX4aGK16YIQr9llZwpyA
+O+l9fkyAJcuX8Gq3GnN4/Y11jEUGsLjbpOEs74UiMELAARUCQQDvTs9PCUc4iOvW
+7Vij/BCV8EQ49Rx31Bc6toadXwd1LOBGeflcU/5fRN0Vmw3WwikkiwcGohosoaMG
+vNq4UZG1AkEA6lni34oyMtdxItmW1k7Gt2KnPZ0lvljVMn3CLJmVyNVsCEYaPCBm
+BPZC942+tZ7+cNR0xZIlk2fHnRSzpeySuwJAHDnddeMQRXjQ6G7iT6VBh43pXhZ7
+Hx8jBkfVJOa6iHWclnN4mA1IKZCDyzKYtUX9eFP1pjCkibMe+YJ5AdiNKQJBAKC7
+N6yj5xwRwanqXNbtvsNGaXgL0ThFSyxPLp9SU3YkUu01z4aPngknMfUCBdwhiVev
+j8t2GkmIc1McQL67jEMCQQC6xJb7eWqWMfmGzF2znmrk5+YG4ucq30jG+ERvFa9j
+3kh0/TIRU366INx1dcqd0HhffK0hTe6QYsEyIl8pGlGn
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
index c179979a2..5ea3c97f7 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
index 1bfb0d19b..50f14fcdc 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/fullchain.pem
@@ -1,25 +1,25 @@
 Bag Attributes
     friendlyName: server1.example.com
-    localKeyID: F0 BE 4B C1 8A 44 3A 96 44 D5 9F D2 9E 96 32 4D 15 88 0B EF 
+    localKeyID: 3A EB 23 91 8C 35 F8 BD 33 31 FA E8 A8 A8 A7 04 EA E4 56 9F 
 subject=/CN=server1.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
 MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALxfj7W1l2EagOuo
-g4o3BzywHX3yqQkv7X6VvnbrzC1MkU8niDxU7mcg5NltphGd7BYAUxilscnZPO0s
-QorQPDz/rTwkjFdlHtTLXJohbgGc3r3448Nai1w/3yXzSH5yOLYqwgb9P2vwsdPU
-lEwdnwVy3JslZMF8x9dAVE6qYCuBAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMkDLKjP/CG/5xc3
+duWy5WydT/dH1Ni82VWzrf2WArI0zjDV5+SR5R+Qqmd5Cm9Ax37QRtu7X1y0vJfZ
+7likFn+NX7bN0NxgmvUFj5XB9BQq689nGrjmulIcm2pJY1jbGVs/sBzqzNMH1Ojy
+Vl4Wk9FAXO8Odv4wRwQCk0W+gW4hAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tgiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2Vy
-dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQATmJl3ofl3Lfgl2Gja
-/KWpuQ6EZQYD+JEhRN4uYuuScnET7qDsXfJqxgabO0d4JMotM29b6TOl5Pg6riqd
-5lx0hbFpKRTJSg5IJ9TfqkUrZ68HfKNs95hLrtQGkpG+m0rDHDPk0Fr9Ah372/1t
-x5tr+n5KK/sMOjHanfj55Efqdw==
+BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tggkq
+LnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQA04ipCJtqmqI7nfDzK
+NwN7afFMOOqOBS0bgU6QYR0v1OnNGbi8G1vGWgWa5Zw7dyXiLoPv0AKVKphg3qu0
+BJfuPiRj4ph00mUw2QqckqjPZsYOUPIJ2uwJ2AdEx0vu9B08V9/XSK/HSuRupk4u
+Lvd6D9ouxF0t7t8BsCxs3mswqg==
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Signing Cert rsa
@@ -27,17 +27,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -45,14 +45,14 @@ subject=/O=example.com/CN=clica CA rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
index 5b19cbabb..7804f2268 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/key3.db
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
index a0b3319c9..e512c1bc8 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.chain.pem
@@ -1,37 +1,37 @@
 Bag Attributes
     friendlyName: server1.example.com
-    localKeyID: F0 BE 4B C1 8A 44 3A 96 44 D5 9F D2 9E 96 32 4D 15 88 0B EF 
+    localKeyID: 3A EB 23 91 8C 35 F8 BD 33 31 FA E8 A8 A8 A7 04 EA E4 56 9F 
 subject=/CN=server1.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
 MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALxfj7W1l2EagOuo
-g4o3BzywHX3yqQkv7X6VvnbrzC1MkU8niDxU7mcg5NltphGd7BYAUxilscnZPO0s
-QorQPDz/rTwkjFdlHtTLXJohbgGc3r3448Nai1w/3yXzSH5yOLYqwgb9P2vwsdPU
-lEwdnwVy3JslZMF8x9dAVE6qYCuBAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMkDLKjP/CG/5xc3
+duWy5WydT/dH1Ni82VWzrf2WArI0zjDV5+SR5R+Qqmd5Cm9Ax37QRtu7X1y0vJfZ
+7likFn+NX7bN0NxgmvUFj5XB9BQq689nGrjmulIcm2pJY1jbGVs/sBzqzNMH1Ojy
+Vl4Wk9FAXO8Odv4wRwQCk0W+gW4hAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tgiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2Vy
-dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQATmJl3ofl3Lfgl2Gja
-/KWpuQ6EZQYD+JEhRN4uYuuScnET7qDsXfJqxgabO0d4JMotM29b6TOl5Pg6riqd
-5lx0hbFpKRTJSg5IJ9TfqkUrZ68HfKNs95hLrtQGkpG+m0rDHDPk0Fr9Ah372/1t
-x5tr+n5KK/sMOjHanfj55Efqdw==
+BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tggkq
+LnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQA04ipCJtqmqI7nfDzK
+NwN7afFMOOqOBS0bgU6QYR0v1OnNGbi8G1vGWgWa5Zw7dyXiLoPv0AKVKphg3qu0
+BJfuPiRj4ph00mUw2QqckqjPZsYOUPIJ2uwJ2AdEx0vu9B08V9/XSK/HSuRupk4u
+Lvd6D9ouxF0t7t8BsCxs3mswqg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
index 9b06670c3..1b01bce89 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server1.example.com
-    localKeyID: F0 BE 4B C1 8A 44 3A 96 44 D5 9F D2 9E 96 32 4D 15 88 0B EF 
+    localKeyID: 3A EB 23 91 8C 35 F8 BD 33 31 FA E8 A8 A8 A7 04 EA E4 56 9F 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhc6jbTmwP4ECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECLXK+PTUw/IEBIICgPok+EzDiDQR
-p7t3S4fGARGCaKzAPILrc1QiqjE1O155PfNa+EUab42WiVo8cQ1vYX1VSxAEgroY
-qdoGwurmQYAj2Xi+oaeUOjGFDe+u4hOW85k4A9n4CKDefFVZfFAOYUl6bl71Inn0
-+BnbooJxBITZoYEtK5EPLBL5pwPfuoaNEweP08SrEIp9JR4XvrmDpKn86xYlePN4
-Fj8LINTf5sRSwlHswzC1VaMoG8NO8uvT0MFVLn0NVH2IK0eCwnSzt0NSvwNV7ne+
-3JCl1A1M9jcogl1HMkQJK21XQe3CDQ1IazA4AW4w5BYXIn/1l/LD5+0GfPaMja+t
-2Uk1rv75+WOdAylFZrLhFUGULUmgRRvZ6eSil9fJIDYbqh/8OyIG49p3gVw2T4Fh
-AM1UBp8HINXLqttxCz9/1KRIHWbNQWqA9YiHPADSZfPTicTVjIieH5d7SVtC8RQY
-1YxgIbYJERYla3iiLlZZ+SEMBpu+pmEj3Le2x9CtlSUrLj/6m/ENjoyEZwAjOAB0
-czsGcJnKprN7nM5GACLOtdKkzbUN0xbl7dKrpmt1S/qLZQ7qZRfJ4D2D+WrDqByE
-2mukG5SjGu2uylXlwT1dyxs04Cvp4a7Ux6T7t4SJQKAn6+5YBuleoQejESe+gMJI
-kqsQbwg3CCBDm4bazn6DQaQmMiPGUIeis+b/13qY5mIUJenHysR85+UWH/CcbeY8
-IRc2a72ae/dVv4TLCwb1zmSCFHOn34uVqfVU7qXOSiLeRqyqvjxWhTGUnU0EfZyG
-HdV4CtIbvK7uZxCWBg1B3msnWzI1/q3SmXRqJFwYOhqdrYlBEGjrmXb+ZXjFE22x
-e7pw7NZvLeA=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIMsmnIfnit9MCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEVhcDlQmgeiBIICgNorYUpIkQFT
+nouaASv6pd2ZUfXuYE82ZTQUlbgBMNS5/orrYUXE+D4tSY5+7w2I9268p32nzW2D
+FKSjP4RUgwplSco3QEZQX/nVrmztMFiq7OwIsd0M0PscwH6+ZpOGz4P1Zd+3EacL
+x5y2pXsURLKZgL2MqkoE8k50kRwP3bjwv2CFrsVOJ5FqK0ca/5iAHLNf2LwTMmoD
+L9bsAVODpUoaDzgseHLDCMBAnPPx3sVST5jCAIfbu3BPjhiI6kGCIzDgKzvOGnWj
+usnjvGRpCt/g4KjfVZkRPPr5ieVmDNzKoCC+jzckpwALaptp2/oSltYkGQB7dOvk
+sSwjpkGNELVGhl1CvyzD7oM5/Znm/2mmPcCQcHXd94IITbpQO9z6ZSeHph/9j8PM
+UlO4+JwUU6kk7jYdUbv9lA671wkOdErfF4PfPY8jCQBS1GzCes+j3VE/rpNUqukB
+Byuk/v7Q1pYgbJTydaCZ7u79pbgTInonKmkFs5jip9QcAN1Kw6U0jodZxPsA2i0g
+4A0pxte8pJcr/MEXJqXWquBOT3Hd8IBIfx7MQE2ll1fY6pSvz83ulJh7kTlQ/fW4
+hqTjvCsBAxzLllu8KJpXvC1frxJb6uZ2vgqIxuOSn3K2VdCt5DUhQkcWSqsAfRBv
+IQIAvBF7MLZH4LQRKSl+aRvzT4+YRmYXRnwTU8BrSAQH2CTyZbpUDKkzGwtIjy8t
+lVrDKkQ50URtZsk9uacfJYtl1UT5I8hLDZm0KQi1xAmy8y0bN7iMjCwI10imZXdS
+jx7htfE5XaAenO8ooASXBAP38sUwVkEcAD0ZN2FkozztWgVp2FZB8n7+r3qHOQDC
+kGU294YEM6c=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
index b6842717b..6a51f98a3 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
index 41587219a..5b3eb3fbb 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
index 4d1fdd6af..cbaab9e73 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
index cd0da3568..90c4d15b3 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
index b7795bd1a..8522187dc 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
index 0d678b166..635a23bf9 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
index 3c89e43c6..794ce3034 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
index 44f857ff2..bd860a1a8 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
index 0613678a3..ae3d253e1 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
index 21ad5d764..23c9a35cc 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
index 5df1643c5..087154fa6 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.p12
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
index 0f51f061f..7db25a776 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.pem
@@ -1,23 +1,23 @@
 Bag Attributes
     friendlyName: server1.example.com
-    localKeyID: F0 BE 4B C1 8A 44 3A 96 44 D5 9F D2 9E 96 32 4D 15 88 0B EF 
+    localKeyID: 3A EB 23 91 8C 35 F8 BD 33 31 FA E8 A8 A8 A7 04 EA E4 56 9F 
 subject=/CN=server1.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
 MDExMjM0MDJaFw0zNzEyMDExMjM0MDJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALxfj7W1l2EagOuo
-g4o3BzywHX3yqQkv7X6VvnbrzC1MkU8niDxU7mcg5NltphGd7BYAUxilscnZPO0s
-QorQPDz/rTwkjFdlHtTLXJohbgGc3r3448Nai1w/3yXzSH5yOLYqwgb9P2vwsdPU
-lEwdnwVy3JslZMF8x9dAVE6qYCuBAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+bXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMkDLKjP/CG/5xc3
+duWy5WydT/dH1Ni82VWzrf2WArI0zjDV5+SR5R+Qqmd5Cm9Ax37QRtu7X1y0vJfZ
+7likFn+NX7bN0NxgmvUFj5XB9BQq689nGrjmulIcm2pJY1jbGVs/sBzqzNMH1Ojy
+Vl4Wk9FAXO8Odv4wRwQCk0W+gW4hAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5jb20vbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzBw
-BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tgiFh
-bHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5jb22CCSoudGVzdC5leIITc2Vy
-dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQATmJl3ofl3Lfgl2Gja
-/KWpuQ6EZQYD+JEhRN4uYuuScnET7qDsXfJqxgabO0d4JMotM29b6TOl5Pg6riqd
-5lx0hbFpKRTJSg5IJ9TfqkUrZ68HfKNs95hLrtQGkpG+m0rDHDPk0Fr9Ah372/1t
-x5tr+n5KK/sMOjHanfj55Efqdw==
+BgNVHREEaTBngiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1wbGUuY29tggkq
+LnRlc3QuZXiCE3NlcnZlcjEuZXhhbXBsZS5jb22CIWFsdGVybmF0ZW5hbWUuc2Vy
+dmVyMS5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOBgQA04ipCJtqmqI7nfDzK
+NwN7afFMOOqOBS0bgU6QYR0v1OnNGbi8G1vGWgWa5Zw7dyXiLoPv0AKVKphg3qu0
+BJfuPiRj4ph00mUw2QqckqjPZsYOUPIJ2uwJ2AdEx0vu9B08V9/XSK/HSuRupk4u
+Lvd6D9ouxF0t7t8BsCxs3mswqg==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
index 938902f40..7efd7258c 100644
--- a/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC8X4+1tZdhGoDrqIOKNwc8sB198qkJL+1+lb5268wtTJFPJ4g8
-VO5nIOTZbaYRnewWAFMYpbHJ2TztLEKK0Dw8/608JIxXZR7Uy1yaIW4BnN69+OPD
-WotcP98l80h+cji2KsIG/T9r8LHT1JRMHZ8FctybJWTBfMfXQFROqmArgQIDAQAB
-AoGAA2QGS94Ild3f7jNVUs/qGG85yKztMADQhJPLdDaLBqcMgovn9DYPKIS7ZH0z
-HQ67qNW5U9s/rQN1CPaKqBcBeTZexOUHXHo1xfO0XsESuAgCZCftFMXneqbl5X4z
-9YbvG4qyCYlzDQHhmuMe/LS9uzQKLYChW9rnQbnTtbzpjxUCQQDipKW1BUfMz8so
-BeY33tpGK4d0M/g2AgjYSb86V/U/wC04FyMX9GkbfdtPMK8hT1uagQkto//eoPNB
-za/gOajDAkEA1MXob+f0asEmZZDDFEepiBY0ySNhdjjpRum7xNlyXKZwG1cAXPSK
-sjQqa6obWDqNnHPUfKpxjm45C06nVcS2awJAVRRtyEiVLYOLxhiA1dRoqBLLJIol
-0VBuNZNpn+NJA4eG8hltaR6tHk7etxmVhLGft55c7a807EQLTVaDgW7jtQJBAKm5
-GHkziJcjbXJ07/ecVlI0jHSpYVQBf6tORLZ4Ua4wIZrdYm/DrWMLE4+ASIGva0iS
-aLvs5doceCpZ2kcjO/MCQBOaq44ykvTeHuVX+3CtBRi0Dl8HkD7QIRChVIqxYghC
-7Q2XKeVNxLCgF/QGNSpOBBCrOJEC3zO024WHzTN33qU=
+MIICXAIBAAKBgQDJAyyoz/whv+cXN3blsuVsnU/3R9TYvNlVs639lgKyNM4w1efk
+keUfkKpneQpvQMd+0Ebbu19ctLyX2e5YpBZ/jV+2zdDcYJr1BY+VwfQUKuvPZxq4
+5rpSHJtqSWNY2xlbP7Ac6szTB9To8lZeFpPRQFzvDnb+MEcEApNFvoFuIQIDAQAB
+AoGAA/kNtslD5SmzxZi9aePiZtud7x1ICrUX0WVvhskCWmHoDIfLxqUaC34f2hNG
+u8/CqaIFm9XtGB9ZMLdNqkpASLczHcV1PyTEjXFayOvtQ+dyVYrmFy+605tteL4/
+9vGHE/l9MNTmIp9es2UHoSj/sJ/gF5ctx3RbC8A0fZvtFzkCQQDvVLpjs3u8bdxF
+Ww4mrSGwL4jE4TdM1u0JPLJhW6asK48z4/rah4GXVRZ7gMH8Zo2YEU36ewl4yKQQ
+H/bBFtiZAkEA1wM55gGOZFEGfNCTr8L/vsh/rB8WkNXhbDFu/dHiMdLHGZ/IOA1Z
+YH4XBAro93aSeksXql0eVZR5DAnBuCEOyQJBAM9zSuj2/89SDveTOM3vjl7wpQW7
+DjstpWM3WIupbOyaCVP6Tkuz33G0kHtXHU7R+fQRM91lXs1yZTuQ6UtvqSkCQEc6
+o2CmHVTwXrTUqEhu0iiS5XDQ77nVkRM1oS5m7IdS63B6tWqUSYqk2t0U/C6W0lm/
+LLzckmMJh7xMMyfbk7kCQB7/tRxJtj78FK41apNIzxoIxMX47BFuEJcEbh1Zb0OO
+B68wY20vIElirF5Rbgjf5XUbDZGhZRET+vzB0oLEOas=
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
index faddc9e5b..29739e012 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
index 4442cd207..4578b0108 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/key3.db
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
index 0ec09fe68..243b37d47 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.chain.pem
@@ -1,36 +1,36 @@
 Bag Attributes
     friendlyName: server1_ec.example.com
-    localKeyID: 76 B4 09 FA A3 38 20 94 4C 34 2B 5F 3F 13 63 1C 42 9E A5 77 
+    localKeyID: ED 1E 94 FD D1 BF 35 60 F1 9D 89 B1 A4 AE 50 41 A1 DC CD 03 
 subject=/CN=server1_ec.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICrjCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE5WhcNMzcxMjAxMTIzNDE5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQART6623V/zdlL
-bwD25893JfE7Eu92Ap4dKDTE0sM8klkdlgErS/Rzy8GNe/FWS+voPwK7vsEVcLNV
-5DTchlNmIEsBAKHLqbJjqcu0U6WLFvnCJDIOMWdl1kZgSWsxI8hBux6Y4Lb0SI77
-ftDduQtti6447za5iy6P09WgtYEokkgtYg+jgeIwgd8wDgYDVR0PAQH/BAQDAgTw
+MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
+LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAp0rsXgXX/hc4
+lpacoHTUXhZOYDLGm2w4TmzMAW7LY+VDcn/VOFGudCv47W5Q2ahCBCYnNpgQkCii
+xsf8jkJi00kAQgvKfOgCLglhNGvEDmS0Irm9bixpKwk7jPS3ck9qlx8lxJQOglAP
+HKlePmvt6VMLa1daShYZOR/izjy6mDBuBymjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
 MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
 JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
 AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
-VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYITc2VydmVyMS5leGFtcGxl
-LmNvbYIJKi50ZXN0LmV4MA0GCSqGSIb3DQEBCwUAA4GBAJYP6/iBZA8yD68fy8iP
-gn5LR9VftBDDZzrlE4sX96xIUOqt7lyd5Rix1J6sO3v4ZD+owf8WUZ3YZGYKj+mk
-/xIOBd/qzBN4h79LvZSkTI1PPgzX2LnJRT0c8aFdVOdZYhdhi+jl/tIV7YKNXgt0
-TgEyGxkCb5edTo85ZhFXFpVP
+VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYIJKi50ZXN0LmV4ghNzZXJ2
+ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBAAXNrY+W+xG+MySOWEKw
+vHredlA7bbezGflMaeUuPk+dRY0vOQq/ejF2LipxgeSz8uFn3vG3yStJ7+S5ojQT
+WbJu8GRWNRCiwy9amOL1pykKcsuCtC5xOVw5eXrKWeWJNfGluITKd6P7F+cLprIf
+GL0spZJce8FqLW2scekcN4JE
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
index 15054a8f1..941aee598 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.key
@@ -1,13 +1,13 @@
 Bag Attributes
     friendlyName: server1_ec.example.com
-    localKeyID: 76 B4 09 FA A3 38 20 94 4C 34 2B 5F 3F 13 63 1C 42 9E A5 77 
+    localKeyID: ED 1E 94 FD D1 BF 35 60 F1 9D 89 B1 A4 AE 50 41 A1 DC CD 03 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsVsZHUzbyPwCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIt8e08ZsMCTBIH4h9K/QeDbES9q
-WfQGGNpLsyExg1axcZkdCjQQksmRQlETTIrcn3VHeBP0J1szRnnYSd+BAeZ8mKWM
-LHtqo9MCDJGE+hrT1M77y/og73oy42lrIgh5vwE342uQn9xEZ2FUjps5It7M/DeD
-qM5Rejx9f6vI9CDiwUeZyDBIwkLa1cTmihEXS+qaQ0kPSBQcpqxV5zf6LqSjih1p
-UQtmI0zynfRM7/xgpG6Q0VrS1HFU6PzUe3/iapP+dNkeE2aAy0sb3Ql2oabO5Nf/
-3Ssza3sytT407p6IGtG8kwJIWhxWfWap3Migb2Au3q1FmJUbNwDCdIWOth8G+Zk=
+MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQINBx7NUtEdCMCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMt4C/rM4q7UBIH4z1ia6kUtQ9ok
+cJ8KK40T4vUbvY4VQha+vG1YUNVhaT07eYLCt6mVVdE8QFbvjd7mj0pIquM+H+t0
+Ysk7CzuD4Dx80rVU+Xtk/l3OzCWHr/AL/qrPaVZn1oGxXYNn8VXY75OL4vScBBj+
+Zxf0Z153z620ZpCdLsxmGiH9lMgf7PiGFWT1DCAr7rjwcsHJ83izyOaYgk2F6R80
+dZasjBKZd2Ax6JGktFVCTjTkpmKYoJrXcYMN2zei6pWaNN6zX2FtXFbVz2ZzR+dN
+yc5Y5tWVOFTCJichs7ed9B94AvUT/lgAWTmiaJtO4EruQY5/csV92IenygDpPMU=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
index 170d6d8a7..05249677a 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.p12
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
index ef5267fef..8dee32b70 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.pem
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server1_ec.example.com
-    localKeyID: 76 B4 09 FA A3 38 20 94 4C 34 2B 5F 3F 13 63 1C 42 9E A5 77 
+    localKeyID: ED 1E 94 FD D1 BF 35 60 F1 9D 89 B1 A4 AE 50 41 A1 DC CD 03 
 subject=/CN=server1_ec.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICrjCCAhegAwIBAgICBE0wDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE5WhcNMzcxMjAxMTIzNDE5WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
-LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQART6623V/zdlL
-bwD25893JfE7Eu92Ap4dKDTE0sM8klkdlgErS/Rzy8GNe/FWS+voPwK7vsEVcLNV
-5DTchlNmIEsBAKHLqbJjqcu0U6WLFvnCJDIOMWdl1kZgSWsxI8hBux6Y4Lb0SI77
-ftDduQtti6447za5iy6P09WgtYEokkgtYg+jgeIwgd8wDgYDVR0PAQH/BAQDAgTw
+MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAhMR8wHQYDVQQDDBZzZXJ2ZXIxX2Vj
+LmV4YW1wbGUuY29tMIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAp0rsXgXX/hc4
+lpacoHTUXhZOYDLGm2w4TmzMAW7LY+VDcn/VOFGudCv47W5Q2ahCBCYnNpgQkCii
+xsf8jkJi00kAQgvKfOgCLglhNGvEDmS0Irm9bixpKwk7jPS3ck9qlx8lxJQOglAP
+HKlePmvt6VMLa1daShYZOR/izjy6mDBuBymjgeIwgd8wDgYDVR0PAQH/BAQDAgTw
 MCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCeg
 JaAjhiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUH
 AQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC5leGFtcGxlLmNvbS8wQQYD
-VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYITc2VydmVyMS5leGFtcGxl
-LmNvbYIJKi50ZXN0LmV4MA0GCSqGSIb3DQEBCwUAA4GBAJYP6/iBZA8yD68fy8iP
-gn5LR9VftBDDZzrlE4sX96xIUOqt7lyd5Rix1J6sO3v4ZD+owf8WUZ3YZGYKj+mk
-/xIOBd/qzBN4h79LvZSkTI1PPgzX2LnJRT0c8aFdVOdZYhdhi+jl/tIV7YKNXgt0
-TgEyGxkCb5edTo85ZhFXFpVP
+VR0RBDowOIIWc2VydmVyMV9lYy5leGFtcGxlLmNvbYIJKi50ZXN0LmV4ghNzZXJ2
+ZXIxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBAAXNrY+W+xG+MySOWEKw
+vHredlA7bbezGflMaeUuPk+dRY0vOQq/ejF2LipxgeSz8uFn3vG3yStJ7+S5ojQT
+WbJu8GRWNRCiwy9amOL1pykKcsuCtC5xOVw5eXrKWeWJNfGluITKd6P7F+cLprIf
+GL0spZJce8FqLW2scekcN4JE
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
index 19566485e..ff14f20a3 100644
--- a/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server1_ec.example.com/server1_ec.example.com.unlocked.key
@@ -1,7 +1,7 @@
 -----BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIAcFmmaladXE/SIAVtW5nBlHwPoVGyb5MfYZZejaptIo4YJh5gEv40
-oU0XTjlTFO9DVBN7Im3Ck0JMHsfX3vxx1SmgBwYFK4EEACOhgYkDgYYABABFPrrb
-dX/N2UtvAPbnz3cl8TsS73YCnh0oNMTSwzySWR2WAStL9HPLwY178VZL6+g/Aru+
-wRVws1XkNNyGU2YgSwEAocupsmOpy7RTpYsW+cIkMg4xZ2XWRmBJazEjyEG7Hpjg
-tvRIjvt+0N25C22LrjjvNrmLLo/T1aC1gSiSSC1iDw==
+MIHcAgEBBEIBl/zZfhr8aog4fQuPVmm8uPwkFCYPdVEYJtA4cVjpaLIURb9OuTbU
+OfS2cs12RbG5m8xyks8EX90Wxv6Rhr/P56mgBwYFK4EEACOhgYkDgYYABACnSuxe
+Bdf+FziWlpygdNReFk5gMsabbDhObMwBbstj5UNyf9U4Ua50K/jtblDZqEIEJic2
+mBCQKKLGx/yOQmLTSQBCC8p86AIuCWE0a8QOZLQiub1uLGkrCTuM9LdyT2qXHyXE
+lA6CUA8cqV4+a+3pUwtrV1pKFhk5H+LOPLqYMG4HKQ==
 -----END EC PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
index 2e4e703c9..9d3456b2d 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.com/CN=clica CA rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
index be15a3904..2ce093743 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
index 01225fa25..934284c55 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem
@@ -1,24 +1,24 @@
 Bag Attributes
     friendlyName: server2.example.com
-    localKeyID: 54 AB 24 D7 17 24 35 C3 70 17 8C 26 6E 6D FA DC E1 3D B4 3E 
+    localKeyID: 7C 00 CE 8D B0 88 62 F0 99 9F 2C EB BC 55 93 08 1E 5A 68 12 
 subject=/CN=server2.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
 MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDsYoP8ERKZ5qk6
-6VaxcN9j+gMpWrTWvb8pCeXYBu1kExGJt0Q3JhaQ1ZdpCsvP7RnVbCUOdAA6dJdl
-p2Dr4kIhkI61Zi4UQibH3+d+ACWhWvLW67dAQXxLKCMs2DGIJIV7DautDGieWQdG
-CLh9zHxbzMGu9ONsE0qbDKwCvKCdVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4eiW0/mMuTie8
+2SGTxGUgJzk6g4i+lBTH32/keXRs32I6ZGnjkiadxlHY1zBUrQknkRT1RtFYULKa
+/TlutUGYo8RRjyOQGYNFl2fm3iRg1+QryqxVjTs+/6LIa6LNFskOyShNDnvJWvet
+MRMyesL+YBbSWhs4qucdCe5ePhrJ2QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
 QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
 BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEAoPX7ejjfYyI4
-gc8WA8+Roe49y8t36ARgkdKrbaSUxmKl2g+fbL4vGohVR0nRu7HWx6XprJZhzEHc
-7gU4ouoWsILKXVEScYStuhFVJhvGBjAsqIc2/X63J4KK+9KWK2NvGmnQIx7KVSz9
-Z9nZjwzTr2KmXkJmQTtxsLcT8xu8TfM=
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEANFJm83U5YcMW
+cE8GUb69Ns6b8aM83db/xXNIlIRp2dignWGMwS+uVHj2RadakeoLltwnuht/6X2C
+UnVXEyNAEfUv0tchc0GFY2u2jH/8IRNb6L0JInIlsk6GohuzTJ7K0f1L2RWKVmzM
+K0fWhbJovbkZ03cylUtKAQd5C/XOR+8=
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Signing Cert rsa
@@ -26,17 +26,17 @@ subject=/O=example.com/CN=clica Signing Cert rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -44,14 +44,14 @@ subject=/O=example.com/CN=clica CA rsa
 issuer=/O=example.com/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA24Iq+SO2
-6mWdJoRAavFvmsPj+U6VmMq5YiHaEIQY3mfYSgfT1FJe4L08ym7zx93QKExCLsvs
-NNeCfoQ0dKBENLHk1yJ5NctvZ5EyyYaoXllvyNwRee/XEAXNr8gNF0hF08UYKbnw
-mhNcCDU7xFRDXe3dR9TjRrhQ7ZtaM1CpqbkCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAnD+uBhp2
-SrbAg1MxFxUcss3hCQx0hVBGzikBJ5cEXCmsDY9+isG8eSbnXps6pBC/NqY4WXRw
-Dn36Ymop5mgLhKLMHY3+booagwvrqNeFB2ut+0PWtEngm1HxWwM9ITQHyVkZ01CI
-0OtpX9zcBHWUnVdmGmyyipil/msETKcGYwY=
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsdXF1UEA
+pVAFogqa9rnoELGqckPbgKCMplg6zoOSS/2IZVpqsDUMgfPaHQLEKSKmehMiKQDg
+yU5iRW7D0KvLDfezCL6SUUS4Y6FMcGLTbyEDpNLhvUZrSBpwPwkRheFPfdPei8oE
+/1uEDCFevbgY7NZk3x32qziGCbK5C1JCG2UCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAn8nGdtYA
+6LKNsfBelA9HMYHg5YddFtLhfdEtPbPOEv8WFwGV7r52GbHsHurvdZLde9PqXE5p
+IFeLUMd/HEiBgdKw+NQQHGv9nR7mtQcKycKgV9loJaRCyFXN43IVDE8F7TVIIoke
+wgVUNpcpWXskxsf76/5TnbMYQwlu8K4l+JE=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db b/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
index 3807aacac..94b86b974 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/key3.db
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
index f13ec24e0..e27202b94 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.chain.pem
@@ -1,36 +1,36 @@
 Bag Attributes
     friendlyName: server2.example.com
-    localKeyID: 54 AB 24 D7 17 24 35 C3 70 17 8C 26 6E 6D FA DC E1 3D B4 3E 
+    localKeyID: 7C 00 CE 8D B0 88 62 F0 99 9F 2C EB BC 55 93 08 1E 5A 68 12 
 subject=/CN=server2.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
 MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDsYoP8ERKZ5qk6
-6VaxcN9j+gMpWrTWvb8pCeXYBu1kExGJt0Q3JhaQ1ZdpCsvP7RnVbCUOdAA6dJdl
-p2Dr4kIhkI61Zi4UQibH3+d+ACWhWvLW67dAQXxLKCMs2DGIJIV7DautDGieWQdG
-CLh9zHxbzMGu9ONsE0qbDKwCvKCdVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4eiW0/mMuTie8
+2SGTxGUgJzk6g4i+lBTH32/keXRs32I6ZGnjkiadxlHY1zBUrQknkRT1RtFYULKa
+/TlutUGYo8RRjyOQGYNFl2fm3iRg1+QryqxVjTs+/6LIa6LNFskOyShNDnvJWvet
+MRMyesL+YBbSWhs4qucdCe5ePhrJ2QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
 QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
 BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEAoPX7ejjfYyI4
-gc8WA8+Roe49y8t36ARgkdKrbaSUxmKl2g+fbL4vGohVR0nRu7HWx6XprJZhzEHc
-7gU4ouoWsILKXVEScYStuhFVJhvGBjAsqIc2/X63J4KK+9KWK2NvGmnQIx7KVSz9
-Z9nZjwzTr2KmXkJmQTtxsLcT8xu8TfM=
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEANFJm83U5YcMW
+cE8GUb69Ns6b8aM83db/xXNIlIRp2dignWGMwS+uVHj2RadakeoLltwnuht/6X2C
+UnVXEyNAEfUv0tchc0GFY2u2jH/8IRNb6L0JInIlsk6GohuzTJ7K0f1L2RWKVmzM
+K0fWhbJovbkZ03cylUtKAQd5C/XOR+8=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
index 94d6ea92a..2f7ad66f6 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server2.example.com
-    localKeyID: 54 AB 24 D7 17 24 35 C3 70 17 8C 26 6E 6D FA DC E1 3D B4 3E 
+    localKeyID: 7C 00 CE 8D B0 88 62 F0 99 9F 2C EB BC 55 93 08 1E 5A 68 12 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI40010BUifWsCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECDqKW0SC4xirBIICgDqh+8Fo2XKp
-VvZ6XNhceWefUKoO1tteaWXOj6ERkcLs0f0lzqTiRuNvP61XEJX6qggj/M1zXzSC
-2gFKyPj1gPyg5etPsUQNJcp4rIY13WxY/0B0e2B5X63Bbbojh4H0b/B1MTdl8KU2
-OAfQtTE2HiXtAbvckWpScAA+mcn1DPJBavHD1nyWUU1JfJguVP+vRoGBIlIQGyNw
-03XJHUNBeu5+wdSgysI5Im8JKDKgUFMRrHjvLPEgy3+fE4NRh7VyhLg0laHNvpvP
-LTwKeMTAo8UdDKynUMOIioK7nwcoqcbE69lYDuk1ZmyQhGHsKlhqsDXnrI1TxNaz
-sdRI3G8GhK2OhxZTdqRW8lRWoKCBk2+MpdUg1tcnQ5YBLEeo4iNvzU6Vdcgm8nNK
-8W3aDtx44mEYOdfu0ujxMrZ3Bk1PzTSUzNQeo8oqzZzmtYCHshPwCfDTSWGb0fV5
-EBtJGgzG0dYrIZIrXNPnay38En6spPbu1kp3eHRkcacBQYvvmTJSloIGDvpql0q4
-2cDuAglLxA/C1iE7f065PzBM17rsIWa2cwVKF7f2t3NSC4GRsj4XWcWSRh3WhSbA
-7bMRYp5KEX6CWRh1XPFUZmK/2I9lMMFvLYoxZIG8xoG9pxfLrqG9loxxZt21Hduw
-QXJmt2uFso41B5qBdsvT1Rat4D2/RRR8yWD7TeuPEubEhIkMnwZEz50Ylr6bw33g
-qf1So8BFDCs4LvyXaN/6S3SZqSgmv99bYVYbeeLUWh4GC54jbOwes2ftlPeYqAvA
-ve85Atjw6tcCYGZBRSu9x+8vNY/+3vUXnTiJKuT14xljMreU0A9DtH4veswWxAAB
-xaDgBFTXRaQ=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI3J+3s+e9z+gCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECG8s78a38VBCBIICgDbjWmwPBL8k
+MHO6+ZVHOwWO6KB0/PeTHby5geW3rKsJm2wZtv7/BoR+nTCZ/rqPhezJpuZNVVkU
+sM35U3roLhxBzF3oTGQX0Chs3KluQyrwJY4+t6mM8zzomHrMOWcYWGf4XKFjnyPr
+7sEXcTgc/DqMXQaQZufuRbQRv+QBn9cb51+gUCKfDKKMx07w+/UNOFAxCbKEOk3D
+4YRzVESZHldZSq66oR6TiPP9vZXZ89o4GS1RCFqJbLMMIvVysFloYIDsY0PMmjxh
+jDVPiAjzyqRY1G5E8bIVDSNPYhuRqR8LeH/LJa0dNEELqQFhRJrZzupl1P12Gm8b
+BOx0lXDKrnQIW3IgbjA5UsQ8+xfQXa4k7qM7y9ZDHVB4KmrSqhhwwYaIgsjzQt4Q
+q/FyRoj/4uYxm1SPl2fJ0TwvwCeSJvyaZwgfV19hzaihnCV3MHQNfTPppP7AnpcB
+xKLObc6JZsUTYF9W5V+H0zIVFmYYIQLCaeDnaYWAITX4SXlYErl1vOnAryNhq3c3
+hrD429QX98vq5NRqhQ9n2aprHXoU/ZM1VH2ux5SCWR/hHkkcK+7Um8q02gTLYTxe
+GDgBm1hFCoEBRD2jG9ubfqEI3Q8GKKkk0Z6dCmBhKPmzs/Vm9zfgXM9ZX1hkRQsX
+QezAasEHvrppqC1hKlaqeZ6MATALKypInuSS3H0E8DDVebV9Qb9m4XJsPKPEblBV
+pRR7kfzgMxJUZ6ieXFEVrerfQpwNpKrBP98hbhmt4zMg/qs3BIdzK52KPoUAN86d
+ldEX+xwFYAchoUm832oqfQY1DeATx+JuETwpqT+brg/6JfH5s234Q/CiY98Ky927
+S/h4f2j2lA0=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
index 5275bbdb5..e103841f8 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
index 988af29ee..71dfe2dcd 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
index cc589d7f9..833f4ca5d 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
index 988af29ee..71dfe2dcd 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
index aa24f11dc..fe57e201a 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
index 30dd1a6ea..7989c46dd 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
index 30dd1a6ea..7989c46dd 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
index 6b3f07498..0b6491f3e 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
index 5a713fa9e..e6a05717d 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
index 5a713fa9e..e6a05717d 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12 b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
index 655da115f..177b3c8fa 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.p12
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
index b57630cee..8c523d285 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server2.example.com
-    localKeyID: 54 AB 24 D7 17 24 35 C3 70 17 8C 26 6E 6D FA DC E1 3D B4 3E 
+    localKeyID: 7C 00 CE 8D B0 88 62 F0 99 9F 2C EB BC 55 93 08 1E 5A 68 12 
 subject=/CN=server2.example.com
 issuer=/O=example.com/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5jb20xHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
 MTAxMTIzNDA0WhcNMzcxMjAxMTIzNDA0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDsYoP8ERKZ5qk6
-6VaxcN9j+gMpWrTWvb8pCeXYBu1kExGJt0Q3JhaQ1ZdpCsvP7RnVbCUOdAA6dJdl
-p2Dr4kIhkI61Zi4UQibH3+d+ACWhWvLW67dAQXxLKCMs2DGIJIV7DautDGieWQdG
-CLh9zHxbzMGu9ONsE0qbDKwCvKCdVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4eiW0/mMuTie8
+2SGTxGUgJzk6g4i+lBTH32/keXRs32I6ZGnjkiadxlHY1zBUrQknkRT1RtFYULKa
+/TlutUGYo8RRjyOQGYNFl2fm3iRg1+QryqxVjTs+/6LIa6LNFskOyShNDnvJWvet
+MRMyesL+YBbSWhs4qucdCe5ePhrJ2QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
 QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
 BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
-E3NlcnZlcjIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEAoPX7ejjfYyI4
-gc8WA8+Roe49y8t36ARgkdKrbaSUxmKl2g+fbL4vGohVR0nRu7HWx6XprJZhzEHc
-7gU4ouoWsILKXVEScYStuhFVJhvGBjAsqIc2/X63J4KK+9KWK2NvGmnQIx7KVSz9
-Z9nZjwzTr2KmXkJmQTtxsLcT8xu8TfM=
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUuY29tLzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
+YW1wbGUuY29tggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEANFJm83U5YcMW
+cE8GUb69Ns6b8aM83db/xXNIlIRp2dignWGMwS+uVHj2RadakeoLltwnuht/6X2C
+UnVXEyNAEfUv0tchc0GFY2u2jH/8IRNb6L0JInIlsk6GohuzTJ7K0f1L2RWKVmzM
+K0fWhbJovbkZ03cylUtKAQd5C/XOR+8=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
index eba0cb74a..2129c7664 100644
--- a/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDsYoP8ERKZ5qk66VaxcN9j+gMpWrTWvb8pCeXYBu1kExGJt0Q3
-JhaQ1ZdpCsvP7RnVbCUOdAA6dJdlp2Dr4kIhkI61Zi4UQibH3+d+ACWhWvLW67dA
-QXxLKCMs2DGIJIV7DautDGieWQdGCLh9zHxbzMGu9ONsE0qbDKwCvKCdVwIDAQAB
-AoGAH0Ua+5XQlZ5PRbVHXBq32nRgxbAzmvKn3ohqKM0lyybAm6ysL/VwZ8FxkZo1
-gvB1CegP8N0EiLcSrgZZymp4X9IvRmNKmuBekSL/6NCnChq/P4F9IJSEziCm7dTK
-8B8da3y6TWZk8ic0WNiIn1AUJSS470f7xxXhmkfjTXGNk5UCQQD97R4WjyF9dRm8
-DqwnV7odWSUCeqFeEb0tpPB6lHZ2vud6mJr/3OBeIjaufpUG1Z3kSFIDCfq9so/F
-jEiIwWq9AkEA7lC5ajJwk5qlyApf4O3Uwwuf2OOALI/+KOGWAjL9RdkLMPxrCwPR
-0ahkPIz6dDKGTyxHK23HVRJVNBcUlG4zowJAZoo3aUK5cnE0SDXgnS6W8L0L7flZ
-aqRdMa52kfmb8Q3caixwAzzNuhW04TgqtAzVatctjx6bi7ksx8iDjf4VPQJBAJzw
-7logY4DhDCIDqwZ+uWnFQvxbPfKa1R7pCJfkKmUQPU2CPaAgYNH4WiKCGQHisA59
-s1THU8kTbKcEOBpTxI8CQC7/PeKUYnOtGS+dq+0D9w7Fbncjs/Z99lI5vHmuHpQe
-a1BzvuZSh3KdQTHGoGRrDFfE3jt5n/xXc6+PcSyEZ54=
+MIICXAIBAAKBgQC4eiW0/mMuTie82SGTxGUgJzk6g4i+lBTH32/keXRs32I6ZGnj
+kiadxlHY1zBUrQknkRT1RtFYULKa/TlutUGYo8RRjyOQGYNFl2fm3iRg1+QryqxV
+jTs+/6LIa6LNFskOyShNDnvJWvetMRMyesL+YBbSWhs4qucdCe5ePhrJ2QIDAQAB
+AoGALI1XWPBM3KyEXU/lE45NS+gdIpwMpNYXdLPqDngknXyPeQGyLwMnb1grgR5r
+LjAB83vO33OkcFtA3zyDp9B/kCe9djaSVf72THqda1Ok41C73mL2r1EayD/8VzDT
+3jrhrBJxdvknDCa6Fxs1foTsptoF4/kd14zsrSZGNn+3yd8CQQDsCuZztof/Nt/J
+No1zIkwx+8lNBjnvK5rd5hkKpvLFggYBK3QYNJlf0FcGNEY03QVIYyBn4lJauZAZ
+iwyi1hTjAkEAyBMfTBoWnUo7NBnhls4MX3chOMkIK8/PsXHodq5HkDSatnIrcxAm
+MO34AON46y56ccHIdfcwRCgdYITiYF1fEwJAAdnsCMhLtMK3apqU7Ww9cL7qy0Hb
+Pnb3FfpyA9VfXhEw/t1aYb433bqClDfgvRVmrzSn0mjCAJgn+ytOBBDtxQJANjTY
+GepHjj36ZFdOw2j3+TVxjs0IpbYb81uFPAJj6TIXaK7uDrKlZkRTGQqITE+/ZOq3
+wR5DuXOU4f2ex7UEeQJBAJT/Mctxaugf/WRHkdVudztANceRgmqlbsbA4w9yQsCX
+tORhqutv5/KInqix8N7MSAWWvVfOJR/3JPvdvCY0OQk=
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
index 8664a3269..8c96a754c 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/CA.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
-w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
-xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
-LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
-/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
-RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
-GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
+PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
+6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
+9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
+fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
+6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
+TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
index ba9d9e638..6eff4f448 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/Signer.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db b/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
index 2aed3d496..718cb4bac 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.net/BLANK/key3.db b/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
index 084770b3d..bc0e01a58 100644
--- a/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/BLANK/key3.db
diff --git a/test/aux-fixed/exim-ca/example.net/CA/CA.pem b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
index 8664a3269..8c96a754c 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/CA.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
-w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
-xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
-LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
-/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
-RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
-GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
+PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
+6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
+9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
+fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
+6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
+TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
index 2023f8c65..d36c42abd 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.key
@@ -1,20 +1,20 @@
 Bag Attributes
     friendlyName: OCSP Signer rsa
-    localKeyID: 2C 45 3E AC C0 F1 EF D0 2F 29 71 33 62 0A 8A B3 8F 2A 5A 30 
+    localKeyID: 8F 0F D1 D5 09 5C 4F 25 B2 F7 87 F9 41 6F EE A3 F4 3F 73 3E 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAM9XmsMSvKp6sxY/
-pPrz/3ui+qqv8e943N0tsxre1ch4Az/jSJCEaqBDgX918DbE2dTQ+l02COZ55ttO
-JuU46iQ/j/KA0PzAdkTuqQiJ7yZXKd5bt0jqplUqnRKjC94saWP1FVygCsavOe0H
-IefgQo4C/f0A03jZWOMwAsQ2ogYpAgMBAAECgYAyACYL412YfgDofV4ff45NhjLN
-TSM6lOqsMtxVf0XOM3TTKBAEe85LyiO1NV+BkayXN/McXc69J8n+emUCU5yQxJxX
-dOSGB+5NACWGujcoP0hmoRFUzDNuNPFc+xMqxH/ONRbndYk4pd2WBwkQMyq5YP7z
-10vc6XXhy3sodyX9JQJBAOjFAELMt4bCYo4Aq6yc+dMUtzyvezDot5/JJjxiTkIp
-HSke3gd2fZqgnuCCIwLSimxcYxGy0UwThevB8s+YE/0CQQDkCPbEDpDKZk7sIbFz
-l+Q1UQ0RJCT+ITYcZD8RxPW64u1bLV5892537zXBJBzEzSYTJjwOvjsj696L5Pmm
-ZhSdAkArkMONvRcUZ8leXo3DDtZLRXNOLmHWM5g6lcFMR/HxvBQzIA3aQ7kaebmC
-t5ip7JHv2hLIuzklDfpgt7okVIhZAkB59LlU/Z0+Qh0veI2ZDsEEKsbcRgJqz4RL
-BuocLMRnIPpkaw0/tG0mQ47yLsgcEMOuNiKkl+S1P26UTu+dqLaZAkB7KQQCpOfj
-gHi30Ip2jVCKKVlePemYsr6JEaRBW6wfHSgLbcc7SDwBDdOMhzR4eOIcEavY3po2
-rjbvcT+YDLmz
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKPP31MJNhuRdxqi
+9tLgMo/B7yj3v5elVjw54P8igL0joDp4fM2U5dDQlArRVm59hDHew7WwTmlrLS65
+rVKNXSSUPt3vLebTPY9ad72TaUaeGKsKOiEAvzVVcUdW8+8HeDq6NEHI9nacRYNc
+Zb5jrckXPTU8f0Cvob0VTikeUu+LAgMBAAECgYAB+JwsVWqkQq5w0JzKhTSDWSCo
+/1b72sGpFqoBblRBC/uymGtc1SAK0Jrnbzg5OvA4FWeJEsA7mBso4JN+vQEg5mpv
+/DSv00AJnv9BdJ33+/AMAuL9BLN3sVQDzuW/cIN0rPVhqZc0fBZhaivViperUdiJ
+wFxnH19u5B/dGsNMWQJBANjfWjtQEBbCKrvYlRGl35yuL7SnhiVQ7dF2NUTX0HIO
+3iwYIW5XB6oVmA3zsbFVurfTikThkQvlx3EK3r7tcPcCQQDBXdN7SxkLmv0NfS9u
+JeS7KCUR/FV8786gUXEVsewd6xXpcOlvs5nEQ47u/VetNiD4CHnJZ3JLD4/7iXcY
+86UNAkEAmcRLUtCih7Bl4khe8WNdl9a9BmbdKyolZKVegZBPP/+gsTzuvzA/w+2J
+oSLPM4AoYlw/pjUUxY3HCjR92Hu74wJAcCs+X5oruCi7PJTu66V9rvfVsT5AVQ5D
+PYqg3+XrQ1u4xUcjkxGLVGegRZCeyLLKozc/do7UpSgs7MxMUyQbDQJBAL02YM/i
+ctKBDAvEfg0KcBhrqjVexfdhft4Z6BY7GBqqrsQePzV4bz5dR0MdlP++JKdokCl3
+vlOy8LJ4asnRG34=
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
index 15d055d7f..8ca93749b 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.p12
diff --git a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
index 082f125d6..347bc47ce 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/OCSP.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
 MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTNaFw0zODAxMDExMjM0MTNaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
+MDExMjM0MTJaFw0zODAxMDExMjM0MTJaMDYxFDASBgNVBAoTC2V4YW1wbGUubmV0
 MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB
-BQADgY0AMIGJAoGBAM9XmsMSvKp6sxY/pPrz/3ui+qqv8e943N0tsxre1ch4Az/j
-SJCEaqBDgX918DbE2dTQ+l02COZ55ttOJuU46iQ/j/KA0PzAdkTuqQiJ7yZXKd5b
-t0jqplUqnRKjC94saWP1FVygCsavOe0HIefgQo4C/f0A03jZWOMwAsQ2ogYpAgMB
+BQADgY0AMIGJAoGBAKPP31MJNhuRdxqi9tLgMo/B7yj3v5elVjw54P8igL0joDp4
+fM2U5dDQlArRVm59hDHew7WwTmlrLS65rVKNXSSUPt3vLebTPY9ad72TaUaeGKsK
+OiEAvzVVcUdW8+8HeDq6NEHI9nacRYNcZb5jrckXPTU8f0Cvob0VTikeUu+LAgMB
 AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN
-BgkqhkiG9w0BAQsFAAOBgQCTmyVj/GNFTfOC2LHWjs9CjxGaGHz37XYJmjmtbWXM
-RAC1J8bgUqZQzJq/SbfDDcRKJD63pycYH0oK7fxrYeZ3MfIebuRcYJ7I3nPJMoNY
-tfvl02lWHmGJFmE4U2b/2U31BWc3Q1sl+DlT3+bKJiuGqGGmyDod8NSPbBAz1EnJ
-qw==
+BgkqhkiG9w0BAQsFAAOBgQDEbNnKgxSgWPLFBxGjXTGItRT4NUj5pgiyGknHcJY6
+oErI/JYcmuLjb5pWhUL164QSe8qZahKwkJSF5p7Di+KsThJ/KzSOWsvGnYyPObmY
+EJJ015teZAfDOESrgdk229VIIt0FNK6bypaZPal1etgclAdPRk+x6xGvyssrVa3S
+gA==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.key b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
index 3adbac715..c384a09f2 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.key
@@ -1,20 +1,20 @@
 Bag Attributes
     friendlyName: Signing Cert rsa
-    localKeyID: E5 F2 EA 2E 57 7A 67 18 A3 0F 7D 20 25 68 7F E7 82 4F 24 22 
+    localKeyID: 31 2B 18 B7 AF BE 4B 4A D0 18 7D E8 01 96 53 29 09 2F C8 CB 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAM3LDZ2KKrH4YTGA
-k60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyEGIc2EyVvyaIWasY2rqW1
-9m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8YaXju8gzhy2/eAj/w4M7
-o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAECgYAWqvv5c0DSW1nCskx8op4v+PkA
-E7bU9XbisJEx5rnmCn03JhJVvBeuSZrFNSxfJw7YgVCUSOQtqClNpIDxWWHZAxoa
-WzJ4S6Evc2qNi6knjAFwaL90qXiE+wBv/5NtZJOCYE5C/fgxIt3ZKcSNEMkl9blp
-IZwLVcdIlYA62jjDUQJBAPB45X74TlmynexC4Azn0tN+IIFrhdc6xLe/gm3C0gcY
-xUWXNvIYDDSoQDZmxwS8mLBQFs2XS8YoheyzZjy/b3ECQQDbFOXH+bSpWCNI7wM4
-9QgcJJzNUigi7I1xPN0TVc4NP3aRf6qethHVIxkX6hR0H0JnBjUFEDPiL01M/Se0
-WcHTAkEAvbgUD9VlMz1JfNHSJDxtx6/1g0XKZWEXPITaKTCQNUsksF+52MyCLLUl
-XAZANAt7R3cYVoFsJd1os7NiEMFT8QJBAKhFH8x+Jd4gHVHqit4XjjgXgvxNCxjv
-+h+ssN0l/ZK9WPOeTE2E6KN9RsvQdg9O5zC8WsLd1Av5avUkSHfErRMCQQCHPAAL
-VWQFd8alawkNozIVUPWEOC7iVWOfEvvnE+09NevVJlxW6sL1+pv+vrBLBOukQTCC
-7spJ8rlK7cUugnOz
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAM6+EJ2LbxoEH5Kz
+poFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE1ew87+OzSqJdG837h4aq
+bk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2hJdshyJLHuHD5HbM6bO2A
+76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAECgYBGuQgQDMnF2ZE/awtThKDt1X10
+rAMRHGOoPGPZ9xuEgqBkbEp9et8pF9xnFUHk3XemqgenATjovtm+vICdkKJ4z+T/
+po5jM8A1ZlIRdEVBkDpS9BMg6unuzZ6XWlcLfygvkFfJQLI/kz8BX3OCKnba+hlZ
+98dHU543V4JX1xYGAQJBAOoNYYl251aXLSSIrEAonshadx0VrqKfqUDd6d5ExkNX
+/+Z6TWzYtJZP2uUzwyW3crMSsx3sX51cPwr7D7IGcxMCQQDiIRa7i41WLdbVCq60
+TkVNyoNBA5o7SjXlSTw0/roQSWvsix5BZs2LrpOUVfkLWDHur0sX/TteUhUDMHIp
+iIkBAkADCgdxNIUOf8oLRmcOMjjVmy8expBM9kvJVthZlYUJjNP61y24MxwtM35B
+KanoDHjF0IFY6x/WuELtTpNGmYTXAkEApfw33Y6APqQDL/pZZwyVHpbqZYypZ5//
+k8CAKz5XgaEDUWyE1ukJM+D/f0DkQAmLDXMqof9F1uRVfDPReN86AQJAOSIO8LJe
+yQzDCSbpoMxhX6EE3svNMNKiast0F7OazRKXJi/IiXMlSMQ5g/8kFkYo952JcenB
+RCEU15p4E1IMTg==
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
index 7941c34c8..25f50f985 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.p12
diff --git a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
index ba9d9e638..6eff4f448 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/Signer.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/ca.conf b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
index 2c4388a7d..dc948f87a 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.net/CA/ca.conf
@@ -1,18 +1,18 @@
 ; Config::Simple 4.59
-; Thu Nov  1 12:34:13 2012
+; Thu Nov  1 12:34:11 2012
 
 [CLICA]
-signer=Signing Cert rsa
-ocsp_url=http://oscp.example.net/
 ocsp_signer=OCSP Signer rsa
-level=1
-sighash=SHA256
 crl_url=http://crl.example.net/latest.crl
+sighash=SHA256
+level=1
+signer=Signing Cert rsa
+ocsp_url=http://oscp.example.net/
 
 [CA]
-org=example.net
-bits=1024
 name=Certificate Authority rsa
+bits=1024
 subject=clica CA
+org=example.net
 
 
diff --git a/test/aux-fixed/exim-ca/example.net/CA/cert8.db b/test/aux-fixed/exim-ca/example.net/CA/cert8.db
index 155cef1ac..e3ef1134e 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/CA/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
index 3cc83605c..5a5ba97d2 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
index b1f47aeed..b76bfd547 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171216011707Z 
+update=20171216204807Z 
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
index 16ba8587e..38d2071a9 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.empty.pem
@@ -1,8 +1,8 @@
 -----BEGIN X509 CRL-----
 MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQx
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MDExNzA3
-WjANBgkqhkiG9w0BAQsFAAOBgQCMieUwhQ9xi2JuN5RvEhoSELKC4YCHbw44EV3Q
-LsXwjlpBncPBxiZo/rhkNmu/qNXjGA1WBU601cHkGcQXaXLPKo3P1flaBOhL/1F8
-9w9hFOu932c1A1V8IxAYGA6lXnswi5V3Km4nYtefjQD7rYaMbQwfIAqX4rY0b1As
-sPM5CQ==
+HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MjA0ODA3
+WjANBgkqhkiG9w0BAQsFAAOBgQCvhjEkEZK5RItu+1xMobalh89/01wCeTBkc1JT
+TJPE3yCIAftOcJPn+9FXhixVTojkgLCNYk8RlTvD7cBWT98D2dIcRtHAQjDkciUN
+daBLCzqcH4OxN0tNBVgY8mf0Su2vW4+PDlMZJAmdGXf2BwmW00IExPyoxJCYmsfw
+p6rIyg==
 -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2 b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
index 3f3cc34bf..96d582826 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2
diff --git a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
index 1c243fdfe..9c5883f64 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.net/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.net/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
index fdc3c31c1..8d881b9ae 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.net/CA/crl.v2.pem
@@ -1,9 +1,9 @@
 -----BEGIN X509 CRL-----
 MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm5l
-dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYwMTE3
-MDlaMC0wFAIBZhgPMjAxNzEyMTYwMTE3MDlaMBUCAgDKGA8yMDE3MTIxNjAxMTcw
-OVowDQYJKoZIhvcNAQELBQADgYEARRVelc8xn916fSmWsu4zu/MtPqJQOuzhr6tv
-hZOLbh4cF2eUGoA7AeTlfRmmwSJDbalyPIcES+J3jLNbJ/OVkAsaKldfZoI2fBTx
-MTtvjhJ8mlR/IaEywzxJzQgr0UxsTCGcEwbUcjELLJuFr2qPpPHbb+VU3M9XvQBe
-R0K7Cjw=
+dDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYyMDQ4
+MDlaMC0wFAIBZhgPMjAxNzEyMTYyMDQ4MDlaMBUCAgDKGA8yMDE3MTIxNjIwNDgw
+OVowDQYJKoZIhvcNAQELBQADgYEAJ6In6PZ0YboHucwFUV9txmFltNJa9ZS3a1Nb
+1vgdGfyu9XVHBQiTHp240+XFMC3sylp5dKTCfZfyOxNux/woGirrjJrqPZt6kdFW
+zevWKDhvnRXPxLySSzgzCw/27QQzi6K5BHi+XP5HcRLGj55c0Of97mm8J/qnsin4
+nEH5Dks=
 -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.net/CA/key3.db b/test/aux-fixed/exim-ca/example.net/CA/key3.db
index beabba78c..377905cbf 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/CA/key3.db
diff --git a/test/aux-fixed/exim-ca/example.net/CA/noise.file b/test/aux-fixed/exim-ca/example.net/CA/noise.file
index 6ef09ba9c..74acca58b 100644
--- a/test/aux-fixed/exim-ca/example.net/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.net/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        664        400         99         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        890        185  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:      26824      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     638976       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     141144          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    1293842         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        910       1871       1480       2860       2448       1488       1879   Non-maskable interrupts
- LOC:    6821846   10426338   18563397   16012904   28148887   24504155   16316969   18889553   Local timer interrupts
+ 122:       5099       2645       2048    2133029       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     307576          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    1528276         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        366        323        340        333        336        355   Non-maskable interrupts
+ LOC:    6160879    6212197    6080647    5762425    6022590    5959545    5961613    6075333   Local timer interrupts
  SPU:          0          0          0          0          0          0          0          0   Spurious interrupts
- PMI:        517        910       1871       1480       2860       2448       1488       1879   Performance monitoring interrupts
- IWI:         58          3          1          1         16          2          1          0   IRQ work interrupts
+ PMI:        368        382        366        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:   12075154    1391705     533941     177241     287938      72263      62869      48691   Rescheduling interrupts
- CAL:     180655     143208      98859     104850      41110      73752     113286     111989   Function call interrupts
- TLB:      53363      51506      31574      33734      16525      24424      38918      42710   TLB shootdowns
- TRM:    3945657    3945657    3945657    3945657    3945657    3945657    3945657    3945657   Thermal event interrupts
+ RES:    2767471    1298401     589844     442459     433552     428642     274114     316935   Rescheduling interrupts
+ CAL:     346242     329420     331874     336846     344965     333344     332836     336492   Function call interrupts
+ TLB:      99587      89302      89373      92699      93692      88842      83748      88761   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:         9526140 kB
-MemAvailable:   13821984 kB
-Buffers:          437980 kB
-Cached:          3579080 kB
-SwapCached:            0 kB
-Active:          3759460 kB
-Inactive:        2482184 kB
-Active(anon):    1519936 kB
-Inactive(anon):   326136 kB
-Active(file):    2239524 kB
-Inactive(file):  2156048 kB
+MemFree:          171612 kB
+MemAvailable:    1949360 kB
+Buffers:           25320 kB
+Cached:          1900320 kB
+SwapCached:         9076 kB
+Active:          9045324 kB
+Inactive:        6504092 kB
+Active(anon):    8608644 kB
+Inactive(anon):  4972928 kB
+Active(file):     436680 kB
+Inactive(file):  1531164 kB
 Unevictable:          48 kB
 Mlocked:              48 kB
 SwapTotal:       8212476 kB
-SwapFree:        8212476 kB
-Dirty:             11148 kB
+SwapFree:        7958012 kB
+Dirty:             11360 kB
 Writeback:             0 kB
-AnonPages:       2224724 kB
-Mapped:           671568 kB
-Shmem:            327224 kB
-Slab:             326436 kB
-SReclaimable:     238592 kB
-SUnreclaim:        87844 kB
-KernelStack:       12432 kB
-PageTables:        54060 kB
+AnonPages:      13615968 kB
+Mapped:           393344 kB
+Shmem:            322824 kB
+Slab:             237008 kB
+SReclaimable:     127500 kB
+SUnreclaim:       109508 kB
+KernelStack:       14352 kB
+PageTables:        95220 kB
 NFS_Unstable:          0 kB
 Bounce:                0 kB
 WritebackTmp:          0 kB
 CommitLimit:    16359228 kB
-Committed_AS:    7104468 kB
+Committed_AS:   29506660 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: 66808098   75169    0    0    0     0          0      3746 18376786   63294    0    0    0     0       0          0
+ vnet0:   46917     481    0    0    0     0          0         0   325097    3671    0    0    0     0       0          0
+ vnet7:  502731    3695    0    0    0     0          0         0  2163888    8497    0    0    0     0       0          0
+ vnet3:   32162     252    0    0    0     0          0         0   291837    3410    0    0    0     0       0          0
+enp0s31f6: 191748506  170914    0    0    0     0          0      3922 42697681  129935    0    0    0     0       0          0
+vnet11: 7303439    6454    0    0    0     0          0         0  2343040   11288    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  1206381    5925    0    0    0     0       0          0
+  tun0: 112501735  104283    0    0    0     0          0         0 30579473   80458    0    0    0     0       0          0
+ vnet2:    8030      34    0    0    0     0          0         0    42770     387    0 1712    0     0       0          0
+ vnet9:  126854    1141    0    0    0     0          0         0   686477    4612    0    0    0     0       0          0
+ vnet5:  139304     988    0    0    0     0          0         0   787497    4718    0    0    0     0       0          0
+vnet12:  133857    1141    0    0    0     0          0         0   815494    4633    0    0    0     0       0          0
+ vnet1:   71961     671    0    0    0     0          0         0   421240    3847    0    0    0     0       0          0
+vnet10:   85763     802    0    0    0     0          0         0   485974    4056    0    0    0     0       0          0
+ vnet8:  445523    6298    0    0    0     0          0         0 15036777   14092    0    0    0     0       0          0
+virbr0: 31723072   82878    0    0    0     0          0         0 119518666  124425    0    0    0     0       0          0
+ vnet4:  327621    2427    0    0    0     0          0         0  1590733    6985    0    0    0     0       0          0
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
index 63ddb4752..7331ebeb2 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
-w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
-xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
-LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
-/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
-RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
-GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
+PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
+6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
+9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
+fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
+6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
+TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
index f2ea8bfb7..7cb8f0a19 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
index de418d53a..b6a7c269a 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: expired1.example.net
-    localKeyID: 7F 93 5A 71 A7 4F 6B 77 6A 00 1B A7 EF D3 36 BA DB 64 C7 DE 
+    localKeyID: 20 AB B0 6D DA 38 DC 2C E8 14 97 C9 34 53 9A CD D1 B3 FF 5A 
 subject=/CN=expired1.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTVaFw0xMjEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDH3xYtjWPX7OL2
-1qWtIh5YIYPDnPd2Oq5+MU/VStQ0YOe0slhkh9thKLK5jf8OLUuFoKYyHoPD3nhD
-uk7RKVeQzj0fACd/0uqkAmgaLlg0grS1FhPUcVGHv8/5VepAqD1CTKxw4vNXlLQy
-qNvAwMBogQ0E6lKo3eGwrMcqQDX9SwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTNaFw0xMjEyMDExMjM0MTNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCeodbLOpgOlgQW
+61h+HDyH0WA0uAUBWpbVU/s3JRVoNz00IPr4eCsIScaEG2v5JpD5PgkIjcxADYVw
+hWPx79RCWIM6aRtQ+MfW1FWwdASnF+mvqlnpAFuD9YP0N15Z/S45qTr6+M1irXYg
+CG/8+6vpw5V8IQYqLvwUmIvdpyjlfQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
 A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AA49vc79t/fQujwKm6O0Cx73EYaiZc4+0AzlPnJpPDlRPLxN5ZsYbPlzAytckVFC
-cOmbZOW/4j9HzO47rT4XLIoC9nWIFWwI+ziXLo0fJ6BcWpUZgOAsXdvxV/vnEwLt
-XPk+c7E9S4iafvXAgeRoO5AFSv9VTwNvufXwcRrbHagm
+AKule3gU2qMfFdZdJz4ZX0I882dt26ccqUhn9gdlxgMgxyygUEjNa1aQ2Fw95CEa
+zRuCuXh8kNQe3A7Oo6aTDqdtFDRU3yfOhPTamkr2Vxq9sLoy+C/5QDAJ/gPOw1cM
+uT+7JAx3Jf6bfDg/9m0tVTi5OS4n9myhq5RT6xReAW8e
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
index 0083d9b3d..a724ca640 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: expired1.example.net
-    localKeyID: 7F 93 5A 71 A7 4F 6B 77 6A 00 1B A7 EF D3 36 BA DB 64 C7 DE 
+    localKeyID: 20 AB B0 6D DA 38 DC 2C E8 14 97 C9 34 53 9A CD D1 B3 FF 5A 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI9I/lCSm8nygCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFyTcthNjTZ7BIICgPcDpcsyFNT/
-OrvGDaQuvlGwdWCztsoq1jbj1/uTwDbJhu8z+CnKhesVrnIWMMXf/9V5+HtAVkNE
-YirmfR6RSXLef3pq8GGsiThy23sBNTJWAnjoagKX81xvlIENqxEJIYn4zxsaBGkx
-jWevqcNMjyXUesNji8/wq1bFOPn64jVbEQIwDeaO2Oc5oFkkkIl0j7COwClM1nIn
-IQ5HwbDDLzkYgH3IYL92qNPi6R5j/T0ZrOipss8udWcw7MuKLpJLfw7nWiqOegXs
-lBv4xWYzD6Kso9WiyFdLp2IeFvXk6mFukOQ8DD+Cjs5NNeZMZwsfmwkXaTcRV6oW
-mcrfeoDfv00dnjnm1bP2TUqwW++LhXUKVD7U2cG6E3lk1zc/gtiwzJEN+lLDc6aB
-l2uAIkv9j03G+DqjHpU2eGk8GMt8mpwTvEC/MVvZypKhBKfraiVc9w61NOADgNa0
-ASyt0KQY4bDluXN6PAIC140JtmbUTRhpIAAHYyoCvf/HAXptH9yggrFEPmzPZu/Z
-fJ/1V4vzLiaKpzhcxuAv3pEa0eXS6GbLMBk+M142yBOIwXIp067jTKVIiprZ5Bmx
-7obzjOxVmIjDRWibkXU/osyZlWSfS1P6YgPjJV95oOdv1jokv2554Yep69EKJ6kh
-D+Cktg3QXboFmDRkCtwzL99chGpTE7xFyXEwJI+aAZdzRxOrro6vKQuEdKhSdDLh
-w4XUAy41XiFmysLEZJzCpohEil15DF059S687mKh01nEVqk5KF0+NBJg3n4P+UKF
-YYxF/1716FxkOOp1RS/4e5nev42UlnJ8bqoI2vKFNbAlFxXH6jHvUV9e1M+jw5jm
-VeP+CJkGWl0=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIqaiqWCFWBSICAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGLzb86NzdkHBIICgAaWeSCqwXxx
+W/020iDsemI1oQqWmg3KtlzLVo00taV+JZSuDhjuG7VUtY7I9aGO30sKsHjvIzRT
+T5miHOBkTrAC3VYTbDxh9tXyoccUU3vi/IbBPlv9LBXBzJZq3rTlvsoCytI7utz3
+1vV6hSUuKO8ovQrBBTUr17zrcmmSUYOcV+2qgb2VgsbPP5Gk1LCzu/BMAhM0cwxP
+YEkVBogzhtzAMm9HVwT7rtQLmgSzYBfeRu/c2BqMAdUlzTD9Z3kSCFf9LzUu+DcB
+G0/whBtQnaq/BU6m5rZp5U8oUROk2BJ3U4j+jrbWj6NAykucYweM9Frf9ACvmwlL
+jYVvTzMAutfkXM9sRaE1BIezbvT2LTKrUiS/XQBAgAgTV/ygn1bGLaHYkvjvRyM4
+mMZicByY1dFE0FmTlVYrAM6Zkka07TC00mDtey14hD/jtVNVQ3GPCdMtI+Pc4M8S
+xQj2e5uxmFPs4wsUlOXupsKQUjU37Sa6S37Fxpypw6sdfCdlUp3iRKaIn3m5a3Si
+W6K2Q1o4jvqK72JQNesz528FfhGLsnWbN+T6Bnm281YmVIiiwWDTW8FbLYLTsb32
+gOIeVcieMwgAQO6RM9crh35qKvCFMW3pOPu6vQcGYdwXKnAM/s9jLGqh8PM+IrPs
+pA9R0fFlZP1KcmBJH9kNviZFmIrbFFaSZW8Bv28ulCJ1KEH2ol64QcXV0aZHwE60
+ibqYQ1cEXAwPpgRX7d5oH6LHxgNy8V/cx57+S9pvLNnbFMpONcvlc0Y/npVtX0lP
+2YFaNXc/OI/sNFDICeAQ+SXHtig93YsqD11m7QcZlfN90nDgRQLDz/LYHcTWHLDN
+q9kwi6NdHfs=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
index 816ef2522..3fa59a3c2 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
index 0e474dbcd..beb3ea9fe 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
index d63f6c113..5e027717b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
index e22da87f3..aad3fcf9d 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
index 8936e2cc0..0d281819f 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
index c92b8862b..170913f1f 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
index af94e40a3..a25962199 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
index 0f05e0b28..78094a5a2 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
index 6e1e217aa..f9486b6f1 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
index 9bd2e3f6a..a33e50593 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
index 04735189f..13ea93d1e 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.p12
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
index a4f7f6cb1..66da79775 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: expired1.example.net
-    localKeyID: 7F 93 5A 71 A7 4F 6B 77 6A 00 1B A7 EF D3 36 BA DB 64 C7 DE 
+    localKeyID: 20 AB B0 6D DA 38 DC 2C E8 14 97 C9 34 53 9A CD D1 B3 FF 5A 
 subject=/CN=expired1.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTVaFw0xMjEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDH3xYtjWPX7OL2
-1qWtIh5YIYPDnPd2Oq5+MU/VStQ0YOe0slhkh9thKLK5jf8OLUuFoKYyHoPD3nhD
-uk7RKVeQzj0fACd/0uqkAmgaLlg0grS1FhPUcVGHv8/5VepAqD1CTKxw4vNXlLQy
-qNvAwMBogQ0E6lKo3eGwrMcqQDX9SwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTNaFw0xMjEyMDExMjM0MTNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCeodbLOpgOlgQW
+61h+HDyH0WA0uAUBWpbVU/s3JRVoNz00IPr4eCsIScaEG2v5JpD5PgkIjcxADYVw
+hWPx79RCWIM6aRtQ+MfW1FWwdASnF+mvqlnpAFuD9YP0N15Z/S45qTr6+M1irXYg
+CG/8+6vpw5V8IQYqLvwUmIvdpyjlfQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
 A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AA49vc79t/fQujwKm6O0Cx73EYaiZc4+0AzlPnJpPDlRPLxN5ZsYbPlzAytckVFC
-cOmbZOW/4j9HzO47rT4XLIoC9nWIFWwI+ziXLo0fJ6BcWpUZgOAsXdvxV/vnEwLt
-XPk+c7E9S4iafvXAgeRoO5AFSv9VTwNvufXwcRrbHagm
+AKule3gU2qMfFdZdJz4ZX0I882dt26ccqUhn9gdlxgMgxyygUEjNa1aQ2Fw95CEa
+zRuCuXh8kNQe3A7Oo6aTDqdtFDRU3yfOhPTamkr2Vxq9sLoy+C/5QDAJ/gPOw1cM
+uT+7JAx3Jf6bfDg/9m0tVTi5OS4n9myhq5RT6xReAW8e
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
index 65dd43bae..7332eb618 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/expired1.example.net.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDH3xYtjWPX7OL21qWtIh5YIYPDnPd2Oq5+MU/VStQ0YOe0slhk
-h9thKLK5jf8OLUuFoKYyHoPD3nhDuk7RKVeQzj0fACd/0uqkAmgaLlg0grS1FhPU
-cVGHv8/5VepAqD1CTKxw4vNXlLQyqNvAwMBogQ0E6lKo3eGwrMcqQDX9SwIDAQAB
-AoGADY/uslKYxssVL4irH09kXbiQd1KMXCJpOrjf4Oo98fvtXQ6I/vFVCoe3cO3Y
-s76RFFUtUdNOP5k18eqPdJPolBUjbIgZoE4nggOl3PFtfhN3xgNKVfeaXBm07PW5
-1IUCkvSZUtUltzRK6yZk5ONbKrkeKsxSTErmkBNLend6mFkCQQDp23Zgadj9Ck6f
-oAm/zWw+dB3gbBct9k8iL1eBLZPJv03848HiKwSQxMvSCe/9k7+wvEyQEo1JO+NR
-FxUyJOKHAkEA2svUv2S+vQSmBzMaxvCW0aUwnyfA1fXc6GfGdq9OPQLvlMpiweNN
-i8k1mfgGDhDZnTPE0QFhzQOUfYFaBcYMHQJAPZ/9g86gxZ2PtnS/3PFPEu4aaWdS
-fGQp2kJLdtkB1uo4rOl/0A+x9kxFwaWovlPO8c3NBzI8VQ4ZCudgSIR7xQJBAM1g
-9C1Mlja7vFWZxRLlF81m8IMVP9AX3+tQLl2OJTTkIpxadeVmRo5mqygCRzzA2GTW
-CXPfhjx5ldNRrn0o8IkCQEPzDRwJ4bhdkOlPH25HkmHiwBWOrNtaYLxz7bh1mPLZ
-AbGEifbIp9jsXmpMLrt4rPbBZXT7drMHgMMx1NjrQx0=
+MIICXgIBAAKBgQCeodbLOpgOlgQW61h+HDyH0WA0uAUBWpbVU/s3JRVoNz00IPr4
+eCsIScaEG2v5JpD5PgkIjcxADYVwhWPx79RCWIM6aRtQ+MfW1FWwdASnF+mvqlnp
+AFuD9YP0N15Z/S45qTr6+M1irXYgCG/8+6vpw5V8IQYqLvwUmIvdpyjlfQIDAQAB
+AoGALo5M3cRKkC1S8e8MP6bF1Q6L76z6OxV9IwrMtbh6eeWMXto3Dekmp/4O9wKd
+Q7gf4CZmvE3xXfMZ8JYVaRH79y5hon34caRu5XQlieZKSkCW+g7/enLMTyIzzZDr
+NaK09GJ0/1dxbNJfFsNX0MefVWyiIUt5UqY/aYcudBVprHkCQQDSYONjoMlriQ0+
+QIfGmx1tVuRMjaxS2A2srBThq7r0+UA2XdpNl9ukIiqLmyI1cpt/nDTCgbQOpmbs
+6AtbP0qfAkEAwQhEjX3xI8WCqG/Z2/egJel1ffyqUefYXuX73H0bzISh0zVEfiid
+DbHbhyAiCtIkIJNhVBnZPIzxithMYB62YwJBAK1rwQZ3nJJQv+H5P/OwGmnvnvKc
+Ntlz0JHuqKf+8HbQoOYwJ6ye6ig7IedDUsfMWfKvya4tTUhmU6InBnWJjvECQQCR
+GhXuBm3t5dqBoxKxN0M7PHMFcZjWWOFc9KSO6byr0EeU7MW/z+e/E6Nhv9XXLH/b
+vO28unGCArDPHijLWErhAkEAyvpdWnCNP3UzRgMgjkID2WkW06sZx8D7LInR8QQn
+VCWsAGwnUxA71EL/X7x7T76qk+6n5WcLfhoQMwju2w6j5A==
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
index 14ed5345f..b5436f836 100644
--- a/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/expired1.example.net/key3.db
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
index 63ddb4752..7331ebeb2 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
-w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
-xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
-LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
-/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
-RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
-GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
+PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
+6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
+9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
+fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
+6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
+TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
index 56e747dbb..d4a50b906 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
index ff8df35bd..a781e5fec 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: expired2.example.net
-    localKeyID: 15 5E 15 B1 43 DD 5B 16 2A 5C F2 82 D2 9F 4F FF CF 2E 16 FE 
+    localKeyID: 3B E2 EC F9 FB F9 23 AD 53 E1 1E 17 2B 28 91 EC 0A ED CD 34 
 subject=/CN=expired2.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE3WhcNMTIxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArgzEgDRr0AQS
-xDojWqcYJenCWDEY/NpODPKTf0AqA+8v1x0wRsafq56PsIyscc9V8hH1nrKy+yQ/
-9K9/Q31Mv6kHrdM17H0XkwYJXDrqoMbYzT1CYwssB9VxJtJyCccrCXVy3UNJ/H3x
-uEwuDdHBHRBjBZbpR/yScFUl2Ep4MwUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE1WhcNMTIxMjAxMTIzNDE1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3KMWV+L619V/
+YRCxml+TMflwa2/EazeebWwhbwY56m9mt74EI1MQ/LClEbx+efvtJ3ZMPXN63FXu
+waqh1MOcgZjPCVlMGLeOINormPNoC7hByDfJy4C17nSsBUOkruozrL8OLteJVBPA
+bRUxHtIWM5w5Mkcz75B8sI/AZEq9NQcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
 BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQBAd8eYuCaPHDZoXm8EwaiMkncqs3BTfLmTatgzzFtKv9Dmtmsc30dfsjuZnXm2
-l7NpRFUMmhKQy5eRx0ee9DdU8ZfckOQKNh6fZBVg2Yw4RO1XUtY6cxwtqNtGjsFJ
-jBiID/ON+1w9AMWnGMGfeJ0Hv8vUe8/YqP8fbunf4/LUVA==
+gQC8qwvBmde9z+En9n2WgVqkB1ki7nM9+c+zV7b0iSpeMCZ/n7vUBWAJcFLmOLDa
+zruq9Mi3H6EkUJSWlcPdKA5IlaXcvORAfaeCFoTpjZGSypbO3klBuWSRsf+zciih
+N77o/GTQK5+6Lo1XM2ArFyp4H6gDvLIjs7rbQf3wjJQH9g==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
index 2bbf66888..93f01f30b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: expired2.example.net
-    localKeyID: 15 5E 15 B1 43 DD 5B 16 2A 5C F2 82 D2 9F 4F FF CF 2E 16 FE 
+    localKeyID: 3B E2 EC F9 FB F9 23 AD 53 E1 1E 17 2B 28 91 EC 0A ED CD 34 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI865PqaogKaACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBT7nNRRaluIBIICgBLFSXNLPWMp
-M07NUb4KU14Q0edarPUyWv00v+z/Lz39hOTjUwDw6WuB59ogzg2MyqCljP8YUtvW
-4H8kk3mEq/0spX7Vb8Bd7laZySfIvHzeHQWq8+8TS6yncdZMhDSXcxcMT5YQ9Xaq
-8hCdaNNq8mfkR52FwMviw7BBvkNDjyuAq91joPixjk9kukkEtUosMqlU/GJMoRvF
-9dShrk8qN3idweipRXEJ5Irpup6JtC2M9nIt7ft1JyLxJi1kh5uYUzkc08ySuuzg
-QItGDNQzLGVsqqqy6mmrrMetrgn26LBFIIDHxYFDhe00PR/oKb56FdIWpCH1SumN
-Yx+GHOoE9ldRpSKR0U76KntdJESMfPkVcttvn2VxaBQoE/6FkLtc8H27pQcov4gq
-jzcpIfZN5EQUe1E937F3qIDRvcCNmGbNtWqOaOq5riwMlXyYjGazFHkUM2Fq3Xy2
-h/aD3W4mKEzHo8n7OPDFk3XDgPL65QrtjRqJdNV5/sqBn1c0G7JVQkLBR73N9/oH
-K8HYF9Db5ztPn9GtQ/CeRTAJgDi+31RXmDE7ADfsrxAH/Jimsn95y+141ZgmKFEj
-NK/SomNzcywJyXFJQ62NTPHJslPy9K1WgXHMmc5jqC/MRX+sEVF/hoveqgs+Jrxf
-ZiYs6xzK3idhsjr2m6N2B3srQYTI5UJgmBtWAAyXnRbyDmx3jTpr0rkI/2/bhtxs
-OhoUP13cIRuN09af5WxjoI4U8RrpQdNMj+kBbbqXZ55RUavgSH1beNyOrIzSunU0
-8A/VE5MeDO0CdlggdwDoU0FPbSkB2DHbU5kdmA2r4L5k41unDJSD1ABEsQ+njYEi
-KCJrXQBxSdE=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIGFdRFqjUegACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJUyJiRl3tt3BIICgAOtV7TMYSUt
+jjtBwVJeSOvcQbEfX87QUfSaEUisjN6ypjnIy/hzAF4/n28cAMTEWWxd32xZoGaD
+Q6rIkIZG+DLcXdzcPTiqZcc0cfec9NC1gEZZkFUue+obyn0sf9GCkazlhTYqUEuu
+V2v0NxOIgguppSsjjA9rQxYTXQmtXgmgiQPbvH+Rj+0z3yLFdj+EtU9nlLOkY9Ke
+w4uB/VAmAgFRRh9tUMbPYrNDie1BmswdRM4KJxxN7qEzp0pdErY8retu9UfAeotD
+0uQa4cQzHxFRotxvlqK+dUCFDgS34/RyXAPxRtgShbilsv89wqHGIoNB2FUSbuJZ
+xNSHV/nSAz0T1s2XXbQe/aIV/lbgpASA/pWKdnqj1zdA1hrgjyL1KV+4s1/bPUzp
+KQRGUnbAAOrq+d/JIafo36ho7TLhRXksq/QE8XcK0gFCb3ePlgPgTPI6ywIs4bs2
+2ojICLXGpYuKgSliwA93VA7dGVyBbnCGayCQ49EYNKTpishu+kwmEnIulVfMiImi
+2KQC/K2AVVCnUJUlDod2OkY/KqZ0vvf9m52H0X9EY8QDJByXdDk7+MD6V5IsaQZr
+gSDv89xCNlA7Kc9aesKaVOHBXus3qXlTjkpYdUgHMqhzXEQ+iBytdImB62x+ROvE
++9NLs0UQ7N8ErODFtxONwEONun4fuUpSVGayVgz+Sd4gGwDEgiLlUU2xTDRe2Hwp
+m7LkxPjrQT3CGgBSs150TTgtnvNRW2UiEyuVaYXGkT2uFJYF1qpHvOAIyS1Ter6p
+JOEZpTcYSVeSuzHRc3RT8EGn1L6FkSbNkKJnGfiMgQKnu5kCslgHiym7oTUyqzJT
+W1VafDgHUS0=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
index 0c502c149..5d174197e 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
index 60e78c7ec..4698590b7 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
index 9b48a51e9..dc5534085 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
index 60e78c7ec..4698590b7 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
index b290e26dc..23b839fba 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
index f44e0442b..10b233441 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
index f44e0442b..10b233441 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
index 06c3343b2..17eea9882 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
index e1a76bb77..32732190b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
index e1a76bb77..32732190b 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
index 550801747..b92905ff4 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
index d94e1b9cb..ad58fe465 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: expired2.example.net
-    localKeyID: 15 5E 15 B1 43 DD 5B 16 2A 5C F2 82 D2 9F 4F FF CF 2E 16 FE 
+    localKeyID: 3B E2 EC F9 FB F9 23 AD 53 E1 1E 17 2B 28 91 EC 0A ED CD 34 
 subject=/CN=expired2.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMswDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE3WhcNMTIxMjAxMTIzNDE3WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArgzEgDRr0AQS
-xDojWqcYJenCWDEY/NpODPKTf0AqA+8v1x0wRsafq56PsIyscc9V8hH1nrKy+yQ/
-9K9/Q31Mv6kHrdM17H0XkwYJXDrqoMbYzT1CYwssB9VxJtJyCccrCXVy3UNJ/H3x
-uEwuDdHBHRBjBZbpR/yScFUl2Ep4MwUCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE1WhcNMTIxMjAxMTIzNDE1WjAfMR0wGwYDVQQDExRleHBpcmVkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3KMWV+L619V/
+YRCxml+TMflwa2/EazeebWwhbwY56m9mt74EI1MQ/LClEbx+efvtJ3ZMPXN63FXu
+waqh1MOcgZjPCVlMGLeOINormPNoC7hByDfJy4C17nSsBUOkruozrL8OLteJVBPA
+bRUxHtIWM5w5Mkcz75B8sI/AZEq9NQcCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
 BgNVHREEGDAWghRleHBpcmVkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQBAd8eYuCaPHDZoXm8EwaiMkncqs3BTfLmTatgzzFtKv9Dmtmsc30dfsjuZnXm2
-l7NpRFUMmhKQy5eRx0ee9DdU8ZfckOQKNh6fZBVg2Yw4RO1XUtY6cxwtqNtGjsFJ
-jBiID/ON+1w9AMWnGMGfeJ0Hv8vUe8/YqP8fbunf4/LUVA==
+gQC8qwvBmde9z+En9n2WgVqkB1ki7nM9+c+zV7b0iSpeMCZ/n7vUBWAJcFLmOLDa
+zruq9Mi3H6EkUJSWlcPdKA5IlaXcvORAfaeCFoTpjZGSypbO3klBuWSRsf+zciih
+N77o/GTQK5+6Lo1XM2ArFyp4H6gDvLIjs7rbQf3wjJQH9g==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
index 44552a828..b4a6a03c9 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCuDMSANGvQBBLEOiNapxgl6cJYMRj82k4M8pN/QCoD7y/XHTBG
-xp+rno+wjKxxz1XyEfWesrL7JD/0r39DfUy/qQet0zXsfReTBglcOuqgxtjNPUJj
-CywH1XEm0nIJxysJdXLdQ0n8ffG4TC4N0cEdEGMFlulH/JJwVSXYSngzBQIDAQAB
-AoGABE/FqGVkDFWlf13vVUYRZ5MIYPXqaA0iZNi3ha35vHo25a3P7djqyK4XYijB
-9tnLh8EhJArKO0V1HiMg1HOsrIJP9YBryElg/mXS6aPqs0VeobasyddxcO2+ncMR
-ErAO/KsE0WGu4z2i4IGQm6F+h8R5RI4VjPG7kD1ozYCF/yECQQDihe/ojWWzEyEL
-7f/FqxRTFiNvwN52kd+G7CRmWnnKQ77+Jw5yRaw0AHpk4VUnVKqHz1Ihf9P7DwNV
-HCg9EzSxAkEAxLLPmJ4qXGH8sFc1OLkDuqebe+d1P6UOz7wKRw/0GLUIZT5XcxLV
-IkQpQY5Je3y59razzB8ZxBggSols/DUIlQJAVq4V7ZEd13Z8cMoz03nxnxGbocnV
-1t1fAYwfKaN5czKVRT/AwW1zxbphG3U2VoSJdMqajQMTJMDL76eEpkpRIQJAXPjr
-2QaBnVMPfkZqOJpy4coRWxqHOAMLojMOZJJs3TTMeBZkfVbceSrgmUTpBL5qo+ut
-xoC4zBBfSvv0EK38lQJBAKkOWDLJn2RGnm3Uf1k/3CxXy8DpO/hlOroPvErbIZzR
-wPrr3b9xPclZ1iCdE4mRxhKfpaI2kLzG33KUuimPpzI=
+MIICXQIBAAKBgQDcoxZX4vrX1X9hELGaX5Mx+XBrb8RrN55tbCFvBjnqb2a3vgQj
+UxD8sKURvH55++0ndkw9c3rcVe7BqqHUw5yBmM8JWUwYt44g2iuY82gLuEHIN8nL
+gLXudKwFQ6Su6jOsvw4u14lUE8BtFTEe0hYznDkyRzPvkHywj8BkSr01BwIDAQAB
+AoGAHBOLdKmcnrnmA2BldAM02ZzSp8lJkb86eNV+t6saKZv9fTo/5TgyfDAFAWnJ
+dRUQNlUBGfzHpfbayBLs6a9EC06csZ4uwxoymOvBcahHoldm3Q/yulFmO9Xj+yr8
+FolQCQ8scXIqrwnmv3/J4zjbLuEpYGxKTBxfDWmtJ6IxjBkCQQD3InbKmpbGw0rQ
+FEqvBRj+uPrC6sC0fjl74dpJwotssNhzxMtRjO06QnAR7ykXEXUFZiHKG92OZpKH
+GiR3oFUtAkEA5I1JGATEx1nOq+7i0RnxT8SQobm80GVYfTsj2wPeVr57YUAEel5O
+vrXyQJ5ggvwTX32wcvEntexGLuFKOvl7gwJBAIINKOZFo8LFUsFdbE/eJuElBxE7
+6F0Tb7y5hd36+tQf3EhP747i0pQuEjvd14nELgjBTlbFgzpE0Cc4oqgxP6ECQQDW
+wX+WRxzUKSoO2phcXSEnkA9LN+kYdLJSchi9+oOYRMJQXkQW67jYcMTiPS94xP47
+MzJyvvFOe2ZzNJR4l+abAkBPTo8GMj9u0zbtClPzKBY2jqMmNaW3gzftkApffJ37
+7WMYebjShYlLaIJTFZvdPwZTrxtbQ/+kpGcHT3dlPMmb
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
index bcf17cb26..1a7fe4cd4 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/key3.db
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
index 63ddb4752..7331ebeb2 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
-w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
-xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
-LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
-/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
-RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
-GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
+PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
+6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
+9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
+fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
+6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
+TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
index 46b01b37f..e86cf36d5 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
index 403f8f262..9b2d8d36f 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/key3.db
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
index 6070b42a0..da60eaf93 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: revoked1.example.net
-    localKeyID: 26 C4 F1 B6 B2 18 C3 D8 62 C3 B7 7F B1 63 FE 1A 05 7D 08 69 
+    localKeyID: 3A A0 19 D8 BC 86 12 CA 44 90 51 1E DD 9A E5 30 1E 15 C7 8F 
 subject=/CN=revoked1.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTRaFw0zNzEyMDExMjM0MTRaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDK3yZb8oFBEG7Z
-5FwtwC1uNRxr3P2UqPvPDBV/xPZ/zV+9hXdI6QO/jPuQg2GAfKKJEn+WdlJPXiex
-oCpCw4RIzBjGTVzc5LSHV9pBovKGwmybEnPcXz1olNxsKmxaSOPSCw8KdkSzEnAZ
-cNkWvzMvMaZuQNMw+rKq9uDyRzB1lQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTJaFw0zNzEyMDExMjM0MTJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCut9yQvAFmTP1a
+JQI9N3sGsBkh35w++U4lQf6FNe0ASQ8nqf5RbdbdTBGPyjszPjJreKug/b/l2gKw
+mm7qHxkep5xud3mjkO/Ia4lzdRe0AcUr61Ru6vfgwLn7aaypboABz9PllRBPwwCH
+ZfhRLRc9KBmCYqt88ko8zmky4inHmwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
 A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AHdM0sDiqGn0H9EllWFPVGRa3UR9rk4Asz+lnk2afcFQ/GSRSUEf/XnzaWT/sV4k
-4JS4Z61hpcU2xE0Woo5Ml8dtxmVKyB4TZ1KT9AijgZbNPG3KciK2fwedmk5gsSfE
-aOJ6H2nLuQfe8Ba2Ffzw7C6Am9FIiHxOc2gAPBYbyaZJ
+ABKY1Bv5fkvRtj10iU75/7lhoOQlRQ5U1M6MqzkhCAHuU7DeeJ3q6xhsslc1yHxR
+PbfN/2F0NDCfVSNgBbRIlwuCT/GkJLFN/7twIuV9N9nTOywqRloxemQvrzIZ6WQu
+ncV6INRNuCznybLEvvdl30TFhqLGJWYWZluZpKUC4qPW
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
index d3e6bd274..3a28790ff 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: revoked1.example.net
-    localKeyID: 26 C4 F1 B6 B2 18 C3 D8 62 C3 B7 7F B1 63 FE 1A 05 7D 08 69 
+    localKeyID: 3A A0 19 D8 BC 86 12 CA 44 90 51 1E DD 9A E5 30 1E 15 C7 8F 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI5YUUjsIypQ4CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJ7bIstO7Wk+BIICgA/QvrilpuGh
-nQD7SW4W0LMKjXXbOyXf6+SBU1iXFnjOiXMgPVWJx1eqP3M65+7PehK/xwciiive
-y+FMm8XspTw30uUXrahuA2j03EV3CETjE6fYVekMszDQX7/B0sZvjoP08QNMxeSg
-Gz9Qz2af/RqMDaEGr6oN1Asf6jrLXjv9qLv4uDL4JtYH2qY/t7ZRid80k9oM+0fR
-rPJ5Ekr2+vO9k4PkvYlu5K9KXRkJvlN47zrTJGbJIc3tj/SztmCNND2hAxFioBbR
-AeIKBG0/JhTEWl8ebjo71eWsjD3BEx4W02Lwe8a4oJDHv1zrEnfdhdNx4GsigEDP
-gkSyIT+/V7aH0kmGr5lRLcYKh0ofg7axF7Y1n0BKDrGy5kVwaDn3UMUaWAaCIJJ5
-7c0T3Ym5c69NMjdpuOF/LMUBWYz85N/EPdamnr/B6Bpoc0vPhPkBgQfhJfTjfKSC
-iniX7ShNkN+ELfDOSi+5aHRSSiFBd0lhojf20E3wPUQVW3XJzj+mXvxNzVyu0yrw
-oJv+1VUo2wjYhoyxmNbbjD9LUYIR+0D18xkUde27m6Crz7XhFvDKWoff5/5JWSnU
-sLcBQpMW9Yf3c8rf5N21fNH3aWxXY78Xbe3C7TvgXpRr7038l2Fk2Y6g7v5eibRk
-PE+cepM606kiHaRIsB7tT9Qk4+H1qBvxlkbVrpfbEqQhJZxJiHHboO/VAxwThAPm
-Lrk7LGLrGPuHyc19L2/9kZtDE1d7lrBdbx/U5j6yqXp+UNtNvReVe8SPnyRN2hzp
-+s7wnUZ1cZLIBldn9Pq7SD6XZCFBWRSGRSuJ3u9byPTkQyhWdXagRehm6YmY7xLE
-n+JKUzJ2GcI=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIHwcRwfkU9DcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECMoUT5KMQwELBIICgHUbtB7X+kXO
+4vAIUvQAZlYij1ZjVdeb5UDY/p6WyOUhXOizyyz6lrNR18ul4J1ibAjKH98B8ZIk
+jJSR9KDKv3TDu4Kx2tXcPR4qUb6yaFnA06DwrAXx4o/6/+dSKnBpBQPLf2H1a6P5
+0g4hq/HLIxxXQZemYEwsHM0KS8wcuJmq09JTjaFL35QtxsakCvYuo0rm5Mzjs65q
+sbJHkMR72aiZdwenUL8JQiYIHJ4R6jwNRCT+3cQKkICpjtBXhZ3AJr/783OY4drh
+Hk4TDglRDHyBsZq4RybFNxhwipK7KYhZFzEmrOyMMy8M9ZM4y11GYf3Klbk6B5c4
+nbm28nK3oNlDkbjwwbM06QRVdgfD0EeTL/ppEpTMV3b6H71Cbzdt+uqyLV2PVg+H
+iUsW2ORog6Il0yCHEN87NbOG45mhcXr04Cllu/SOc/PDVmt7GzmRAV0OH815JNZj
+F6Qufq063g8WVzLJgrhky/03Lv977ugBEFT1xiICRgGdj/tdVup/tIR04WG2qKM/
+wwLy70DwW/o0l9gXqTJ+wN4b9uUhPvhKxn5Jxqp7TdEgREKx44bV6Pjjz1X9gd0y
+eqpQ6/sG+h8vxru0Hzcwvb0XxqAnpQewVqD2Z5KdhoRuxj8CX6JLQHxiHOkJWbrB
+VsV2O/BsTs9p1mfiENLojenUMaXP0UGgzN8WkWF7oRLsqznozHAR8WcK6wlp4TgA
+Z7Laafi13nbLBRyVHhse70+WkMNBhJwRrPmpQicZynKe8Pjv70dAxYk4FA0B3F9M
+dmsVeQRqUh10JSVJ9DC+6y+tKPV6uCMBKKGy5mX9lHzvnoYWAff86H/7bogmtV70
+5mBPyioeH9Y=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
index 7b8dfe126..eadeb727c 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
index 4921a26d5..e3afb3976 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
index 841d1e60e..9070e6402 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
index ee93bf242..b8854e80f 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
index 2e97f7c90..5b32f24bf 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
index b677ef086..d25a9228a 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
index bce692b99..3034a2240 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
index ecf7677fb..566423a01 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
index 662fbf3d0..c22eab2d6 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
index e69c10a62..5c651a849 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
index 19858afcb..f2779a184 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.p12
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
index 7f2677d20..71241ea91 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: revoked1.example.net
-    localKeyID: 26 C4 F1 B6 B2 18 C3 D8 62 C3 B7 7F B1 63 FE 1A 05 7D 08 69 
+    localKeyID: 3A A0 19 D8 BC 86 12 CA 44 90 51 1E DD 9A E5 30 1E 15 C7 8F 
 subject=/CN=revoked1.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZjANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTRaFw0zNzEyMDExMjM0MTRaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDK3yZb8oFBEG7Z
-5FwtwC1uNRxr3P2UqPvPDBV/xPZ/zV+9hXdI6QO/jPuQg2GAfKKJEn+WdlJPXiex
-oCpCw4RIzBjGTVzc5LSHV9pBovKGwmybEnPcXz1olNxsKmxaSOPSCw8KdkSzEnAZ
-cNkWvzMvMaZuQNMw+rKq9uDyRzB1lQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTJaFw0zNzEyMDExMjM0MTJaMB8xHTAbBgNVBAMTFHJldm9rZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCut9yQvAFmTP1a
+JQI9N3sGsBkh35w++U4lQf6FNe0ASQ8nqf5RbdbdTBGPyjszPjJreKug/b/l2gKw
+mm7qHxkep5xud3mjkO/Ia4lzdRe0AcUr61Ru6vfgwLn7aaypboABz9PllRBPwwCH
+ZfhRLRc9KBmCYqt88ko8zmky4inHmwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
 A1UdEQQYMBaCFHJldm9rZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AHdM0sDiqGn0H9EllWFPVGRa3UR9rk4Asz+lnk2afcFQ/GSRSUEf/XnzaWT/sV4k
-4JS4Z61hpcU2xE0Woo5Ml8dtxmVKyB4TZ1KT9AijgZbNPG3KciK2fwedmk5gsSfE
-aOJ6H2nLuQfe8Ba2Ffzw7C6Am9FIiHxOc2gAPBYbyaZJ
+ABKY1Bv5fkvRtj10iU75/7lhoOQlRQ5U1M6MqzkhCAHuU7DeeJ3q6xhsslc1yHxR
+PbfN/2F0NDCfVSNgBbRIlwuCT/GkJLFN/7twIuV9N9nTOywqRloxemQvrzIZ6WQu
+ncV6INRNuCznybLEvvdl30TFhqLGJWYWZluZpKUC4qPW
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
index 5ad2d6082..ef6bdf764 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked1.example.net/revoked1.example.net.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDK3yZb8oFBEG7Z5FwtwC1uNRxr3P2UqPvPDBV/xPZ/zV+9hXdI
-6QO/jPuQg2GAfKKJEn+WdlJPXiexoCpCw4RIzBjGTVzc5LSHV9pBovKGwmybEnPc
-Xz1olNxsKmxaSOPSCw8KdkSzEnAZcNkWvzMvMaZuQNMw+rKq9uDyRzB1lQIDAQAB
-AoGAAKe8hFAsh1zvOWLvF/K78tQsav4ZZOaFfFi0pRH/cyWNqUYKFEE0aDpOAbHQ
-RHhNP2trir0ybNvdUvSKeRFlQaQg3cP1hfZfpf2OrG09e15wnwbgnGR8ajDxGk2R
-C5CxvCEQ2BjV/mCadY1dP4Xc1zJbmFPi5asOk1G8KbaFt+0CQQDn5Q+NzUYNanTm
-ABbVGK+04oWV+dNg5qrtdipouLUSl94fOL6AYwoa7FXRxEhfoU4TysjNdcInUvnN
-Ba3ChH/DAkEA3/XB2DT5vL/BKbEQtCjtUhY39Q2qItr2ERKCQeKniv+RZAILCYax
-hGlfDCxTR1goO/FkxId/AdgukheZ9qT3xwJAORWtN4YRuZm8PyZEeJ7EGi4tHldK
-jq8Z4qzVEcRuZq5V8q+gTbCTuz70fVfpTQlDVCH2PoW/jrihX7QHKzw8ywJAb8wT
-PuV7ATDLsQ81ommHxmFW/5oZoxqgmPcfVNpa/nUDU+P9NH0rYkjjbIU38TZdp0ai
-IcTtrrMG1GC5t7i0AwJBANy+lCT/l5RlKbK7ZQ1hZbOnOANdPIu40fbR/bJM6iwb
-LMWGkSlk0sIFGvwi01D13vcTrACtrFSkv7gzn1YyCyw=
+MIICWwIBAAKBgQCut9yQvAFmTP1aJQI9N3sGsBkh35w++U4lQf6FNe0ASQ8nqf5R
+bdbdTBGPyjszPjJreKug/b/l2gKwmm7qHxkep5xud3mjkO/Ia4lzdRe0AcUr61Ru
+6vfgwLn7aaypboABz9PllRBPwwCHZfhRLRc9KBmCYqt88ko8zmky4inHmwIDAQAB
+AoGAE8REZXGHvQGv1h+CwddBiW+p4D2yqSM+dpOhToPb1ODvIH8ogSDqoq3E/N4V
+1YXPYX5M+JFMwR3pmP5X1w/+oNval4VyZRdVrOdmtoD5LSAyjQDe//XH8d4qh+sg
+MGWCMFSLnsM+xo/K8mAMjcKQZdRA1D58KE/uy9xIYBotAakCQQDYfhJFrrnfCG29
+Cvx9AGuJktJ3nmEYgXmSI0sq1nUo7SsyEqYSu3R3WlzoedZxGWZRPj9it+olFw32
+1m+f7fhJAkEAzpo2a7J71uy3BXIxlK6B9hNoBmp/Y4feWQ9tHqL7klvKa43uL4AB
+NCc4zUD1ghEx/DWMvQ8Uxm3Msk+CGshowwJAPLFTZA+w8jMFuNrMoCqu+zmbIYfY
+Rqt9rpeQaikHXXroAjiyMEw3QYKmy1Hk6X4qbhpaYM2Yqd9Fve6uCpMHaQJAG58u
+i3OPbwqy5X2A93nlUjsB+2mdonb12T5gvmnX7JdtFrghEiSxBIIB7B81M7CM2EVo
+jZZIlsbzSRusL1x/9QJAaEQb6mSgjK0DgtYMMkdAfC9DNDUr9B5OBhGomA84WQYC
+S1MbMj+sPi6beJTCP5HtLWYs7i6fXSyhXiWaXEHLvw==
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
index 63ddb4752..7331ebeb2 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
-w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
-xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
-LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
-/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
-RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
-GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
+PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
+6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
+9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
+fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
+6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
+TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
index 6e4fa2b27..f7719d6e6 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
index e16854303..0b6b6f83b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/key3.db
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
index f6eda58c6..39248dee2 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.chain.pem
@@ -1,35 +1,35 @@
 Bag Attributes
     friendlyName: revoked2.example.net
-    localKeyID: E6 0A 1E CD 7E 1E 3C 01 48 74 7A 8F FF 72 FD B8 9B E6 90 57 
+    localKeyID: 26 BB 8B 03 3C 5E 24 21 F4 F5 6E 4A A4 1E BF 2C 30 44 F1 BA 
 subject=/CN=revoked2.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/apGI+TU//+e
-Im5k/lK3vazxvX6BKRjFHWp0oqpYflECPMLM4j8gOo7RmlY1WV9BCswJ7XqOQg+6
-3q1vv/gT8YQdemMSEVYBOitf/byDXgq/1ryhim7FNd4f33nyG1r00f887/ohCsZl
-bEy8h8SiNgnfbudutgpGZKpypggxvT0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE0WhcNMzcxMjAxMTIzNDE0WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsvTu1iXdH5k6
+LxZgoOo+Mb13Ym2vQEG6zGo6Kjtu3WPCc2bQEeiA+JhHIMyv7uAqS0g4koYVU3ac
+bg6qf/SjrymWyUGlFQn6ZVUxm+A1QI8tsU7Nixc5wbZQGtshrobGMYMRYORrv5AF
+tMKMQVf+IzKNHrDS4qDk7hyZPCSJujsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
 BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQAs+NWJxd2V4TWn1KVdP0fycQOkcwqx3L3Md9Q3fgnn2Sx6OrRbOie3IpGWx2Pm
-lf+NUGBKI33oaKpOr6Hu2kqE4M/qGssoMjXUQS2B4RxCfHiod/fjB+O66IThrLYE
-4aLWdUMgk0dd8Ep8i0ssDLzcdpDd72ASS2f13GdYjP15tA==
+gQBto3HIMUJyB/kh422w2v/LTBY1YeGu70Z8zmJURnTmpMiURPX29P9TweM2cffD
+HgnEm0lAKgBubW+9kTbx2Z5vEhDHt+MulC3lBWBZgyXZrtHyJyrqDL2Lo9L4gWt2
+H0h3vuSU9IjrZZ6EyyiZTbLANlK8Ve7hfUvxQpuCb+zqlA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
index 5d1184180..890525ec9 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: revoked2.example.net
-    localKeyID: E6 0A 1E CD 7E 1E 3C 01 48 74 7A 8F FF 72 FD B8 9B E6 90 57 
+    localKeyID: 26 BB 8B 03 3C 5E 24 21 F4 F5 6E 4A A4 1E BF 2C 30 44 F1 BA 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInd56Mc5DjZ0CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJo8VFTap+ZeBIICgPvKz4ydRWcw
-YKpGYAYu3etaBLW9U7DiLMyONabHO7Dz2xlrPkDUP1Ph5V6nLqiMXcNdco5ULVz/
-mlITC2ZVaKfSKJkTHvGrLbhGIpdJqfSxrKNLw1NOXDWH6dLNKdCyXwAglCulvyEO
-54h1l2FPxg3SHsjaMa7SZZ03qXwfhICLBSqqtf33Goh7GdabdlgUDuaSdSq0czqF
-3RcF8+UCFUR6uAUP2yBKXhf5gByMR0Ah7rdCXfNJCg9y/DWT+PCfdH392cROkLkM
-HhzkzoSN1BiU3BqljYGVyvJS6LO8thUhFviZoalMEkFZR4hFa0Gj8tuduY5Dbdjy
-BK3jbxh7cKU1T/1HVGdKM/9JdEsBFEhrkiLwNFZEWNtBVNOAYZihWlQmVsgRW138
-YVbYoe01W//o5gPToShxce7kfXS2HQyi3PZMEGVlXQxIAYOubmMox2MDVqbCIUdE
-xGpOYyJQicv1wH0J0IeXAxt+LTeC4y2wZTi/jq97NriveBbswBp17gSj2uh1hmaD
-6OkJyvhh06EMxmwofGQNKVCOKHQGKxAVUKTcDOtNC00Lk8BghXaRxx+VLs6Mg09x
-PE9gBTlIH2UaE/Wpe6KDd11c/09zudbR56aoX69R+hhzF9VdRZYqynDMLoM57UtR
-na3qH3Ww9/ewUzAXlSChy9fbv/5Lwi8jU+sRGiVuK7D+7+5doOivcDBoGTa3vN5N
-OxvE1U0dCC6rh/64KnC/y8dyL9ye2GC54gg4eVEKetFyHLjaegCsPgapnn5Cobn9
-S/hAau/deCRguEhGIFSLcJlewrJnlrNRaD1tJgdBlCSeNe9BqE411ue0Pu4PjAul
-J4aV/QKHhKw=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIiQ0ALEbm9UcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAGlXdbzIersBIICgAjHhQ3Roexa
+qfeg+Gouc0vK5gqz8yWI/ci7Y4v+CP2uRUsN0j6xSd4IrTwZyhy7Bic/qLEfxdH1
+UzkveD1lZ0bXqYL4P1F8X61CujQfU0jGhNf9al+dXJHIKl+OiQrwiFgPoVgcQ66w
+xKl17gJD8Boqb6n9Udm5xmXf1jQBMLOX+i+dhCS+XiV9HeFx1AEK3UZt3XzHBFoG
+ez9qnB47+6PLFaBGCNS1KU+aHDbgaXE15hcZYobFbSl4K6KeIj4kY3qQiCD3gjtr
+mR9dK4JWqn6NT4IPNEJ+mgBGHCo97Tv8ZYMbc+1MO9MxCvQDHuytY0MP3wbJlkF4
+HO4qL3u/Dn+WeNPUWk6lhQFFVCv363M+B2lCj44Priv6x+hU7AHlcmYQXRvhgSMO
+r6ftngEufNr+Noev8Xx849nbMh7D2WpCIZVTFamqfeYIt/sdYRRILXBy/4n0a3gk
+pkNhUiJ3Oo8uYQUXiYKC9+U9q9qKiV4IKo7kADt/rppORE3BqdlQAEbzBhLJpzd1
+uMGiww9jCNTsCIzmmdzHMKN41LKLtpwQtKry095QGwYV3WoNS0ynTseFkCp0bbl4
+U8Jf3hPsgcKKou6ZPyKg72yFNqHuvg0rDSE+SwjwqbyLC44HoBYxvQT9XrvleypR
+XEa1bDFIQqZdOViAt1IP+NSkPK6eLwIlrZtiPsbs5Ph/3SkuMtJbUU4RX3on+m0F
+wAKvooW+ruGOygmav5SmlRX9IHTicwYC1EwKaJ+60LyufcQS0xh6wyO0ICjMOb/h
++HrIKHQZRYBolS5MwnQKhjLEinWaCBh1/dUslszpP85bN+ddFeQFr34hhX8X+FcB
+BjLygEHjP6Q=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
index 0c2946011..d85c98cb3 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
index fe24be47b..28c63b01b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
index 81438c5da..1a339eadb 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
index fe24be47b..28c63b01b 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
index d3e991342..7247b3a86 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
index 3d8145a32..f1b928070 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
index 3d8145a32..f1b928070 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
index 740c15093..3aee14948 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
index 61aa79bf8..1301739b0 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
index 61aa79bf8..1301739b0 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
index e24e62283..3d9fff58c 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.p12
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
index f8c4e67fa..66f3cd627 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.pem
@@ -1,21 +1,21 @@
 Bag Attributes
     friendlyName: revoked2.example.net
-    localKeyID: E6 0A 1E CD 7E 1E 3C 01 48 74 7A 8F FF 72 FD B8 9B E6 90 57 
+    localKeyID: 26 BB 8B 03 3C 5E 24 21 F4 F5 6E 4A A4 1E BF 2C 30 44 F1 BA 
 subject=/CN=revoked2.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjjCCAfegAwIBAgICAMowDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE2WhcNMzcxMjAxMTIzNDE2WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
-eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/apGI+TU//+e
-Im5k/lK3vazxvX6BKRjFHWp0oqpYflECPMLM4j8gOo7RmlY1WV9BCswJ7XqOQg+6
-3q1vv/gT8YQdemMSEVYBOitf/byDXgq/1ryhim7FNd4f33nyG1r00f887/ohCsZl
-bEy8h8SiNgnfbudutgpGZKpypggxvT0CAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
+MTAxMTIzNDE0WhcNMzcxMjAxMTIzNDE0WjAfMR0wGwYDVQQDExRyZXZva2VkMi5l
+eGFtcGxlLm5ldDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsvTu1iXdH5k6
+LxZgoOo+Mb13Ym2vQEG6zGo6Kjtu3WPCc2bQEeiA+JhHIMyv7uAqS0g4koYVU3ac
+bg6qf/SjrymWyUGlFQn6ZVUxm+A1QI8tsU7Nixc5wbZQGtshrobGMYMRYORrv5AF
+tMKMQVf+IzKNHrDS4qDk7hyZPCSJujsCAwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzAf
 BgNVHREEGDAWghRyZXZva2VkMi5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOB
-gQAs+NWJxd2V4TWn1KVdP0fycQOkcwqx3L3Md9Q3fgnn2Sx6OrRbOie3IpGWx2Pm
-lf+NUGBKI33oaKpOr6Hu2kqE4M/qGssoMjXUQS2B4RxCfHiod/fjB+O66IThrLYE
-4aLWdUMgk0dd8Ep8i0ssDLzcdpDd72ASS2f13GdYjP15tA==
+gQBto3HIMUJyB/kh422w2v/LTBY1YeGu70Z8zmJURnTmpMiURPX29P9TweM2cffD
+HgnEm0lAKgBubW+9kTbx2Z5vEhDHt+MulC3lBWBZgyXZrtHyJyrqDL2Lo9L4gWt2
+H0h3vuSU9IjrZZ6EyyiZTbLANlK8Ve7hfUvxQpuCb+zqlA==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
index 685436bde..f2fb32013 100644
--- a/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/revoked2.example.net/revoked2.example.net.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQD9qkYj5NT//54ibmT+Ure9rPG9foEpGMUdanSiqlh+UQI8wszi
-PyA6jtGaVjVZX0EKzAnteo5CD7rerW+/+BPxhB16YxIRVgE6K1/9vINeCr/WvKGK
-bsU13h/fefIbWvTR/zzv+iEKxmVsTLyHxKI2Cd9u5262CkZkqnKmCDG9PQIDAQAB
-AoGAB3Krrwudvmt+tOOZZwc+Ol081tPDTpXZ2ciBprIKOaE+x9Jvahgw5c9CM74i
-wF5F3l+JzhV6XlGwaq/cd149FZwUySG8wAnB+rXz+Sxiu8GyXX8QHGS5MlmgYEu4
-jPK3gY1V3098eXY+75O8J/22ITIohcDMA5PzEeQns7P7LTkCQQD/F8V/cEZJiwVn
-QMHRNGlFC2Up1dYC5gUzwPJHv7I6NAsDmd3QDiIzBCHyFMGDiTV1uJ1kgALh2LG5
-sdAZr5LlAkEA/pEz56wRKLrsxJAqzyZcQKZZXrJd3k53ocr/aNRt8sLNuPYZ3bz4
-6QEPdjJWa2NRGG4Bh3yaN87fLd9JhKAjeQJBAJUFwBz47DbefmOZkyCya6UoSQst
-nv7GfdeEKoX72RTjfmO2Kbz35MbE7UfNFFfRemexWFFz7zsdKoZ++EFpLnkCQQDO
-BFkLTrd8TPq8gSgECTlzoKyG9Lb+6GXs7EoTXoe0hW7UF2cLipmuiAspTsedlPzW
-VoCqU27DZ4o6p4/p42eRAkBAFcz5M9OsETk1OIOrOFbHXrhRENLhoTs49CAG3sJt
-F82g7LnXWMVossWYR+rTGsuzBMQCM7CNw302l1ew9f3M
+MIICXQIBAAKBgQCy9O7WJd0fmTovFmCg6j4xvXdiba9AQbrMajoqO27dY8JzZtAR
+6ID4mEcgzK/u4CpLSDiShhVTdpxuDqp/9KOvKZbJQaUVCfplVTGb4DVAjy2xTs2L
+FznBtlAa2yGuhsYxgxFg5Gu/kAW0woxBV/4jMo0esNLioOTuHJk8JIm6OwIDAQAB
+AoGATPYSGs2o1ZSHlcWJY9qpSaniRFXIdxltdMjAX/Y0XQiwkQGnvPPhN0gB2uS8
+Sr5j4gFatwTr+ft6Fci/4Yx7sbpWWacbg6P6iCo0Un/bX/cGRo/QpPL/im2y6zvq
+0FdIO8IjvGaiM/FDjs7hMwfS20jA+dT6IyccqWNYetfYa8kCQQDXDH8zy6nj96iF
+B6EijKupYOl+dmUSWSKpxMaX0F5hud+k6vV6tOl0pVlmEhLZUBj99quZ1lkYFOEh
+s+vdke7JAkEA1Qj4Va0a11UGFD3Bf4StmYzpnrWBQtd/gY62kwnrFO8nZZPn4OoC
+Ywu9KulG1SIHZKqN1KF/QTaJ71a9jnQO4wJBAIyAC7OJgswAiMexfmOWSKl3OdZ3
+//0G45DLkXyqlJ+A009qe0vaWxTs2wXHFS2KGWoD+YWe98K2EYj1hkrTB5ECQQDK
+73aRNwtgoQ/fbEzNirhMk51goIp4AAzof+iP/VzBXmhrLRAwgvqvG1mibQIaugXM
+8WOWcBlnJ+sR4dFEyG39AkBDUpliGMxCkoymzHrg9wFqzLMECKCc3ONhFfkz1J90
+gclTMXODHY4NrVHNzh4OtADzmTJmTRb7d7sbM5/Q7zJk
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
index 63ddb4752..7331ebeb2 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
-w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
-xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
-LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
-/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
-RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
-GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
+PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
+6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
+9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
+fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
+6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
+TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
index 209e7bc7c..16fea6332 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
index 5534c777d..d4027d536 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/fullchain.pem
@@ -1,25 +1,25 @@
 Bag Attributes
     friendlyName: server1.example.net
-    localKeyID: 89 6A 06 67 FC E8 7F D7 48 DE 8E 5A B4 A8 9D F0 78 77 28 E3 
+    localKeyID: E0 8B FD B9 87 58 EC 1E 8E EC FA 9F 78 EC 6D 7E 9E 24 0C 17 
 subject=/CN=server1.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTNaFw0zNzEyMDExMjM0MTNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPuVg3pbveHgoKH
-fUNkYTlf4eihEIsk2kfsGKyw0zibuPQabxKThrKDjx4/m54+pJbuKF7pWolg9XGy
-xpR/qGDLvzzo6bfMZh6rm0fxbOT8XpXpMLoqE3kRIJEymNqx3gkMIEYbP3OKzP5x
-u+VF9LcINNmFzQU3Mv6gE9VLajS1AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MTJaFw0zNzEyMDExMjM0MTJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMJfigB1bwusGslh
+v0GCQtOb+OKCiRNNfBbV09wozWYySTVJPCYBPy20hPJsNU5fw8nUOfSr1kenhbiq
+CRJ/B8Tx6mLpR0aIr+iUO7Is9XwGglbVmR5TfZ7KQCrgdW23XUwp0ZoixtrucgCQ
+5mka6dJrYQ9WwIQTB+fSN33bECatAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
-bXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2Vy
-dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQB2UWYprO3yj8kXHaFQ
-NxRMEvOqU6pPzntU7JtbtU9AsjQEN1B6rlUUq8kGTVbK5D+ZcLWMZ8Q+KzXVR8YU
-1GFN1YGEH8godVnw4mXB90KJQ4xlz83TOb/ZiJM7yIKeYylTiHP8unuMWjYQz4oE
-pmHSoBPGUzPBZHpqYL5aZHkBOA==
+BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3Nl
+cnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2Vy
+dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQAyIjcFDOgOnRBOMTL8
+uBTqg2dbA9ptcegVtk+QWHST4/Iq4Uqf52CP9Sii7ZGf3xOT4NP6PTbOr354o0kg
+6S+uEzVeUJOa5PPt9RjfC8PeBx+HTLnZzp+iKok3fNOp+HXCJWzhSbNL5WejGGH1
+ZJqnF5j4eeF9OJc+Ju99pB+Ijg==
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Signing Cert rsa
@@ -27,17 +27,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -45,14 +45,14 @@ subject=/O=example.net/CN=clica CA rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
-w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
-xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
-LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
-/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
-RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
-GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
+PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
+6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
+9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
+fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
+6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
+TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
index 9067e2c78..76414ae42 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/key3.db
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
index 890772102..1f2b4b7c7 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.chain.pem
@@ -1,37 +1,37 @@
 Bag Attributes
     friendlyName: server1.example.net
-    localKeyID: 89 6A 06 67 FC E8 7F D7 48 DE 8E 5A B4 A8 9D F0 78 77 28 E3 
+    localKeyID: E0 8B FD B9 87 58 EC 1E 8E EC FA 9F 78 EC 6D 7E 9E 24 0C 17 
 subject=/CN=server1.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTNaFw0zNzEyMDExMjM0MTNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPuVg3pbveHgoKH
-fUNkYTlf4eihEIsk2kfsGKyw0zibuPQabxKThrKDjx4/m54+pJbuKF7pWolg9XGy
-xpR/qGDLvzzo6bfMZh6rm0fxbOT8XpXpMLoqE3kRIJEymNqx3gkMIEYbP3OKzP5x
-u+VF9LcINNmFzQU3Mv6gE9VLajS1AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MTJaFw0zNzEyMDExMjM0MTJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMJfigB1bwusGslh
+v0GCQtOb+OKCiRNNfBbV09wozWYySTVJPCYBPy20hPJsNU5fw8nUOfSr1kenhbiq
+CRJ/B8Tx6mLpR0aIr+iUO7Is9XwGglbVmR5TfZ7KQCrgdW23XUwp0ZoixtrucgCQ
+5mka6dJrYQ9WwIQTB+fSN33bECatAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
-bXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2Vy
-dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQB2UWYprO3yj8kXHaFQ
-NxRMEvOqU6pPzntU7JtbtU9AsjQEN1B6rlUUq8kGTVbK5D+ZcLWMZ8Q+KzXVR8YU
-1GFN1YGEH8godVnw4mXB90KJQ4xlz83TOb/ZiJM7yIKeYylTiHP8unuMWjYQz4oE
-pmHSoBPGUzPBZHpqYL5aZHkBOA==
+BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3Nl
+cnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2Vy
+dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQAyIjcFDOgOnRBOMTL8
+uBTqg2dbA9ptcegVtk+QWHST4/Iq4Uqf52CP9Sii7ZGf3xOT4NP6PTbOr354o0kg
+6S+uEzVeUJOa5PPt9RjfC8PeBx+HTLnZzp+iKok3fNOp+HXCJWzhSbNL5WejGGH1
+ZJqnF5j4eeF9OJc+Ju99pB+Ijg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
index 40a86efde..f0363be79 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server1.example.net
-    localKeyID: 89 6A 06 67 FC E8 7F D7 48 DE 8E 5A B4 A8 9D F0 78 77 28 E3 
+    localKeyID: E0 8B FD B9 87 58 EC 1E 8E EC FA 9F 78 EC 6D 7E 9E 24 0C 17 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIhZEQ9rAxa2sCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOgRV/f8pJeKBIICgHhmTZcserjV
-BeTa5fGZn4DlwkbW4ka4wpD6vzByQZdQtvuKhenmkwFa34v42XbGkahWDRQA2QMi
-FyXGE8OXxDVfs5SQCHOo/euyH8K3du44NpdvXLuscnJ7Iv8ZUi8MP8AmtbevznDT
-PR55ntaEreuz+SVoxn7E6Pj0qhoSsKyCBf7k1IRXywrVnQvENbDlkSKRidlE1O6x
-YU8i91FjlYmwy1eFWHwaedyzSHdPDRDq6NWXK/rIMTdYfPOYWHlDAKBC1yxBzoHQ
-X+Ppbk8lkBJYNolVbum2O+/qGlgi0dk2CW4HVTkhzJ/NEpWDprOqxxg4sQXU5hJw
-bX6s2lA5C8Pe4qNRM6mEVLGs87aat8y8lhuILWXlPc88ybBzmH6x+B7m8W0NdBa2
-oqkRjXs+VUrVvtf7s69aXQutBxMhSDm3KV0MIni+C+VE3UApahjEMZVsExmpAq7H
-GBVJMY8k+oXtvIwYXbdkD9PQbfia2NijJ5LRUdCuzhVRdHumPQFdm56LDqxMw7zN
-dsJU//sXbnFARXH9i2uNEHxKwPTN4cOdY80SR1b9oCqjtlrO3kCSSSbDTDHPGklJ
-cyNG40t8urPLq8HR4z0E2tlKlultniRvPhsdy6DGfE2S443ksjWX7xPJAMF66ALC
-ind6X2VapvNihTKzejN4R6dkomcXTSxsxk+cYd0g3k7+fBQeTrGQpjecJYuRIS1Q
-M33q/rYtEFqRoHM2o+qK5URdZ10DiiUrHEw5U7hm+eWpBMj/T8KYR8gNEKd2nTIE
-erHGPR4OBJdUh+8ecjW5GI0U9207XSaMrZRATN220yHth5027Qf/HakqN9jNkepl
-Ybchh28QUqc=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIB8awWTQJWDwCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECHhODpPcFArEBIICgOVTDWy3/4t7
+IXPphJtRLBVmh1VdpsaKk9V6FBmkCFp887CjSAgV0yhh9G6zbLUIAWdO/6tVdoSG
+dBqy8euIOjBqOx8BQWNlwlhSSL3JSqTL3zLBHwcAf803Q0RBBbHy1/lnwS2IE5Jo
+RapBH4VfoDNosSS9e6bvMSUB2a+Vn76A6rgI7KAJ9Uw9MokMTXjJly+VVix57NWs
+epRhQ6eTCA9uw+Y0ZJ8zMeDHANrqIRNKpHUjjQNfoK0mC5tLVQtrIBF4sHOC3dZI
+PMa2OZZoJb8Mt/nGIjTScyubTnoDcHZ9WPzbU31VC9lnM7zSR1Qmykd47vnSI/08
+Zrnxx5uqysOrzuV8iM5+5qmxgV/6bK56jR7BVS+vXP12YlIJPtgk0FefUctMl79H
+b73G47D2qKIhnE4ecNHafN2Nfn7y4DbIINdYxKobrtG2NM6zcYRXpOhaXWhgYvkL
+sPymFzg4AyrAmwiWKSIBHSioRstakqpkNM2uyYbqQSlTRc1v8fgBFxeyt3eVj9mR
+h5qGpwpzWHXaS8tpUOyt06O5sNoSQFErSxMtMcsgHm5Ey3+/KF0Qi/PvZ5BmAV5D
+M1bWMecFOvQDHMl0b6Kwr76KQiqd8+1zfwZqhNbc0kFtynjfIJrerL5W7YBW28an
+mWw1jHjyezazY9od3JjOq3HWMzHEogwzlAYMlZ805aQPqI8ElIpy6x/s9ouvfopN
+dBgLpWtbO2xd03fkKi5OlovTYiDZsebgbaCJJB0Ci0xqyMW9OPpxITY5UEHwA610
+H880Eb92S/WBH9k4NbXjHwoACoQ9iCHVjkmWroqEAYobSu3p93j6hH3i603ZhwOq
+1fsbKWsLu/U=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
index 9f9485639..84a3a846d 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
index 4189e9fbd..759a1d48f 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
index 37e33cda6..98c399e41 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
index 5dee084df..1f8da6889 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
index a56d972d4..ba9f63b99 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
index d1d73014c..dc8b758d0 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
index 331a855f7..1bb17e851 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
index 0b6b0a50b..738f33c56 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
index 4aa66664f..c09983f1b 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
index 260459bf6..017ee1d30 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
index 4ffeadb29..4958c2672 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.p12
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
index 3e781a983..6b43ef1ab 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.pem
@@ -1,23 +1,23 @@
 Bag Attributes
     friendlyName: server1.example.net
-    localKeyID: 89 6A 06 67 FC E8 7F D7 48 DE 8E 5A B4 A8 9D F0 78 77 28 E3 
+    localKeyID: E0 8B FD B9 87 58 EC 1E 8E EC FA 9F 78 EC 6D 7E 9E 24 0C 17 
 subject=/CN=server1.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIC3zCCAkigAwIBAgIBZTANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTNaFw0zNzEyMDExMjM0MTNaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
-bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPuVg3pbveHgoKH
-fUNkYTlf4eihEIsk2kfsGKyw0zibuPQabxKThrKDjx4/m54+pJbuKF7pWolg9XGy
-xpR/qGDLvzzo6bfMZh6rm0fxbOT8XpXpMLoqE3kRIJEymNqx3gkMIEYbP3OKzP5x
-u+VF9LcINNmFzQU3Mv6gE9VLajS1AgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
+MDExMjM0MTJaFw0zNzEyMDExMjM0MTJaMB4xHDAaBgNVBAMTE3NlcnZlcjEuZXhh
+bXBsZS5uZXQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMJfigB1bwusGslh
+v0GCQtOb+OKCiRNNfBbV09wozWYySTVJPCYBPy20hPJsNU5fw8nUOfSr1kenhbiq
+CRJ/B8Tx6mLpR0aIr+iUO7Is9XwGglbVmR5TfZ7KQCrgdW23XUwp0ZoixtrucgCQ
+5mka6dJrYQ9WwIQTB+fSN33bECatAgMBAAGjggESMIIBDjAOBgNVHQ8BAf8EBAMC
 BPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkw
 J6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEF
 BQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzBw
-BgNVHREEaTBnggkqLnRlc3QuZXiCImFsdGVybmF0ZW5hbWUyLnNlcnZlcjEuZXhh
-bXBsZS5uZXSCIWFsdGVybmF0ZW5hbWUuc2VydmVyMS5leGFtcGxlLm5ldIITc2Vy
-dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQB2UWYprO3yj8kXHaFQ
-NxRMEvOqU6pPzntU7JtbtU9AsjQEN1B6rlUUq8kGTVbK5D+ZcLWMZ8Q+KzXVR8YU
-1GFN1YGEH8godVnw4mXB90KJQ4xlz83TOb/ZiJM7yIKeYylTiHP8unuMWjYQz4oE
-pmHSoBPGUzPBZHpqYL5aZHkBOA==
+BgNVHREEaTBngiFhbHRlcm5hdGVuYW1lLnNlcnZlcjEuZXhhbXBsZS5uZXSCE3Nl
+cnZlcjEuZXhhbXBsZS5uZXSCCSoudGVzdC5leIIiYWx0ZXJuYXRlbmFtZTIuc2Vy
+dmVyMS5leGFtcGxlLm5ldDANBgkqhkiG9w0BAQsFAAOBgQAyIjcFDOgOnRBOMTL8
+uBTqg2dbA9ptcegVtk+QWHST4/Iq4Uqf52CP9Sii7ZGf3xOT4NP6PTbOr354o0kg
+6S+uEzVeUJOa5PPt9RjfC8PeBx+HTLnZzp+iKok3fNOp+HXCJWzhSbNL5WejGGH1
+ZJqnF5j4eeF9OJc+Ju99pB+Ijg==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
index e11876ed9..9c36f80ee 100644
--- a/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDT7lYN6W73h4KCh31DZGE5X+HooRCLJNpH7BissNM4m7j0Gm8S
-k4ayg48eP5uePqSW7ihe6VqJYPVxssaUf6hgy7886Om3zGYeq5tH8Wzk/F6V6TC6
-KhN5ESCRMpjasd4JDCBGGz9zisz+cbvlRfS3CDTZhc0FNzL+oBPVS2o0tQIDAQAB
-AoGACky/mRVSpmGLLc7/ab56Z33Z3m2GKWOyXxih71yi+1HoIybuEIFOec+2gtdq
-YlO0Oeibr4HYUQEUagDwsT1jYFrkxLBgJhMR6Ne8Pk6qyWeBlTdYR2XyGecUMwhI
-1O0eflznu1e+U7njKpet6Qa5g3mlJWLTXpTVy8BhIFWBG8ECQQD7Lzm3BzantQaI
-UM8gvvDElYUMABHRNjiMNrrMv6fccbkdRacdI/nnR4ldBP00m8Rkfq75YdTsp245
-VDPgbC1BAkEA1/518eZFzyrvlzDh8GLuj7rO7CPg62aVlocCBcIPfi0Xocs6v07D
-aYNJ8g18q2+VgYkxrx0C+87WX55RdGoGdQJAUGsAOV7v2qWUX9QvXDaFcwrDu+HR
-0n9ff1SOXbsGjQdD0uFX7XZ1LdyzV7qfLlaoe9wrPOBbgSDhoy0YJsO7gQJAKdbx
-0+zuQuYnSRs/+QfA/HiMUrPUguT5PxJh8umXhLKJbF7ov1wrgEndThUMvEy+IjyI
-MkqlZE+5uQX681kCbQJASY8cM4oPsXlUu5gnIFtWTVtejy8DWhb9VjIsPd19q+zI
-Cof7eFHYwJxHeY40PNUPMSStpG1b3/bJ7OoaVcmkyQ==
+MIICWwIBAAKBgQDCX4oAdW8LrBrJYb9BgkLTm/jigokTTXwW1dPcKM1mMkk1STwm
+AT8ttITybDVOX8PJ1Dn0q9ZHp4W4qgkSfwfE8epi6UdGiK/olDuyLPV8BoJW1Zke
+U32eykAq4HVtt11MKdGaIsba7nIAkOZpGunSa2EPVsCEEwfn0jd92xAmrQIDAQAB
+AoGASFKGJa+MVvp9qQq+wCA4v0XcsGNDn7QIBPMg9l0UN/9j7/jE8ZsrJ9VwVkde
++j91uSZHPjul6llxzwktgP1VJRL7yqNU7R4SLnH1R/vxcNxrthMQNhPKDOhuuFHu
+vwbJuGCXP22Rs28uRoi96SYC7VyvYtrVTopHFLruD+riqb0CQQDzsSfyoapFiVmv
+3vH490IS/h8KXPKP0dFOuH2rbVM7gu/SrbdBgDVH0wgmNB6mVeHnZeXbWU4FqEVB
+ppRzfF6XAkEAzDC1r9HbGCro1vLK4KHoIRgJ6IsNqnP0go6maG4wXfeTW8Ya6T4n
+aRqvUTZm7W7bElnBlBfnRGYfc61SVdGRWwJACQ/MYXxbfYx29lA/BTgEj/o9I0CD
+kI+HzfqUSbyd/LeIvXfSObBPyuTxB6KmhR7qcJVcb8SpXxJ7yM4t9QFp7wJAUDy/
+2IQ1fSy3bGfh8x2MUxzYH+osh5OjPH6Dw7uxA+vamxCg2JDU+cdDpz0ieyC5s19T
+4zb1aPpcV59/IDwGywJAYIfTR8dIWJ2GiO8PbLPbeQCD75zdFKTzJ3iu3FXQs+eG
+j9YkYoOCrd0N5lkv2VVFYdUFJ99qKLgcehxzqCihBA==
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
index 63ddb4752..7331ebeb2 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
@@ -4,17 +4,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.net/CN=clica CA rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
-w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
-xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
-LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
-/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
-RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
-GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
+PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
+6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
+9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
+fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
+6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
+TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
index b34623cca..e026addf8 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
index f7a2a621b..e1584f4bc 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
@@ -1,24 +1,24 @@
 Bag Attributes
     friendlyName: server2.example.net
-    localKeyID: 9D 1A 7A 47 26 87 CC 9E E5 9D 04 31 80 63 EF 87 D5 E9 3A 6E 
+    localKeyID: DB F0 A6 20 CF 85 FA 97 D5 2E 21 63 FC 8A 8F E9 19 D5 F7 F4 
 subject=/CN=server2.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE1WhcNMzcxMjAxMTIzNDE1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAATRVl0QgxZDT
-pR2QEQ6T4Tf4T9LKY1tI8Dv/S21Ky79eOipi3clGt5Ses1fAlYZ1YIx9DvSE/Zs2
-eaa7BM7A4uVuubzTVibYpmQRnoP6+aq3T6Sub43q7u5ajdmRDAr1NmAP31kUELkd
-xeI8Acrr8cxRrlhalgkPQfYm4zyqVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+MTAxMTIzNDE0WhcNMzcxMjAxMTIzNDE0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdzkeX0/ipD9YG
+I5c89/QOl6KT/FdxnUCYm27O/UBeFyxA9cIZYX3U5n1XtywV8iXN8pHRlAyXDzRc
+pCaQCI/UyY+dgNbc0ouPHrSt/iB+RUjChJrCi3cj/5lGyGW8iQ60SuAildOVa4Tn
+UUpZwIvD+q3sB7TWlfSgAmUMBgFoswIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
 QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
 BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
-YW1wbGUubmV0ggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAavHM0unGP+/a
-uffgcslwik3r101tlloW0ZDsFUbMxJWWr1VJkqJ2f1kN8frZrGs77Va5fAkD93qf
-8nys4Mx1ARMagR3D2DECmJZdemvjI9ec6mljUXabXWpAR0PaBJNqqDF4tuW9ZIkY
-mQhL9IP0n6Rz7TR28ajbC1X+VRw5lYs=
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiC
+E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEAej++PL9z7jkt
+49KtSuFggOshr34l1Y9KfBSDjNu5U/nWLj8p89RjL2HkGy2ssKdrECYi9jmJDj6q
+2fgBHqXEEzZySpDoNK6zP9uv6JYwUy5YqrydX32k7slSB5VdPbqI4UO+XUK8rsiJ
++6V8srRXT9QCLQ3K7I1BHvd5tVBftV0=
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Signing Cert rsa
@@ -26,17 +26,17 @@ subject=/O=example.net/CN=clica Signing Cert rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -44,14 +44,14 @@ subject=/O=example.net/CN=clica CA rsa
 issuer=/O=example.net/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAla3Sr/iu
-w4xkVFrIqYzFwkxz/ne/Kpl5o9U4S/KtAfk1sGzbJmGyVsG1IUqNRxbYhhc6ZFQT
-xDEEt+CBAwAynsEQ1fOeJCzQoAC9ebtt8uqR6ZxRkhKeRW+nWBL691SeoURn6rfW
-LdPpQAq/DCFqWCnV5k1xaJLir+nSC+L5l1cCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAdzx0zHtg
-/nWvBkT6iU8JpcTYRIEU0fhdXBnESkTRn91Cjs/G51EJctQ1ovK++sam3nkXdWmk
-RG8yx0ez02wFwL+1CYKqpvtOayD/KXRMTf1EXoGDZ8HZH6MKvuL00V5aAhPd/BFX
-GokQy20PXbXfBbRdNgQEDVjExsa1w6CoabM=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
+PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
+6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
+9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
+fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
+6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
+TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
index 7134c1372..36f18c1e2 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/key3.db
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
index 20e4cfd35..3440c1ab5 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
@@ -1,36 +1,36 @@
 Bag Attributes
     friendlyName: server2.example.net
-    localKeyID: 9D 1A 7A 47 26 87 CC 9E E5 9D 04 31 80 63 EF 87 D5 E9 3A 6E 
+    localKeyID: DB F0 A6 20 CF 85 FA 97 D5 2E 21 63 FC 8A 8F E9 19 D5 F7 F4 
 subject=/CN=server2.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE1WhcNMzcxMjAxMTIzNDE1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAATRVl0QgxZDT
-pR2QEQ6T4Tf4T9LKY1tI8Dv/S21Ky79eOipi3clGt5Ses1fAlYZ1YIx9DvSE/Zs2
-eaa7BM7A4uVuubzTVibYpmQRnoP6+aq3T6Sub43q7u5ajdmRDAr1NmAP31kUELkd
-xeI8Acrr8cxRrlhalgkPQfYm4zyqVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+MTAxMTIzNDE0WhcNMzcxMjAxMTIzNDE0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdzkeX0/ipD9YG
+I5c89/QOl6KT/FdxnUCYm27O/UBeFyxA9cIZYX3U5n1XtywV8iXN8pHRlAyXDzRc
+pCaQCI/UyY+dgNbc0ouPHrSt/iB+RUjChJrCi3cj/5lGyGW8iQ60SuAildOVa4Tn
+UUpZwIvD+q3sB7TWlfSgAmUMBgFoswIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
 QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
 BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
-YW1wbGUubmV0ggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAavHM0unGP+/a
-uffgcslwik3r101tlloW0ZDsFUbMxJWWr1VJkqJ2f1kN8frZrGs77Va5fAkD93qf
-8nys4Mx1ARMagR3D2DECmJZdemvjI9ec6mljUXabXWpAR0PaBJNqqDF4tuW9ZIkY
-mQhL9IP0n6Rz7TR28ajbC1X+VRw5lYs=
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiC
+E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEAej++PL9z7jkt
+49KtSuFggOshr34l1Y9KfBSDjNu5U/nWLj8p89RjL2HkGy2ssKdrECYi9jmJDj6q
+2fgBHqXEEzZySpDoNK6zP9uv6JYwUy5YqrydX32k7slSB5VdPbqI4UO+XUK8rsiJ
++6V8srRXT9QCLQ3K7I1BHvd5tVBftV0=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxM1oX
-DTM4MDEwMTEyMzQxM1owNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
+DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM3LDZ2KKrH4YTGAk60yth9UxdlDtoV0/f1waDTQKNVDav8C5UKVsP2UtxyE
-GIc2EyVvyaIWasY2rqW19m6AdAgYChVwwvtfiMHC1VooXWE3OQccvtQ1mH4oiiW8
-YaXju8gzhy2/eAj/w4M7o/VdsKi2NLCn+B8RgZtyUTCXFgsjAgMBAAGjPjA8MA4G
+AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
+1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
+JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAEENcKradcKJugznL2O7oba1zn2Y
-GgrQy/in1xvVcmDGHzA6saScAJ1DskV3v1K3XrcnGPuyP6etG+avuxcHeaH2LTXx
-q8UxNAGtBIDUdRMEdacF2K0zEM4XF1IvlqPq6quE75k16DsXlc+eiR5JH5AHfltd
-63yQbkcs1zncLa/1
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
+PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
+F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
+oBt48YV92qG65zz3
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
index 507f25d0b..220271b19 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server2.example.net
-    localKeyID: 9D 1A 7A 47 26 87 CC 9E E5 9D 04 31 80 63 EF 87 D5 E9 3A 6E 
+    localKeyID: DB F0 A6 20 CF 85 FA 97 D5 2E 21 63 FC 8A 8F E9 19 D5 F7 F4 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIf3aYUadBHRECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECK8HIh2KNOgVBIICgK3+aS2brQpp
-ZwzDXSeeYjTxKTjfe/MJvWuexHBw9ywyQR0bVms5GTXAPbuiYNRQPbmEUbjAfyuh
-SPlPKomyyUrYEa7dr6xVhVEl6E/Sm/NKrG9iQHeA/q1ctF7WMF/mVxHH9PFDTFuO
-U+UzplP68N1UsXAFodTmdvUnvKCzliWp86LBv+eJjHJ4L8Nv/xsJdNblgHgYpq8g
-vyPr8HjJjeNo8+wduv5SuusFqlpuPqmk+22q7Yo+rgOL3X2sj1Bl07xynzYv1O1a
-9CdHV2f8Lnx31FFosy5zksdyERtXVt1iOTRfV20gQfHW88eGuvugy7GLMhwRsHvE
-TkHzKLIStiU8bmLtw+5l34+m90o+oXIpuaiZS3Sui4jLWOs7EJtYsFxGpG7Yl/xp
-W9cR0EjJnQLxX5CdWrypFYWd3/enFO7m7rNoupNbz9TdKRFZVT/gtjwvnilBuuk5
-lFbi7RM/3zO+KuOyoxzmgUKrTTKeSiMGNCa7dCi7t4c90+mZtyLI6JCq7ZQEG6gM
-ESzVtcso55UDU8Wp5KsUQWpRPryL+Sie0OpdzJDxcg0yzboMauwQpcQdeRANBE4u
-lPBGl/Z3YGCV5g7jnVfnab06inErRIfMJovZ7ut0hSQtbREqMDVPBcW/k1rUtFI2
-Sk3feI+sFUaN/XVnNX/z8MN2/Fm/Ix63ZmyJpFJ096gBQgHCIu8WzcJnSrPD0OTS
-DiJV4+whRDn0VzjssV1JGg+w5PCdAZpoAyD/KIHoLuKE+Pn8zgEz4ccbHC3N6Vfr
-ccdSQvYJ8s/FQdtueVU2KfPwVWHtE9V3EAljudsn+ODg0Q7ahgAsshUz0sh+mhoU
-bMius+zsCj0=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIWJhMOXf20eACAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAc/phy22kp5BIICgFa7Rv3+buh4
++vIw4C1TIL7yhh6qgi3bjOfPExayuj806A+bO37/veiP2R8sMK5U9GUt72OJGcWe
+W19VR/J9CHFCaKy1KTsO50EqEY67X2m1u9f5SaeaZNI3zv2n+xmBG6lroJRUbPco
+Um0iVDKwhkUo3DcSrldSzhzpA7ttE9jmMxRxodldTeSs86V1rtx//jLW3JOKc5mc
+oFxlY+yE79PMPobBvomlNvMgVj5eNbCigqb1i2SKdNCScqEK97UiWM1zRS9GSSmP
+kA/kkidijzJiitK3EytJSchPUd5SpOLW0P6OzDKBdxrc2skesEUcVrXIidcyss1u
+zqiZ4NLNcFSvtSpX9+qSJ3nvFtblAu7TD1c9dT6X1Qg7IOga7wdezRwxFP0c9u1m
+5Ab2TzfNDtfragQ4b6ugS3urhngLOi1AIKmsrOZ0cQx33t1N446wtgrJ8wUuiPDW
+7J6d9sn+b1GzY6bSKHA0YQ1QrBtAPOTuRzr/6XCcUU3B9b9mGNlvjqNlS7NhvwwY
+nQhNGZwzXxutMxDoDloR0mrhRy3gi5BRNrA++XJB4OTnAnceT641/5q34H4IWqMw
+/REMYYGTPW60kMAenmhYOPxAzWH+0Qb5wcUxNmOIy+GtppIafy0KSxB9JGbs1P5w
+ZfmomrdC7k3HFRI0QyiRQFtejUppfdZPUN9Q+OlSpAlaLxuXD1751rQhjV125XFQ
+PlO0XEbivTj+oi16oVKk+KeBDtBRoiiIkK+Yj7Y/tHDo2Ak/StuApj0f9LWh6CGs
+C1LGwtcIjnmKLcTWdy3SWogFj7laNokxiLFRl74knyYHK4AudvtsqvpVMt3NVbgt
+hLrsPTl2YzQ=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
index 96d23cb92..8717f8f0b 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
index 0b963d49f..270314bf0 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
index 7a901e053..2dd4190a1 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
index 0b963d49f..270314bf0 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
index a0dce0e07..142106182 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
index f048279bb..0218a25ca 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
index f048279bb..0218a25ca 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
index c05019efd..20fe105ad 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
index 9463162a3..7482cfd77 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
index 9463162a3..7482cfd77 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
index 3e6303c0e..42b9361c9 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
index 510e5e328..89c847c98 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server2.example.net
-    localKeyID: 9D 1A 7A 47 26 87 CC 9E E5 9D 04 31 80 63 EF 87 D5 E9 3A 6E 
+    localKeyID: DB F0 A6 20 CF 85 FA 97 D5 2E 21 63 FC 8A 8F E9 19 D5 F7 F4 
 subject=/CN=server2.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNDE1WhcNMzcxMjAxMTIzNDE1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAATRVl0QgxZDT
-pR2QEQ6T4Tf4T9LKY1tI8Dv/S21Ky79eOipi3clGt5Ses1fAlYZ1YIx9DvSE/Zs2
-eaa7BM7A4uVuubzTVibYpmQRnoP6+aq3T6Sub43q7u5ajdmRDAr1NmAP31kUELkd
-xeI8Acrr8cxRrlhalgkPQfYm4zyqVwIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+MTAxMTIzNDE0WhcNMzcxMjAxMTIzNDE0WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdzkeX0/ipD9YG
+I5c89/QOl6KT/FdxnUCYm27O/UBeFyxA9cIZYX3U5n1XtywV8iXN8pHRlAyXDzRc
+pCaQCI/UyY+dgNbc0ouPHrSt/iB+RUjChJrCi3cj/5lGyGW8iQ60SuAildOVa4Tn
+UUpZwIvD+q3sB7TWlfSgAmUMBgFoswIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
 QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
 BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4
-YW1wbGUubmV0ggkqLnRlc3QuZXgwDQYJKoZIhvcNAQELBQADgYEAavHM0unGP+/a
-uffgcslwik3r101tlloW0ZDsFUbMxJWWr1VJkqJ2f1kN8frZrGs77Va5fAkD93qf
-8nys4Mx1ARMagR3D2DECmJZdemvjI9ec6mljUXabXWpAR0PaBJNqqDF4tuW9ZIkY
-mQhL9IP0n6Rz7TR28ajbC1X+VRw5lYs=
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUubmV0LzApBgNVHREEIjAgggkqLnRlc3QuZXiC
+E3NlcnZlcjIuZXhhbXBsZS5uZXQwDQYJKoZIhvcNAQELBQADgYEAej++PL9z7jkt
+49KtSuFggOshr34l1Y9KfBSDjNu5U/nWLj8p89RjL2HkGy2ssKdrECYi9jmJDj6q
+2fgBHqXEEzZySpDoNK6zP9uv6JYwUy5YqrydX32k7slSB5VdPbqI4UO+XUK8rsiJ
++6V8srRXT9QCLQ3K7I1BHvd5tVBftV0=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
index 31cabaff2..6df0eb4bf 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDAATRVl0QgxZDTpR2QEQ6T4Tf4T9LKY1tI8Dv/S21Ky79eOipi
-3clGt5Ses1fAlYZ1YIx9DvSE/Zs2eaa7BM7A4uVuubzTVibYpmQRnoP6+aq3T6Su
-b43q7u5ajdmRDAr1NmAP31kUELkdxeI8Acrr8cxRrlhalgkPQfYm4zyqVwIDAQAB
-AoGAEd3K0zrBLH+AgNaOJVgWUC0Wj9+gUL7la/3BciRq+25xf0DQWDolFD8u8C7m
-DStHbhKu3/rim/bGrk9W9B4ivZIg+5y/zoHV7KdErYNLVjn0LjzkBEBwsYHveui6
-zDD12a6zK37GXD986r3335JB5e+iLSyoU6g0M1SM9XtpVBECQQDqq2dsj87Mo3yf
-/Tof5J6PjqaaG09nLqMPuTJz1r0sMCJvJRPeWyX+O9b3XfFigXTfImZoa5J22bTS
-CKLXIqBvAkEA0XUE+dSguhQNr0g03tDjUl/lD/Kwk/7fNOaQqWUBTjcJm3eCbAQA
-fkULIb+nmXlli6Q++Luq3k5PpSibPvW4mQJAdhpTj9CEXHs/ImnYUerGXiuF73Ml
-MCHJkQU8vg3p4Q5MljFL4ZFv+pZ1JsOR02ihwBbZAV56NPR2S2prQei8YwJAVvrA
-MTrx77PKJwLWKb0W2StHRQMj/qE1cZNZeW6fRyqly7CqMU7MIaNsRvx+jcYSvBVd
-rQ7Jmv1sJ4qgRVnm6QJAGiP5PxBYQ0jO5ySXMqs65P7l8STqP9qBSq2DY56SqYsV
-gmI+e1qf1d34uod4wwq9cKCT8BlNn/gPA9Z7IE67pA==
+MIICXQIBAAKBgQDdzkeX0/ipD9YGI5c89/QOl6KT/FdxnUCYm27O/UBeFyxA9cIZ
+YX3U5n1XtywV8iXN8pHRlAyXDzRcpCaQCI/UyY+dgNbc0ouPHrSt/iB+RUjChJrC
+i3cj/5lGyGW8iQ60SuAildOVa4TnUUpZwIvD+q3sB7TWlfSgAmUMBgFoswIDAQAB
+AoGAIQV5AXYPKDWRgp1218lUXihzYv5nkvm7KF0aQe+lzxGPxuYE7RwSDImksdPf
+2Nk8M+0qigiKrUyYBONyqEaAtFa1WL+BVPJj6ni3A1A4esz6ZmcuFMIi11WBEdft
+UIAi25KySUcQoVrGoSYoiVpPUSHfJhi8Pywi/io+3Ay85gkCQQD0GARrKxJoWMwI
+0NwvVLkdd/AIaCQj0G0SqJQaOhTn1o/6WHAxXf+db6su9dQGqkngXlkmpbu+7i9n
+uYGEA5WZAkEA6J/0BVF8K+4peLl+FbtFLkGZyF37q8VxxmGxDty7lKjNa+wASKz4
+rB5FgJS9WJKW6Vs/Ago4/ZCBUf6W+h6IKwJBAKiF+G8BIslWHTAs+wfWh6PXzaoQ
+NHthiBystOvSk+Jomaju7C65RiStF1Ppt0QOx8iXexearx+oFKSZR9kcHGkCQQCo
+oIKQdGARrEQNylDWyfi9Ljqe31n3S1pNVzW1M1cazT6Ts/EEvbZJdmwlaCzVjvWs
+VUOYY/aqAF1uJaIlz4ofAkAzbLarOQCllPkwc0WqahctkNhLGOxpPt5S+VU8Z/XB
+BxS2EpBrCXARgKi2jA+Yza+wEnjl6ZfIgeWgEb4C9aNL
 -----END RSA PRIVATE KEY-----
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-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem b/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem
index 59a99f356..dad0bb982 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/CA.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
 MIIB+jCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE5WhcN
-MzgwMTAxMTIzNDE5WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFs8O2Sbb+p
-ld+9d1QpS4CCUO+4vvGJN4KLSd160R7K9HHvWrgnIcpFL7CwVWrijNlWeyhYZ3O7
-CwSVgYZhNJ7DWgCEnaJB7rzSG3agmNay8h0NyqmjZ1HjKVrdnhK0jNIGzkVZT11I
-XXxpxAHWjdZp6ZXaAAzuGLbaoOYY/CgIwld0D6MmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBXzbpMAvg
-Fi3ve78yXsQzhfDt1fIvFN+N8wRB1EjSVkNB5LalI9RTNKw4DKmANl511I7qlZHP
-1J8kbHB/CNhJnRsCQQqvBLioNUTXr/bVWrmt/CgF3YsTITAZizCi/CJwN5mKgTyf
-n3kSGRWlsm4TUFH9iMUoylmz4b99d9oO0oQ2XdKS
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE3WhcN
+MzgwMTAxMTIzNDE3WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFz776d1Z5o
+y5SJzq857i2uLaJYtYTfBH8Bdv1BaMsPjqf53oCbfehFc20sD0F15WhTLN09Z2YM
+XGI/0o6C9XPSkQEvP7tcZtSd1VpTVsT7Rx6tEs878n6PeBgkZu8bRVLuNIPQUj3d
+wNkjoNtApzWyb3X+WPcd2mHcuYbDxCqdYEPxeqMmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBW9a5IiQX
+gMaveGE+YCDrJ8RCbFK8u/3ozwpd6h4buAoSv8dTjZXd2ZEtlOKdOLzhM7bCprxn
+hqvb74KFjk3uplACQW9Vvo5YMICsAHJyud5j2yxVzNqFLWexueoNgvAvBE6dW4/G
+lggR/YDmVkaag7/0RQhJx0SH5q8IV7gNbUUVxuZq
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem b/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem
index d4b36f367..83097cab2 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/Signer.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE3WhcN
+MzgwMTAxMTIzNDE3WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
 AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQB0e7yFiyfAcTNh0I0yp1ri7fi5ZZ9gwdEkt63847ZM2INbIDOT/2UXGWI6yvn
-F9b/mVxqO+dPBo49Yqc7XVeGrf0B7WPCkX/pFx5yT3lSe1+LYMSRljHfkBgWGB0X
-U08n+iWv9rCpYZey+mJt6gZ751hz+aTw+lLBf0v5hN9UXOmjJbGjPjA8MA4GA1Ud
+AAQA+MSRIZjmfWFGq+vT4j1IbOAETDI+Cvi6sBBCXcRWGc6D9CjUtdlpviB9ki9l
+8SquWlK8jDrjNOYYpS4oW6i6of8BNnbLbnC5qppS7lSX7D+VVaMKYaVi0iJf/LQO
+RKOk6uxAbcuZvN/9o8ogTxPUdr5aAzM37aBPolqBw++PtRi9FU2jPjA8MA4GA1Ud
 DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJBC8H1Os8a4uuI3UIlPdTB4NZmNhRk
-h+n61gVgYhyWkmSaaE3OTecrMzVyZQMAxD0s9ZhnceDwkwWkNzty5M1MkfYCQgDV
-R030VMVlgi05zYrIesKMEKBeoVTKDwIPEFm64hXbtbeK4uHqqJSM0uusDavYHz+4
-SmjoWBskpmkusgwIVFG6Tg==
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCAevpJUO2KozGFnkhwKRwKklzordS
+8tDKtqkxfB+da16ox7IfC9JshyBDDt3DCFVmbDn7AJVHqtGMuQfWnVLl7pPAAkIB
+vaW0hBeJyHUwIWwhSsT/KMpK0TXCj2DajrBQNUF2euXKopaANoxpyJ2O11cBZ3Ct
+ESIYrxLSnAzqIsNJhgbuwiM=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert8.db b/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert8.db
index 67169f218..f71f0a0b3 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert8.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/cert8.db
diff --git a/test/aux-fixed/exim-ca/example_ec.com/BLANK/key3.db b/test/aux-fixed/exim-ca/example_ec.com/BLANK/key3.db
index 240b372e8..e0b4d7a1b 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/BLANK/key3.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/BLANK/key3.db
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem b/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem
index 59a99f356..dad0bb982 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/CA.pem
@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
 MIIB+jCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE5WhcN
-MzgwMTAxMTIzNDE5WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFs8O2Sbb+p
-ld+9d1QpS4CCUO+4vvGJN4KLSd160R7K9HHvWrgnIcpFL7CwVWrijNlWeyhYZ3O7
-CwSVgYZhNJ7DWgCEnaJB7rzSG3agmNay8h0NyqmjZ1HjKVrdnhK0jNIGzkVZT11I
-XXxpxAHWjdZp6ZXaAAzuGLbaoOYY/CgIwld0D6MmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBXzbpMAvg
-Fi3ve78yXsQzhfDt1fIvFN+N8wRB1EjSVkNB5LalI9RTNKw4DKmANl511I7qlZHP
-1J8kbHB/CNhJnRsCQQqvBLioNUTXr/bVWrmt/CgF3YsTITAZizCi/CJwN5mKgTyf
-n3kSGRWlsm4TUFH9iMUoylmz4b99d9oO0oQ2XdKS
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE3WhcN
+MzgwMTAxMTIzNDE3WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFz776d1Z5o
+y5SJzq857i2uLaJYtYTfBH8Bdv1BaMsPjqf53oCbfehFc20sD0F15WhTLN09Z2YM
+XGI/0o6C9XPSkQEvP7tcZtSd1VpTVsT7Rx6tEs878n6PeBgkZu8bRVLuNIPQUj3d
+wNkjoNtApzWyb3X+WPcd2mHcuYbDxCqdYEPxeqMmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBW9a5IiQX
+gMaveGE+YCDrJ8RCbFK8u/3ozwpd6h4buAoSv8dTjZXd2ZEtlOKdOLzhM7bCprxn
+hqvb74KFjk3uplACQW9Vvo5YMICsAHJyud5j2yxVzNqFLWexueoNgvAvBE6dW4/G
+lggR/YDmVkaag7/0RQhJx0SH5q8IV7gNbUUVxuZq
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key
index 0917dad9c..76844a8b4 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.key
@@ -1,12 +1,12 @@
 Bag Attributes
     friendlyName: OCSP Signer ec
-    localKeyID: 72 CD F3 DE 94 2A CF DC 32 69 F1 47 44 B7 3E F0 A0 2F 68 2A 
+    localKeyID: 2A A4 72 3B EA F6 46 75 57 1E D5 72 EE E8 51 1E CD 28 CB A3 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAWq1ABBRysrpX3kHH
-4t/cptRBEaHooR4gkRfg9zHPvz+MTsNNcoD81YVuc1Fsc7yemcscAcwLqy5+6TgQ
-53a3gpqhgYkDgYYABADjJyqQAfv2uj0trycfbl5R+LZFLeMWCbVBnzacqm7U1pG8
-2cPJ2BR2v5MXj1mcj4rqGHbHk+TME2zkdzO7aZS6LgHSncoDexcvfg1/Agd/uX/Y
-zAU0bZ6djsa8CpXpDXVRn1TnL4E10MmnO6nH/U1WLvFfocpU9Ou4kQ6QJKLfyb95
-EA==
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIBcVqBu5kEzunxldCF
+r3mHuRvLKi/EiwLk9sRhGvr2UBHc1XCyFgEOutO1GlZp0cdS7CPXrHxq7RdvaGUs
+p0FeBCqhgYkDgYYABAGB4X3xkrvhShu65Fm8uOzhcV2blqxGxuN6ARcOzJDD1q9L
+Nty1xwd+wAoQf9SiO71ns5MBBsBGjz60lpQ7I4rPZAGu7gaUBnVIrjl44VhUWF7c
+mehVBpiv4lIyXkD+wCkocx8VaLvAhgJlE5f41lqeq6HgHAs1DsbgJQxWS8uzMgjs
+SA==
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12
index a4398eb5c..ea9692b9d 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.p12
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem
index 67a061433..8cef0c3cd 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/OCSP.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICEjCCAXOgAwIBAgIBQzAKBggqhkjOPQQDAjA5MRcwFQYDVQQKDA5leGFtcGxl
+MIICEDCCAXOgAwIBAgIBQzAKBggqhkjOPQQDAjA5MRcwFQYDVQQKDA5leGFtcGxl
 X2VjLmNvbTEeMBwGA1UEAxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMB4XDTEyMTEw
-MTEyMzQyMFoXDTM4MDEwMTEyMzQyMFowODEXMBUGA1UECgwOZXhhbXBsZV9lYy5j
+MTEyMzQxN1oXDTM4MDEwMTEyMzQxN1owODEXMBUGA1UECgwOZXhhbXBsZV9lYy5j
 b20xHTAbBgNVBAMTFGNsaWNhIE9DU1AgU2lnbmVyIGVjMIGbMBAGByqGSM49AgEG
-BSuBBAAjA4GGAAQBk70N/VnGYsp+PBGK6XavLqlmmNLL7mdf7TmzQliSoYpPxXQe
-Ai0Ax9QWh59vkdCIwCzRgfQitZ23iofHJ+Qaua4AFhEwleBJMLql9houPhmVDRds
-iq0eRolWt1ia4dYSLU7WvjvtJ0r3iRCyqWMxkC5wH1sp6eMeom9wqUVy+kAKXuqj
+BSuBBAAjA4GGAAQBgeF98ZK74UobuuRZvLjs4XFdm5asRsbjegEXDsyQw9avSzbc
+tccHfsAKEH/Uoju9Z7OTAQbARo8+tJaUOyOKz2QBru4GlAZ1SK45eOFYVFhe3Jno
+VQaYr+JSMl5A/sApKHMfFWi7wIYCZROX+NZanquh4BwLNQ7G4CUMVkvLszII7Eij
 KjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAKBggq
-hkjOPQQDAgOBjAAwgYgCQgGFJ8FM0ZdBK/CkACyOpkoZMbYj6Fxh2ll2B/n1Qp/h
-ECkvVZoRcKDx1WwajXlXjYhnKzwaHy/c8sYNEaOnyQ53RwJCAPxHQCBXTXBPiAlh
-gTeKQopi1T2+OlLg2BgP1Pfjp2daIx+Yh0au/8l1RlItAOJ1GUMnsX5gv3L4p5uD
-qrTj/1g+
+hkjOPQQDAgOBigAwgYYCQSwAFUP52R0/cWkxxBCMdkmXc54RLwyj1zRvACIMefKC
+CgqWBaDKZ2TfYM4TOyMKT8MSRV7Zwa1CnASq4M5FBFbaAkEq2F9pBdTcXWl7B8lb
+DiGLnOtSdT8/PFgwcu74U90W200sDUcNt+MNAN7VQWn6a+d+gTTb3cFfGMBXbmeQ
+G31hfg==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem b/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem
index d4b36f367..83097cab2 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/Signer.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE3WhcN
+MzgwMTAxMTIzNDE3WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
 AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQB0e7yFiyfAcTNh0I0yp1ri7fi5ZZ9gwdEkt63847ZM2INbIDOT/2UXGWI6yvn
-F9b/mVxqO+dPBo49Yqc7XVeGrf0B7WPCkX/pFx5yT3lSe1+LYMSRljHfkBgWGB0X
-U08n+iWv9rCpYZey+mJt6gZ751hz+aTw+lLBf0v5hN9UXOmjJbGjPjA8MA4GA1Ud
+AAQA+MSRIZjmfWFGq+vT4j1IbOAETDI+Cvi6sBBCXcRWGc6D9CjUtdlpviB9ki9l
+8SquWlK8jDrjNOYYpS4oW6i6of8BNnbLbnC5qppS7lSX7D+VVaMKYaVi0iJf/LQO
+RKOk6uxAbcuZvN/9o8ogTxPUdr5aAzM37aBPolqBw++PtRi9FU2jPjA8MA4GA1Ud
 DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJBC8H1Os8a4uuI3UIlPdTB4NZmNhRk
-h+n61gVgYhyWkmSaaE3OTecrMzVyZQMAxD0s9ZhnceDwkwWkNzty5M1MkfYCQgDV
-R030VMVlgi05zYrIesKMEKBeoVTKDwIPEFm64hXbtbeK4uHqqJSM0uusDavYHz+4
-SmjoWBskpmkusgwIVFG6Tg==
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCAevpJUO2KozGFnkhwKRwKklzordS
+8tDKtqkxfB+da16ox7IfC9JshyBDDt3DCFVmbDn7AJVHqtGMuQfWnVLl7pPAAkIB
+vaW0hBeJyHUwIWwhSsT/KMpK0TXCj2DajrBQNUF2euXKopaANoxpyJ2O11cBZ3Ct
+ESIYrxLSnAzqIsNJhgbuwiM=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf b/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf
index 57a133b69..e4afb0a20 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/ca.conf
@@ -1,18 +1,18 @@
 ; Config::Simple 4.59
-; Thu Nov  1 12:34:19 2012
+; Thu Nov  1 12:34:17 2012
 
 [CLICA]
-ocsp_signer=OCSP Signer ec
+crl_url=http://crl.example.com/latest.crl
 signer=Signing Cert ec
-level=1
 sighash=SHA256
-crl_url=http://crl.example.com/latest.crl
+ocsp_signer=OCSP Signer ec
+level=1
 ocsp_url=http://oscp.example.com/
 
 [CA]
-bits=1024
-subject=clica CA
 name=Certificate Authority ec
+subject=clica CA
+bits=1024
 org=example_ec.com
 
 
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/cert8.db b/test/aux-fixed/exim-ca/example_ec.com/CA/cert8.db
index 6960b3281..5c0cc223d 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/cert8.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/cert8.db
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/key3.db b/test/aux-fixed/exim-ca/example_ec.com/CA/key3.db
index 6b81633cc..5ef522ebc 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/key3.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/CA/key3.db
diff --git a/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file b/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file
index 11dc69058..9e4b13937 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example_ec.com/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:      36956        740         73         30        667        400         99         40  IR-IO-APIC    1-edge      i8042
-   8:          0          1          0          0          0          0          0          0  IR-IO-APIC    8-edge      rtc0
-   9:      78513       9418        672        193       3932       3366        890        185  IR-IO-APIC    9-fasteoi   acpi
-  12:    2901234      64831       5457       2075      45248      28156       6890       2620  IR-IO-APIC   12-edge      i8042
+   1:      28375       2779       1799       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:      26824      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     638993       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     141150          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    1294442         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        910       1871       1480       2860       2449       1488       1879   Non-maskable interrupts
- LOC:    6824042   10428739   18566178   16015365   28150405   24506280   16318930   18890777   Local timer interrupts
+ 122:       5099       2645       2048    2133117       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     307593          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    1528831         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        366        323        340        333        336        355   Non-maskable interrupts
+ LOC:    6162055    6212743    6081423    5762854    6023466    5960370    5962589    6076079   Local timer interrupts
  SPU:          0          0          0          0          0          0          0          0   Spurious interrupts
- PMI:        517        910       1871       1480       2860       2449       1488       1879   Performance monitoring interrupts
- IWI:         58          3          1          1         16          2          1          0   IRQ work interrupts
+ PMI:        368        382        366        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:   12075461    1391923     533943     177453     288358      72386      62935      48827   Rescheduling interrupts
- CAL:     180656     143208      98859     104850      41127      73752     113286     111993   Function call interrupts
- TLB:      53363      51506      31574      33734      16542      24424      38918      42714   TLB shootdowns
- TRM:    3946280    3946280    3946280    3946280    3946280    3946280    3946280    3946280   Thermal event interrupts
+ RES:    2767527    1298513     589876     442478     433571     428648     274117     316939   Rescheduling interrupts
+ CAL:     346266     329440     331896     336865     344976     333365     332859     336510   Function call interrupts
+ TLB:      99587      89304      89373      92699      93692      88842      83748      88761   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:         9521984 kB
-MemAvailable:   13818192 kB
-Buffers:          437988 kB
-Cached:          3582812 kB
-SwapCached:            0 kB
-Active:          3759524 kB
-Inactive:        2485956 kB
-Active(anon):    1520036 kB
-Inactive(anon):   329508 kB
-Active(file):    2239488 kB
-Inactive(file):  2156448 kB
+MemFree:          168072 kB
+MemAvailable:    1946816 kB
+Buffers:           25348 kB
+Cached:          1903880 kB
+SwapCached:         9076 kB
+Active:          9044108 kB
+Inactive:        6507372 kB
+Active(anon):    8607116 kB
+Inactive(anon):  4975524 kB
+Active(file):     436992 kB
+Inactive(file):  1531848 kB
 Unevictable:          48 kB
 Mlocked:              48 kB
 SwapTotal:       8212476 kB
-SwapFree:        8212476 kB
-Dirty:             11748 kB
-Writeback:            12 kB
-AnonPages:       2224832 kB
-Mapped:           671936 kB
-Shmem:            330596 kB
-Slab:             326440 kB
-SReclaimable:     238592 kB
-SUnreclaim:        87848 kB
-KernelStack:       12524 kB
-PageTables:        54176 kB
+SwapFree:        7958012 kB
+Dirty:             11992 kB
+Writeback:            48 kB
+AnonPages:      13614352 kB
+Mapped:           390516 kB
+Shmem:            325416 kB
+Slab:             237004 kB
+SReclaimable:     127500 kB
+SUnreclaim:       109504 kB
+KernelStack:       14296 kB
+PageTables:        94940 kB
 NFS_Unstable:          0 kB
 Bounce:                0 kB
 WritebackTmp:          0 kB
 CommitLimit:    16359228 kB
-Committed_AS:    7093088 kB
+Committed_AS:   29524564 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: 66808903   75171    0    0    0     0          0      3746 18377785   63297    0    0    0     0       0          0
+ vnet0:   46917     481    0    0    0     0          0         0   325149    3672    0    0    0     0       0          0
+ vnet7:  502731    3695    0    0    0     0          0         0  2163940    8498    0    0    0     0       0          0
+ vnet3:   32162     252    0    0    0     0          0         0   291889    3411    0    0    0     0       0          0
+enp0s31f6: 191749422  170921    0    0    0     0          0      3922 42698749  129945    0    0    0     0       0          0
+vnet11: 7303439    6454    0    0    0     0          0         0  2343092   11289    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  1206433    5926    0    0    0     0       0          0
+  tun0: 112501735  104283    0    0    0     0          0         0 30579473   80458    0    0    0     0       0          0
+ vnet2:    8030      34    0    0    0     0          0         0    42770     387    0 1713    0     0       0          0
+ vnet9:  126854    1141    0    0    0     0          0         0   686529    4613    0    0    0     0       0          0
+ vnet5:  139304     988    0    0    0     0          0         0   787549    4719    0    0    0     0       0          0
+vnet12:  133857    1141    0    0    0     0          0         0   815546    4634    0    0    0     0       0          0
+ vnet1:   71961     671    0    0    0     0          0         0   421292    3848    0    0    0     0       0          0
+vnet10:   85763     802    0    0    0     0          0         0   486026    4057    0    0    0     0       0          0
+ vnet8:  445523    6298    0    0    0     0          0         0 15036829   14093    0    0    0     0       0          0
+virbr0: 31724349   82897    0    0    0     0          0         0 119520165  124442    0    0    0     0       0          0
+ vnet4:  329164    2446    0    0    0     0          0         0  1592284    7003    0    0    0     0       0          0
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem
index 913dbc91a..99b93e2e7 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/ca_chain.pem
@@ -3,18 +3,18 @@ Bag Attributes
 subject=/O=example_ec.com/CN=clica Signing Cert ec
 issuer=/O=example_ec.com/CN=clica CA ec
 -----BEGIN CERTIFICATE-----
-MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE3WhcN
+MzgwMTAxMTIzNDE3WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
 AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQB0e7yFiyfAcTNh0I0yp1ri7fi5ZZ9gwdEkt63847ZM2INbIDOT/2UXGWI6yvn
-F9b/mVxqO+dPBo49Yqc7XVeGrf0B7WPCkX/pFx5yT3lSe1+LYMSRljHfkBgWGB0X
-U08n+iWv9rCpYZey+mJt6gZ751hz+aTw+lLBf0v5hN9UXOmjJbGjPjA8MA4GA1Ud
+AAQA+MSRIZjmfWFGq+vT4j1IbOAETDI+Cvi6sBBCXcRWGc6D9CjUtdlpviB9ki9l
+8SquWlK8jDrjNOYYpS4oW6i6of8BNnbLbnC5qppS7lSX7D+VVaMKYaVi0iJf/LQO
+RKOk6uxAbcuZvN/9o8ogTxPUdr5aAzM37aBPolqBw++PtRi9FU2jPjA8MA4GA1Ud
 DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJBC8H1Os8a4uuI3UIlPdTB4NZmNhRk
-h+n61gVgYhyWkmSaaE3OTecrMzVyZQMAxD0s9ZhnceDwkwWkNzty5M1MkfYCQgDV
-R030VMVlgi05zYrIesKMEKBeoVTKDwIPEFm64hXbtbeK4uHqqJSM0uusDavYHz+4
-SmjoWBskpmkusgwIVFG6Tg==
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCAevpJUO2KozGFnkhwKRwKklzordS
+8tDKtqkxfB+da16ox7IfC9JshyBDDt3DCFVmbDn7AJVHqtGMuQfWnVLl7pPAAkIB
+vaW0hBeJyHUwIWwhSsT/KMpK0TXCj2DajrBQNUF2euXKopaANoxpyJ2O11cBZ3Ct
+ESIYrxLSnAzqIsNJhgbuwiM=
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority ec
@@ -22,14 +22,14 @@ subject=/O=example_ec.com/CN=clica CA ec
 issuer=/O=example_ec.com/CN=clica CA ec
 -----BEGIN CERTIFICATE-----
 MIIB+jCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE5WhcN
-MzgwMTAxMTIzNDE5WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFs8O2Sbb+p
-ld+9d1QpS4CCUO+4vvGJN4KLSd160R7K9HHvWrgnIcpFL7CwVWrijNlWeyhYZ3O7
-CwSVgYZhNJ7DWgCEnaJB7rzSG3agmNay8h0NyqmjZ1HjKVrdnhK0jNIGzkVZT11I
-XXxpxAHWjdZp6ZXaAAzuGLbaoOYY/CgIwld0D6MmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBXzbpMAvg
-Fi3ve78yXsQzhfDt1fIvFN+N8wRB1EjSVkNB5LalI9RTNKw4DKmANl511I7qlZHP
-1J8kbHB/CNhJnRsCQQqvBLioNUTXr/bVWrmt/CgF3YsTITAZizCi/CJwN5mKgTyf
-n3kSGRWlsm4TUFH9iMUoylmz4b99d9oO0oQ2XdKS
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE3WhcN
+MzgwMTAxMTIzNDE3WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFz776d1Z5o
+y5SJzq857i2uLaJYtYTfBH8Bdv1BaMsPjqf53oCbfehFc20sD0F15WhTLN09Z2YM
+XGI/0o6C9XPSkQEvP7tcZtSd1VpTVsT7Rx6tEs878n6PeBgkZu8bRVLuNIPQUj3d
+wNkjoNtApzWyb3X+WPcd2mHcuYbDxCqdYEPxeqMmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBW9a5IiQX
+gMaveGE+YCDrJ8RCbFK8u/3ozwpd6h4buAoSv8dTjZXd2ZEtlOKdOLzhM7bCprxn
+hqvb74KFjk3uplACQW9Vvo5YMICsAHJyud5j2yxVzNqFLWexueoNgvAvBE6dW4/G
+lggR/YDmVkaag7/0RQhJx0SH5q8IV7gNbUUVxuZq
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert8.db b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert8.db
index f50286dff..9f8dcc8cb 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert8.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/cert8.db
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem
index ea9a76ba4..51bd10a83 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/fullchain.pem
@@ -1,44 +1,44 @@
 Bag Attributes
     friendlyName: server1.example_ec.com
-    localKeyID: 22 58 C5 1A A2 CB 84 00 AB 82 BE 21 0C D4 98 5F 84 CA DB 03 
+    localKeyID: 13 50 6E 98 0B B5 F5 64 25 EA B1 1C E0 51 24 00 D2 D1 B9 6A 
 subject=/CN=server1.example_ec.com
 issuer=/O=example_ec.com/CN=clica Signing Cert ec
 -----BEGIN CERTIFICATE-----
-MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
+MIIDADCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
 ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xMjEx
-MDExMjM0MjBaFw0zNzEyMDExMjM0MjBaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAAfLUhsCQbs+SgH
-7EW6s1JFkGdFWnFgoE7TSRrSQTYtTkQAcy7z9qQJQpbz5eSQh9eE40EGqqS8v7OH
-TBHTljCO0AEgZKDiUK0k0HXYLCReWpyTxr98q1tTRtvcG7pfej0K87EHJcw4DDV1
-3vo/F4ZLmZZKrw2YaETgoyUyereOdQUGBKOCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTdaFw0zNzEyMDExMjM0MTdaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABACjPPWQJF4NAwMR
+tM+fjkYmFAb6C1GSZP7uycVIytPQ8Uq34OCSeVyL1nSWk0Xkf9QWEZIqFt5KNjw5
+w2CMLKbYcgH4/XwphZYKv/187jIRpkmbinNDEDSS/tv4G8SZl+LUK9onJ0/b8UYh
+8C+UOK1ccekVkY3kZTh2fhsjgRAg91kFUKOCASwwggEoMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4IiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIh
-YWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1wbGUuY29tggkqLnRlc3QuZXiCE3Nl
-cnZlcjEuZXhhbXBsZS5jb22CFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkFk/Sa0M7iRtTYJtlXKCJigqJPPOxoQ98gwie7LdIowltkB
-YYmbARyrQRyPkwgZ1kG2z910PPexCL3iTYE96Ogn1gJCAKqhz3dURIiIv8zCvYpg
-2AmiceQGC+/PM7IymCmJE15XIJ5XerFO7ATx7Nhbv9rn8onPQO8Vnk8q4tMieMrp
-2Pcb
+BgNVHREEgYEwf4IhYWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1wbGUuY29tghNz
+ZXJ2ZXIxLmV4YW1wbGUuY29tgiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1w
+bGUuY29tghZzZXJ2ZXIxLmV4YW1wbGVfZWMuY29tggkqLnRlc3QuZXgwCgYIKoZI
+zj0EAwIDgYwAMIGIAkIBs8lxZjxw+4xJzs7kz9ybeUOMhrs52krigS2hq1JwsHPD
+g9PJKcza6C/68L7D1d5/rltJMNPfK19QuuyuymIzyQYCQgCiYivDkoIHM3JKI3Rx
++Esavn1vkdfr+QI+gk2uaE8J32MZ0rQrIlVP/SWvOuxdHczxes3Kz/KLWojetS+f
+kmu9uA==
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Signing Cert ec
 subject=/O=example_ec.com/CN=clica Signing Cert ec
 issuer=/O=example_ec.com/CN=clica CA ec
 -----BEGIN CERTIFICATE-----
-MIICHDCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDIwWhcN
-MzgwMTAxMTIzNDIwWjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
+MIICHTCCAX6gAwIBAgIBQjAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE3WhcN
+MzgwMTAxMTIzNDE3WjA5MRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEeMBwGA1UE
 AxMVY2xpY2EgU2lnbmluZyBDZXJ0IGVjMIGbMBAGByqGSM49AgEGBSuBBAAjA4GG
-AAQB0e7yFiyfAcTNh0I0yp1ri7fi5ZZ9gwdEkt63847ZM2INbIDOT/2UXGWI6yvn
-F9b/mVxqO+dPBo49Yqc7XVeGrf0B7WPCkX/pFx5yT3lSe1+LYMSRljHfkBgWGB0X
-U08n+iWv9rCpYZey+mJt6gZ751hz+aTw+lLBf0v5hN9UXOmjJbGjPjA8MA4GA1Ud
+AAQA+MSRIZjmfWFGq+vT4j1IbOAETDI+Cvi6sBBCXcRWGc6D9CjUtdlpviB9ki9l
+8SquWlK8jDrjNOYYpS4oW6i6of8BNnbLbnC5qppS7lSX7D+VVaMKYaVi0iJf/LQO
+RKOk6uxAbcuZvN/9o8ogTxPUdr5aAzM37aBPolqBw++PtRi9FU2jPjA8MA4GA1Ud
 DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4
-Y1hnYjBRMAoGCCqGSM49BAMCA4GLADCBhwJBC8H1Os8a4uuI3UIlPdTB4NZmNhRk
-h+n61gVgYhyWkmSaaE3OTecrMzVyZQMAxD0s9ZhnceDwkwWkNzty5M1MkfYCQgDV
-R030VMVlgi05zYrIesKMEKBeoVTKDwIPEFm64hXbtbeK4uHqqJSM0uusDavYHz+4
-SmjoWBskpmkusgwIVFG6Tg==
+Y1hnYjBRMAoGCCqGSM49BAMCA4GMADCBiAJCAevpJUO2KozGFnkhwKRwKklzordS
+8tDKtqkxfB+da16ox7IfC9JshyBDDt3DCFVmbDn7AJVHqtGMuQfWnVLl7pPAAkIB
+vaW0hBeJyHUwIWwhSsT/KMpK0TXCj2DajrBQNUF2euXKopaANoxpyJ2O11cBZ3Ct
+ESIYrxLSnAzqIsNJhgbuwiM=
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority ec
@@ -46,14 +46,14 @@ subject=/O=example_ec.com/CN=clica CA ec
 issuer=/O=example_ec.com/CN=clica CA ec
 -----BEGIN CERTIFICATE-----
 MIIB+jCCAVygAwIBAgIBQTAKBggqhkjOPQQDAjAvMRcwFQYDVQQKDA5leGFtcGxl
-X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE5WhcN
-MzgwMTAxMTIzNDE5WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
-AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFs8O2Sbb+p
-ld+9d1QpS4CCUO+4vvGJN4KLSd160R7K9HHvWrgnIcpFL7CwVWrijNlWeyhYZ3O7
-CwSVgYZhNJ7DWgCEnaJB7rzSG3agmNay8h0NyqmjZ1HjKVrdnhK0jNIGzkVZT11I
-XXxpxAHWjdZp6ZXaAAzuGLbaoOYY/CgIwld0D6MmMCQwEgYDVR0TAQH/BAgwBgEB
-/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBXzbpMAvg
-Fi3ve78yXsQzhfDt1fIvFN+N8wRB1EjSVkNB5LalI9RTNKw4DKmANl511I7qlZHP
-1J8kbHB/CNhJnRsCQQqvBLioNUTXr/bVWrmt/CgF3YsTITAZizCi/CJwN5mKgTyf
-n3kSGRWlsm4TUFH9iMUoylmz4b99d9oO0oQ2XdKS
+X2VjLmNvbTEUMBIGA1UEAxMLY2xpY2EgQ0EgZWMwHhcNMTIxMTAxMTIzNDE3WhcN
+MzgwMTAxMTIzNDE3WjAvMRcwFQYDVQQKDA5leGFtcGxlX2VjLmNvbTEUMBIGA1UE
+AxMLY2xpY2EgQ0EgZWMwgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAFz776d1Z5o
+y5SJzq857i2uLaJYtYTfBH8Bdv1BaMsPjqf53oCbfehFc20sD0F15WhTLN09Z2YM
+XGI/0o6C9XPSkQEvP7tcZtSd1VpTVsT7Rx6tEs878n6PeBgkZu8bRVLuNIPQUj3d
+wNkjoNtApzWyb3X+WPcd2mHcuYbDxCqdYEPxeqMmMCQwEgYDVR0TAQH/BAgwBgEB
+/wIBATAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwIDgYsAMIGHAkIBW9a5IiQX
+gMaveGE+YCDrJ8RCbFK8u/3ozwpd6h4buAoSv8dTjZXd2ZEtlOKdOLzhM7bCprxn
+hqvb74KFjk3uplACQW9Vvo5YMICsAHJyud5j2yxVzNqFLWexueoNgvAvBE6dW4/G
+lggR/YDmVkaag7/0RQhJx0SH5q8IV7gNbUUVxuZq
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key3.db b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key3.db
index 05249cba9..97f061cb7 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key3.db
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/key3.db
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem
index e8940644b..fe307fb11 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.chain.pem
@@ -1,38 +1,38 @@
 Bag Attributes
     friendlyName: server1.example_ec.com
-    localKeyID: 22 58 C5 1A A2 CB 84 00 AB 82 BE 21 0C D4 98 5F 84 CA DB 03 
+    localKeyID: 13 50 6E 98 0B B5 F5 64 25 EA B1 1C E0 51 24 00 D2 D1 B9 6A 
 subject=/CN=server1.example_ec.com
 issuer=/O=example_ec.com/CN=clica Signing Cert ec
 -----BEGIN CERTIFICATE-----
-MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
+MIIDADCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
 ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xMjEx
-MDExMjM0MjBaFw0zNzEyMDExMjM0MjBaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAAfLUhsCQbs+SgH
-7EW6s1JFkGdFWnFgoE7TSRrSQTYtTkQAcy7z9qQJQpbz5eSQh9eE40EGqqS8v7OH
-TBHTljCO0AEgZKDiUK0k0HXYLCReWpyTxr98q1tTRtvcG7pfej0K87EHJcw4DDV1
-3vo/F4ZLmZZKrw2YaETgoyUyereOdQUGBKOCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTdaFw0zNzEyMDExMjM0MTdaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABACjPPWQJF4NAwMR
+tM+fjkYmFAb6C1GSZP7uycVIytPQ8Uq34OCSeVyL1nSWk0Xkf9QWEZIqFt5KNjw5
+w2CMLKbYcgH4/XwphZYKv/187jIRpkmbinNDEDSS/tv4G8SZl+LUK9onJ0/b8UYh
+8C+UOK1ccekVkY3kZTh2fhsjgRAg91kFUKOCASwwggEoMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4IiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIh
-YWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1wbGUuY29tggkqLnRlc3QuZXiCE3Nl
-cnZlcjEuZXhhbXBsZS5jb22CFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkFk/Sa0M7iRtTYJtlXKCJigqJPPOxoQ98gwie7LdIowltkB
-YYmbARyrQRyPkwgZ1kG2z910PPexCL3iTYE96Ogn1gJCAKqhz3dURIiIv8zCvYpg
-2AmiceQGC+/PM7IymCmJE15XIJ5XerFO7ATx7Nhbv9rn8onPQO8Vnk8q4tMieMrp
-2Pcb
+BgNVHREEgYEwf4IhYWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1wbGUuY29tghNz
+ZXJ2ZXIxLmV4YW1wbGUuY29tgiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1w
+bGUuY29tghZzZXJ2ZXIxLmV4YW1wbGVfZWMuY29tggkqLnRlc3QuZXgwCgYIKoZI
+zj0EAwIDgYwAMIGIAkIBs8lxZjxw+4xJzs7kz9ybeUOMhrs52krigS2hq1JwsHPD
+g9PJKcza6C/68L7D1d5/rltJMNPfK19QuuyuymIzyQYCQgCiYivDkoIHM3JKI3Rx
++Esavn1vkdfr+QI+gk2uaE8J32MZ0rQrIlVP/SWvOuxdHczxes3Kz/KLWojetS+f
+kmu9uA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMVoX
-DTM4MDEwMTEyMzQwMVowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
+cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwMloX
+DTM4MDEwMTEyMzQwMlowNzEUMBIGA1UEChMLZXhhbXBsZS5jb20xHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKT1/n//U4ydUw51j66a5/7KmG+9rBcX2JUiSfdutK0/MPTtGqoziQ0ZFSGP
-j6USuvXTnlbr0zS57GmF1eO2a/k3bQ5Osb73i1AiBQCkvJ7Dz8utkwTs6WHoGkTV
-ViWCJSZ+8P1iGO93uFFyA97m6bviBbXY53Ve5SZ9mpjQXj+zAgMBAAGjPjA8MA4G
+AoGBANyxIVDJpsgkZguCYBj+vjFFusZvBZjFOsKJUYuMjWv9zGJU8OEAp7/7Zype
+4sm628Hh5oUruvbXGzVjrp1it4XlfgnnU1y/J3XFp5uMe6zvFyOgVk553Wk00uWl
+hkgVecG8RDoYpjK8ymJpGHox7eulE3sDXsaL20mVSsX6/mgRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAFuWo6pNgzOUze4GP6znYsjkV3Mv
-rD23HBoYPKejKr/DlDVfHQrBxjC7TzfTdNs1JzXLYA4SJ4XsBHItQ0JTenfQ3M0q
-12Bl6CjiU1Wb1TfT6+pIIu6OIHE4o5rf/OkLEfQkwvRcFO2SUPGTHMZ/KqAb/s0S
-9wxD7gNq579mfo3O
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAWdrOC7MalRI43oMDzf369S7+F+
+ZkLyh5WkK6r+9D+jGdD2nwRP/JWNRDssKJ0pHWFLR7QBgwscqoleZUEyiXck3OLi
+RQNK6zIrCeYuMm4cMq9maZS0Ev4mxVZl+GAUmgkeBjINB6fgv1t7Ef1ZbI8d4+tD
+xuUP7GVcKnMnFtuN
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key
index b053868e8..9c8c3dd31 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.key
@@ -1,13 +1,13 @@
 Bag Attributes
     friendlyName: server1.example_ec.com
-    localKeyID: 22 58 C5 1A A2 CB 84 00 AB 82 BE 21 0C D4 98 5F 84 CA DB 03 
+    localKeyID: 13 50 6E 98 0B B5 F5 64 25 EA B1 1C E0 51 24 00 D2 D1 B9 6A 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIgRa9HUgAsP4CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNAVUdobpFA8BIH4aK26ePrSjdFU
-J6rySlqYil0YRK9XqVXoVm1GCFH5bLPHUjDCj9ooNxf+TkfWWiSHZuz73qQraPqw
-lFbQqJ2EA/RsswAcPcngLxz9XN6LZRLIM/l3CQqGPwjji6YGW2ska4gHF7mlDS0E
-aVFZQufEMNQnpFIfsrJR6YwfMRGLd3/7keXQVSby+t7uEtJT+poi9ZFFSW31FuPa
-t8u0lgVbv0XIZOED2UHH4+y9ZpyuKwjCU8s+YqOcU7jxW8Ar7he5CI4nZCKeyUS3
-FFEWmuBn06LThJ06qO2ahQRpsivBT9L2ZhT5zuCehAMEpiMSFZ0ODwqR8OJuc1g=
+MIIBSzBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIbtWI2cX4H3YCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBaBi/NrmcaGBIH4BesU+ARQHydk
+2BexSJ4RgqjVpEPxwjWhfVSh+f6k71UgQsL1CEyMgtSYjRkYyI2COX+Vo9iqm3kD
+pCgqUC/yaL6qJw0GBRNGVaFm8eyZdfr1ki8OVcNUWBZVliaW0QR7BmqDoLVDP0BU
+R/j7DhhQNvUfP/65WRbYnnhl7eMkhk0qWEDPkEOw1cbLdkRUu49gbroQuEEbxOnE
+AvZu/UXKszri+3ZI6LmR7q3udVjIQb1rEb6TThlvXO1oauDpFJImhSX/w5bfrd2h
+KcvUYJ3VKypMRjq3iQ9EtQMiYADrHDbS4qMg8O3UIlHkPSrOUIYk656vr9ex93g=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp
index b3e42c96a..e5c9f26ff 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req
index 495a190c8..2c5e18236 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12 b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12
index 8828605e8..4e1ef3753 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.p12
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem
index 0b656da93..57c865b03 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.pem
@@ -1,24 +1,24 @@
 Bag Attributes
     friendlyName: server1.example_ec.com
-    localKeyID: 22 58 C5 1A A2 CB 84 00 AB 82 BE 21 0C D4 98 5F 84 CA DB 03 
+    localKeyID: 13 50 6E 98 0B B5 F5 64 25 EA B1 1C E0 51 24 00 D2 D1 B9 6A 
 subject=/CN=server1.example_ec.com
 issuer=/O=example_ec.com/CN=clica Signing Cert ec
 -----BEGIN CERTIFICATE-----
-MIIC/zCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
+MIIDADCCAmGgAwIBAgICCDUwCgYIKoZIzj0EAwIwOTEXMBUGA1UECgwOZXhhbXBs
 ZV9lYy5jb20xHjAcBgNVBAMTFWNsaWNhIFNpZ25pbmcgQ2VydCBlYzAeFw0xMjEx
-MDExMjM0MjBaFw0zNzEyMDExMjM0MjBaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
-bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABAAfLUhsCQbs+SgH
-7EW6s1JFkGdFWnFgoE7TSRrSQTYtTkQAcy7z9qQJQpbz5eSQh9eE40EGqqS8v7OH
-TBHTljCO0AEgZKDiUK0k0HXYLCReWpyTxr98q1tTRtvcG7pfej0K87EHJcw4DDV1
-3vo/F4ZLmZZKrw2YaETgoyUyereOdQUGBKOCASwwggEoMA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTdaFw0zNzEyMDExMjM0MTdaMCExHzAdBgNVBAMMFnNlcnZlcjEuZXhh
+bXBsZV9lYy5jb20wgZswEAYHKoZIzj0CAQYFK4EEACMDgYYABACjPPWQJF4NAwMR
+tM+fjkYmFAb6C1GSZP7uycVIytPQ8Uq34OCSeVyL1nSWk0Xkf9QWEZIqFt5KNjw5
+w2CMLKbYcgH4/XwphZYKv/187jIRpkmbinNDEDSS/tv4G8SZl+LUK9onJ0/b8UYh
+8C+UOK1ccekVkY3kZTh2fhsjgRAg91kFUKOCASwwggEoMA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMIGJ
-BgNVHREEgYEwf4IiYWx0ZXJuYXRlbmFtZTIuc2VydmVyMS5leGFtcGxlLmNvbYIh
-YWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1wbGUuY29tggkqLnRlc3QuZXiCE3Nl
-cnZlcjEuZXhhbXBsZS5jb22CFnNlcnZlcjEuZXhhbXBsZV9lYy5jb20wCgYIKoZI
-zj0EAwIDgYsAMIGHAkFk/Sa0M7iRtTYJtlXKCJigqJPPOxoQ98gwie7LdIowltkB
-YYmbARyrQRyPkwgZ1kG2z910PPexCL3iTYE96Ogn1gJCAKqhz3dURIiIv8zCvYpg
-2AmiceQGC+/PM7IymCmJE15XIJ5XerFO7ATx7Nhbv9rn8onPQO8Vnk8q4tMieMrp
-2Pcb
+BgNVHREEgYEwf4IhYWx0ZXJuYXRlbmFtZS5zZXJ2ZXIxLmV4YW1wbGUuY29tghNz
+ZXJ2ZXIxLmV4YW1wbGUuY29tgiJhbHRlcm5hdGVuYW1lMi5zZXJ2ZXIxLmV4YW1w
+bGUuY29tghZzZXJ2ZXIxLmV4YW1wbGVfZWMuY29tggkqLnRlc3QuZXgwCgYIKoZI
+zj0EAwIDgYwAMIGIAkIBs8lxZjxw+4xJzs7kz9ybeUOMhrs52krigS2hq1JwsHPD
+g9PJKcza6C/68L7D1d5/rltJMNPfK19QuuyuymIzyQYCQgCiYivDkoIHM3JKI3Rx
++Esavn1vkdfr+QI+gk2uaE8J32MZ0rQrIlVP/SWvOuxdHczxes3Kz/KLWojetS+f
+kmu9uA==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key
index 64f44335f..dfb3497ee 100644
--- a/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key
+++ b/test/aux-fixed/exim-ca/example_ec.com/server1.example_ec.com/server1.example_ec.com.unlocked.key
@@ -1,7 +1,7 @@
 -----BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIAhXnc84SdcRG7JUWdMebgOWg5vAQqsEF9bz/jd0Ke2/UNNTG6hvVq
-VNevI+oFo8fzHF160z4wutMDOig6pgFAMDKgBwYFK4EEACOhgYkDgYYABAAfLUhs
-CQbs+SgH7EW6s1JFkGdFWnFgoE7TSRrSQTYtTkQAcy7z9qQJQpbz5eSQh9eE40EG
-qqS8v7OHTBHTljCO0AEgZKDiUK0k0HXYLCReWpyTxr98q1tTRtvcG7pfej0K87EH
-Jcw4DDV13vo/F4ZLmZZKrw2YaETgoyUyereOdQUGBA==
+MIHcAgEBBEIA2Zty72QNEZ+qGMnpyKJq8J56mxxSFbojmuCAD0hzPVXaapc94Fos
+tk0CKxTuLdfNzo+Ne+jSQSLTEwPJrP+FfnWgBwYFK4EEACOhgYkDgYYABACjPPWQ
+JF4NAwMRtM+fjkYmFAb6C1GSZP7uycVIytPQ8Uq34OCSeVyL1nSWk0Xkf9QWEZIq
+Ft5KNjw5w2CMLKbYcgH4/XwphZYKv/187jIRpkmbinNDEDSS/tv4G8SZl+LUK9on
+J0/b8UYh8C+UOK1ccekVkY3kZTh2fhsjgRAg91kFUA==
 -----END EC PRIVATE KEY-----
diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex
index 34bf70d10..92f4df2af 100644
--- a/test/dnszones-src/db.test.ex
+++ b/test/dnszones-src/db.test.ex
@@ -450,7 +450,7 @@ DNSSEC _1225._tcp.dane256ee TLSA  3 1 1 2bb55f418bb03411a5007cecbfcd3ec1c9440431
 ;
 DNSSEC mxdane256ta          MX  1  dane256ta
 DNSSEC dane256ta            A      HOSTIPV4
-DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 6ec4a7b5f5310953ea3d6deb3f210ba60923be16bf1450b7a45e7567e98287bc
+DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 001c760ab1f0d84446c19245b2163c5b53f3c64f13aa25e23f5ad7cc8439811b
 
 
 ; full MX, sha256, TA-mode, cert-key-only
@@ -469,7 +469,7 @@ DNSSEC _1225._tcp.dane256ta TLSA 2 0 1 6ec4a7b5f5310953ea3d6deb3f210ba60923be16b
 ;
 DNSSEC mxdane256tak          MX  1  dane256tak
 DNSSEC dane256tak            A      HOSTIPV4
-DNSSEC _1225._tcp.dane256tak TLSA 2 1 1 7e241508cffb12c85b1b06a00268f6f7f926ba742db671f3994cbebc81368816
+DNSSEC _1225._tcp.dane256tak TLSA 2 1 1 8b5ec53fbdfa6388cf2dc68855f45ecaa1de321804035262f36693af3dbc4cf3
 
 
 ; A multiple-return MX where all TLSA lookups defer
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
parent	b66afe222257742c497fc2c5b498434b9e52b6b4 (diff)