18 files changed, 130 insertions, 130 deletions
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 700d94885..6f83186d6 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
@@ -4,22 +4,22 @@ subject=O = example.org, CN = clica Signing Cert rsa
 issuer=O = example.org, CN = clica CA rsa
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-ggEKAoIBAQC03q9JccjRRcH6bj0DURJ4qyjEWR/rQveVfmuQaEQy3IEXCPzU0DWR
-k1rQ+vfmVFsr/z2JIW8z/l+j2QrGENhNmYbhUkrqYVmujjS5ugVpvzPAwhjTAlo6
-3gEB6NQ6ffP7XVDhriAaLXUd+JzxuhT+baIGE+3CA9YeBmveJHqIAH3GDR/uxLVc
-Cxg42FPoXWbluR6rqlQSY7dj1L+H4irq6vbcskib4F5psg3//iTnkFXguj7QwGrV
-JhqRy/zz3l9+1kwNoyjOD8Nz3ozWTCwGic9o0wACcikSlchiiO6jlaWq/LzHBy6d
-PuQKONhvBvtjlMRgXD0q0x1ycOdpzc5jAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+ggEKAoIBAQCsac/ZFA4uQnOk8L6Ywf3IuJDnp4ONs7SYNSQqlReDuYz9QRUIHBeA
+FoBKkJ4Zk3jSxm3qVkll8i2DDJmR9Qi/eq23fC9UFWL3Uvp+WN0I79ww+MqpsBJ0
+ha2qtdbtRGvU7pmxgdlXyDqfqa+1NCMYM6B59Y45Xap52235bctMCzbUW9nhojdG
+GYRqxa9rxLZhX/MkV+KxAFCEYqktOXmy+dyFpEkPStaxLENDziO4yvmWPoDkPjAJ
+urCjLTO3Kc0bK/B1Vgew6l5kfQ15CSYfYh0ctSCjECJUAc3BUuFvpwbq8nzypg/d
+WzI9u5fkdz4d4tLJW+EE1lWx27dl5RsVAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
 BjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0d0N4Y1hnYjBRMA0G
-CSqGSIb3DQEBCwUAA4IBAQDAAtknYQ1Qox8QnfgUbXougZY/PpukWVCLDlRBrC1f
-SmPVdIis74PYASBkXvo52F6R68id8cb3maECS7H7QZEYdQuveq2aIiQr/zJP83NG
-EDFhT6gDQPCOAMLC0RCLJ3atqyAc/sRqO6kIIEb8yA+pU8KTtgDvcDgeokupWO4b
-8wwSY0Y+wkmq8W68GTI0juAKw9/WbHojlke0pwX06aDNX4JH/BCX5wQ3MDCHiW6s
-/866Wkd98eKHhyt0PSREgKIuhUgK0y3LD1NivkKzmJhf25QtU/jistUWzUrGZf8w
-vTECcKSzoD7jT3NDnbNpjUVUHX6pQkOUTZx6up4Fm1qM
+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
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -27,19 +27,19 @@ subject=O = example.org, CN = clica CA rsa
 issuer=O = example.org, CN = clica CA rsa
 -----BEGIN CERTIFICATE-----
 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
-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
+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
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.db
index 852df629d..c08ba81c1 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.db
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert9.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 5c49f01de..ede4d0365 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,46 +1,46 @@
 Bag Attributes
     friendlyName: expired1.example.org
-    localKeyID: F2 67 BE 8C D6 E0 D3 F6 93 93 15 49 78 6C 7D 8C 94 C5 4F FF 
+    localKeyID: C0 9A 97 7E FB AD A1 DD B2 63 3B 03 87 98 F2 7B 21 70 DD C4 
 subject=CN = expired1.example.org
 issuer=O = example.org, CN = clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM3MThaFw0xOTEyMDExMjM3MThaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPrH9kRX
