18 files changed, 130 insertions, 130 deletions
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 25703d07d..8ae2b8508 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,22 +4,22 @@ subject=O = example.com, CN = clica Signing Cert rsa
 issuer=O = example.com, CN = clica CA rsa
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.com, CN = clica CA rsa
 issuer=O = example.com, CN = clica CA rsa
 -----BEGIN CERTIFICATE-----
 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
-cGxlLmNvbTEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzQxNloX
-DTM4MDEwMTEyMzQxNlowLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALF/
-mibgvCGYwqApXnN7sD53QfZ0luIozEan/FsNmTXGyrH6HIJaPSlon1m2+njtEasT
-LKeFiL/hFTyVOVIscAEG8znPcFlVP1UJwPVQfH5OkFbyMp17Yiz/RHQQjEdjQuco
-Fxc6PPBbrdrh4iLP2YLfRGY4+Uvnop7nHHkCVhxptRZweZtCEyOaaOv5W5P3By+6
-qs1j6EiQdSbB/3MS0KJBckNqMeu4L93Ugak3EA2QIcX6FQKrEjTcTrHRwZfd0K9W
-/yjtkOKj6kzTApN7y/AynopqfWoHXRlRmVXG811aBe4FpRsLrpjcbIggiMSQHjU1
-nDZ6DnfBcbsPXqA9MFUCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAKZAhPL7t82UQzrWA/0hF5Is
-PricbvYbGepVy8eJHHymDZrO1fCOAR7Hco31+03SfFDDRid7yeu0utXSVvs6YHs9
-sG6ArM//zP4mUN14uOlSUXBbF1N0fi9/E64q9FXjC1vykocz94Lp7q+pb90sMr++
-UCjWyHgAH/skdMvYUs+N6spIOb2wzm6VXcPSQZ8rFC7WP2bIKpxR2xbMXRb9qcs2
-TrHJizB8J5rw7L1IIAjyiYiDVLPX98TKipyWgi5fUKWAHv0wnswHk+E6DyvRxEGh
-OLBE1Ob/0a+yuEm+Jf61exuX/u/yjl8EeZo58Zt8JU3amBynTigGYmrNWT9/N3g=
+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
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.db
index e5ffc244d..c69040480 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/cert9.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 f6ff6f5f8..c66c29c60 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,46 +1,46 @@
 Bag Attributes
     friendlyName: expired1.example.com
-    localKeyID: 1E 7D 93 E7 45 B9 35 B3 D6 01 92 0D 96 04 AC 58 E4 DF 3D 86 
+    localKeyID: 55 28 F8 94 CD 10 2F 29 62 37 95 1F CF 7C A4 21 C9 A5 CD 72 
 subject=CN = expired1.example.com
 issuer=O = example.com, CN = clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM0NDdaFw0xOTEyMDExMjM0NDdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3YEJrsry
-T0KCVm5o/TavHUffYLRB6+aIOvXS4+Hb6DziAjTUaReV1WWArtrmOvWxvfcXngCs
-t56C4B/KrZkoq0LutMT1gPuJN6nfD/YdDlg58JcHYBp4suA1uI5jc2m7R+7AIFJw
-GiZ6HkKUYQKDERs8vGAegaCZH8Qte9auoterdmU7UNHQR350dFLIALMGN997LHht
-QI26BTPRpKYOGjFLerOxW4Nokb2bnLprTfbWcbs5s/AJ4nZ+47lj2TZropAJKmg+
-oM2/corav94U/rGH3sTRkwDxqJINqNNcE08aFHuc2jHVLj/Fp9I44niivijlRWL9
-m+WBjStVU2JeNwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM1NDJaFw0xOTEyMDExMjM1NDJaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvPLGhDlL
+6DxKpNuilIYuW5ZpvV4DwX/0bl5xQ10fsOl9L1TLKFQNjo+ugXmKaqGDb1Q8IJ1E
+oipjJP1cSXiT9aKRh0eZfnu5F1WFG9DQzf1jAFCk5CjeZiEu2/dlaeCXYlBP/edT
+NV8bUIBA6y8/7sdkdJ9qbBEumsCZqzxJYXjM+jEvrADQ0LZ/K2GpJHPTEnixtwQr
+seDOkfwwn7h5x1nSmj547vMgxFjM9r4NAmM2wBUTJiWHgjZsWonl221NoHLZ07+D
+33DFvJgD6QB7lZVmBldxx2DhVtiGdYS+QTVlYO7RMnWDr7Hl5EZLL93I/qsCvyGi
+i/wYydh+EkXbVQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
 FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
 L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
 BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCj8h11Ym+Wp45V
