Testsuite: testcase for Bug 2198

17 files changed, 135 insertions, 133 deletions

diff --git a/test/aux-fixed/exim-ca/example.org/CA/CA.pem b/test/aux-fixed/exim-ca/example.org/CA/CA.pem
index 7857c9b56..c4327b8b2 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/CA.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/CA.pem
@@ -1,13 +1,13 @@
 -----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/CA/OCSP.key b/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
index c3c26071d..9e77717f7 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.key
@@ -1,20 +1,20 @@
 Bag Attributes
     friendlyName: OCSP Signer rsa
-    localKeyID: 73 AB 15 E6 08 22 FA 22 2A 6B DC 0A DA 29 F9 3B 43 DA C6 00 
+    localKeyID: CC 96 CE 2E 01 43 FA F2 92 30 54 A1 BD 3A 04 00 0F 75 4E B5 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALLS3gS5D13RDozz
-Y+qzsCDhwlIlbOR++EW7QVimy0JTKgWBq77A9AXez4gKgDWms0156zYnrJmsmcF1
-id1Go6ofQsLlGdJnizMUD4e+iG/44UNZ05mXtAhyqHbWQbJvTk+ON3LK+tL1IRSy
-jSMqr5w3VGeITbJqiK+VQS875W3rAgMBAAECgYAQJzwm8RCSSPAni1TbPqAKWFpV
-UUwk19NVeTTN7UMvGpQRK0V4VbW1UgstHsW2EvjfZsP4gFz3BMBe2V86vcbK0JGt
-Sj0CR8EZj6zXgGtnEEJ0BkOyxpbxVmSK3khG0VJaJ9XWzAQV5iukXN1QFAtJLTWR
-CE8BM3OxCnKJMuE+AQJBAOH4zHhVomMK5Sb2GRj7Le8vyM6+zjP4tSdgI4hk7RKD
-Z2Vg3l0RNdNX2gOzdsLqikS6PUKWmO2qfRV/ZUGRFMMCQQDKlinNL5TT7C7B7Nc9
-pHVs6gdP77u5GyfR8nntjay7L21BDf2ERj6XV02wKV+L8trrvNX0EgSf8WA+kIHJ
-cg+5AkEAsvVVCV/YUNPKEwcHbU9PW4PeZk2aBHLNFLgAq/4x+l1yv0juEYqVtCB5
-GkFAprEUe8V6yod16ZMBqMrRqBF7/QJAdWDUD4LGJJPv84SaoaisMNLYMcSha/sD
-820eoDk6H6q3Dr5gaUeZ9G4tISiXp6qqlXPwM15NN67PKPDpgiKIYQJADI3/Ys+b
-cQIqGdXYRbyBVliTdIPfRBnwSUNnjpgmK2Rlzoln+IIEiRA4x5RcZ7QF/cgPIUVO
-V3sst4hVxsE2vw==
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALqMz/iuUILGHemE
+SJqNRbxrVHXfH7PUZQFxfbgmFTa5HGPYga6vzcfbYRtPloxzkBRfYkA5zDsf3Irx
+MY1Ls+EjYCyrwCDM4QQUcebafp0kWBpJYiguRDfoOpnMEiIGDqjSA5VnhARJjAxI
+1oHZTPmIxTr177BzcRbJ9J6ysv3lAgMBAAECgYACo2yHWPiswNAdtgkFSFY3fKbl
+X260dmWoMubvnj+Zq6T/XkmjsUlHG+RMz0AEuWWwfPYyjJB+qgTq73pYJ68Mr3Dd
+2b/ivUSOkVD0+19CCfYaCGiZzosPXAKxrruVm1H0feclsUYbz+m4S9Le3BZe2d5Z
+g5TByATsI9hmtalngQJBAPIROIbgNPP8f1hYBtFp+WRwnu0f7yC0b9Um08n9fIjr
+qSQZqmJRRH8qOKRVyJwv6MIYyI5Jn+H3JXh2gmCpS5UCQQDFSZBr9bKSUf9mPo6f
+BImihw+/8VS5e34wVsIdmHM3qDyqRP1BZt1OeFr692uj4r6Wts5N23Q2gbGFRHKo
+ytURAkBQ+JWx+Bl+a72lLXzKW+qCQHHI29+/TtwBrsU1UcdwfXPMkZE+5fRFnTfp
+MJC0PgpbsrKTdek3StaL3whpkPepAkEAuzMkkOxgdyrLN09gsU7y8n9J2I28IQwn
+HuMT6lU/7q36cm5oCOj8UXsuiTjAsI903Tm05He5/AZwVc4vJi7goQJBALx05qNy
+hxYA76vuIWNQgq6ParirZ4SJLP4Voq14jRsIDF3/SKSRJzZ8tA0op30XMUCQ+QZm
+CNdP5Sf5e33I8Vc=
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12 b/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12
index 7f643579b..87293808c 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.p12
diff --git a/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem b/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
index 5bd481420..b7f08d8d5 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/OCSP.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICDTCCAXagAwIBAgIBAzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt

+MIICDTCCAXagAwIBAgIBQzANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFt

 cGxlLm9yZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYTAeFw0xMjEx

-MDExMjQ3MzRaFw0zODAxMDExMjQ3MzRaMDYxFDASBgNVBAoTC2V4YW1wbGUub3Jn

+MDExMjM0MDdaFw0zODAxMDExMjM0MDdaMDYxFDASBgNVBAoTC2V4YW1wbGUub3Jn

 MR4wHAYDVQQDExVjbGljYSBPQ1NQIFNpZ25lciByc2EwgZ8wDQYJKoZIhvcNAQEB

-BQADgY0AMIGJAoGBALLS3gS5D13RDozzY+qzsCDhwlIlbOR++EW7QVimy0JTKgWB

-q77A9AXez4gKgDWms0156zYnrJmsmcF1id1Go6ofQsLlGdJnizMUD4e+iG/44UNZ

-05mXtAhyqHbWQbJvTk+ON3LK+tL1IRSyjSMqr5w3VGeITbJqiK+VQS875W3rAgMB

+BQADgY0AMIGJAoGBALqMz/iuUILGHemESJqNRbxrVHXfH7PUZQFxfbgmFTa5HGPY

+ga6vzcfbYRtPloxzkBRfYkA5zDsf3IrxMY1Ls+EjYCyrwCDM4QQUcebafp0kWBpJ

+YiguRDfoOpnMEiIGDqjSA5VnhARJjAxI1oHZTPmIxTr177BzcRbJ9J6ysv3lAgMB

 AAGjKjAoMA4GA1UdDwEB/wQEAwIHgDAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCTAN

-BgkqhkiG9w0BAQsFAAOBgQBg4j6f2vDQ07fxilUMATSitbc+rgZyxKi6PF7UrEMy

-NG6JnJZKn7QthkWOJSRPzmxsRD3Vr1qWrViaHA2fNTWR+sFqEao0W4sNcsbo00vw

-9lpr/aEBTap2HsDtIzSKu4K8QNCfnnZwlBy0lc6TamuyVxnNZvbg2X0rVTNzTYsU

-Dg==
+BgkqhkiG9w0BAQsFAAOBgQBI94iIVZQAID3eyShKfxq3FWf58piUJMFQsMxDZweC

+j2zVsLHUkxlpUHe3TjXnVZZwm+wo2gLx5GOpZkryWXh/PuI181SWY26s50CZ+uAo

+bQGDqkF1jLwiYLuvFAPVKDWa7H4X5fqNvowOM1EP1HUA/1naJNRL399Y/D7sliS8

+ug==
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.key b/test/aux-fixed/exim-ca/example.org/CA/Signer.key
index a30158b41..08e0eb2b1 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.key
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.key
@@ -1,20 +1,20 @@
 Bag Attributes
     friendlyName: Signing Cert rsa
