18 files changed, 76 insertions, 76 deletions
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 7331ebeb2..3beef64e5 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
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
 -----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
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwWOzCZR0
-PLKMPK1AtJDXI98B0uySpDQExW4uI10rjBtJIrwp00dnxR6VnIlcSRzLzkeG6qn7
-6jNd+IxcEuptSvnuleuti5DzPBJahWAQfSixGEUGqAC2eWM1xItHOxQ++m4DAdfa
-9Yt8JIBWjiHq5YHXDQbKYJb2epn05ZYJ2pUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAUJPe4Jux
-fCmLFc+vUwmhN2QTE42kZ1sK9/eCB941C4n5RUr4MyV/vtu4gaSDiRYL0y6x99oa
-6TPO0bw9hEUfiwGhW4ZrwgA1/1/znFsN2ifsahJ4qNGCALjT2vR2pCijYdGdlffy
-TWKGBHaLOMxBn/OFnXs15OLp7dhTw8sWR3o=
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs89Jw+yK
+ohiMwcSLAciqgj5CtxYRsoW1AmQrhD3QwE6es0RBjTGp5SNjjPlRxCZ5T+dQQXR1
+RirvSKH+isbd1ENIbS9dPgaR2mFUYwcSxUIRrXn4mkxZ/QtpTVOoY184lFAPhTrW
+et4o+wE9OI2e75RD5GdAyB/52paGplt+K38CAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAOcXFUXls
+ChTDzMe2y+qv1YlOZbkf43S9je72ATYXzS7/eT8I4sAq/CFdgmn+lw5kHJlgxCag
+BPwuLYHW55r69WI1IwQHrJXaavyPSkonVgK+ZssEcQmqbgNj8oV5ZnyzYnNZv0VU
+nMl1n6nCl1xdUwPwhhdssGXEoX8OF5iMw4U=
 -----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 7cb8f0a19..bee4de063 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 b6a7c269a..74e2dc7b9 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: 20 AB B0 6D DA 38 DC 2C E8 14 97 C9 34 53 9A CD D1 B3 FF 5A 
+    localKeyID: 01 11 9A C0 58 86 76 AD 43 C8 AD 6E B7 D8 88 6A 00 8D 27 AB 
 subject=/CN=expired1.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTNaFw0xMjEyMDExMjM0MTNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCeodbLOpgOlgQW
-61h+HDyH0WA0uAUBWpbVU/s3JRVoNz00IPr4eCsIScaEG2v5JpD5PgkIjcxADYVw
-hWPx79RCWIM6aRtQ+MfW1FWwdASnF+mvqlnpAFuD9YP0N15Z/S45qTr6+M1irXYg
-CG/8+6vpw5V8IQYqLvwUmIvdpyjlfQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTVaFw0xMjEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwzxfp2vYw5w96
+4Eq57WBMZdmZZ4B27eqMV2gGS7fINlWoUqR6JsClfrBJ5A60LjsvPF2ccr9uyG6r
+mLlarc0kXBREXRpZdmcxX04MS7lu/1TnGem170ZzldtTXV/Z7UHukvDID+tYV2X2
+aTQblO2JbE1+9F2tXILc9TSX9fbBNQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
 A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AKule3gU2qMfFdZdJz4ZX0I882dt26ccqUhn9gdlxgMgxyygUEjNa1aQ2Fw95CEa
