13 files changed, 102 insertions, 72 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 f8f92755b..93c9d7239 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
@@ -3,45 +3,54 @@ Bag Attributes
 subject=/O=example.com/CN=clica Signing Cert
 issuer=/O=example.com/CN=clica CA
 -----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
 MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority
 subject=/O=example.com/CN=clica CA
 issuer=/O=example.com/CN=clica CA
 -----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAwWhcNMzgw
-MTAxMTIzNDAwWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAxYR8NYQvEd7/e4MvOj9dh2+o
-mnywT9ajMo1589DWt2z14ouRKhSZWlx4O4AicPZc6n4uvt7++t0tTHhmm5JIbwID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBALjVd1KMBadFJFIzTEspoPYxJvXKvLMclekQs5QY0lmmUj5+
-ugITEG6ywu3s+REUB+8Dj+ofQz3tgIm9NBpkfsA=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
+MTAxMTIzNDAxWjApMRQwEgYDVQQKEwtleGFtcGxlLmNvbTERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALw3TIYMk4w2ob6o1TFb
+FT5sDY4HL+9uHWZfPh6dF1ILu04KVgEb0SqP/LnHLcviH6NG0G9EsiDTdG31Svuq
+xx5CrqyW+rs1pYb5NjS8mpnp3A0e2YvoWhBrfwY3+OQo193JnNDDxC5fD+bkq1P6
+LIwI72HF4/YBqGuOSGm2G34TAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAC1/IueycXMDP6mSC862
+YU584GqXCxUaxO+5X9J7qnqsBEuNCvBwnfCuPAjo+MVftpV9rghBNUvujyisBQ62
+u/q7iuEsm2Oo7LlfZ/tQbAPqBbHCSnsS4+q+rdkNz0xPpiF87p9HbG5xA0motcUT
+cIF38qe4aoHWHF7EsPgKUDbr
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: expired1.example.com
-    localKeyID: C3 70 0A 4C 75 DB 50 B7 1F 67 60 9C DC AD 17 A3 C0 65 5F FF 
+    localKeyID: C6 54 3D 15 33 26 1F 85 58 37 5E 12 C5 4B CB 9F E6 EC A1 34 
 subject=/CN=expired1.example.com
 issuer=/O=example.com/CN=clica Signing Cert
 -----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTEyMTIwMTEyMzQwMVowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAuhbGp8Jqy4UZdYGiPLl+q1m4
-dBdrY6689kqn5x5FUZ4PNl9ty9+mnC2Dx5WiYbrOybQZViM9lAIvGRI1GKsHdwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUuY29tMA0GCSqGSIb3DQEBBQUAA0EAkrXPLW+etluRGUilUcMsAWEZJ8Syu317
-kXvPuyjNVz3+lGo/4hzhehSusTzy4+22UgsBmgZpjG+uI8tNRmDnAQ==
+MzQwM1oXDTEyMTIwMTEyMzQwM1owHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMGE/KgstC+6lmLQzUCs
+zdgjlZj5cDw0rp0vpHdf/4nqUNOnia67EQCBVvvPgL9IUsD42KTqub8WTGJ+Ti6Z
+PsRWTIWBVfrHM2rJ6HppTQs4y8OiNas5rXJnGpu0E5RJIiiWK1BkaELBX6YDBlho
+ZFFV499MqtoZYk63k6VXogY1AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEFBQADgYEAlb9q
+okquamR7BnFLorpGo0Q7Wxs5IVQAHzbfJ/OGbm9uWpnhGENhxvU063e2VXVJbF2v
+agUHBGxszX0w0RLjXls+ZwWiD/evVvJ0l97NQ6C0sMmHMLuRXhZLmOHOI8LMCKQv
++N9MuJbiVVrwy7WrdKUz4WDS+Veo66gYSGV3jZ0=
 -----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 29784aef4..c23528565 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 fe5dcdf2f..c16cb51d0 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,29 +1,35 @@
 Bag Attributes
     friendlyName: expired1.example.com
-    localKeyID: C3 70 0A 4C 75 DB 50 B7 1F 67 60 9C DC AD 17 A3 C0 65 5F FF 
+    localKeyID: C6 54 3D 15 33 26 1F 85 58 37 5E 12 C5 4B CB 9F E6 EC A1 34 
 subject=/CN=expired1.example.com
 issuer=/O=example.com/CN=clica Signing Cert
 -----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTEyMTIwMTEyMzQwMVowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAuhbGp8Jqy4UZdYGiPLl+q1m4