-io2ozwXcCqgLI8ae8WpQnAg/9h4M/BYYWtXMQGu4My929I7qL8xLj45XZx06i73m
-a9vOBjyYlvKh6BUdW43GzcTKL2DwF+6UjYUzvkYLuoQjYzia9+rZvi2k3awJqZtJ
-fnkJwrxyxDYYlSUo9Mhl9XVjiooD4zCmvnuxLH3JqnbENevBV+WRB+jMTyvL8GQM
-KEDZ8nx9UQyR7XNj9H5eyAez88TrNUdXq15GkhUeSss/9RVfW6xjXscTqMAdMyAE
-SKQ8eRQKfDld3cIBKS9Sr394yuI2lGMh4mw7f8lJJyNn7iJfN8EvskzPney45zz0
-PpxRh95vNq1KcQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM2MTNaFw0xOTEyMDExMjM2MTNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0EtWs7wK
+3H2iwUYETyxB2qw4jlUvKtDkJbrN/U28vbLzEei398bIAwVkQe5BA+0dCYvqAjU9
+886yQdlBBZEOI7jr5/U6ditbT0nIzyeojb3DMJI30R+Vpxhtaubwu7kiXeIjjlkJ
+2IGGOISejHosCzGQ9Zx/v10hix//pmTORPU4u0W6zAO2rzXVIsaTjVsOK4owEkJV
+M4a7lqN/IJZ9JY5gMeszWivvKM61ktVInE4xaJ/FuAUyIwIqf2Pr5j6TNYAFRw+o
+Yr/3Hpxe3OlDhVZZAwEz6HNZNkO38zuzfpw/cG5g8qYauGkmaHeSDjsfLg4flRFM
+JbYImfCkZAXzZQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
 FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
 L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
 BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAQ1pW1ZyHpP9eK
-Ao6nqHZUIPFnyW4alfez+eTdgo9vg7ua7oVN/sxm+T5yj0H3QGuvy2nIGaKC1KGu
-zNZk1Oxq76GtkDrCEtTYeQ3qvPkWzdqBrwYPWpKLgMoCn8kRVpAmjFLL1D7Ot5rD
-Nzbi8bSNrKzuKWmV+1xuS5n4u6yySrDxz1WzHFixLACbEAub5L+ngZ95Ws1hmJgv
-FiyqOLt9yKB0Zd0gA2ndiqzcn3WjxmrnJPNoeiPsWjo39+pNil0zvhd0UbqAHygg
-BuX/fd5mx8ICX/XfYik3tiBB3ndlewg4ef1UZqY/oXzvge9C5FdqpKDFKQE4LiGc
-4BpHDCZv
+cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBPXa50mqKAsYqB
+/Z7ocge7x9d2vfETzKJLC0JHBsb6S4IGed9CqXdlbdxWiDokRwBKlRkUnfAG48VB
+ZyUV82knq94OlscomO1KYNve4LPG3lvE41eLyxr+m34y/mSj8lILbkSyq86gXnxx
+lJdAhgxovdQ8Iprij54L2akALIz9q5iCHWI+UL1l5mJQSHOVVpf81Ibgb6CD5/nP
+FKkMb4oDF+7JiK/M64EzSp5D8O63/sCFQ6zGTtfruk64A/m9pYIFDmNCao9ZZopE
+9EorgYucmlWeEx7uu0e+4meSfEA3HQvUj4OLxx8sAjxf5TFYRocBnXPdzkdrKGtM
+V1Gglima
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIDHTCCAgWgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzY1MFoX
-DTM4MDEwMTEyMzY1MFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzU0NloX
+DTM4MDEwMTEyMzU0NlowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-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
+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
-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
+CSqGSIb3DQEBCwUAA4IBAQBssrgFYSEAAic3DEIGVR09J7EhpLuLQk2Zednfwe3o
+f5lH661QAzEp972dvF2Z0sA2V+RlikhVH/JbQ0Mg4tHF7Qz88zOVSRx8NgZGw/NV
+HDMu1H7PDVAVAWMneTJ+56DfEO4mJft9wJiSpFs/+hfyPINf5EQUqOCtfQSpdahS
+6YjoH+XSZWfYw1rxjE9G9dQ++xAO1u8MxjofUGvyLPDupDs/JVKu7OYG6gQ3nerU
+3LOM6mjChe2hlD6TjoTUVTqkuAwdQ8gJHfnvsBWAWg5fA85AUsTixFruhNm556nD
+V6AE557SEUUUZYAN1DCsXFAp4sV5tkD6FfDTg6fR4Z2q
 -----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 ab0e1b8a3..a3ffcf723 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,34 +1,34 @@
 Bag Attributes
     friendlyName: expired1.example.org