-yHxjBNCY5rN3za3fnNChULlRWRc+X9Kw2guz8zgCgBAsvo7ZYNuRr2m6kB2k0V7U
-T8qCiEnjEBT9sTZUtO880IXuSzZci+ciUmQFXmuVxvSeQt8n68NrKCycSBjsEr/H
-jfHK7puRdTy/m8RKm49zn5Yk8w+TE3DwDGlkQFIbqBhZyokwE9L6EvqWIgUCpy0p
-R3Mso8Lh+NQDSKkO4siN3FDpgMeKpUbNUQMkYYLLCJXxnTC+LL8tk9Yf2S80pbwt
-EeStAYi8VwKVWV2bkpu8u0Rv80eLDccTuwbWUOwrsTNYH2UuCaS7NzIe0cdEOqOu
-Rb2McZ7a
+cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBNUlRqXZq/NMtx
+jjizZJZnvLHMRg+lB3azYwlnHut6U/rWQkT0zb0CVUO2U50oY8lSpXqZRojhztZq
+yWlGmJZMG8mvv7HXg5lGP6NtYPjfOG2Im+w1H1b6gwdVW60Gcjy3mYhYA3pqYkeo
+2glfUZiNUM8rJh10GyXzX8bF7x1g5oeK2Ar1peW8EUvdLPvZkMxwp5rhrTv+AmMi
+xKj9KJZ4NOMsDRyAGGzUjDzANMxldx0Uq0QgUYfacH0U4HM/WHaUmmh6lfJkYe+e
+R1M0kPc12maC0W4/A5j4owTR9ZO2W380IO4xQH1ZV5Kny6Xu4nWxfvXK7ZQWoAsf
+F3qpUfxx
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
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 4bfbc8de3..4f66ee1ad 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,34 +1,34 @@
 Bag Attributes
     friendlyName: expired1.example.com
-    localKeyID: 1E 7D 93 E7 45 B9 35 B3 D6 01 92 0D 96 04 AC 58 E4 DF 3D 86 
+    localKeyID: 55 28 F8 94 CD 10 2F 29 62 37 95 1F CF 7C A4 21 C9 A5 CD 72 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
 -----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 b0fe5a68c..8546e8c41 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 d026c9bb9..4cb269090 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 98e75600b..154d8feb5 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 eef32e293..e7bc920d1 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 6c0d099eb..628a4e481 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 484d69fe6..ef65fa79c 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 a8b4ec28a..5ad5db6b5 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 ad5e0a286..fcf54e44a 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 873f8f081..eb5f05ddd 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 f464a20a3..0f1c8650f 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 9451cb9f8..5e5d8f321 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 7aec44ed2..9a488a778 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,27 +1,27 @@
 Bag Attributes
     friendlyName: expired1.example.com
-    localKeyID: 1E 7D 93 E7 45 B9 35 B3 D6 01 92 0D 96 04 AC 58 E4 DF 3D 86 
+    localKeyID: 55 28 F8 94 CD 10 2F 29 62 37 95 1F CF 7C A4 21 C9 A5 CD 72 
 subject=CN = expired1.example.com
 issuer=O = example.com, CN = clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM0NDdaFw0xOTEyMDExMjM0NDdaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3YEJrsry