-    localKeyID: 15 D9 60 73 58 7D 85 31 7F 89 78 B7 ED 29 C7 03 03 EF F5 84 
+    localKeyID: 1A 38 55 FF 5A 14 AE 47 1C 03 74 AA D6 58 DE F7 6B 14 D6 E3 
 Key Attributes: <No Attributes>
 -----BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKZv+bgWOI9qjQJd
-3Y95xvMdMNmF1EWjAVry+Q6w4Jtrjvo3fsYJu/KFLkMLzfATGPgmf2YvlQITw4gC
-VXquKmlkjH8ZDkVYTQvBv7UzrlksLL9gTtm9UoouG/tAWByDkFPGvNVOIgUXIGLz
-c8kjmp6OJmQENS3FlP53YotrEGppAgMBAAECgYAJyZ/30Wa2GF/+eaKj41dtyJOs
-1w/qoHFd9dfroz8yJJsd39GWt8/TrT1ROAp+ScE4JptrWPT8UEk5YFnCgyd/PuCz
-I0KvBk2RC1tAEyhuRDiGrwREXnwkDQxmCBcwNFh9wixYK6UrCtqptpexK9Ru6jy7
-J4I1THpMusJeLoW0YQJBANGJM31rgo2vh9J2DPUnYdO4e/RLTTrQVUrr0QwCqTlo
-MBnB7K0xmw7XZWW50qwcEcCZ48/bmnR9McrAZW1MoJUCQQDLWC9QUoBNKqTz6vlB
-SJC+KfDR+o5R2h31W8zpdXKGBoWKkL1SEhy2eD87AEFs5IdPw6xtYmw2rsTEEyPw
-fMmFAkATWk20JsrfFThBOwAFYIbLjD1+mbnfVcCa897R8ij5EWNn7Z5TfMJqg4Bs
-/dW0ab9F/7Cn0QuZ+LoxlMWJa8tlAkEArIDSGpTyrQQJTbe/3mceC4Tu/GNPSxb7
-pUNMkZ0GG7b6oPNq+G3PF+jo0zfDSQqR09QOufjuDnGzERefvItQNQJBAMh/UV5l
-uaDWIm2Fn2bCwe2jGgbIpmchlJb/n3YGSKBuFGx9vYEUUNN16WuBRCB5eeMIkENS
-QC9HJItRZLkLCC8=
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKrshuM0DdH5ARXd
+VQh0rriN4CR7de9j+E77g5A6nt8GzKb0GZGrjNrWw1oRevGDyMk2TZ997csWFLkX
+PGQpYBDRQGs9lLMmoJ64vyJPGLmQBh8Y44/jS9hFerMQKOHj9vWEXeaTZOvWchff
+GO4UkzvRQ1oX/qtu/Jq8zLirX8mvAgMBAAECgYArkfOogyJqvfC65BrC9wt63B+g
+7R/ZEEDB0XduEqNg8tjETkEeUv6q4kgV85LFcfSC5ibPW0h8lnpd3EB2v91OwYMv
+pz+u5+ZO+C0FZVPayhgEgdb+DL7wByKUnC52sHDvmOBq0HIVgfmZB6nv+T4aa25f
+Jdijf2lCzPggxFIH0QJBANF1hyBzafWIYZVb6bOnaP9dO3A8kmmP+3QH5VO7MaBq
+RQjbDvz1qyEO63Rx/j18ckLwTLj+VthjDKeybnrQtTMCQQDQ5wnVm8hDbxyVPmt6
+HAU74DrSrYzpH3x9zTfbdUabg535YYCQz/JnIH/Z07f7Z8N+rpaEHm+9yVy0nA5b
+ymGVAkBPDQoohyZwUj5x/jRfZ0lLR0aNf27KhFqkWe6FAVsjbbgMNZCci6NAYL8g
+PX10eyksdkCeeO8Rz6ARElh75ZTdAkBlNtur9EuGaKpXoSOfyT278ftuIgo41TmT
+FkAvA1ZPeOiscFJDV41h6/wmBQ+KLo8orNxebQTE1nAlTcsjLB41AkEArDtyK1ER
+ZnDLpHOYgLmZ3arFE23ictKRMsih8/3fNKeDRn6Ob54aqpsHO9tEGvOcdIbddCcE
+Nx5Ono2x/KL2oQ==
 -----END PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.p12 b/test/aux-fixed/exim-ca/example.org/CA/Signer.p12