-    localKeyID: F2 67 BE 8C D6 E0 D3 F6 93 93 15 49 78 6C 7D 8C 94 C5 4F FF 
+    localKeyID: C0 9A 97 7E FB AD A1 DD B2 63 3B 03 87 98 F2 7B 21 70 DD C4 
 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.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 030d9f824..4bff97504 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 11be80091..70a545066 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 a5f66dce4..26e84606e 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 8ce970851..7ac7426e8 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 8bec76d18..63d9c4afb 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 1f45fd50d..ce27c660b 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 eac70ae9b..0f0a3ff5d 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 0a073251a..dc9a10b80 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 cd91488e1..41d10c460 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 b308294af..761bb412b 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 9b93243b5..c01fdbd91 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 653c98293..90013d231 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,27 +1,27 @@
 Bag Attributes
     friendlyName: expired1.example.org
-    localKeyID: F2 67 BE 8C D6 E0 D3 F6 93 93 15 49 78 6C 7D 8C 94 C5 4F FF 
+    localKeyID: C0 9A 97 7E FB AD A1 DD B2 63 3B 03 87 98 F2 7B 21 70 DD C4 
 subject=CN = expired1.example.org
 issuer=O = example.org, CN = clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIIDkjCCAnqgAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xOTEx
-MDExMjM3MThaFw0xOTEyMDExMjM3MThaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsPrH9kRX
-io2ozwXcCqgLI8ae8WpQnAg/9h4M/BYYWtXMQGu4My929I7qL8xLj45XZx06i73m
-a9vOBjyYlvKh6BUdW43GzcTKL2DwF+6UjYUzvkYLuoQjYzia9+rZvi2k3awJqZtJ
-fnkJwrxyxDYYlSUo9Mhl9XVjiooD4zCmvnuxLH3JqnbENevBV+WRB+jMTyvL8GQM
-KEDZ8nx9UQyR7XNj9H5eyAez88TrNUdXq15GkhUeSss/9RVfW6xjXscTqMAdMyAE
-SKQ8eRQKfDld3cIBKS9Sr394yuI2lGMh4mw7f8lJJyNn7iJfN8EvskzPney45zz0
-PpxRh95vNq1KcQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+MDExMjM2MTNaFw0xOTEyMDExMjM2MTNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0EtWs7wK
+3H2iwUYETyxB2qw4jlUvKtDkJbrN/U28vbLzEei398bIAwVkQe5BA+0dCYvqAjU9
+886yQdlBBZEOI7jr5/U6ditbT0nIzyeojb3DMJI30R+Vpxhtaubwu7kiXeIjjlkJ
+2IGGOISejHosCzGQ9Zx/v10hix//pmTORPU4u0W6zAO2rzXVIsaTjVsOK4owEkJV
+M4a7lqN/IJZ9JY5gMeszWivvKM61ktVInE4xaJ/FuAUyIwIqf2Pr5j6TNYAFRw+o
+Yr/3Hpxe3OlDhVZZAwEz6HNZNkO38zuzfpw/cG5g8qYauGkmaHeSDjsfLg4flRFM
+JbYImfCkZAXzZQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
 FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDov
 L2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
 BgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8GA1UdEQQYMBaCFGV4
-cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAQ1pW1ZyHpP9eK
-Ao6nqHZUIPFnyW4alfez+eTdgo9vg7ua7oVN/sxm+T5yj0H3QGuvy2nIGaKC1KGu
-zNZk1Oxq76GtkDrCEtTYeQ3qvPkWzdqBrwYPWpKLgMoCn8kRVpAmjFLL1D7Ot5rD
-Nzbi8bSNrKzuKWmV+1xuS5n4u6yySrDxz1WzHFixLACbEAub5L+ngZ95Ws1hmJgv
-FiyqOLt9yKB0Zd0gA2ndiqzcn3WjxmrnJPNoeiPsWjo39+pNil0zvhd0UbqAHygg
-BuX/fd5mx8ICX/XfYik3tiBB3ndlewg4ef1UZqY/oXzvge9C5FdqpKDFKQE4LiGc
-4BpHDCZv
+cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQBPXa50mqKAsYqB
+/Z7ocge7x9d2vfETzKJLC0JHBsb6S4IGed9CqXdlbdxWiDokRwBKlRkUnfAG48VB
+ZyUV82knq94OlscomO1KYNve4LPG3lvE41eLyxr+m34y/mSj8lILbkSyq86gXnxx
+lJdAhgxovdQ8Iprij54L2akALIz9q5iCHWI+UL1l5mJQSHOVVpf81Ibgb6CD5/nP
+FKkMb4oDF+7JiK/M64EzSp5D8O63/sCFQ6zGTtfruk64A/m9pYIFDmNCao9ZZopE
+9EorgYucmlWeEx7uu0e+4meSfEA3HQvUj4OLxx8sAjxf5TFYRocBnXPdzkdrKGtM
+V1Gglima
 -----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 15ae6376e..28afa7918 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,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCw+sf2RFeKjajP
