13 files changed, 106 insertions, 76 deletions
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 323ae1688..cabaa2feb 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
@@ -3,45 +3,54 @@ Bag Attributes
 subject=/O=example.net/CN=clica Signing Cert
 issuer=/O=example.net/CN=clica CA
 -----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority
 subject=/O=example.net/CN=clica CA
 issuer=/O=example.net/CN=clica CA
 -----BEGIN CERTIFICATE-----
-MIIBaTCCAROgAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
-Y2EgQ0EwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAp2tm7DhEtMNQPz23MpsxYVje
-SgMgmkDx8qdr97SBBVqtPcHMMrCEZ9dQiYCFxbshxXfeova+DbLZISDlHA9xjQID
-AQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBBjANBgkq
-hkiG9w0BAQUFAANBAG/rfiV0UE6Q//VIKN5CprvNXDGQFfcFCWNRCu6ZGTPpaDf2
-iPqVISD9trZrvtlUIgKjGgOQQbdNH9RBj5+6QKo=
+MIIB7jCCAVegAwIBAgIBATANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjApMRQwEgYDVQQKEwtleGFtcGxlLm5ldDERMA8GA1UEAxMIY2xp
+Y2EgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANxsitxvuTf1LtcvBkHf
+Ph8vuxdyWei/ZKWmlycMyMjFbjCIDbCGFhux+92S9OIzCkvq2KPpVQB5Lgf2bKwi
+b9KMtmWWdXej3lSqQOapf6h8aUc/F3flUsadTKFQPzHZi4+hOi4+t1aXzaBuopVX
+IqO2MjTQcIorxEZ9fUO+c4blAgMBAAGjJjAkMBIGA1UdEwEB/wQIMAYBAf8CAQEw
+DgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAFjeFqPGxfNLnC1K/PPE
+QEA05z2oadv0m5trTvO3YNNYvQHdh0whiFiRRo3rc2gOSL0b4mxKDz9n4i5wdWN3
+sfx0a1RNG6rqJP4ZSF+GNye3Kux6amnHEI/tNbo/LDHxq8FQ9crva8v/pgAVXrhP
+qYhEcoGqK3DkLcSqc0LCLJMs
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: expired2.example.net
-    localKeyID: 1A 68 61 A3 03 A4 DC 65 19 7A 7E 5E 65 37 39 DB E3 CB 56 AC 
+    localKeyID: 40 FC 15 EC 15 17 E0 33 9C CF AB 8B 86 3A 3B 13 BE 4A 73 A9 
 subject=/CN=expired2.example.net
 issuer=/O=example.net/CN=clica Signing Cert
 -----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
 bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDVaFw0xMjEyMDExMjM0MDVaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUubmV0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMRPNIrjXhmHfWrc/c+K9esj
-3cXECi38lpKgZyhqN8CjRvifIaMoZaCPoXoppyC3MmtLhT5JnYe8+1vSApl9jPUC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLm5ldDANBgkqhkiG9w0BAQUFAANBAMmrnrUFZRECJcDk4BGSMQp5vvC/uHi0
-1NSP3Ki4Yu+CbXUHtgZqwOB5abU8INeLbJoab2stMFsdevzRYuuqb7s=
+MjM0MTFaFw0xMjEyMDExMjM0MTFaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyYgxFSfRxFRnJXiir
+x98gGlztFVjWFXz6lj4Aug+MyZRmk0ve+LwhgyPYQpUVj1sHcAFS2+BcPITkwISE
+OswZ/T96op3bE/ajY9jWc3DKcixCDlpgWFjGHOQncfP/StakQqchjPr60/OnDghX
+VLZHt9TF7cEjNcGaq3glpsHImQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBAAk2
+Ilqx1ZkSVp5B/AS2U16tiUz00+pYJnDPg6c4dHmZFC2XwjlR5EXs9g5D0DUXjXDY
+6u4KBZyd5AEGhNIrxwYR83HSiwLWG9ZbvjtoTh5WeIwHiTYfU33SU264jNrwb0Vg
+cfDiwaKSBNWg8LL2mnKNEUGmPYr0RwCfx3qtlUA0
 -----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 6df2cda50..14f980429 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 b8e34d0eb..214ed8426 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,29 +1,35 @@
 Bag Attributes
     friendlyName: expired2.example.net
