Testsuite: move CRL testcases away from using SHA1-signed certs

18 files changed, 76 insertions, 76 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 fa992f144..c9cf7dcd9 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,17 +4,17 @@ subject=/O=example.org/CN=clica Signing Cert rsa
 issuer=/O=example.org/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
-DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
+DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid
-6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc
-bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G
+AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje
+bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ
+vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G
 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE
-bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i
-RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9
-MCjrBA4uMYWHJsge
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO
+NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U
+b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v
+tzM43Bo0kuWzn62i
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
@@ -22,14 +22,14 @@ subject=/O=example.org/CN=clica CA rsa
 issuer=/O=example.org/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
 MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
-DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3JL933VG
-DyAuNTMqTm2pgv3rFaMGj5wEoiwCjOKWV8BGfWBl+8k1jJB+tiyE0zjZMSb6GycD
-8gFY1x0VyJI97OGqJTpo0Xp8Uhf0j12+tO5pAZTyQAKxI3tm+OudGTxaFu3uoGdv
-/66MahoorO6sYT7fA92B/uXz67R7IWjSWmUCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAYj8JhjaT
-C4uz7D+KiJMnGcNmv0lWREfk1aCPYcl4ZA901Uy9hl8jky6X3DTjTPi2XcAsh6YS
-GJNOpTwUZwTsImjU+/qR+2zuy5jEhHjQ0i9IO0AnwA9keUHvKkhEaVbQI3+F/Yz8
-pJpLn5MyRU3oasOqWPLDOxM7PqXKO43lZLg=
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX
+DTM4MDEwMTEyMzQwOFowLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAw4JFjAQr
+oK/87+wzLtvmEa5eQc7oZPrzziKz8EnH8bT2chPEUO1rt+7O9yxWZGyH7JkSw399
+bBu9Kw5xsxqvWrXYUQ0OPj1tuf8/tXc1FCtCYSLVp2vV2It+xfqQdoFHUxgK0dSz
+sYCPYPpaPag/x7h3lWfvhZfMxdDMOSBR6VMCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAJ+FVy3d0
+Bz1nk9xcA8rTGhx4sITmI0R1ccjOMlghQErpJx2pYEZ79osrZyOAIuOGSA/g1JFf
+n4llCc6vTbKjR/VUR8wWPmMttDK08YU0Nt9QJNHH1Okl/lpVQxDvHuMQMZ4tP8hJ
+Mu1lg0IENm5gyQ2y91p3m5YNX2kI7SiViUg=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db
index 0c60a9fd4..373627491 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/cert8.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 31f6e1b71..cc9c7a5f7 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,35 +1,35 @@
 Bag Attributes
     friendlyName: expired1.example.org
-    localKeyID: E7 84 FA 98 F6 B7 DC B2 C2 3C 24 22 3B 4D D7 09 F7 20 4F 40 
+    localKeyID: 90 42 F6 BB C9 D1 AC 51 79 53 4E E0 F2 44 CD B0 FD 03 25 A6 
 subject=/CN=expired1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDhaFw0xMjEyMDExMjM0MDhaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDaBoTFNAnUtbJO
-LDBleZhRGtgL08bCBj7wv5JqD91CKGxKCt6rZxs1gIBu2NAfdep4tC/H9oOKrRZA
-nZd80XPu4Zqp3TH+CJFiMNv9sAK5ZI26Vc/8MbNbwJnWokndIAmH7BTCwNcelfFg
-kDkq9mojMA4VphLTU322Jji6x6/y8QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTBaFw0xMjEyMDExMjM0MTBaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDF9YzUTezJJ8uz
+6B6rG+H8o72xbwqFhLpEUUXjcHR5jvQu4U5ITpX5ojFg0PV7cH4kJtAfVrijcHwe
+XtxYNB4XgrV1/9ndFu0NHLgdsS+C1Tu3h2b4jdcjyN/DXfRd3tIZOcYxaOhHgAz8
+zpb/TClKxDmP5UDmNmeMS/IZXXOOBwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
 A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-AFQhEz5n6ZoYvoU0QHevvBpsjFMHxMFMkEPsB5CLWxyvOLnKHurd8RHAcW9b7KiS
-XX8Bp4cpPRg/CcJzrsSR4QIMccEBPInuvAUMei/LmMqlI1Vq2Kr5cKaVdLSDo+Z8
-Ti4q6MjoFVxEVKVdrWiSbnEy5bnf9qmuji+liviPzUgg
+ADiojtPPZXV9BMA0dh4i40Lws8MZpnm2to3OlTW4ekGhHB303SZtauGzHiP16kQd
+36f+5aVYB9c05lYznKiaCymdMUTzuvMBosUA9iYRs0yXJw6IeRpVOPks9FzEhDyv
+bXRF8cAqfrjWggfukQ7v22EiFDP42DEfeDKb+5Lal5UA
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt

-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX

-DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT

+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwOFoX

+DTM4MDEwMTEyMzQwOFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT

 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ

-AoGBAPB0NqiM9gODja3YIiiScuTPzGmziMEKP7ltX7oLJH9pxMl/U8FgDCh/vSid

-6D9qkmMGqwWoA4tIkk/KR6LMS7giTuHXf/ZhqKf5+Y8oGfnChIID6V5c77/Y4kNc

-bztvkmAdyaOfU2NH9l8P8/KjduotvP8iYG9vcCI2uJ0A8xa7AgMBAAGjPjA8MA4G

+AoGBAKvNwx4xa7WCNqEVZytf9wBSqEyyJGZrzauZyQleeD564JHoYpfqgi/WiTje

+bOF+sPAK9x+o+sBYwUu227LUaYgotqqcbhY8kr5lnUQt8il52dstsqcVKpwPG1uQ

+vmTv5J5W9WjF38aHEpFHJL1l8SmC7Og318AbGNuY2b5VmVFbAgMBAAGjPjA8MA4G

 A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0

-d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAKtihL9wZgOxpwmdKl08xN/IKmHE

-bJPXn/Hbty7Tpa5Y/kVQwoNFPPa87T2taRFGDtDJ3P3zb9obLEL8eu5TUdJOmU4i

-RNHSteObkWrIMdqcImq5DkllaWpIJacvB/hjeTsDw9ps7FyacEnQhn+Ehz5UDyF9

-MCjrBA4uMYWHJsge
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAGtwA01/eJwFs17LhHpVC+LTlxFO

+NC8rQCNXWLlt6S9v+ueuO+E5k5s1TXnQ9iB9eZbMXz6tGEuiiS5zDhUTf2kLt55U

+b2pjpDg4doh9h778ss+Yz5ASKg0vqQ0E9yHY1FzJBqxcPHl2BnkcCml9fDW9oI0v

+tzM43Bo0kuWzn62i
 -----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 264fc586c..46678dc74 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,22 +1,22 @@
 Bag Attributes
     friendlyName: expired1.example.org