-BdwKqAsjxp7xalCcCD/2Hgz8Fhha1cxAa7gzL3b0juovzEuPjldnHTqLveZr284G
-PJiW8qHoFR1bjcbNxMovYPAX7pSNhTO+Rgu6hCNjOJr36tm+LaTdrAmpm0l+eQnC
-vHLENhiVJSj0yGX1dWOKigPjMKa+e7EsfcmqdsQ168FX5ZEH6MxPK8vwZAwoQNny
-fH1RDJHtc2P0fl7IB7PzxOs1R1erXkaSFR5Kyz/1FV9brGNexxOowB0zIARIpDx5
-FAp8OV3dwgEpL1Kvf3jK4jaUYyHibDt/yUknI2fuIl83wS+yTM+d7LjnPPQ+nFGH
-3m82rUpxAgMBAAECggEADIgNXaY0LqbeM55+GLESbNuVCJIXGB1LbiFtmPH1koT9
-+/fEqLctLJ7r/StxlD4neTEsIpX1OWDsgyuKQHH4vea01/U/hPVwvY8XIRKvKSAr
-7EaocPIHUXDCJFjYRyuTN3EFlCFfQFnQs53FYJhWAEWL011XPtyrijVAljctL2KT
-mYjOHLglbxQIiug4kZ8Mg9rXBt6bg5ZDBYJyKw+hdBmomta4LSVXrW6HmwfBSI9D
-JBkoBIsK/9sldlQMgQ8hHfjEEwZBxyjwOx8rVCcpQQPN07Lz1Aba3yyX2mqLSubK
-wx1MhPbuZITYywvFXy41dliLmA2BBWKVzNYTvUcH0wKBgQDe6TE0QJN0AX29zVEs
-Qi8YGV+5yuieH6ZVQ/iHIumQiQiQy+BEbkeTjtgRnTcSIjj3w2pSK8qGiYkynhwv
-aol3PzTlKtIKcCtaRjbPqFtjpNVXnsFJwWQONCg7AsQyMvHGipMrYJPyF2COYCWk
-m85pc4Jcs65yFD4LZE6YO70YhwKBgQDLQCjwIi9TAYNNKg0nhMm455Q/ut2Tz9mD
-LV9gYBLQMtgSGo9RRreO0oeP8YYP86Rfa4tRh7unTbHH3re9LLlI1FpBj2qlVcxp
-YXw/98fxjTAju/tCcTpJoA0zJgY5VfBBfiGWRbG5//QHE6ca7+Z9hpIVVav2mbdG
-XSmVpMDbRwKBgAciy/JyRsYl7hKPahPSopNQ7KGT/1JgjQCZxnD9CyEXYfDQtgM6
-zIvKvNwDfmnUMqKr3NF4mWkpKf021owmCvSIT3cuob63zIt9R+/p4dMUyceeS23D
-BSL3RHpvIjzBKMBEW2W+F75eRTcJmOrmGfuCOSAimGkKgNn4ghOZhfotAoGALx/a
-HgsfA9TW954nXKFKEAgJdFlEJJBNcz+i3HqKAiG3vULRNdv6lS+05KfwGGS6GLGb
-pLSeyqSV8qxt13u2He+2WXsCFAF3mntSzpYJkrTUk4RzNi2AgS+Nv+0yBjspsFWp
-Pek80s5IaxegZ/t1amc4GaA6dbugJb1V9e80E+MCgYEAuq3zlI627BfkEvR7kxZn
-ZN8N6hQfG+DEjp/mwWF5Sbzc2Lcw/XHH5iUVRyvvkiLmcPkaI0cyfGPevAFf68eL
-hIVVoure8WRK1YFYpE5uzPpwMbcwp9lwx0pjLvGOrD4S3YwawAM8Zsf10GdStmhP
-sewqoOLZLqVcrsnuWuBnVNc=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQS1azvArcfaLB
+RgRPLEHarDiOVS8q0OQlus39Tby9svMR6Lf3xsgDBWRB7kED7R0Ji+oCNT3zzrJB
+2UEFkQ4juOvn9Tp2K1tPScjPJ6iNvcMwkjfRH5WnGG1q5vC7uSJd4iOOWQnYgYY4
+hJ6MeiwLMZD1nH+/XSGLH/+mZM5E9Ti7RbrMA7avNdUixpONWw4rijASQlUzhruW
+o38gln0ljmAx6zNaK+8ozrWS1UicTjFon8W4BTIjAip/Y+vmPpM1gAVHD6hiv/ce
+nF7c6UOFVlkDATPoc1k2Q7fzO7N+nD9wbmDyphq4aSZod5IOOx8uDh+VEUwltgiZ
+8KRkBfNlAgMBAAECggEAIhsj8DwrHx1nR/RaAkjB47dtb0jdd0pLAS6MShyvefRS
+Pq13ahffajc4yl7jwGvT5FtHjuL+6OwAXi3fqrSstwaxggKyduT0h5ASVHEu9T6M
+NmjKwPBGBd1HFUkJRAO1b9/2aHmF1jCnNJvqhh//FDoifUUJ2eC6/FfZ+XnqGHov
+BZlq0xzx34WYG7gYT9jL2tfowaOb24F9hpo8F3ISSl59NIxjmPC9ugBYwc3OlL6M
+6hnxp3o8Xst0rx/lfVl1Rh/gvLlyMXG5LS+x0kZzRG8+fIgn3x7+6y/bHTO4m9Rv
+7zNCCEqBXZ29eOrFnmbKOk0SpPETljnC+ItN4KAcxQKBgQDxGXo50wmVhHGfWQrD
+kTBXz8ZZLB3b6DyxEWG8ZpilyLT6bPtys+uZHB1cu69WAqJeEHcnKXctoCKx6Kx/
+MRWGtKfeZz3VJ9J5HWhCsKDamEG5AYD4phGeqp6W4QpRA7OeEbzxbyTFh7nU4ZEF
+B3mvpCKLH2pZUxT+UNDk4ORvewKBgQDdKtZ9yXwraf90I/PfotK22BvUkmYXE2LT
+rFCnd3P1jdTBeKeDQoA096BFlb7CwW+rJ7XUXb9tYcnkyUcST5spYRB6vPAHZ/hU
++W32AQBZ+JdDVIda1pRBR825oSqjTtJOgJymwFlt/2VEV7sxCHan1kbIfUryXL9n
+gg/frAVCnwKBgQDI/T5BekbhGDpIZshsZFryuUlXCUoTCzWdPypFDxpuCjWlFrk/
+0/GyABgSOHxgrW2CESPjx9OMe5Swz5ENr3OMionvBA4t5ja1tOg3wFs4H/maK0DD
+CF5j8USn7w7UnstcGNl0Q/1Zll46s5hbovG0lJYfeJ8FvBciM2kRhNGqhQKBgHND
+PxPBLPhHPr3detyjM+PczuxC+/esv8WHOWV9qK5ho27NHagXwU9Zemqpdwhy3Wq6
+wFWUIg60dw7II0UUvc2b64W77/A8LDzE3ZzmurMpDlQluoEJ8avv6vSCXQFNM+d7
+uahh+HmOL82lV0Zfnc8sqikUuzmCQrKEIxezw+4LAoGBANlsrgXW++44KTD3O9+U
+GtPjhT4D4KBROW9HETMh7k3fgKm87oGVN6YnZSlHoL2yySaLmnBVIKlG7sfpdNGG
+UazaI3xl+GZPJenDLPam4NPbK5Qo3/wb57GHezI77UoouTiYNxaYwOO4dw3REht2
+u/9RsWfOO3Vla4GC1/Pi54Os
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.db
index 1730eea3d..35dbfe7f4 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.db
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key4.db