-    localKeyID: 1A 68 61 A3 03 A4 DC 65 19 7A 7E 5E 65 37 39 DB E3 CB 56 AC 
+    localKeyID: 40 FC 15 EC 15 17 E0 33 9C CF AB 8B 86 3A 3B 13 BE 4A 73 A9 
 subject=/CN=expired2.example.net
 issuer=/O=example.net/CN=clica Signing Cert
 -----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
 bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDVaFw0xMjEyMDExMjM0MDVaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUubmV0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMRPNIrjXhmHfWrc/c+K9esj
-3cXECi38lpKgZyhqN8CjRvifIaMoZaCPoXoppyC3MmtLhT5JnYe8+1vSApl9jPUC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLm5ldDANBgkqhkiG9w0BAQUFAANBAMmrnrUFZRECJcDk4BGSMQp5vvC/uHi0
-1NSP3Ki4Yu+CbXUHtgZqwOB5abU8INeLbJoab2stMFsdevzRYuuqb7s=
+MjM0MTFaFw0xMjEyMDExMjM0MTFaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyYgxFSfRxFRnJXiir
+x98gGlztFVjWFXz6lj4Aug+MyZRmk0ve+LwhgyPYQpUVj1sHcAFS2+BcPITkwISE
+OswZ/T96op3bE/ajY9jWc3DKcixCDlpgWFjGHOQncfP/StakQqchjPr60/OnDghX
+VLZHt9TF7cEjNcGaq3glpsHImQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBAAk2
+Ilqx1ZkSVp5B/AS2U16tiUz00+pYJnDPg6c4dHmZFC2XwjlR5EXs9g5D0DUXjXDY
+6u4KBZyd5AEGhNIrxwYR83HSiwLWG9ZbvjtoTh5WeIwHiTYfU33SU264jNrwb0Vg
+cfDiwaKSBNWg8LL2mnKNEUGmPYr0RwCfx3qtlUA0
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIBpzCCAVGgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDAzWhcNMzgw
-MTAxMTIzNDAzWjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
-Y2EgU2lnbmluZyBDZXJ0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAN9lXg/7R2gY
-392B325b/0eHLOrQG1px0aPuSwCBG0cKwCATtsKjYne15vNXAskVAdejY0Ujvo+a
-d4jVi2qYJ8sCAwEAAaNaMFgwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwMgYDVR0fBCswKTAnoCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9s
-YXRlc3QuY3JsMA0GCSqGSIb3DQEBBQUAA0EAlm29nFrjiJPaldOtHxpmWzE3Zxit
-Sl4RxdeJcJ7aGL2gDOAWmiVh6UPbMm/o6Vg2PxHp2YviOhVunp1C2t85ow==
+MIICLDCCAZWgAwIBAgIBAjANBgkqhkiG9w0BAQUFADApMRQwEgYDVQQKEwtleGFt
+cGxlLm5ldDERMA8GA1UEAxMIY2xpY2EgQ0EwHhcNMTIxMTAxMTIzNDA4WhcNMzgw
+MTAxMTIzNDA4WjAzMRQwEgYDVQQKEwtleGFtcGxlLm5ldDEbMBkGA1UEAxMSY2xp
+Y2EgU2lnbmluZyBDZXJ0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKrKrC
+NeeRsSHVCt+ycL8W7IDSUQzEziHWw/zTg7sAKPYYgx8vKT+I3GQgDEp915Ase8+a
+q9zPMrD2tJXh2QCUrft8ZuDPsSU5ufC/wdfWmEa/rzJ7zwik7Co1yX/1NnRTtpLr
+UnMBiEeo0fVPCNzJzOfTXXAULV/TzkxUEXKLxwIDAQABo1owWDAOBgNVHQ8BAf8E
+BAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBADAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmV4YW1wbGUubmV0L2xhdGVzdC5jcmwwDQYJKoZIhvcNAQEFBQADgYEA
+rq0h+qCnF8nZMSrFunei0bzu683qhhmN8o0TcNjuVe+uCQiXjLJ2/qhj5gfoUnhx
+YoPQ50zuHbtH8W8choPuSh1JtnBvgsnsKRtBZZAI+OOdO69NKNqkYUhsFVD+Nj5B
+zqCDAmvJcZlWpk4iwohBYZX8hnpvE3GGAXA7XAn3LgQ=
 -----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 382ad41b9..1dab786ea 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,15 +1,21 @@
 Bag Attributes
     friendlyName: expired2.example.net