index 976a33cff..81b769bc0 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.p12
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.p12
diff --git a/test/aux-fixed/exim-ca/example.org/CA/Signer.pem b/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
index 58e4f30c9..b54773370 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/Signer.pem
@@ -1,14 +1,14 @@
 -----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/CA/ca.conf b/test/aux-fixed/exim-ca/example.org/CA/ca.conf
index 1fc26df65..57b486796 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/ca.conf
+++ b/test/aux-fixed/exim-ca/example.org/CA/ca.conf
@@ -1,17 +1,17 @@
 ; Config::Simple 4.59
-; Thu Nov  1 12:47:33 2012
+; Thu Nov  1 12:34:07 2012
 
 [CA]
-bits=1024
 name=Certificate Authority rsa
-org=example.org
+bits=1024
 subject=clica CA
+org=example.org
 
 [CLICA]
 sighash=SHA256
+signer=Signing Cert rsa
 level=1
 ocsp_url=http://oscp.example.org/
-signer=Signing Cert rsa
 ocsp_signer=OCSP Signer rsa
 crl_url=http://crl.example.org/latest.crl
 
diff --git a/test/aux-fixed/exim-ca/example.org/CA/cert8.db b/test/aux-fixed/exim-ca/example.org/CA/cert8.db
index 4851408f6..35f307697 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/cert8.db
+++ b/test/aux-fixed/exim-ca/example.org/CA/cert8.db
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty b/test/aux-fixed/exim-ca/example.org/CA/crl.empty
index 40a4bc28b..e64683cbb 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
index 711ad2c03..b1f47aeed 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.in.txt
@@ -1 +1 @@
-update=20171202184206Z 
+update=20171216011707Z 
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
index a04419497..e9516f3f2 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.empty.pem
@@ -1,8 +1,8 @@
 -----BEGIN X509 CRL-----
 MIHxMFwCAQEwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhhbXBsZS5vcmcx
-HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjAyMTg0MjA2
-WjANBgkqhkiG9w0BAQsFAAOBgQBEi7Ke3rkwbwDWF5QQLSULGmRWcZslQoAqTMaG
-KefPKTyX9CDIjdy6NmzdgBUwaam3e8QkbWpH70zZ5prAtCzkHUPkMvrglb7KXuAj
-KoRixls6nT65yugt8U8g0USg6/nbCEoYQkcKkWnqRou3afUwz6buzsEnuK2JTAMq
-k4QkRQ==
+HzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EYDzIwMTcxMjE2MDExNzA3
+WjANBgkqhkiG9w0BAQsFAAOBgQBptRy3E47znC529PtvDyItQJuM405ktb1AZgCi
+bDXKuUBTYg52TB7Ibm+cL84hIMY31XZs3SLN9VkNcZAt3NpJIlqhM34SYlbqdiqz
+zH9SDRyzJCl0jaWnJ15iQcSFle6oB3J8ee6JJlzHOn+i81GgB8AQ7rnKcJoZBs8Q
+LuLdqw==
 -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2 b/test/aux-fixed/exim-ca/example.org/CA/crl.v2
index 8beba8359..9083e8d45 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
index edb250faf..1c243fdfe 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.in.txt
@@ -1,3 +1,3 @@
-update=20171202184208Z 
-addcert 102 20171202184208Z
-addcert 202 20171202184208Z
+update=20171216011709Z 
+addcert 102 20171216011709Z
+addcert 202 20171216011709Z
diff --git a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
index 620d4a8a6..dd6987a7c 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
+++ b/test/aux-fixed/exim-ca/example.org/CA/crl.v2.pem
@@ -1,9 +1,9 @@
 -----BEGIN X509 CRL-----
 MIIBITCBiwIBATANBgkqhkiG9w0BAQsFADA3MRQwEgYDVQQKEwtleGFtcGxlLm9y
-ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMDIxODQy
-MDhaMC0wFAIBZhgPMjAxNzEyMDIxODQyMDhaMBUCAgDKGA8yMDE3MTIwMjE4NDIw
-OFowDQYJKoZIhvcNAQELBQADgYEAHpAAr1bmrRSgkJlBBNeA14SiklGyCEBeVME+
-nZYHTv121/+AYkHgIb0KX/uFQQgBEaHjOO3mNmAHZVgb01VSfGDgMULj1xdrQ4dB
-cM0PGPce13vhUuWgPCcH1VWxav0vUFe8L8aglRYt3RWIwr5z3i1rC/kI7FWSDCCY
-NJ2Vyuw=
+ZzEfMB0GA1UEAxMWY2xpY2EgU2lnbmluZyBDZXJ0IHJzYRgPMjAxNzEyMTYwMTE3
+MDlaMC0wFAIBZhgPMjAxNzEyMTYwMTE3MDlaMBUCAgDKGA8yMDE3MTIxNjAxMTcw
+OVowDQYJKoZIhvcNAQELBQADgYEAc/MOgAaI/ddSlc6XnXGiNFQH7XwpZ5wrRHFk
+WtEg4S39T8njOhKdAiqinD7yDE85KjUwQxJ6lHsDlKrw3YN+Tqe3F3laL6THCa4F
+sYeXlBAvB3b+a2KH771golTiSat+yFmezljPFu0CIQxHc/xxq4VjMnRkmbqEcZk0
+XG6i/RY=
 -----END X509 CRL-----
diff --git a/test/aux-fixed/exim-ca/example.org/CA/key3.db b/test/aux-fixed/exim-ca/example.org/CA/key3.db
index 10b634d28..c4d3cb4ec 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/key3.db
+++ b/test/aux-fixed/exim-ca/example.org/CA/key3.db
diff --git a/test/aux-fixed/exim-ca/example.org/CA/noise.file b/test/aux-fixed/exim-ca/example.org/CA/noise.file
index ce507f5f4..104c6cae4 100644
--- a/test/aux-fixed/exim-ca/example.org/CA/noise.file
+++ b/test/aux-fixed/exim-ca/example.org/CA/noise.file
@@ -216,72 +216,73 @@ power management:
 
             CPU0       CPU1       CPU2       CPU3       CPU4       CPU5       CPU6       CPU7       
    0:         75          0          0          0          0          0          0          0  IR-IO-APIC    2-edge      timer
-   1:      31269        202         87         48        453        423         74         52  IR-IO-APIC    1-edge      i8042
-   8:          0          0          0          0          0          0          1          0  IR-IO-APIC    8-edge      rtc0
-   9:      41534       3276       1387        877       7155       5730       1140        669  IR-IO-APIC    9-fasteoi   acpi
-  12:    2318674      35852      10877       6907      58328      38294       9421       7960  IR-IO-APIC   12-edge      i8042
-  16:          0          1          0          0          0          0          0          0  IR-IO-APIC   16-fasteoi   i801_smbus
+   1:      36953        740         73         30        658        400         97         40  IR-IO-APIC    1-edge      i8042
+   8:          0          1          0          0          0          0          0          0  IR-IO-APIC    8-edge      rtc0
+   9:      78513       9414        672        193       3930       3366        885        184  IR-IO-APIC    9-fasteoi   acpi
+  12:    2901234      64831       5457       2075      45248      28156       6890       2620  IR-IO-APIC   12-edge      i8042
+  16:          1          0          0          0          0          0          0          0  IR-IO-APIC   16-fasteoi   i801_smbus
  120:          0          0          0          0          0          0          0          0  DMAR-MSI    0-edge      dmar0
  121:          0          0          0          0          0          0          0          0  DMAR-MSI    1-edge      dmar1