-zRuCuXh8kNQe3A7Oo6aTDqdtFDRU3yfOhPTamkr2Vxq9sLoy+C/5QDAJ/gPOw1cM
-uT+7JAx3Jf6bfDg/9m0tVTi5OS4n9myhq5RT6xReAW8e
+ABHsEhKoJeK909uBPQLCZVVVGiHybCGkoXbf3iLR8lQsEHrHi1B2Jh4b8UbHH/Co
+PmDmpRpbpQOjawMDQIRZxr5NJlBFSDHC9XN1LfIarevXrqmHz4YnuelWxR3dZ+mx
+joeBCLnshd8U80WmsVesPlNWnG8XCRdZ0QylvBpd1Ufp
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxMVoX
-DTM4MDEwMTEyMzQxMVowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQxNFoX
+DTM4MDEwMTEyMzQxNFowNzEUMBIGA1UEChMLZXhhbXBsZS5uZXQxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAM6+EJ2LbxoEH5KzpoFUbMgWJP/BDl3J3EQaT2Nd3ma511xaMmCkZMKFXeiE
-1ew87+OzSqJdG837h4aqbk6lDIzQtnDRwlvaD8Po2i8fKATRjMcZ8LxwGK+Vkk2h
-JdshyJLHuHD5HbM6bO2A76TxRoQQjxmMhCNtHGfry6ZSs54TAgMBAAGjPjA8MA4G
+AoGBAKFOi+80c9pb3UidQJd+TQ9j9lmOlw3HlhRxYNadHL2jZ98OHrwlDB1JgToy
+PruZ9yLq26a7c6sLYqEvpHulS6ACUqYaqu9kKb8m4l7xlheoyLT/jkZjq4Z0owp8
+PhzYl4p3M23rQzNSXcHCxcwu+6KPJ8FgrdNuB2RmHU2M27wRAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGVq/dPoUbmzgGAfqkEgGwyj1UFA
-PwN6m9R/svv7399iTboFW9C/9dCU254dGvHeV2IvmSL2Qnf8d7J/dq9X1DoD5Kr9
-F+LZDy/FOUoXz+cH2Hw1BKDuLJySG6WHLwb2MRnW+Bxe7Be64Mr6/iUA2wfNv8OG
-oBt48YV92qG65zz3
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAUlBd0/XrkhQ6Gm8s44uOU/gSAe
+Ap8baRLuhTrrvzd+nPDBN0YbwVUMwd9TbY4MsmDy+GhE9/V8i8OydEshl2iE15+E
+JX2DJEmNd7RMfWb6EIZVuzFFDWRszxA14YdNvDXjwS6BYmsSWJsNH4P/eTRrTCJi
+C53ODVdhE6yCQs1m
 -----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 a724ca640..bda96e53c 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: 20 AB B0 6D DA 38 DC 2C E8 14 97 C9 34 53 9A CD D1 B3 FF 5A 
+    localKeyID: 01 11 9A C0 58 86 76 AD 43 C8 AD 6E B7 D8 88 6A 00 8D 27 AB 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-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=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIsdmFOA4pkusCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECOwDCiGC5J1ZBIICgNkR92fHe4t/
+TnXkRaqoFcs/AOgsCc4NN9jqpuhcFU6vbzT0vR32//DNgTXdwDYFQJ8/Ff/ST96v
+o+/MqVNsaUXEd9cowKSRKLDaBI8HlfSFToQnBoCLNAzSDo4FD7iOKke7jUe3Aqfv
+cydn4xxdEQxlKC1UzTjsl9MgNdV3P61kGVDaFYcXGWsDJGoLsLbOZIurlL3In8hU
+68vsznk55hXioTocYJWHadhcgJULYd2inJx0yS7+S+aGzGzhSxf8Yen861zutNlw
+Hl61CJs+fzyxBXpZHb+JfEh2vIlCU+HFhdTCCaNU3lP7w8WacYWvM995jW1KsdAz
+RsJvFFLa9UTnhAou1FRiHuHD/XObF9sOUsvoqUuGjtbQG27FPPLAVG+H2Fc/fr+g
+7qLNMvpcnZaOipTF67iPdFUDuJy8wpnBMlvXkMKiWqhMG2Tv5fBhFR2ozoYasFah
+aSDhchL2Wpc+uwxA8sz+EsNnmkFDyc8LFLikPRUS3jn9PPDio1PLqlXBbSHlx3xh
+4ci75ho0gEqpmE8nfoNtzMh+QZadpg63iOn1Rcw2YqGnDRaJQyGqEJucUY15KtTz
++WOzVw55joukpgdiOuEL3dsR0mYJsDkq5oAD+FxNK9KzYXeNDKoCVNxc9HgXFRDX
+eQLQVZeBzorHnrwB0rBWc0CoSFq1ENwa+9Ij0Emd41Eeo/8nxEisW0nt+ezjEUdK
+ZwcFbdzUdLh6mU5y4acNDTNZ+oiEZ66lXK3sVGkcoleyhj7Y4J40ys3X7LfqWkq1
+BLoOQ7rt1NwWjLneSoUS9PzH1FoM5VAP3zkbZMywXsj6rpj2TMV5xIk3Ke+pLLtd
+gQMv6zy52N0=
 -----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 3fa59a3c2..3b3a2a794 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 beb3ea9fe..a8b4ff4d9 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 5e027717b..63ca00468 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 aad3fcf9d..d7592fc07 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 0d281819f..170190efa 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 170913f1f..51ba5582f 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 a25962199..95ce1a7ff 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 78094a5a2..523c369db 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 f9486b6f1..8fa0c98ca 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 a33e50593..8fb99762a 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 13ea93d1e..66ef77e21 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 66da79775..d07da34e5 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: 20 AB B0 6D DA 38 DC 2C E8 14 97 C9 34 53 9A CD D1 B3 FF 5A 