-    localKeyID: 1A 68 61 A3 03 A4 DC 65 19 7A 7E 5E 65 37 39 DB E3 CB 56 AC 
+    localKeyID: 40 FC 15 EC 15 17 E0 33 9C CF AB 8B 86 3A 3B 13 BE 4A 73 A9 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIU+oGNqBSHjcCAggA
-MBQGCCqGSIb3DQMHBAjYaI7Iob+lDASCAWDAZIbvl/AbphvMZhynrCFGzj6iN309
-N+U1mQPGWD6hisPfA4aTpIQyHtVah6KCE1fbzGFgiNULsfByVj4XBRbetiVKMuWA
-xs/EEcPhNRG0KOeRxzDtSpM0lG078XAC4p7wgqvhf4R9524Vq4PpYzt+tKfh0rPC
-leF7VFJ5vi7Tms7q1wqtL76Wgibq4m43XoFrYMbQL2qbXl98rRAP6R6u852f4L/D
-Cy1EGsgWIdGjCPQRxdwC0Vf1vIjaspXBmVhbFJR9Djp48DShbAO11cXRSIligH6t
-7p+aesQM/illunmCaMzMYFAjdrMYZEO1bqVdU5Nd7/tlQQLgHSdo+iD6XLnci7dw
-elQ9bRxYVMEDX16kTXd4NU6xP0Zpac5XHu4ji2PKlSOSxQh5GbPICXdEH7K/Oshv
-CUIZbYnlGsOT2uFgnChtUeIwc6OXcSv3LLXIwzg0ec7yN83j0r3jQRQx
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI7bYIuOTKDfICAggA
+MBQGCCqGSIb3DQMHBAiPk4bG554wGASCAoCvbxLayy40eB5onrGDZC7EuSxFtf4f
+V3X4C+tQSvzlCmVgiTTFsxqExOrVXpv6BFVUxt0Lw8DN99jTdSrgDoO2pydPQYgv
+OTjP+hIzJasLjz5LmzrL2B73lIvBz6Cq9z7Udw18XJ21d3LlQuoT7BA65vUq2Os0
+qgl5SxM8j3RuBZB2tlorCZHu+j8ofFN8pd3jeE8qWAtL8YAU1xPWcFbx6aXURa7Y
+/Nis+V8rRlMwgArCSYsemoilK8+cj5ZRf46DkHQ5yHWHJkdVs+magZydoyCU9wGp
+kbBdnQiWlK4OJfl6otx/56ZmVn9kicFCz+TmjeAdvR8qe9pKE7MCfgTCRLLy3UH3
+2W77sf4nT317eT+W+BOskvdsepYcaWHf3SiHSNBbqJ++J551INft6oT3iUbU4LeS
+ETM77tIdhmXSdK0QKsOsUZLjOnwOOWAhv5/Da1yOrLAwV5ImJwlLqrF2c/l1eE6s
+bRb/+x7QSn0mo6th2swmQY67tR0MSjkzNzWBoiSXVATGQNsTxuZjZkGfAqlMlPxH
+1vvn+iWfpILaxIg99VWUPo90zuVXifmdl6WXt2JPqyk+s62dRzAZQV4gfBt/d5Eq
+OMuxYx5ggbgGmACOMgJ002vD6dkhY036fPMIKRPeuIdWCgQEXvmR++i3TdMkSmEc
+8gWEuc0dZGzTaRNRmwXnC73UC2mKzaNCFiTfsgRzuMwCA3DWO1CtrFRq6T1zZfci
+eZE2ARdRcli4hv4MJ/3yDubaXDw5UY55QlbBe4fcp9yJRvXhsCuXlWIgglpTLeEL
+Jkrsej7DCtRCi06U457TDVtKs+LJvfjFZXMubY+rqmZxqhoRojTXmrz2
 -----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 7f6c27bf7..9d2661a97 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 a9ad37057..bdd8d7adc 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 4684f0756..771595f80 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 a9ad37057..bdd8d7adc 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.p12 b/test/aux-fixed/exim-ca/example.net/expired2.example.net/expired2.example.net.p12