-dBdrY6689kqn5x5FUZ4PNl9ty9+mnC2Dx5WiYbrOybQZViM9lAIvGRI1GKsHdwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUuY29tMA0GCSqGSIb3DQEBBQUAA0EAkrXPLW+etluRGUilUcMsAWEZJ8Syu317
-kXvPuyjNVz3+lGo/4hzhehSusTzy4+22UgsBmgZpjG+uI8tNRmDnAQ==
+MzQwM1oXDTEyMTIwMTEyMzQwM1owHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMGE/KgstC+6lmLQzUCs
+zdgjlZj5cDw0rp0vpHdf/4nqUNOnia67EQCBVvvPgL9IUsD42KTqub8WTGJ+Ti6Z
+PsRWTIWBVfrHM2rJ6HppTQs4y8OiNas5rXJnGpu0E5RJIiiWK1BkaELBX6YDBlho
+ZFFV499MqtoZYk63k6VXogY1AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEFBQADgYEAlb9q
+okquamR7BnFLorpGo0Q7Wxs5IVQAHzbfJ/OGbm9uWpnhGENhxvU063e2VXVJbF2v
+agUHBGxszX0w0RLjXls+ZwWiD/evVvJ0l97NQ6C0sMmHMLuRXhZLmOHOI8LMCKQv
++N9MuJbiVVrwy7WrdKUz4WDS+Veo66gYSGV3jZ0=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAxWhcNMzgw
 MTAxMTIzNDAxWjAzMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGUYGllRw9Y
-7ATtT3iqwv3rnnpYYWaxGdamUYznYS6l8lAyHFOqfEktdHZ+bUyRVWsbvyx/a2St
-u1vpZpkihvMCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLmNvbS9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EApouSZ4cX2rx+pZWcDHJH+KaCMpMa
-ScrHO8bFSCWI02ckzoIxWfu1DMNO++EpyzrTgyaXoCROjvhdslwucMqAIg==
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDbtEkB
+9r2diCSVkDt3dvHxXy/FpSeDJMdAmyKrnvXiPsSoy/jh/As9Jfvue7uEOZlvQ1Bv
+kQV2MWBbO0IDkSV4wwDWBUcT+h1kiPRWENo9UDa1MRCASvhyhCrGDvPChAshJMNf
++RTjtboDYaJO4xdUK6vwna+0JpHNs2ZAnP4NWQIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+IaeUES+PaeRhUOkeTWSlMbvlMGJ8ncchCB9Of5S3sxUjKEmhH8pWGLa/cxp3N1Ck
+tpC5MvUbjL31ZGBZ0aYsv7db3BgaR/OATENVgOcdIx2FeBGPE7xn4tSoP//LjJlI
+AjOlSXCuJauvTz9w+EgUERsaaFGtn321FjhmNsi0qnU=
 -----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 ecfb0cbc7..312ac1c6b 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,15 +1,21 @@
 Bag Attributes
     friendlyName: expired1.example.com
