19 files changed, 150 insertions, 91 deletions

diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
index 21c59228d..3f3530a13 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/ca_chain.pem
@@ -3,33 +3,33 @@ Bag Attributes
 subject=/O=example.org/CN=clica Signing Cert rsa
 issuer=/O=example.org/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczNFoX
-DTM4MDEwMTEyNDczNFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
+DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAKZv+bgWOI9qjQJd3Y95xvMdMNmF1EWjAVry+Q6w4Jtrjvo3fsYJu/KFLkML
-zfATGPgmf2YvlQITw4gCVXquKmlkjH8ZDkVYTQvBv7UzrlksLL9gTtm9UoouG/tA
-WByDkFPGvNVOIgUXIGLzc8kjmp6OJmQENS3FlP53YotrEGppAgMBAAGjWjBYMA4G
-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al
-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDANBgkqhkiG9w0B
-AQsFAAOBgQAeIGkSmwyU57tDZKA9tjO0/GKD9b4SvDsNs3oDy4WGwQ764s0byh8Y
-ASGoOOAamb842slg3XaooCEYbLFeErKL/KApWQvmVjZgYwckXj/SERpjLKxISMjO
-ZWcKmZiaARIPYzZJKG66BUGLD51qpRMCAsDnE/kf6XPWV0JaAdrZYA==
+AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
+evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
+KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
+BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
+XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
+jy6Z4hMSt9SGKbnR
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
 subject=/O=example.org/CN=clica CA rsa
 issuer=/O=example.org/CN=clica CA rsa
 -----BEGIN CERTIFICATE-----
-MIIB9jCCAV+gAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczM1oX
-DTM4MDEwMTEyNDczM1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
-DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsGboLNgO
-VK5xiqFWxJI61S430vafiz0ox7vNv1JtKox2vvqrIdCbhWzq7+MxG5mAx00s/Z/X
-d3EH6KhDtv0F329n5Xynw6eJlhEazuEEdrlgAczGop5RXw5BIdKpRNiUVP/QVCtw
-yHVgxmEXO29iv3p5SfU5kKdL3HNrDNM58WcCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
-BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAbPEgbXcX
-qnBzwKZ1d4EqwXAhQhDgoSoMUyiYraJPe+RNF34MdNDqhHkU2IIgMtz5ylnsQRHU
-vnAnbnX6ndGvOy+OyBwlXFuaS+nR37surhjxBYCsUE0OOiNONiLHeSCJIR4zTjIJ
-c1nvJsbTO2EI0ttp4/9VRHSl4IkYz0Ed9oA=
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
+DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
+D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
+KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
+BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
+d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
+OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
+BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db
index 6d3e4c5ca..fd452222c 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem
new file mode 100644
index 000000000..20db6f945
--- /dev/null
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/fullchain.pem
@@ -0,0 +1,57 @@
+Bag Attributes
+    friendlyName: server2.example.org
+    localKeyID: D6 D8 A5 A7 2E C3 B9 09 69 A2 D5 6F 5D DE 84 B5 47 D8 4C 08 
+subject=/CN=server2.example.org
+issuer=/O=example.org/CN=clica Signing Cert rsa
+-----BEGIN CERTIFICATE-----
+MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
+MTAxMTIzNDEwWhcNMzcxMjAxMTIzNDEwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDZLK3PjPzFgBS
+40KJ3zHJe1pCeHKIKt5FZ3VLgbCc4XMhyeC6xEkZlk3rigbnWpKW/rrDVzqC/CDT
+HnLhSMbhv1dDrDPxONKrUMDqeGjXYqyg4LN56muchPYCsmjQ+p6eRVV5lHw++jv8
+fIJAFRFnPfREm/MC1lXzUoJyrCVx4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
+QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
+BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
+E3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEAKqkkZmviHSf2
+as+cofud5lEZ8B+FPxJuwnrB96nZ2xnCmKZMrx6HrUKEgHO5hapooA/uE4oEqwCf
+5Q0ArOkyOBKbSKZCpBu+EapDGY7E4wrf/JSq0X3afserSbxKJ2nypE2dFLrReSeW
+imlIU4YiSgPTJdsip2jB54MgZkUDSew=
+-----END CERTIFICATE-----
+Bag Attributes
+    friendlyName: Signing Cert rsa
+subject=/O=example.org/CN=clica Signing Cert rsa
+issuer=/O=example.org/CN=clica CA rsa
+-----BEGIN CERTIFICATE-----
+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
+DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT
+FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR
+evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ
+KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0
+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl
+BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt
+XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91
+jy6Z4hMSt9SGKbnR
+-----END CERTIFICATE-----
+Bag Attributes
+    friendlyName: Certificate Authority rsa
+subject=/O=example.org/CN=clica CA rsa
+issuer=/O=example.org/CN=clica CA rsa
+-----BEGIN CERTIFICATE-----
+MIIB9jCCAV+gAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX
+DTM4MDEwMTEyMzQwN1owLTEUMBIGA1UEChMLZXhhbXBsZS5vcmcxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnylWyR6z
+D2h++fDsOatjFRlLW4pB2xMwWL5aq+auMlcIApXJVfxZcrv5j7XZqtiQiqM3mocS
+KyXnmBHDmhSES+os4xyIwSBvFlsS+UbanNA5+NmnjmDVnxATjXI2wtpYHb2uUXgm
+BAq8FAnR2mLJbcdtFQOXv/51lx1RhW2M32MCAwEAAaMmMCQwEgYDVR0TAQH/BAgw
+BgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADgYEAlQFbF5+0
+d1Ol9aorM1rjXBN64wBMTWhk++hSz4UBlPqYrFgvzChF93Px+EGvdXpFOmg9fg43
+OWwJwvDwiQwA3BWgUf/62qp1P0nqxqJMJl7uii+xfYUWG5FdobvRq1Ql/h/xCVVU
+BKrR//1u6D7k2EcEqlh7O/Z8DOGEJMqzano=
+-----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db b/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db
index 7353c40fe..cb590629e 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/key3.db
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
index 3c9c17d6c..1a1990539 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.chain.pem
@@ -1,35 +1,36 @@
 Bag Attributes
     friendlyName: server2.example.org