index 8f9ef945b..00ce6efe8 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 8c10ace44..7ca367210 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,18 +1,21 @@
 Bag Attributes
     friendlyName: expired2.example.net
-    localKeyID: 1A 68 61 A3 03 A4 DC 65 19 7A 7E 5E 65 37 39 DB E3 CB 56 AC 
+    localKeyID: 40 FC 15 EC 15 17 E0 33 9C CF AB 8B 86 3A 3B 13 BE 4A 73 A9 
 subject=/CN=expired2.example.net
 issuer=/O=example.net/CN=clica Signing Cert
 -----BEGIN CERTIFICATE-----
-MIICBTCCAa+gAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
+MIICijCCAfOgAwIBAgICAMswDQYJKoZIhvcNAQEFBQAwMzEUMBIGA1UEChMLZXhh
 bXBsZS5uZXQxGzAZBgNVBAMTEmNsaWNhIFNpZ25pbmcgQ2VydDAeFw0xMjExMDEx
-MjM0MDVaFw0xMjEyMDExMjM0MDVaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
-bGUubmV0MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMRPNIrjXhmHfWrc/c+K9esj
-3cXECi38lpKgZyhqN8CjRvifIaMoZaCPoXoppyC3MmtLhT5JnYe8+1vSApl9jPUC
-AwEAAaOBwDCBvTAOBgNVHQ8BAf8EBAMCBPAwIAYDVR0lAQH/BBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6Ly9jcmwuZXhhbXBs
-ZS5uZXQvbGF0ZXN0LmNybDA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0
-dHA6Ly9vc2NwL2V4YW1wbGUubmV0LzAfBgNVHREEGDAWghRleHBpcmVkMi5leGFt
-cGxlLm5ldDANBgkqhkiG9w0BAQUFAANBAMmrnrUFZRECJcDk4BGSMQp5vvC/uHi0
-1NSP3Ki4Yu+CbXUHtgZqwOB5abU8INeLbJoab2stMFsdevzRYuuqb7s=
+MjM0MTFaFw0xMjEyMDExMjM0MTFaMB8xHTAbBgNVBAMTFGV4cGlyZWQyLmV4YW1w
+bGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyYgxFSfRxFRnJXiir
+x98gGlztFVjWFXz6lj4Aug+MyZRmk0ve+LwhgyPYQpUVj1sHcAFS2+BcPITkwISE
+OswZ/T96op3bE/ajY9jWc3DKcixCDlpgWFjGHOQncfP/StakQqchjPr60/OnDghX
+VLZHt9TF7cEjNcGaq3glpsHImQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE8DAg
+BgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAnoCWg
+I4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUFBwEB
+BCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AvZXhhbXBsZS5uZXQvMB8GA1Ud
+EQQYMBaCFGV4cGlyZWQyLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBBQUAA4GBAAk2
+Ilqx1ZkSVp5B/AS2U16tiUz00+pYJnDPg6c4dHmZFC2XwjlR5EXs9g5D0DUXjXDY
+6u4KBZyd5AEGhNIrxwYR83HSiwLWG9ZbvjtoTh5WeIwHiTYfU33SU264jNrwb0Vg
+cfDiwaKSBNWg8LL2mnKNEUGmPYr0RwCfx3qtlUA0
 -----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 12a48de18..6da7a9cba 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,9 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAMRPNIrjXhmHfWrc/c+K9esj3cXECi38lpKgZyhqN8CjRvifIaMo