- 122:       6059       2640       2167     208503       3549       2888       2163       2225  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
- 123:         11          5          1          6          1         18          4          0  IR-PCI-MSI 327680-edge      xhci_hcd
- 124:        218         86         28         17         18         37         23          3  IR-PCI-MSI 2097152-edge      rtsx_pci
- 125:        235         80         13          0        180      12173          0          4  IR-PCI-MSI 520192-edge      enp0s31f6
- 126:          2          6          0          0          1          2         12          1  IR-PCI-MSI 1048576-edge    
- 127:        298         81         68         39     943393         40         36         26  IR-PCI-MSI 32768-edge      i915
- 128:         15          0          0          3          5          8          7         11  IR-PCI-MSI 360448-edge      mei_me
- 129:         16          3          4          0          7         10          2          0  IR-PCI-MSI 1572864-edge      iwlwifi
- 130:        217        118         38         21        142        132         15         20  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
- NMI:        542       1337        726       1755       1377        574       1182        153   Non-maskable interrupts
- LOC:    5726859   12104570    7169167   15454589   12386378    5972292   10890572    2707146   Local timer interrupts
+ 122:       6192       2656       1995     638948       3343       2724       2207       1782  IR-PCI-MSI 376832-edge      ahci[0000:00:17.0]
+ 123:         28          1          7          1          2          3          0          3  IR-PCI-MSI 327680-edge      xhci_hcd
+ 124:        260         59         40         24         12         13          7          1  IR-PCI-MSI 2097152-edge      rtsx_pci
+ 125:          4          0          0          1          0     141134          0          0  IR-PCI-MSI 520192-edge      enp0s31f6
+ 126:          0          6          1          1          0          0         12          0  IR-PCI-MSI 1048576-edge    
+ 127:        388         49         69         20    1292852         24         72         40  IR-PCI-MSI 32768-edge      i915
+ 128:         13          8          1          0          4         13         10          0  IR-PCI-MSI 360448-edge      mei_me
+ 129:         31          2          0          4          4          1          1          0  IR-PCI-MSI 1572864-edge      iwlwifi
+ 130:        472        177         79         17        234         80         20         64  IR-PCI-MSI 514048-edge      snd_hda_intel:card0
+ NMI:        517        909       1870       1479       2860       2448       1487       1879   Non-maskable interrupts
+ LOC:    6817458   10420741   18558647   16007809   28146012   24498558   16314487   18887302   Local timer interrupts
  SPU:          0          0          0          0          0          0          0          0   Spurious interrupts
- PMI:        542       1337        726       1755       1377        574       1182        153   Performance monitoring interrupts
- IWI:         28          0          0          5         13          0          1          2   IRQ work interrupts
- RTR:          7          0          0          0          0          0          0          0   APIC ICR read retries
- RES:    6213575    1012955     875565      80428     350229      43031      16198      17215   Rescheduling interrupts
- CAL:      55517      38528      41399      31968      43913      46731      41270      53176   Function call interrupts
- TLB:      38864      25517      30447      18261      30281      34832      28014      41608   TLB shootdowns
- TRM:    2294155    2294155    2294155    2294155    2294155    2294155    2294155    2294155   Thermal event interrupts
+ PMI:        517        909       1870       1479       2860       2448       1487       1879   Performance monitoring interrupts
+ IWI:         58          3          1          1         16          2          1          0   IRQ work interrupts
+ RTR:          6          0          0          0          0          0          0          0   APIC ICR read retries
+ RES:   12074515    1391703     533454     177021     287023      72263      62627      48496   Rescheduling interrupts
+ CAL:     180651     143204      98858     104850      41109      73748     113286     111987   Function call interrupts
+ TLB:      53360      51502      31573      33734      16524      24420      38918      42708   TLB shootdowns
+ TRM:    3945331    3945331    3945331    3945331    3945331    3945331    3945331    3945331   Thermal event interrupts
  THR:          0          0          0          0          0          0          0          0   Threshold APIC interrupts
  DFR:          0          0          0          0          0          0          0          0   Deferred Error APIC interrupts
  MCE:          0          0          0          0          0          0          0          0   Machine check exceptions