-    localKeyID: EF 32 D8 D0 AB 8A 89 5E 23 A0 35 D8 4F 1D 05 8A 32 45 F2 39 
+    localKeyID: D6 D8 A5 A7 2E C3 B9 09 69 A2 D5 6F 5D DE 84 B5 47 D8 4C 08 
 subject=/CN=server2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
-MIICjDCCAfWgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0NzM2WhcNMzcxMjAxMTI0NzM2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDasFQRXJ/6w2mp
-7fE7VK0yFKNzyjH0pQYUU5ettDvTWUiSjR7dZecpULFHfknxejyBXyDJkMdSrX0l
-LRPsBy4m9FTpVr6OVHQagKRxKWSlkNg47AvpF4V29W4I9QQPumGf66AEXrmltrzq
-at7Jo0TZd9COfTtCrdnlj7ds1GK+mQIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB4G
-A1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEA
-MJlWIROrYbJwsmn8+FvsEbz9Ps1SHKQFQsbtvsijAKBJdYbDqBuBcoAc3DDOLb2N
-1iUyMPHcrjTdnuO/CpnQhTd4O233ULXvvx+DgMOBJC/YeUfI7OhIZkzBWklEoNlm
-DbRZjVhoimhkVmE26gImPR8i/mwGjFYlfTKLHs5KHIY=
+MTAxMTIzNDEwWhcNMzcxMjAxMTIzNDEwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDZLK3PjPzFgBS
+40KJ3zHJe1pCeHKIKt5FZ3VLgbCc4XMhyeC6xEkZlk3rigbnWpKW/rrDVzqC/CDT
+HnLhSMbhv1dDrDPxONKrUMDqeGjXYqyg4LN56muchPYCsmjQ+p6eRVV5lHw++jv8
+fIJAFRFnPfREm/MC1lXzUoJyrCVx4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
+QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
+BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
+E3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEAKqkkZmviHSf2
+as+cofud5lEZ8B+FPxJuwnrB96nZ2xnCmKZMrx6HrUKEgHO5hapooA/uE4oEqwCf
+5Q0ArOkyOBKbSKZCpBu+EapDGY7E4wrf/JSq0X3afserSbxKJ2nypE2dFLrReSeW
+imlIU4YiSgPTJdsip2jB54MgZkUDSew=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIICNDCCAZ2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt

-cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyNDczNFoX

-DTM4MDEwMTEyNDczNFowNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT

+MIICGDCCAYGgAwIBAgIBQjANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt

+cGxlLm9yZzEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTEyMTEwMTEyMzQwN1oX

+DTM4MDEwMTEyMzQwN1owNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcxHzAdBgNVBAMT

 FmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ

-AoGBAKZv+bgWOI9qjQJd3Y95xvMdMNmF1EWjAVry+Q6w4Jtrjvo3fsYJu/KFLkML

-zfATGPgmf2YvlQITw4gCVXquKmlkjH8ZDkVYTQvBv7UzrlksLL9gTtm9UoouG/tA

-WByDkFPGvNVOIgUXIGLzc8kjmp6OJmQENS3FlP53YotrEGppAgMBAAGjWjBYMA4G

-A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6Al

-oCOGIWh0dHA6Ly9jcmwuZXhhbXBsZS5vcmcvbGF0ZXN0LmNybDANBgkqhkiG9w0B

-AQsFAAOBgQAeIGkSmwyU57tDZKA9tjO0/GKD9b4SvDsNs3oDy4WGwQ764s0byh8Y

-ASGoOOAamb842slg3XaooCEYbLFeErKL/KApWQvmVjZgYwckXj/SERpjLKxISMjO

-ZWcKmZiaARIPYzZJKG66BUGLD51qpRMCAsDnE/kf6XPWV0JaAdrZYA==
+AoGBAKrshuM0DdH5ARXdVQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oR

+evGDyMk2TZ997csWFLkXPGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQ

+KOHj9vWEXeaTZOvWchffGO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAGjPjA8MA4G

+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMBYGA1UdDgQPBA1BQWJ0

+d0N4Y1hnYjBRMA0GCSqGSIb3DQEBCwUAA4GBAAtoFuxndtFyiK+KGn3yTWMvpmLl

+BSyIQZNvDkTak7SL6vGeXu5P8xFOKdxb3P5mPpFH9MKGcI0PZdif4mJ/f54+IESt

+XcATkfQIcOhRtwtAGexPNWzbEBgYm1p2X9ydRLNTmpya5Jv/yEqRAvMgEj2Bxu91

+jy6Z4hMSt9SGKbnR
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
index ce1a9e988..81dc4281b 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.key
@@ -1,22 +1,22 @@
 Bag Attributes
     friendlyName: server2.example.org