-ZaCPoXoppyC3MmtLhT5JnYe8+1vSApl9jPUCAwEAAQJAOCkksfs8B3ewlKrmXcK2
-ee/H2XUtKFzTwtzqxjAlBRHwxgSOZr4rn10t+R4j6cvLqhfbXGu0p+1oGgFCYAe6
-/QIhAOU/L1TRGgE1Q0gR+BSyWTlHNSXu1wmy0j/nVSk1fb2bAiEA2zgBX7vxRt1M
-d7AKLfqjpMKolmMUyWNQdGFI/+Ch0K8CIHsFMkAgygS18XoecnOg1bKgHMxTZEBH
-Hv6+BHxNwUFbAiBpXA98/Y1G69F2rMsXsiC4bT4tmU1CRVNDvAYjxMjAzQIhAOHO
-1ynQHqtSfjlkpZtcNqey2SlcqXz7xI/aEXVYj5Q4
+MIICXAIBAAKBgQCyYgxFSfRxFRnJXiirx98gGlztFVjWFXz6lj4Aug+MyZRmk0ve
++LwhgyPYQpUVj1sHcAFS2+BcPITkwISEOswZ/T96op3bE/ajY9jWc3DKcixCDlpg
+WFjGHOQncfP/StakQqchjPr60/OnDghXVLZHt9TF7cEjNcGaq3glpsHImQIDAQAB
+AoGAOFcFXyEDhm/OrC4EFHVVQJNzBCJ442z4A0FOpfYeES5do6QkE3FmIgOEX7pv
+0dZsPsYedOgjTZ6DrqgrcoQLkCaj1XiKDKhfJeJnA7Db6ip83vvXUUyX3u+L3q6L
+Asn8P0hFxdOjvdyqE+6N6qddyWm2PqAmCx71MvMX+Sa1K7ECQQDhEoOSYlGZD82Q
+nKTXVbbVkjAHIBVGe2Q1MaZtzV6KcL61gAQiuOcOt8bivAzXjz6y3sgkDLMd6wP7
+hlwZlRuFAkEAyuUelguPYvwhHPkPfR34aPp4n0w8sxawI2YX3Ese/TwKeZxvItPM
+2Uhiax4R89DJCOw9zGrfBPk1A/v5raXzBQJAfXfKrPHuNvteRv1rzzbTI5/I8k/q
+TE5BAH5bHt7bkyViyt9AbvLQq527W24lYo1SEHis7Zu+xjDbGX4/HWvH2QJBALEK
+kE/ZMnrrCnHfmfZRCot/03Uc7vJOX8/jq/pbymSp2XIYYJmBOwR2NvrFOGEJ1AHn
+Ml2G+6e5VNtvKYSug4kCQBYKIp6/ZqCLx72m5IK2LjskH671RvmpuqGgRhxgkLtN
+GUfe131qT18M0LtC0SoYUc73p1NUJz6OjIOsRSSQEsc=
 -----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 4489ac32f..32112c1ce 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/expired2.example.net/secmod.db b/test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.db
index 372213dd5..1cfbdb2d0 100644
--- a/test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.db
+++ b/test/aux-fixed/exim-ca/example.net/expired2.example.net/secmod.db