-    localKeyID: E7 84 FA 98 F6 B7 DC B2 C2 3C 24 22 3B 4D D7 09 F7 20 4F 40 
+    localKeyID: 90 42 F6 BB C9 D1 AC 51 79 53 4E E0 F2 44 CD B0 FD 03 25 A6 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIWDp+nZ+C3VECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPJb6giMa6zEBIICgOfaLlc5lPqq
-zyVbiGuZliHmGHSiQKskHAKcRtLM5P8h4/grOSzKM2q6eSjoWDIl4nfCm2FvKoFf
-G9NK8tS0LNwElcRhEVqSfHQvrJcISSObdFbwO98PvcEo/22rj4NKyEToFEk5cJbc
-SWVQWExJUfmMYewcbPoTJrFZOwEaX2NjAh3Ji27gyfcUU6QKKTLXKD5S3npcZ4aX
-fXAjPHq9PZrGSSj2SQQJ38+jlZpj4J+e4B8jS0/kLVU+5zO2dc4sIbwILVfECbwC
-yT+J1jRAT5X/ByskZL7F2AaAkvwGSEQxnGxiXJxW9V69SaNkBzAc+N8Gek0Hk92O
-ed2/NgETYdGZYz0ZKzRRAfLkuGTs02Iuferoad8e9dy9PtxANPqBd1FrAXIexjKQ
-WG2SDwfeADDnjRu5IdcsRkxz8COx5/NuP1qJ9z3AGcQPkuYhHGBrOy1djTFaXAtQ
-bNnbFXhBX8Mku20vSW4pV+jROWbvA2Ws9+8bYgtpv+JG7Ja8fzJ6tXEJZTqagVDW
-PsCYqlTnvD0sER3ocK466wrSE+gU5Ymjt2HBruCLgMEBT4nV5QO2/hP2Ly0BQhc7
-0YGfMghk6Nahz7WBFINkk4fOZQGk93ztU2rIbhpcTIATb+dcQDblW00bPlWmDLYz
-dALbRjbSNKbRxhPuRlo1BqU36HHJzCkskQSwQ1YNcGujZFdqtNQOy0RlCn1jrFOk
-dUu4fcI6hzGkVjradaSDytT7MfAio0gvOA6A9jwxrhxmX6UICCzZIAiGyVEauzGn
-bl27i4D9akwwsBh9dfqkIa2aQ3KgOsi7Y/idhHhYQWj4vQYGfAuKOxYSJqbZJeqX
-UwpPT33eXKc=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIZQtWztc7lo0CAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECFFLUbCqhj3eBIICgITbQ441dxkl
+xvMcRvv5T2DIQge76FnPKY+0bUYb7dsB1uZZQ3mKcD6GRiPFR4/x0F6KMzpMoL8Y
+225xxu3sdQwtjVivMVsPSuRHDJmqX0uUjv27oD1NOAfQOZiZlFu4x9h7odsA00ML
+1ryw5BUbvz4hfBsDRBTU2yzB/0fCm0qgMb5ak2aHqiR21Ad8ha14Y/1E0LXnGmbK
+b27eWqzuegRGSij5V4COhY17QB2nKhqmi1Y3uVC7KSuSBWNpz1fFpN+UpNZXJwAp
+iyWqHpl8rD/juJ3BKCzvhM1fOFkBkm8YWxb2KJMCILnRu9ucOy7ZpLeyBEn1Jua+
+Z47kGqoNauKLMMOZFBreRrudvH1yqtI1SxZJLftCMQ8yAH4eDxLrw7bxc4LJ14No
+0oZiW3SHcwNU03GZ3wQCg5SggKeRJOeymkMQsYqkdySyn1IV83051V/1oMMsWluf
+A1oxp8u2l5mvMFJ/B9CiIwTFOcUW6QvL9F+/bpKSUVbTqVhF5ndZLbZBDe7GMwZs
+cieGYGZiqzz5WxK5Im+BP1IChPAKvkr5Sd4UZv+vrY0IsLjX9BT9yGrRQPnVy73S
+NAym0O4y8snl2MUzTn6+XFvsW7xTh5CnmKKkDxsORdwb25Rw2wqN+94BubBH3IrV
+mjOlHCUeomx7VAouR6xiZmJi33gFHfTkvg5GpDhWNjMqMB7yNNWUfvNF4v4lEVI0
+J6dFwTlXJOOBV3teqBz2cz4h16Tdd5KZHV4WvZr5nanKO/QZCvmfzUdl/QpeLhsL
+ZPfY6xJTGhK/Hpg+8pbQgkbdxWHp3YgnJ4jwQy6wMX26Whwe7/xhdm8eQvmx1c0h
+XkNwMqOpjeg=
 -----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 43cd7d7d8..810da1db3 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 fd92b85da..522e30ff9 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 d5382cc3d..394654548 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 19c69baef..05accc2de 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 baef0b341..94742bc15 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 13f45c612..6a886604e 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 f4879c609..3d046615b 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 a89d39830..887a3787f 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 9c85297f8..c3e16699d 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 2dda3a2af..cf05fae11 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 9d0ce538a..61da138b2 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 cd97df798..8f782a59d 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,21 +1,21 @@
 Bag Attributes
     friendlyName: expired1.example.org
-    localKeyID: E7 84 FA 98 F6 B7 DC B2 C2 3C 24 22 3B 4D D7 09 F7 20 4F 40 
+    localKeyID: 90 42 F6 BB C9 D1 AC 51 79 53 4E E0 F2 44 CD B0 FD 03 25 A6 
 subject=/CN=expired1.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
 MIICjTCCAfagAwIBAgIBZzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt
 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx
-MDExMjM0MDhaFw0xMjEyMDExMjM0MDhaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDaBoTFNAnUtbJO
-LDBleZhRGtgL08bCBj7wv5JqD91CKGxKCt6rZxs1gIBu2NAfdep4tC/H9oOKrRZA
-nZd80XPu4Zqp3TH+CJFiMNv9sAK5ZI26Vc/8MbNbwJnWokndIAmH7BTCwNcelfFg
-kDkq9mojMA4VphLTU322Jji6x6/y8QIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
+MDExMjM0MTBaFw0xMjEyMDExMjM0MTBaMB8xHTAbBgNVBAMTFGV4cGlyZWQxLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDF9YzUTezJJ8uz
+6B6rG+H8o72xbwqFhLpEUUXjcHR5jvQu4U5ITpX5ojFg0PV7cH4kJtAfVrijcHwe
+XtxYNB4XgrV1/9ndFu0NHLgdsS+C1Tu3h2b4jdcjyN/DXfRd3tIZOcYxaOhHgAz8
+zpb/TClKxDmP5UDmNmeMS/IZXXOOBwIDAQABo4HAMIG9MA4GA1UdDwEB/wQEAwIE
 8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
 oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
 BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB8G
 A1UdEQQYMBaCFGV4cGlyZWQxLmV4YW1wbGUub3JnMA0GCSqGSIb3DQEBCwUAA4GB