-    localKeyID: EF 32 D8 D0 AB 8A 89 5E 23 A0 35 D8 4F 1D 05 8A 32 45 F2 39 
+    localKeyID: D6 D8 A5 A7 2E C3 B9 09 69 A2 D5 6F 5D DE 84 B5 47 D8 4C 08 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIe66QWJX2oXECAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECF6/ZAUe+eWWBIICgIpShtpD8u9F
-Pz4AIng2IB6CzqT/H0exQT3X2xY22y4qn+9EUzNyJSknw9B8AI5j/dTVkxXwZnJE
-XxQY253blHDCPcBuUlUtjZRd4gJt4r+L70kZQPYiXXz1nGbKbP1PPusS5X4mc2N8
-0HpYUgRr6rt+DU1aqDBhAsETi74RIFMn43B866FMbqXxaLoDyztN3tu1hDtt3RXr
-PsX/o0GRWLbULNbkMkBxqnC9/fiEdSvHzKg78R3mudPvwIvaFZb67kcdrYUHP2h7
-2Xe1/A6Qfttmg4odSSQ3E2en6fX3J/w6Ecegl+du5MEyONlPWayvAlrtMMJQOQJ0
-1KiwM6P8uNJitV+qE9EVJQncISoCoe8UuAcd7DonVMJ9ocIZAes8I3MJ9OmvHRbG
-Y1aGdZVJELOkElfnEFsSQVJx/8h23X9UWylJRbLYFWRHmMahxs2bo0sh5xtZd+eU
-2mUAUQ4ci14oGnk/C3xoILYFKugPJSw48DkvgcR+9ECgGcQbFtrrMwy+gypqR+ZW
-Su1lubqDy9Z2OKjkONZ9UfEVcQM/ASipFLpD45h4MXnBewaPMDTn9New9Rpk4WZl
-uCAL3DdhwjoObj1djThGOMVjKDrQhrqrkmbXxWx6A9GZxjEEhv7SpQYyZTGhqlQI
-73w0wHYcZe9JeBFvhGPrZ5/R6AS98Qr3qTzDrPVKQys7yF05URjsLplymMI+4Jqp
-Qr3wGSP9n4YJ01mxkQMXkktqUkzkpBJWqJl4HYj7EshAneKRK6KPREMIR/ZWedZM
-/GlGGj4ibjNnwB+MK4YFP06oZ9Wr1WAq21eC99sMVXxz9K+fnmLtSlND90f1xXbg
-Dqy9I6oJnI8=
+MIIC1DBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIu7ltHZm+aKcCAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECIpK8LPcynoCBIICgM+TWaNwAglY
+jXslsNJPmQA4ccY2Hf7RKovBEdPvUBzarTRnc1w9UfArUqP2kGh5NdsZ+triNobT
+Evm+02ZzKk+Lj/z3Ti/BrFSEZec+UnRQpBtqgSzMOIrgGAxZewJuT8xlunFIxk1H
+Hemjxdl/6PWhy/dYZtDN4Joe8LdiL/6QpmGwT5KYHIAIjunubofa+iJ/afFnbR6t
+Ci0ta10sfe133PCWGmuYpURiGi/u0niUVlLAeXpYWws8j3fyqOUkMaPyJqdSIreW
+OSazZh0iMiO0bo7hfvWP5SOO0xcF1MXw6JtCSDG72CAl3E50a+16dOMzzphYt6Ha
+tL97jZU7IAndCnrWcGM1DS1XQAQOPTe7sAgTtfNhoKFBHE0o+ZaIYPAP2T58ix0M
+9XvZk+u0u7QIJ8G6P5Hw4myZkaPj6A8/eYeFa5aFOVLZwgpT8nDOLLwpvyh0D17M
+Nlg+tgdtWOEds/0kuQ9dp2VR1oiow8pNd0RDWblTH4xSQwNJBIqrp2kLC3+dl0pK
+468ERLSK+WRTBzP2ciO+o69m9+dW5+KsM4bO0eXlnVmZJqQp0+y7+oIwkaM14xMB
+d0Dsnu9KZEOF48CNy5FNwXFqBpngObmHhzDBVw/U6CZq/HCUjo3/iPceiplG213r
+OSTcnUJIDzLGD72wbTyn/YO42Zm4tw31DP2vQGZCH2AjD1PuePn1kYAKmSMqAxTI
+weTnnb22X+1eztTijTfDD4GDyPV2Q6Xtn46xgR4MHmJnoVOH8GeUrzCsO1ylvPQH
+yR/nihERqpQM7ZuJGtElnGfhQySQVEG6/JhTHz7+l2NACLTsIwdFPKH4ekhbGlTm
+qVxMidiNb3s=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp
index ba3ba6d1d..94b5449df 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp
index 3f3e96774..aa95bac76 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req
index b3d0addfc..293d137ad 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp
index 3f3e96774..aa95bac76 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp
index b3f884d3a..4f6d4763f 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp
index e34bbba42..8480225e8 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp
index e34bbba42..8480225e8 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp
index bc57982d7..2b40c76fa 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp
index bb8ca0e56..37ee3c231 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp
index bb8ca0e56..37ee3c231 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12 b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12
index de207bebf..80f79105a 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.p12
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
index 63a827f1b..3b183a1c9 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem
@@ -1,21 +1,22 @@
 Bag Attributes
     friendlyName: server2.example.org