-T0KCVm5o/TavHUffYLRB6+aIOvXS4+Hb6DziAjTUaReV1WWArtrmOvWxvfcXngCs
-t56C4B/KrZkoq0LutMT1gPuJN6nfD/YdDlg58JcHYBp4suA1uI5jc2m7R+7AIFJw
-GiZ6HkKUYQKDERs8vGAegaCZH8Qte9auoterdmU7UNHQR350dFLIALMGN997LHht
-QI26BTPRpKYOGjFLerOxW4Nokb2bnLprTfbWcbs5s/AJ4nZ+47lj2TZropAJKmg+
-oM2/corav94U/rGH3sTRkwDxqJINqNNcE08aFHuc2jHVLj/Fp9I44niivijlRWL9
-m+WBjStVU2JeNwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM1NDJaFw0xOTEyMDExMjM1NDJaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvPLGhDlL
+6DxKpNuilIYuW5ZpvV4DwX/0bl5xQ10fsOl9L1TLKFQNjo+ugXmKaqGDb1Q8IJ1E
+oipjJP1cSXiT9aKRh0eZfnu5F1WFG9DQzf1jAFCk5CjeZiEu2/dlaeCXYlBP/edT
+NV8bUIBA6y8/7sdkdJ9qbBEumsCZqzxJYXjM+jEvrADQ0LZ/K2GpJHPTEnixtwQr
+seDOkfwwn7h5x1nSmj547vMgxFjM9r4NAmM2wBUTJiWHgjZsWonl221NoHLZ07+D
+33DFvJgD6QB7lZVmBldxx2DhVtiGdYS+QTVlYO7RMnWDr7Hl5EZLL93I/qsCvyGi
+i/wYydh+EkXbVQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
 FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
 L2NybC5leGFtcGxlLmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
 BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCj8h11Ym+Wp45V
-yHxjBNCY5rN3za3fnNChULlRWRc+X9Kw2guz8zgCgBAsvo7ZYNuRr2m6kB2k0V7U
-T8qCiEnjEBT9sTZUtO880IXuSzZci+ciUmQFXmuVxvSeQt8n68NrKCycSBjsEr/H
-jfHK7puRdTy/m8RKm49zn5Yk8w+TE3DwDGlkQFIbqBhZyokwE9L6EvqWIgUCpy0p
-R3Mso8Lh+NQDSKkO4siN3FDpgMeKpUbNUQMkYYLLCJXxnTC+LL8tk9Yf2S80pbwt
-EeStAYi8VwKVWV2bkpu8u0Rv80eLDccTuwbWUOwrsTNYH2UuCaS7NzIe0cdEOqOu
-Rb2McZ7a
+cGlyZWQxLmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBNUlRqXZq/NMtx
+jjizZJZnvLHMRg+lB3azYwlnHut6U/rWQkT0zb0CVUO2U50oY8lSpXqZRojhztZq
+yWlGmJZMG8mvv7HXg5lGP6NtYPjfOG2Im+w1H1b6gwdVW60Gcjy3mYhYA3pqYkeo
+2glfUZiNUM8rJh10GyXzX8bF7x1g5oeK2Ar1peW8EUvdLPvZkMxwp5rhrTv+AmMi
+xKj9KJZ4NOMsDRyAGGzUjDzANMxldx0Uq0QgUYfacH0U4HM/WHaUmmh6lfJkYe+e
+R1M0kPc12maC0W4/A5j4owTR9ZO2W380IO4xQH1ZV5Kny6Xu4nWxfvXK7ZQWoAsf
+F3qpUfxx
 -----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 b33ebd4d2..a55005fe0 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,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDdgQmuyvJPQoJW
-bmj9Nq8dR99gtEHr5og69dLj4dvoPOICNNRpF5XVZYCu2uY69bG99xeeAKy3noLg
-H8qtmSirQu60xPWA+4k3qd8P9h0OWDnwlwdgGniy4DW4jmNzabtH7sAgUnAaJnoe
-QpRhAoMRGzy8YB6BoJkfxC171q6i16t2ZTtQ0dBHfnR0UsgAswY333sseG1AjboF
-M9Gkpg4aMUt6s7Fbg2iRvZucumtN9tZxuzmz8Anidn7juWPZNmuikAkqaD6gzb9y
-itq/3hT+sYfexNGTAPGokg2o01wTTxoUe5zaMdUuP8Wn0jjieKK+KOVFYv2b5YGN
-K1VTYl43AgMBAAECggEADaHu+CCKeEFWJz6lXIw8i9dMErYVZpDqKoLNp3PTpn/0
-wwEAX7VxZdBY8qoLSG6tsUzfWbyd5LEvSd77COMnwx6b9Wk32OfiQphEX8WcdTEN
-49ZPwGTwr8Wn2MN+sHA99AfoMDUSrDFZC7q6Shwu9+MOwmNCDWVWd0OKLxh/6Aqz
-q8jbEXwc6Ri1XUcg0wBZaxUlaAicqMt+P1Y5LCq8ftJiR9nsw34XZxIhHJwD9jog
-V3SQTorvTzaUtrlPMVdh1fgmHNriUIRARxtZA8agM3IZkkCBdELqZc3lGCbT+tNo
-BU9iDkSDDorzQokglytbuyQTxT8fNXo92DM0yx205QKBgQD6kDcIThFvzHARH2I9
-ev+7qnNfHm/qpLMwKKZ18iUdjhNHt4Rdr8W1rJ6Z/nkQZqr+0HGq5HcS6jKUqxd3
-mQfMwaZS2ecgPPcooG4pPP02saik7y/C2yXBEHXjB2tu7DUrEuVV74pUOgbVngE0
-DOUvtrqpyv92+oddshfu5zeR8wKBgQDiT2jSW8ElJ/fsM88+0/IpbRzes36MnGpK
-uKGCQuZydqwtcj/igwkCwn8+oMEUsSbuWLeYc22MvvXSVnYSSl0x+eOEzw+H+d+d
-XfT0Ve8OFo9Ho1HtMJz7C2nj3DbjfurJSs3SB6e0jOU0G/GiN5sy5Op6OlL+xRJm
-2bU+u/qPrQKBgQC4FMOZomFFFZkvuzLdoEPJiAyC0UW/yYir1PGWrXN/JyYbBkSE
-3+IM+uj6ke43knYGBvW7a2Xfy5eliZ0QDKmiUJL1Q4l+McwTWOoV+ey+Bf+0TNV1
-/rLaCFHTnVvcfkUBhDxgyj+Caa8juZWAvAiU6VZx7+WHb7+Loo/awJwe6QKBgQDP
-94trLDhs7bLOE7pSkTCLUyLhoG8dxiuDaPG6o8Hj1BxbUw9UF3hzWcrXAaENY9JT
-26Ez7nbwjReXaC7ulfnYkDu9cw5htYUBtzMASev5tU+L1JDX+AF6Tb3MUDT8kEgw
-HJbReIlryMJkRX2ixZjQhz7WfbyBNRa4/z2oXdRerQKBgExfHCNdskCtmk8Wg61/
-iZvw1bQAiSiempy6D4Ld5dwpV+T4ogymRwplue9IsEb2cLnG4Sj+B3W/B3kl/KDe
-Ou9ZPIDPJH2XBGOvBDx0hdrIL/aZmfGDGoxMsp0cKf6WIchDib3dvp26IHo/Z762
-hoS4U6wn5HNFkKATs1n9eE/Y
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC88saEOUvoPEqk
+26KUhi5blmm9XgPBf/RuXnFDXR+w6X0vVMsoVA2Oj66BeYpqoYNvVDwgnUSiKmMk
+/VxJeJP1opGHR5l+e7kXVYUb0NDN/WMAUKTkKN5mIS7b92Vp4JdiUE/951M1XxtQ
+gEDrLz/ux2R0n2psES6awJmrPElheMz6MS+sANDQtn8rYakkc9MSeLG3BCux4M6R
+/DCfuHnHWdKaPnju8yDEWMz2vg0CYzbAFRMmJYeCNmxaieXbbU2gctnTv4PfcMW8
+mAPpAHuVlWYGV3HHYOFW2IZ1hL5BNWVg7tEydYOvseXkRksv3cj+qwK/IaKL/BjJ
+2H4SRdtVAgMBAAECggEAA20xrW8ukbkaL3AuPBxM1etd4onEbqtn3uKGkk6rhvVN
+CGE0x/fyQP4ZD48JNBLWw9uWtY60km5LWv3fQRPXNxKqKfZh8bnDqwkpf04jo0Cv
+nW9Y9ixJkDeU1ndflvJ0PFuxf6zExQiDAcw5oSo7shRanYTQlMIhArxwbPsMZ6CV
+r+L8behY+5KT4SxWnkwB4WhSxJIt86c1sOs6t+HK4kgrr0bzu8s9BJxBjfKxxHYG
+QbdLsfAcEIdA3N3t587J8E7F8uEUKADpYNF7bpln/TLKc0YxMY9TP5eUV6q0sDm/
+LaDe5xPdiHCjD6+RuBGhNElJzLcdcKybEzTwNtIG0QKBgQDxnfq5pLVuf6XxNRYI
+Ze9gzeatOnspp3zMKJz4OVyik6EbNpi9eoGlLozNGTUKeiJwzDfPKskE5j6QFf14
+CCR9AEzeTCr+j7MkyHxEl+mlwJQ4egol0K9ZJZ3ZwAblhLOiSUwd67HSg40TVAb4
+hl/V+dPXgt5xIftQVoUxsyrqHQKBgQDIMixE8NVerA6gUxW3OV/l9GYJ5OgZ4Mi9
+x6AiFQs5g9Zyy97PbxB8lka9li9brGB/W6y2alVLOOyu5pKCWEAlXR00JXXtORv/
+kj2CxcMGz/178FLL2wLHNsJIELO6KiiAIWzzsQFhMbUje8GorwRn/3UJas6Fknzn
+8Fxcr5ywmQKBgQCuVodrHGWtbX2XJe7X8HVhLDCeHexwieGKjmN02C73P/6nXCWp
+0pNpVMVT2DRlcusW6MP8P6r8VgYegT97NKTfbTAJ1nvPYnCoweCovdRhPSu19JkN
+4B4l/PaBAAX55l6XYrwBeue8Nh+9Kow9FvhftPweLNfEWfi0ZzmEOvtkIQKBgEHk
+mcObTW+azDmi/zvOi60Bs3BAQtD5trkYcrGlIYutxDEGv3ChStjnEaOnQjE3XI+u
+2fs0ppxawTSUOdbjO0HREyKtzdHmATwuo0Ze12FvpixcHrRwgsqVUH8t2CpHZAtA
+dT8EnMKj/M4QFt7xtE6Su6/80rsOS0SATbZIKxfJAoGAVHrl3MgrJg7YUqmnqjNe
+XZE/D1/B4zrMxCm1hNnvzwCrfswMKf3lmWjtmzEwGFtGM0I6s4pxLpNZqDSUd4/+
+tOCCq1BEVc8Iz8ZjSvfzyrVCGtk8+xp762HZQZuFFbk41Na387UWoOuNgEe9H9+x
+KOszjOPQ2eoP3bcuRSKoaYM=
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.db
index de5f1d0e1..2643a67f2 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/key4.db