-    localKeyID: C3 70 0A 4C 75 DB 50 B7 1F 67 60 9C DC AD 17 A3 C0 65 5F FF 
+    localKeyID: C6 54 3D 15 33 26 1F 85 58 37 5E 12 C5 4B CB 9F E6 EC A1 34 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBnjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQINZM2aHxF3EcCAggA
-MBQGCCqGSIb3DQMHBAjc9XMhJPg/ZwSCAVicoTPaeGXGPJyPdhflErlI9EWbj0PH
-bv8AchovLDfYq1Q4EJzkUG1XyelHNha+BS/zFxCcmtpdQtXedL/SdXsOyM99wdJH
-tjpJyWxM3bysqDUdhv2g11KTG0M9L7RBtKmbQq0zcHf9oTZbABKSe4EzX6a9khJY
-5bRVBSQPNtj3/5aAr0BOQQnythh0880FcYmvbFmZQNR12Cexc0+X0/aTaQ/LhM1y
-8GlRBFXGACP+mrY4RfEk/EatcGmqn4JCVASF7Z7zu7JKsEskLDArF9nvVh2xN22n
-DugUfQDRPph4ug2MyUcKNSZzGs+khWmS2TgPgUV0gr1tqS4Sqo+59NuZInyGSMRn
-FeiFTSYcd+zmxinF20MCs+Y6fFasErs6/zdK5oeV8pMlTCX0/yky9Ye4kfth2oHl
-UV+Rfe2Bo40wn6QkxuptagYdoDTJrMUCH9WL/ODRn4IA1Q==
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIZ7oddrWXYk0CAggA
+MBQGCCqGSIb3DQMHBAgyw+PxiMXbfwSCAoCJs8edW5MnlAboAlXblPxI6NkTUzyN
+IVUY/8atgVpTOvF0a4YQAq580jw8TA2u0xzggDGyDhp6MnxqQgKRGkEkeWUVug0G
+67FwJRE2aeJwFD7oKUUGviKl46ReTpJR/maZHhS7AknifzkQzoHPhWLWn8MQ264Q
+/V2qv7F+pnJtofQwZnLWG3BGHWlJsj1i9qtwDEZmR9Zg0PLQZ5w+NnsXR1QGNnjL
+H/NoiVybJBXn7keAFfyPP4IhbHB+HXr4P8JP/7VIj09sXVAi1REF4x4bwaQD991R
+eSNSZ8JU1hTLVFnICEebKq5w13vuqo1TdHIwVNih+pvz2YmAC9qYexcTRPyU6rSr
+ZuxF2K1/PsBpI61cKYlM9X26uCDsz7u0mHpNSR5NBu7x+iCCx8ar0W4w7mQ4bG/6
+gPUgYTRR9xLdvOjZdKbRalZ+xBIICtvECG0lIJvtyylSp0A2fO0DuzIRTPZ2T1JA
+NxBVgBFnMAGYe6bIW46xBJLT9jTV+7geARJFO5MkmtXyYB0zhUE9LlVNbuX0FDfx
+DJRIGRxQPqjMFEzZC/PAjXMGwMUcAcNKmGPtyjknspmnGzERQlKC3yxdxqZaegWM
+G/ty1eYnPBT7aynCGK92WycIFK9B8UTC7V7rJPl0F6LD2+/hAi01v/HsljWXjdo9
++qCtPTyUvmvv5Jdg3vDbrzYZXvPoq1fv9ZLybN9ffnOPJUTCirDnq7x9bmHVYvQp
+0hJNzh1kJLvlqwBQPmiTXlv/a2NxXMK+qsVKIlLfNHyx8M3XrVM/H/D+HlOFsyCr
+7FLLHBx0hxUjwsNYSfbqlV7Svect/UEoxziTiXd0C/jrirSsoU6+kzwn
 -----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 d7ba6319e..52f4a3d80 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 3714a90de..6edc0a935 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 37b83a669..b2648789c 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 4a259407a..bfe9e42b8 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.p12 b/test/aux-fixed/exim-ca/example.com/expired1.example.com/expired1.example.com.p12
index 488e3e58d..4bde4fc2b 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 d30bbe096..f4e7277f5 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,18 +1,21 @@
 Bag Attributes
     friendlyName: expired1.example.com
-    localKeyID: C3 70 0A 4C 75 DB 50 B7 1F 67 60 9C DC AD 17 A3 C0 65 5F FF 
+    localKeyID: C6 54 3D 15 33 26 1F 85 58 37 5E 12 C5 4B CB 9F E6 EC A1 34 
 subject=/CN=expired1.example.com
 issuer=/O=example.com/CN=clica Signing Cert
 -----BEGIN CERTIFICATE-----
-MIICBDCCAa6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
+MIICiTCCAfKgAwIBAgIBZzANBgkqhkiG9w0BAQUFADAzMRQwEgYDVQQKEwtleGFt
 cGxlLmNvbTEbMBkGA1UEAxMSY2xpY2EgU2lnbmluZyBDZXJ0MB4XDTEyMTEwMTEy