-    localKeyID: EF 32 D8 D0 AB 8A 89 5E 23 A0 35 D8 4F 1D 05 8A 32 45 F2 39 
+    localKeyID: D6 D8 A5 A7 2E C3 B9 09 69 A2 D5 6F 5D DE 84 B5 47 D8 4C 08 
 subject=/CN=server2.example.org
 issuer=/O=example.org/CN=clica Signing Cert rsa
 -----BEGIN CERTIFICATE-----
-MIICjDCCAfWgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
+MIICszCCAhygAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
 bXBsZS5vcmcxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTI0NzM2WhcNMzcxMjAxMTI0NzM2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDasFQRXJ/6w2mp
-7fE7VK0yFKNzyjH0pQYUU5ettDvTWUiSjR7dZecpULFHfknxejyBXyDJkMdSrX0l
-LRPsBy4m9FTpVr6OVHQagKRxKWSlkNg47AvpF4V29W4I9QQPumGf66AEXrmltrzq
-at7Jo0TZd9COfTtCrdnlj7ds1GK+mQIDAQABo4G/MIG8MA4GA1UdDwEB/wQEAwIE
-8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMgYDVR0fBCswKTAn
-oCWgI4YhaHR0cDovL2NybC5leGFtcGxlLm9yZy9sYXRlc3QuY3JsMDQGCCsGAQUF
-BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cDovL29zY3AuZXhhbXBsZS5vcmcvMB4G
-A1UdEQQXMBWCE3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEA
-MJlWIROrYbJwsmn8+FvsEbz9Ps1SHKQFQsbtvsijAKBJdYbDqBuBcoAc3DDOLb2N
-1iUyMPHcrjTdnuO/CpnQhTd4O233ULXvvx+DgMOBJC/YeUfI7OhIZkzBWklEoNlm
-DbRZjVhoimhkVmE26gImPR8i/mwGjFYlfTKLHs5KHIY=
+MTAxMTIzNDEwWhcNMzcxMjAxMTIzNDEwWjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDZLK3PjPzFgBS
+40KJ3zHJe1pCeHKIKt5FZ3VLgbCc4XMhyeC6xEkZlk3rigbnWpKW/rrDVzqC/CDT
+HnLhSMbhv1dDrDPxONKrUMDqeGjXYqyg4LN56muchPYCsmjQ+p6eRVV5lHw++jv8
+fIJAFRFnPfREm/MC1lXzUoJyrCVx4QIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE
+8DAgBgNVHSUBAf8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYAN
+QUFidHdDeGNYZ2IwUaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5jb20xFTATBgNV
+BAMTDGNsaWNhIENBIHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGG
+GGh0dHA6Ly9vc2NwLmV4YW1wbGUub3JnLzApBgNVHREEIjAgggkqLnRlc3QuZXiC
+E3NlcnZlcjIuZXhhbXBsZS5vcmcwDQYJKoZIhvcNAQELBQADgYEAKqkkZmviHSf2
+as+cofud5lEZ8B+FPxJuwnrB96nZ2xnCmKZMrx6HrUKEgHO5hapooA/uE4oEqwCf
+5Q0ArOkyOBKbSKZCpBu+EapDGY7E4wrf/JSq0X3afserSbxKJ2nypE2dFLrReSeW
+imlIU4YiSgPTJdsip2jB54MgZkUDSew=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
index 9110dbef2..72b4ea053 100644
--- a/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDasFQRXJ/6w2mp7fE7VK0yFKNzyjH0pQYUU5ettDvTWUiSjR7d
-ZecpULFHfknxejyBXyDJkMdSrX0lLRPsBy4m9FTpVr6OVHQagKRxKWSlkNg47Avp
-F4V29W4I9QQPumGf66AEXrmltrzqat7Jo0TZd9COfTtCrdnlj7ds1GK+mQIDAQAB
-AoGAPQnCLSZhMKiiMV/MWPcFcFj6VjM1RkdZLws15rHLkO32p5Dj8H+kyY9QK9g/
-4zpu8N0QVbInMBhkOaAfU12dr5WERaqNQ1eF0ADhE2uRATuYl7+ydegUqOgRYVqp
-ayT6UgW9Scdpx6VoEva7KHjCCewBngav6UCP9aVA0N5i4ZECQQD3Wrz/MgQcVMpW
-GQnV/ee2t0mbg+RUgoAEybO5MCjhx1XaCN23n8joe9Bb3BlS5he/oQK2Us0z4yOT
-P8KWK6aXAkEA4lUY7uFErh0Unvgrh4Ny1FZLLMjguwbB6oINhZJSr/8DQJFkRxmm
-2gOhNoDTFESFLPfRE6/AUOm9RE/x6NkaTwJBAMLU6QtFtTEvpFRe0n2IygwEoOjq
-4V2jkPy0d2jFw13bqgbcdu+c3x4n8D16x0Oh01DwnPdJjzJwleP1E+s/JK8CQQCk
-qcS6BqoxAnc+MM96h+fDFAUdUAgwCXqLYpLz2sDNynpTP3P1RnRdqMZhINhwpmk9
-jg5OhE8mjudkC8Wz4j+BAkEAz6VjEUeuvbky4FxHBN830m+kyuTkraGhogSodPwr
-NjMXcMrvxCneOXyJr3GWF4hzGYCHlXmcYfie2i7Zxa61+w==
+MIICWwIBAAKBgQDDZLK3PjPzFgBS40KJ3zHJe1pCeHKIKt5FZ3VLgbCc4XMhyeC6
+xEkZlk3rigbnWpKW/rrDVzqC/CDTHnLhSMbhv1dDrDPxONKrUMDqeGjXYqyg4LN5
+6muchPYCsmjQ+p6eRVV5lHw++jv8fIJAFRFnPfREm/MC1lXzUoJyrCVx4QIDAQAB
+AoGABPJ1ryuqMm5ZHKAkBxQ9aSbYMaDFsxaFRUv12X8fjPBNG0LWj5oAyQ7f+w3G
+CBloJt4tFb0tlkOKk/fUVCmE3gbh+Gs4sGlCbnZxG3z+ijySZqcK4A/p0SMeu2i2
+ZGP7xo0EUhWWBxHFTcNO1AptRRCHchq/c7Y8S179t1v+3VECQQDuzPMlO8xVtYiN
+bbIbfadrAdfutcEskYRKVHLiZ6WvLAm0jo5pDlo+Mq3HjBFRVxLyKNwOty1w3KDx
+Jf2lo3cxAkEA0Xdlx1rwwgGcUTRRI2WEA5BoKX+8OewFoO4Fzqp+4sfwxUp3R9aW
+a4CISNrIWat2OH0UpqSMWC0F7cC5YLBZsQJAeGaHVUeQH8q2fbBIM8on5jD4wVeM
+fT8lNyDbB8IAbJDEl++kZ92frGp66fh6JsvDNqtZQGYlGBl1YACqoaAIkQJAZVPj
+2V9FriQHUUUEpyHZjbvSl5iiHkbtph7ekk3p2Zys/VN7hjXpSBHCW7PyTWZjZwoi
+7kYVWiZVguDDDGHi0QJADq+ZkveZpdOcNJyhmQSpFicx0gqnb+Gj5NkxqffUumSZ
+NlhyB//iJ4D9yK495gPbvvF4qv8FZcedoKeAVN/8xA==
 -----END RSA PRIVATE KEY-----