-AFQhEz5n6ZoYvoU0QHevvBpsjFMHxMFMkEPsB5CLWxyvOLnKHurd8RHAcW9b7KiS
-XX8Bp4cpPRg/CcJzrsSR4QIMccEBPInuvAUMei/LmMqlI1Vq2Kr5cKaVdLSDo+Z8
-Ti4q6MjoFVxEVKVdrWiSbnEy5bnf9qmuji+liviPzUgg
+ADiojtPPZXV9BMA0dh4i40Lws8MZpnm2to3OlTW4ekGhHB303SZtauGzHiP16kQd
+36f+5aVYB9c05lYznKiaCymdMUTzuvMBosUA9iYRs0yXJw6IeRpVOPks9FzEhDyv
+bXRF8cAqfrjWggfukQ7v22EiFDP42DEfeDKb+5Lal5UA
 -----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 b0c224ed5..4206ee002 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,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDaBoTFNAnUtbJOLDBleZhRGtgL08bCBj7wv5JqD91CKGxKCt6r
-Zxs1gIBu2NAfdep4tC/H9oOKrRZAnZd80XPu4Zqp3TH+CJFiMNv9sAK5ZI26Vc/8
-MbNbwJnWokndIAmH7BTCwNcelfFgkDkq9mojMA4VphLTU322Jji6x6/y8QIDAQAB
-AoGAIpffMCUKHEh6EqI7SZaJ/vBp8DJ5emagTPWwhwieXDVqvTLNUtfovsv1VOEs
-4JkGi4FXhXxNMc811SnME/9ty+G1/jk4zygoaMJyPKbOwb8TPzVlD+Z0WN11XmDu
-tAUohYuKaa9Ct0J0hw7LHBRs0Z+WTFqdvAS93bYyqCqR9YsCQQD83fEGFS7yMrWv
-DWzvboWXrd4vNIg+Lr5gbOoeVK+hcnEImafLcWDIOrQsmgBcqvgeboFlVh1G+isU
-2aViqKG3AkEA3LoQltTpjbVfGKv8WSUL6NEuGo/Zo6w3/+wISl88vK2ZMfFFSVzd
-pNnztvC+jzypfUis/BXHdH6oU21g0kvwlwJBAIQQljULEz3DZkhKxr42Bue1Evms
-gguX9i3+NDgrGp9DWe2X8p66VEW/AyLYO6AqWvPp2wLF+vx648077ricQfkCQGhA
-kZlMEsvVwIa8pMHOF6PtOONe0iLWMtTzvK6z8NIFBHhsRpdx/1Xfg5cCel7Y/gyo
-iNu/xacmM4bEAJkTOR0CQQCt9p3t7LYVpEqsLBP9QHHyzA3Lik5C9CIp/wQbq+Gl
-ixcIG5h1TqM/LtJ93tPPH8nKEFmEEKE2S8HDjhezwwkf
+MIICXAIBAAKBgQDF9YzUTezJJ8uz6B6rG+H8o72xbwqFhLpEUUXjcHR5jvQu4U5I
+TpX5ojFg0PV7cH4kJtAfVrijcHweXtxYNB4XgrV1/9ndFu0NHLgdsS+C1Tu3h2b4
+jdcjyN/DXfRd3tIZOcYxaOhHgAz8zpb/TClKxDmP5UDmNmeMS/IZXXOOBwIDAQAB
+AoGAKUopuSCVynE0Ak7gkrUKolzu1IMCMU45YcWH68QJb09bbCnPX7KQgpSLcxOy
+mDAjB1xXHapDccelA9qqX/Vi7wsBOEhSGxaRgmP9H7tO7pJjgr4bs+Rlv1bR3foI
+1qyxHMGUqCVx3t/mvE+Vp18tBpbd7UFMkJtKvPVPWsy2nNECQQD6cRm/uU4kTg8j
+cROWfv9tyrmeob/HmtfC/3zGEmExfcnYDiH8qyLHqAK0RKTHgYZO4i1J50DH5zCn
+8yuJFnvXAkEAylpEOzaVgjIz8oadxkCF7SNE1rL2TrPcPqLhYW9g0G3krSM3c54G
+np0QFVJwTUUMT0bYon0lhfX9+1ryNei5UQJBAK4n1GYU8JgiiDh3O83eBrZM0YPU
+q06dCQmbLSN4SIpoFOLgARZ507fPyAGf8o6iLcnRUvkfjVb2GEnSuiWcswUCQAyb
+URLrVKc233ulnWDDllRu1RQXNDc1B2yzkx0R5lM19YA/6G2Ak+L/4AekCjEWMy0h
+Oc/twg+1gqxNPzfSlvECQBOPfF/dU47YThXaSzU1IYve08aapgXtxdhYqawbVHQM
+m7DH4qvsCgTU7Ct13/CdIxoXtmTpQqBlfy3v97F88k0=
 -----END RSA PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db
index 666d2f049..590c5c695 100644
--- a/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/expired1.example.org/key3.db