-MzQwMVoXDTEyMTIwMTEyMzQwMVowHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
-ZS5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAuhbGp8Jqy4UZdYGiPLl+q1m4
-dBdrY6689kqn5x5FUZ4PNl9ty9+mnC2Dx5WiYbrOybQZViM9lAIvGRI1GKsHdwID
-AQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxl
-LmNvbS9sYXRlc3QuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0
-cDovL29zY3AvZXhhbXBsZS5jb20vMB8GA1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1w
-bGUuY29tMA0GCSqGSIb3DQEBBQUAA0EAkrXPLW+etluRGUilUcMsAWEZJ8Syu317
-kXvPuyjNVz3+lGo/4hzhehSusTzy4+22UgsBmgZpjG+uI8tNRmDnAQ==
+MzQwM1oXDTEyMTIwMTEyMzQwM1owHzEdMBsGA1UEAxMUZXhwaXJlZDEuZXhhbXBs
+ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMGE/KgstC+6lmLQzUCs
+zdgjlZj5cDw0rp0vpHdf/4nqUNOnia67EQCBVvvPgL9IUsD42KTqub8WTGJ+Ti6Z
+PsRWTIWBVfrHM2rJ6HppTQs4y8OiNas5rXJnGpu0E5RJIiiWK1BkaELBX6YDBlho
+ZFFV499MqtoZYk63k6VXogY1AgMBAAGjgcAwgb0wDgYDVR0PAQH/BAQDAgTwMCAG
+A1UdJQEB/wQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAj
+hiFodHRwOi8vY3JsLmV4YW1wbGUuY29tL2xhdGVzdC5jcmwwNAYIKwYBBQUHAQEE
+KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb3NjcC9leGFtcGxlLmNvbS8wHwYDVR0R
+BBgwFoIUZXhwaXJlZDEuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQEFBQADgYEAlb9q
+okquamR7BnFLorpGo0Q7Wxs5IVQAHzbfJ/OGbm9uWpnhGENhxvU063e2VXVJbF2v
+agUHBGxszX0w0RLjXls+ZwWiD/evVvJ0l97NQ6C0sMmHMLuRXhZLmOHOI8LMCKQv
++N9MuJbiVVrwy7WrdKUz4WDS+Veo66gYSGV3jZ0=
 -----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 9754e14fe..45432ce33 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,9 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBALoWxqfCasuFGXWBojy5fqtZuHQXa2OuvPZKp+ceRVGeDzZfbcvf
-ppwtg8eVomG6zsm0GVYjPZQCLxkSNRirB3cCAwEAAQJAbb0wuY21XP/I27ru6dCa
-GoJ2fD+zXL2XQccU7P608kO6R9g73lx48QT21OGvLkKGA4J2U3qqvqJWKP580o3X
-gQIhAN8A4PM0w3cLBnibnQcr+5TfhSUye/4AQcaqUQBnjQW5AiEA1Z+eWtugFdR3
-D6ntc4UdyXsO1DMDn6QyuyEyrJqUDq8CIGGfrtqJVLB+gRy3cuy60m3/0/fOu/0b
-+6+Oy9sTeebxAiBK7m5RWHBSt+/7YpOTzcGhBrUw4aQHv0S8Nuzbdm0wqQIgYW0B
-7KVyChX6OpKifrdrSK3Jp3iXP9pgNunxGNj1QbM=
+MIICXQIBAAKBgQDBhPyoLLQvupZi0M1ArM3YI5WY+XA8NK6dL6R3X/+J6lDTp4mu
+uxEAgVb7z4C/SFLA+Nik6rm/Fkxifk4umT7EVkyFgVX6xzNqyeh6aU0LOMvDojWr
+Oa1yZxqbtBOUSSIolitQZGhCwV+mAwZYaGRRVePfTKraGWJOt5OlV6IGNQIDAQAB
+AoGAahPPuw/mJVOOI9R47j7LBvNaiWQR1a67GIaJDLaeiKbcb2ii3BjGlRRQ7e8s
+j63BTu4ZMy1HbCt463R4vqpZ8KlFWFnKV0XydCZY3UY0Nq/eGFPImhGHZeNdpmxC
+N2aDkJuVTI2qdv4vFUrUlwnGCZWt8BaNB9sjapEryxcKn/ECQQDrjKWW6eQqWzzI
+ASOtbmcStNTwlvZJd9K6J4kDaqK0o9lmepWzNIePehsSEeRjdZMhhlju1Nnb8T7L
+ijeXzcLzAkEA0lItZb4WqunWb38oOJEaL5N3uwxhHprDJOZ2EnRpfmjhTpqxuHpN
+0WwWmakLj74PyWtdkqzv59jzCutE2n9MNwJBAKBkazUyGs3ExsSiEfs8nC8et4kE
+IrywPOvJlAChkh1THOwtONaIRG6shNZvHIelPgSsCM7IXXjo8wuCGIzj7YUCQAH6
+E8MpDj19BS73GwGtG3nnAPEZJLCM89ic8e8qePNfOP7sJU9+lsypH21CUYGAX9Wc
+1LxUM80SFPa9T2BeYfECQQDe1c0qv6aLdzHyAaPGwXZiC2SP1ZTyinJFHWxrE560
+5EbZRmxa6kXuW9QN+Hqj1nns7cYNOpnsnOYDz/7zoLSC
 -----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 706f876a7..94626c0f6 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/expired1.example.com/secmod.db b/test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.db
index db5dae7d0..5ab9cbddd 100644
--- a/test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.db
+++ b/test/aux-fixed/exim-ca/example.com/expired1.example.com/secmod.db