+    localKeyID: 01 11 9A C0 58 86 76 AD 43 C8 AD 6E B7 D8 88 6A 00 8D 27 AB 
 subject=/CN=expired1.example.net
 issuer=/O=example.net/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm5ldDEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MTNaFw0xMjEyMDExMjM0MTNaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCeodbLOpgOlgQW
-61h+HDyH0WA0uAUBWpbVU/s3JRVoNz00IPr4eCsIScaEG2v5JpD5PgkIjcxADYVw
-hWPx79RCWIM6aRtQ+MfW1FWwdASnF+mvqlnpAFuD9YP0N15Z/S45qTr6+M1irXYg
-CG/8+6vpw5V8IQYqLvwUmIvdpyjlfQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTVaFw0xMjEyMDExMjM0MTVaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUubmV0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwzxfp2vYw5w96
+4Eq57WBMZdmZZ4B27eqMV2gGS7fINlWoUqR6JsClfrBJ5A60LjsvPF2ccr9uyG6r
+mLlarc0kXBREXRpZdmcxX04MS7lu/1TnGem170ZzldtTXV/Z7UHukvDID+tYV2X2
+aTQblO2JbE1+9F2tXILc9TSX9fbBNQIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm5ldC9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5uZXQvMB8G
 A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUubmV0MA0GCSqGSIb3DQEBCwUAA4GB
-AKule3gU2qMfFdZdJz4ZX0I882dt26ccqUhn9gdlxgMgxyygUEjNa1aQ2Fw95CEa
-zRuCuXh8kNQe3A7Oo6aTDqdtFDRU3yfOhPTamkr2Vxq9sLoy+C/5QDAJ/gPOw1cM
-uT+7JAx3Jf6bfDg/9m0tVTi5OS4n9myhq5RT6xReAW8e
+ABHsEhKoJeK909uBPQLCZVVVGiHybCGkoXbf3iLR8lQsEHrHi1B2Jh4b8UbHH/Co
+PmDmpRpbpQOjawMDQIRZxr5NJlBFSDHC9XN1LfIarevXrqmHz4YnuelWxR3dZ+mx
+joeBCLnshd8U80WmsVesPlNWnG8XCRdZ0QylvBpd1Ufp
 -----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 7332eb618..7f468ecfa 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-----
-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==
+MIICXAIBAAKBgQCwzxfp2vYw5w964Eq57WBMZdmZZ4B27eqMV2gGS7fINlWoUqR6
+JsClfrBJ5A60LjsvPF2ccr9uyG6rmLlarc0kXBREXRpZdmcxX04MS7lu/1TnGem1
+70ZzldtTXV/Z7UHukvDID+tYV2X2aTQblO2JbE1+9F2tXILc9TSX9fbBNQIDAQAB
+AoGAAxmgEwO5u4uTNZwKkC40BfLm0oeowXnhDTsYTrzAiRXaATykHj4t54wl0PRB
+a77AK+jBJwj+B6+8/QZAmoq5ZSluJc7iZN0Ma3p3Mc/bhygFTNRFaY2ajfHiD0Iu
+lX2K7CBxhFHimmCldjGe5IhPzObd+QIpTpVi397DrJtUaSECQQDlJEinubLoxNNV
+LVLrHV1/SfTKBoXXBUkszGtLGhUeWAwgOQKloAIV57C3Ctik/nn2Hm845KGaMqhw
+yNnZDfjxAkEAxYh98Ln516WAqc1uOJbDVkfYJDZ1cYtXcuHIoJ8Wsoc4hE7ZOF0O
+dtGbP6GkP3XGN8QFB/kdKO+/8tJ/IZsshQJBAIhB0j6Cq4PE/xJIeGU9OgrmNH0p
+8c6R4xiTmj23jdVUcCl9HTjV9EeIVcoS1g8PEAEtyd+f/QTPmOAwX3K131ECQC/8
+raO6emCR+0TE/D7RGVkvkOmTNUrFMBRfl2611zy9rtQtl4Wiza290/pMWWt1QBcy
+DorWUOgt/jKOQoY2fUUCQEvPP9mHzvrzjWGCm4jTuw6WvhK+M+o1XCPujMNhVN0M
+YFCKPt2RqLZenWvdTxouJ5OVw7TsqxRrsbJiPpXzpjo=
 -----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 b5436f836..af75b1c8d 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