- MCP:         63         63         63         63         63         63         63         63   Machine check polls
+ MCP:         91         91         91         91         91         91         91         91   Machine check polls
+ HYP:          0          0          0          0          0          0          0          0   Hypervisor callback interrupts
  ERR:          0
  MIS:          0
  PIN:          0          0          0          0          0          0          0          0   Posted-interrupt notification event
  NPI:          0          0          0          0          0          0          0          0   Nested posted-interrupt event
  PIW:          0          0          0          0          0          0          0          0   Posted-interrupt wakeup event
-MemTotal:       16292156 kB
-MemFree:        11441148 kB
-MemAvailable:   14206304 kB
-Buffers:          168068 kB
-Cached:          2422560 kB
+MemTotal:       16293504 kB
+MemFree:         9525580 kB
+MemAvailable:   13821608 kB
+Buffers:          437968 kB
+Cached:          3580964 kB
 SwapCached:            0 kB
-Active:          2310388 kB
-Inactive:        2152832 kB
-Active(anon):    1237636 kB
-Inactive(anon):   267172 kB
-Active(file):    1072752 kB
-Inactive(file):  1885660 kB
+Active:          3760216 kB
+Inactive:        2483432 kB
+Active(anon):    1520068 kB
+Inactive(anon):   327828 kB
+Active(file):    2240148 kB
+Inactive(file):  2155604 kB
 Unevictable:          48 kB
 Mlocked:              48 kB
 SwapTotal:       8212476 kB
 SwapFree:        8212476 kB
-Dirty:              2152 kB
+Dirty:             10128 kB
 Writeback:             4 kB
-AnonPages:       1872664 kB
-Mapped:           640228 kB
-Shmem:            268188 kB
-Slab:             192284 kB
-SReclaimable:     121152 kB
-SUnreclaim:        71132 kB
-KernelStack:       12352 kB
-PageTables:        51296 kB
+AnonPages:       2224764 kB
+Mapped:           672168 kB
+Shmem:            328916 kB
+Slab:             326532 kB
+SReclaimable:     238596 kB
+SUnreclaim:        87936 kB
+KernelStack:       12416 kB
+PageTables:        54128 kB
 NFS_Unstable:          0 kB
 Bounce:                0 kB
 WritebackTmp:          0 kB
-CommitLimit:    16358552 kB
-Committed_AS:    6760540 kB
+CommitLimit:    16359228 kB
+Committed_AS:    7095508 kB
 VmallocTotal:   34359738367 kB
 VmallocUsed:           0 kB
 VmallocChunk:          0 kB
@@ -296,13 +297,14 @@ HugePages_Free:        0
 HugePages_Rsvd:        0
 HugePages_Surp:        0
 Hugepagesize:       2048 kB
-DirectMap4k:      218600 kB
-DirectMap2M:     6983680 kB
-DirectMap1G:    10485760 kB
+DirectMap4k:      247272 kB
+DirectMap2M:    10100736 kB
+DirectMap1G:     7340032 kB
 Inter-|   Receive                                                |  Transmit
  face |bytes    packets errs drop fifo frame compressed multicast|bytes    packets errs drop fifo colls carrier compressed
-virbr0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-wlp3s0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
-enp0s31f6: 68732049   70678    0    0    0     0          0      3153 11932028   54493    0    0    0     0       0          0
-    lo:  103039     867    0    0    0     0          0         0   103039     867    0    0    0     0       0          0
 virbr0-nic:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+  tun0: 13292850   17711    0    0    0     0          0         0  9359951   16745    0    0    0     0       0          0
+virbr0:   60189     494    0    0    0     0          0         0   548231     726    0    0    0     0       0          0
+enp0s31f6: 66806972   75165    0    0    0     0          0      3744 18375796   63291    0    0    0     0       0          0
+wlp3s0:       0       0    0    0    0     0          0         0        0       0    0    0    0     0       0          0
+    lo: 2832452   10497    0    0    0     0          0         0  2832452   10497    0    0    0     0       0          0