Testsuite: regenerate certificates tree

The OCSP proofs had become out-of-date

19 files changed, 177 insertions, 190 deletions

diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
index 28ee5da58..6f79c2d4e 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/ca_chain.pem
@@ -1,49 +1,45 @@
 Bag Attributes
     friendlyName: Signing Cert rsa
 subject=O = example.net, CN = clica Signing Cert rsa
-
 issuer=O = example.net, CN = clica CA rsa
-
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
 subject=O = example.net, CN = clica CA rsa
-
 issuer=O = example.net, CN = clica CA rsa
-
 -----BEGIN CERTIFICATE-----
 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
-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
+cGxlLm5ldDEVMBMGA1UEAxMMY2xpY2EgQ0EgcnNhMB4XDTE5MTEwMTEyMzcyNloX
+DTM4MDEwMTEyMzcyNlowLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMT
+DGNsaWNhIENBIHJzYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANzT
+zcHynjItAQrtsDcxgDI+0Qs2SeJXUkrsyYZl1zNUianG0j8JnxMhrkhAjwAhYQ6m
+NNcOKJ1csgh5fyEuxsCOlUaSCakjm9+LfPBEHm//QNCqL11GJggNvYA6w82AW5Ly
+UPtdLLQqIgGIQcsKX9x/OAI7BYqG8AfKQ8Jk/dIA3+TF1v2zY7nYCkyaHy5lFLPQ
+fkTpTuOkM0yFiygJz2xgzgC/ZDFB4/cTYmOIG/qLlS3XGeS+z9/ce4Pmwp2RhRnG
+g7Y47zan2ACdp7XifXUBEWXcCiqaH7M/9fQmmMktm2fgE7WgubsiUyECDVaJ19Om
+PD+IN2bXutiLhP130WkCAwEAAaMmMCQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggEBAF2YN9oC6YtXrdXesgCF8ISG
+lmQrM4oDCCQc+bY6v1t9pEcIfzx5/Oe/5TEyYOBb/mfjVA0zm11nP3rReFqJHKae
+aYgV4HUTuWp48ErLGbR9+1SfjxqLxcMsnCnA4Q0OkQD22DbuUgDCMqEJFCFmM7XF
+ijh8WNXFlFLL1Nqyf+GYcbjdunova68igeTh8hMO6v/TeBe1DBqz6j2elt9JMRI3
+a+bYWZxRGCoqIBpedBKFSNl+L9KQ+FetBff5EAZtGxVLk1gBOtHHQDtBaAdKz9Ok
+W2CGAV5W51L4+ntwttnChVvcw3uqrhrjPNarvQ/JsibBgQdyO4BjQd4l7Qrdmx4=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db
index bda0c544e..335e4e674 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/cert9.db
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
index e3fce40e5..33b16ad8a 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/fullchain.pem
@@ -1,78 +1,72 @@
 Bag Attributes
     friendlyName: server2.example.net
-    localKeyID: EB 51 36 53 11 74 FC 19 77 E3 22 5E C5 1E E0 8D 5B FA E8 75 
+    localKeyID: DF 8E 8D 4A 1D 71 0D 4F AD 1A BE 7A EB 3F 04 D9 E2 24 ED FD 
 subject=CN = server2.example.net
-
 issuer=O = example.net, CN = clica Signing Cert rsa
-
 -----BEGIN CERTIFICATE-----
 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
-bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNjE2WhcNMzcxMjAxMTIzNjE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAujvIB2q0
-IClON+Zaemc0jT5QOltf8d5PTmIshxe6SdvyblFRUCXo69NtRsDBb1beRoERYXSN
-IBaPakPsBCF9pDQNnPTCdsJpmwNiUxTmFdcu7ob8GUCk3PUWn9UpB5sN9Y2BXVJP
-tK1jcnZaRVIWg4sG2tk+j4BeleTD3++7Rr3TNe+69NgheJT3M828iiutR4dixNF3
-gmamo7TZCgLFH4e8DwWf4a/VxEkGvtp77MBlpqGbx7Wsa/2eXNWiMX55N1aAABC2
-bysirIXmXdEs633g6iNyVHH0sh9bDP/dxcKLp7ToZ6ZBMIRsZhaBcF35iQM5LCyB
-M85moXZAeXSJMQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
+MTAxMTIzODA1WhcNNDQxMjAxMTIzODA1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1AfDiYOe
+CYMCscfy0DNzHPuGOSPw6/WzLUJrRmbJBvyHCGI2Qr08Z8t5kGKRY9Or4TdLVN9N
++5sZKSyf47OH0ixT8olx3FOZ61FVcoBTG4oa1+sNJcCCqcrnanpp/6EapcAwGofj
+DyRVR7xZHmzCuViWmiLafx9qhEwk0wT5E3IoxYPvLeJNBfslgirwHOP2FLfSRp4p
+RxicWayNCnhhsW21LBaYHSKhwuOCOyK3QjjPyZ/FWwARXkXA0o1tra1dlsKQ+t6L
+Zv61rM26RrZiD2OxBwNhTuHpxA+LYT3KiUCFQCZc9qT+Am63jA7J9BC8nJCUW3Jg
+ZvOyjM5Gd3a9gQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
 FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
 UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
 IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
 LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBABiKUPn/kz+6qgMxlffaHijAObOT
-991tNFt9zNiPPXboyn/Wmszjg/3NUIaI+hm2d8j3xH3E3Rp/52vXPnqztoI6v3YI
-9Dy+zuvc+1imFF0Wh9ha4hC1u0Z08FlSLLmnGHTpJKb2LlYCi8WdRd7UCkKB3QDG
-/PpTstmxYcOKZd5vfcLQuK4+AvqwS19etWXyS3qgYYYtrA4STiTHx6BQcEMTJklS
-e8zn7SbW4nRK8IX4na+XqOvFoGao9c/cErf1gVUx0nzR80TPSvN9owzWGOKJnjWZ
-AeRBfZ2ZjhOYNAiTdVZFtZYZ1C07Kk2mViUl4KviKTr0a69NOPy/l6YEKjQ=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAEy7rEhYOPeZjXNOd9SdjeQNt29q
+CyTz/CkaT+We9cl89Wop+NOh1xPpN3KPM8q1l+EEkrF1RjCva9RwHbeGbcFpsow7
+lBNvrebw3I8PAGUqfVwR1m+DuRCtpTsA7vHxelH/v6j6WQSXwP4XR8Or+/bXdyzR
+BElKL00wmi3QNu8pfq33tpdlZLtYTuThL8v/pQaajlf2g+uzQnSIgtCLzbBynbRq
+v6aTU4LuQPu9fXqghiwo1U4iamWqjGDrsaqloxsLoNPhH0P/Mq+85C0cdpydnXqx
+GlkAygbdRlsBxN052aUxkB0Zq55Z3cacfGEXI5eet5FmxrC7gC7HsTFfKpc=
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Signing Cert rsa
 subject=O = example.net, CN = clica Signing Cert rsa
-
 issuer=O = example.net, CN = clica CA rsa
-
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-ggEKAoIBAQDAjSbScAYCPW0cNADb6GPOz+pNf8BOliBkZCzVijCXUOj7Zes/B+jV
-qU27Yn27+BQ12DDftGA0b7K5hrhQCk0m2VIlK2207xfDF/0Xt3gpqLNrJ518g6p8
-XmvRQYoUIFzG4R2RhdDJ1doCXDKNaOviqye2yVELkhA0RCmysILUf8xxgnyFy4Vg
-oJi0Ibrbt8e10pP+MqtvX5j7Q6rxAnhA2HOZsAANbAd68meudwJK0oRbCIovayxt
-pf1WUGn8b0ijysTEPffX67dZYnOD8pSZx+AXr3NQkxIXCh8V01OxFFz/pJTWPpZQ
-cbL5sA5uFh4pLhJ3aIvlngFQNBMwdeaNAgMBAAGjPjA8MA4GA1UdDwEB/wQEAwIB
+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
-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
+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
 -----END CERTIFICATE-----
 Bag Attributes
     friendlyName: Certificate Authority rsa
 subject=O = example.net, CN = clica CA rsa
-
 issuer=O = example.net, CN = clica CA rsa
-
 -----BEGIN CERTIFICATE-----
 MIIC+zCCAeOgAwIBAgIBQTANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtleGFt
-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
+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
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db b/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db
index 4e86e7fd0..85809fdfd 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/key4.db
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
index 4b62befde..014e03426 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.chain.pem
@@ -1,48 +1,46 @@
 Bag Attributes
     friendlyName: server2.example.net
-    localKeyID: EB 51 36 53 11 74 FC 19 77 E3 22 5E C5 1E E0 8D 5B FA E8 75 
+    localKeyID: DF 8E 8D 4A 1D 71 0D 4F AD 1A BE 7A EB 3F 04 D9 E2 24 ED FD 
 subject=CN = server2.example.net
-
 issuer=O = example.net, CN = clica Signing Cert rsa
-
 -----BEGIN CERTIFICATE-----
 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
-bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNjE2WhcNMzcxMjAxMTIzNjE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAujvIB2q0
-IClON+Zaemc0jT5QOltf8d5PTmIshxe6SdvyblFRUCXo69NtRsDBb1beRoERYXSN
-IBaPakPsBCF9pDQNnPTCdsJpmwNiUxTmFdcu7ob8GUCk3PUWn9UpB5sN9Y2BXVJP
-tK1jcnZaRVIWg4sG2tk+j4BeleTD3++7Rr3TNe+69NgheJT3M828iiutR4dixNF3
-gmamo7TZCgLFH4e8DwWf4a/VxEkGvtp77MBlpqGbx7Wsa/2eXNWiMX55N1aAABC2
-bysirIXmXdEs633g6iNyVHH0sh9bDP/dxcKLp7ToZ6ZBMIRsZhaBcF35iQM5LCyB
-M85moXZAeXSJMQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
+MTAxMTIzODA1WhcNNDQxMjAxMTIzODA1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1AfDiYOe
+CYMCscfy0DNzHPuGOSPw6/WzLUJrRmbJBvyHCGI2Qr08Z8t5kGKRY9Or4TdLVN9N
++5sZKSyf47OH0ixT8olx3FOZ61FVcoBTG4oa1+sNJcCCqcrnanpp/6EapcAwGofj
+DyRVR7xZHmzCuViWmiLafx9qhEwk0wT5E3IoxYPvLeJNBfslgirwHOP2FLfSRp4p
+RxicWayNCnhhsW21LBaYHSKhwuOCOyK3QjjPyZ/FWwARXkXA0o1tra1dlsKQ+t6L
+Zv61rM26RrZiD2OxBwNhTuHpxA+LYT3KiUCFQCZc9qT+Am63jA7J9BC8nJCUW3Jg
+ZvOyjM5Gd3a9gQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
 FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
 UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
 IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
 LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBABiKUPn/kz+6qgMxlffaHijAObOT
-991tNFt9zNiPPXboyn/Wmszjg/3NUIaI+hm2d8j3xH3E3Rp/52vXPnqztoI6v3YI
-9Dy+zuvc+1imFF0Wh9ha4hC1u0Z08FlSLLmnGHTpJKb2LlYCi8WdRd7UCkKB3QDG
-/PpTstmxYcOKZd5vfcLQuK4+AvqwS19etWXyS3qgYYYtrA4STiTHx6BQcEMTJklS
-e8zn7SbW4nRK8IX4na+XqOvFoGao9c/cErf1gVUx0nzR80TPSvN9owzWGOKJnjWZ
-AeRBfZ2ZjhOYNAiTdVZFtZYZ1C07Kk2mViUl4KviKTr0a69NOPy/l6YEKjQ=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAEy7rEhYOPeZjXNOd9SdjeQNt29q
+CyTz/CkaT+We9cl89Wop+NOh1xPpN3KPM8q1l+EEkrF1RjCva9RwHbeGbcFpsow7
+lBNvrebw3I8PAGUqfVwR1m+DuRCtpTsA7vHxelH/v6j6WQSXwP4XR8Or+/bXdyzR
+BElKL00wmi3QNu8pfq33tpdlZLtYTuThL8v/pQaajlf2g+uzQnSIgtCLzbBynbRq
+v6aTU4LuQPu9fXqghiwo1U4iamWqjGDrsaqloxsLoNPhH0P/Mq+85C0cdpydnXqx
+GlkAygbdRlsBxN052aUxkB0Zq55Z3cacfGEXI5eet5FmxrC7gC7HsTFfKpc=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 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

-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

+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

-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

+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

-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
+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
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
index 7c31c72cc..61da4bdf2 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.key
@@ -1,34 +1,34 @@
 Bag Attributes
     friendlyName: server2.example.net
-    localKeyID: EB 51 36 53 11 74 FC 19 77 E3 22 5E C5 1E E0 8D 5B FA E8 75 
+    localKeyID: DF 8E 8D 4A 1D 71 0D 4F AD 1A BE 7A EB 3F 04 D9 E2 24 ED FD 
 Key Attributes: <No Attributes>
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInF0aXxpnTUACAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECEXGdFprKCZjBIIEyG7cLY0CWZGQ
-LUPdutadnNbxqy+Y0eIjnO2IkafQ59ps0YQeotJbq1vyvZddKt0NO4s0lT1Lb4a1
-N1XuEY3HOycz2uXyTI2W48fU1r1ks8FFV2nPMeu01YAG7iOvnhS3Srd3FeEo4PVH
-9VPMcV6QoXCe4C41y06OEi+Kw16nwfMNg79hweRpjcLcAX0avYKVFBhx8mpxUdlF
-QDrm4B2aomCfuMYz0puJe2RXOtK2ZZHChIRLJKYucnqVDEwqG1UXxcJA+zt5xNNv
-YBtJUW3vLA0nzqeUrCUe9wON6bdQy+o9a+WAOsxIaYEmjhhd8kLS/mWbEbuaaBt/
-PADFGDNEGazNVuZtIOVzgAEWGPhq28Vjk08rgXMUaEuE3OgovTLuM3AkZ7OvdKYo
-oqQv2juaADWegfeJ62pNrTYdzWpfNvfHJLmBjX24mAO7ZE9qY+h1u0oJXOhXoqO/
-oV9/VQqGKUGtui9MRf7VmlMG0q4l+8thRQjheTuWeUeLeUrCs0jIa6C82OyNue8b
-U9WcImz9AV57ao8s/LOsxC65l+odtlGpZjgCCz1vfxIp1HXuUN60QnNDPkrgp5Bq
-0yB2IPlr0CTxWvOEQtQ5S1mYvrfOfwPf8TMGId2DpIllc7A6k7B9ZRoT3d/Jcupy
-5d5OJodWoFcnZ/Dw9O2MjtgqDbWdfDiWSk9ia8txY5SU/ai24R4MNGgG/O2ASbr8
-XJ/fdB0ZuSO193zv7AIz4W8814ZJZhbGbILTbxx2Ck0BK14c5YYAnWDGY1o44KXg
-aOCNm3ZZqPIL3mwGysET07IAsoqEcKIWddv8/W2/HVuuymCsXcXUkZBCe405u0gk
-udZWrbss9TtscRJHNEWqqkSh/NS25BoXlmIoos7JI+iDF0sKf/yun9lW4uXeWBBT
-XCRAIkPhAF/E1/zt+8Nvojt6nupy8yFqTIav8QAnddJOefUcn9jYAJ+2Ozw+eFlT
-2ySXeuUC/1UQBfdUHEyu3ZV0FaHvZ8ZQ0r1gS69vP/MlKudLb5g9qQGOuAPeetRJ
-enUChD8HYwm/gyy+KBDSIBIwhMsCg4Sr+enIpJUcQ21G2fcCJwP1PweO3OICGu2Z
-9qpuvIo37pHUrGrPlrSxVSYst9lYkese/lKlQiWV97FxHouz+IoCBt0v5hLuEQB0
-LhJ7EJD/pf8rhukbLIseafbqpK6gQajybJ2VAL3LCon1RS3c6G29oSUfjg3Wgwsa
-gyMbvc+dK8eYzR5BEvf0zPqmhE6RLNFHzDkywFZKYFcG478Uo1WoOQqdXoVnHdcq
-Ib4hDBwWbTp9qC5GWOUKokmWDEoNFngXMCiDZM6SpldMb+NOvh9ug+MKNI7xgC+V
-2eJi9uII9gOMBeE8bOyofMPJk1lS+ZPZ0eKJlq40rH9jaaCRba44rDASIA1D2DF9
-IlEDbjP2HoHqJ6Vq6Ki7LzoYZZBgN59jpoNf6ksvzQshpABR3Epb8qMLBF3VmE6B
-DNlA6erPWnjVqUZHirC9fO/eh6RLKw/LzHPoXO9qSyTY0/WWaeCy0TeFmOsbBhqv
-VU1wjVVcqEycL/mhV5LidY+YOVDUSthWjwvtao8dDgoWyQyYNjq85Vf7UGkGYSXH
-R5WSUqWDXelkpHB/2CkQTQ==
+MIIFHTBXBgkqhkiG9w0BBQ0wSjApBgkqhkiG9w0BBQwwHAQIIsIgVstZKzcCAggA
+MAwGCCqGSIb3DQIJBQAwHQYJYIZIAWUDBAEqBBBALYvsAcNH4kMpgmy0olilBIIE
+wH7xqmWhHKEIzw2dfBxddPy3AmktQ/3GRndbj4io6rygMibaKowsyaXQTKcYEUWQ
+LyIYnrEgFMZCEhy4vUt3apmQJ633OXotLkKU3RkW+oz3xyPAJFbkgH1LIN7VTqvE
+x2ZG0YE0z91dFPwd9/1y9vQli/UUAO6mAidKxkeM35dCz/AJp5FuLs1LUYi9huwg
+aVSb2qsJFaWrNHX8rAXwqGve26DM6vq2gqJww60Ty0imQBuIPMM0yGuPjBhFrlIH
+psxJ1CRzQJ7/t8w7TTTQIpws7GtMCB8/ATQFDlfaq7rWNCliVM7pm61wgM8ArbxD
+4OC+3SFGOKDx3FlsP3gjxkGrxopseDEnAAyZ2W73C1GGPGyWlb8//PQ5WiDVorvB
+7iDPMF0+fBMLM2Sc77TcN1ohGLFStG7DsWwoE9DaARMY/79ZT51+b1KUTjd0JNye
+3Y0DW++DiSaWph0xZqEatyiQiZ4T5H4YyOIsX1so45nj1w5n4aMZqPaERlQVONlw
+21Lcl3Di0E66FqPAfctcAHgpJgAYH4Cgh3c88ecgfW4uGUy54d2DG5DIN/36GczE
+4PZgzwzjnx51pyzduOE1AqeomA/T84ekxeucaGJYbXzMnCQle8qqm9PQwbZ8VZk5
+oteAk+mcgwMZsjbVt186i69z7MlpS0xpoVPNMoYCdk/qIn2lGZFHsZFl0ORkcUUK
+uizkKg/nFfxepXIzs6MhUdhXudLTvCtFN8d2XB58+MZtepc4PxcvC29Gd2O3Rqle
+j9MRH19RUq6OIZKoqi2Z0jdXDz2LOYVTE1LAohzLQSItVWcfD0lIQwx5nMm/32Tf
+q9d7cotYxHWr55ciPO4Lqg7C1eI6Ea9MEWWgwCeB9SQCc4RyUD49iuU4DPWHZ0j/
++axq0FFSJuuNj06PV1xVDK2IsW2nXV9hN2UAV0i7v03XDY1Kc+j9kbF3YYMqwm16
+FaWrOIrrkXNJQmori7aXaoGwKmNj+CX7XvDJ2lzQ/CzhlH5W3MLYahuaaXWS1az9
+EJJrWUFxpc4ZQH4xLBg6oGBZodfkTD1qg46NIv2T4jLehqgPfIGh+KcN9RnnNgnj
+jjRSPs+Rt1gbxbXkF7Uayyigxnyz7/HAuUT75Sk+lt1jw09c48/nFZtZT3VsnU24
+BM92d02pYWjgI5IPFGuXdakaeKu9ZM2FPt4NFVLgMSnErN9sEp8mv8GPmOR8Mp/4
+e/FXmThyNO3K/q9aiN/1Zf/gkSjWkXoEV4eHDR3xl5XwpvdO0R0MOkcQRvfcxSfC
+v1pikZntHk49zjC8UsAAxtupWIiVetw6IP3OZ7ill9ecq5Min2bEzp6qDqmQFka1
+MoFJBN9C2oXK8yVaHvTG/dXiAzvtlQ1LeA60eCdfs1EwlqpAihclUNoVUzTPWkMl
+VpA47YaCBZB5fVG09HuYroOFXxHG/1+EIBYx6ECPnbZV1ECPD19fVFCF0DtPkau1
+p4/FMYI92E+Dekx7t0Gw3KH4R4OiZ2uw3W3RvVmX9/rJG24XbVqUXoZsyPB+XBbN
+hCn2YtEj+Aa2qV6jbrROdhyK+3+QwbZqfxB87CVaiuCiM+vsgJitXCeMfDMLjQpX
+uPwDff2ODoYDIgUJ+fdwGhE=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
index 32f857265..09c02f94e 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
index 25446e118..4389f3ff7 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
index 28509373b..95d853e37 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.req
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
index 25446e118..4389f3ff7 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
index 779918797..c7164ff20 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
index 5c0a30bde..46ade7b1b 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
index 5c0a30bde..46ade7b1b 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signer.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
index 43f81d54b..8d5265264 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.dated.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
index b1fe43dca..bfc680d6a 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.good.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
index b1fe43dca..bfc680d6a 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.ocsp.signernocert.revoked.resp
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12 b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
index 5994e20b3..6303d402f 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.p12
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
index 3ba03ad33..7aaf545b1 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.pem
@@ -1,29 +1,27 @@
 Bag Attributes
     friendlyName: server2.example.net
-    localKeyID: EB 51 36 53 11 74 FC 19 77 E3 22 5E C5 1E E0 8D 5B FA E8 75 
+    localKeyID: DF 8E 8D 4A 1D 71 0D 4F AD 1A BE 7A EB 3F 04 D9 E2 24 ED FD 
 subject=CN = server2.example.net
-
 issuer=O = example.net, CN = clica Signing Cert rsa
-
 -----BEGIN CERTIFICATE-----
 MIIDuDCCAqCgAwIBAgICAMkwDQYJKoZIhvcNAQELBQAwNzEUMBIGA1UEChMLZXhh
-bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTIx
-MTAxMTIzNjE2WhcNMzcxMjAxMTIzNjE2WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
-YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAujvIB2q0
-IClON+Zaemc0jT5QOltf8d5PTmIshxe6SdvyblFRUCXo69NtRsDBb1beRoERYXSN
-IBaPakPsBCF9pDQNnPTCdsJpmwNiUxTmFdcu7ob8GUCk3PUWn9UpB5sN9Y2BXVJP
-tK1jcnZaRVIWg4sG2tk+j4BeleTD3++7Rr3TNe+69NgheJT3M828iiutR4dixNF3
-gmamo7TZCgLFH4e8DwWf4a/VxEkGvtp77MBlpqGbx7Wsa/2eXNWiMX55N1aAABC2
-bysirIXmXdEs633g6iNyVHH0sh9bDP/dxcKLp7ToZ6ZBMIRsZhaBcF35iQM5LCyB
-M85moXZAeXSJMQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
+bXBsZS5uZXQxHzAdBgNVBAMTFmNsaWNhIFNpZ25pbmcgQ2VydCByc2EwHhcNMTkx
+MTAxMTIzODA1WhcNNDQxMjAxMTIzODA1WjAeMRwwGgYDVQQDExNzZXJ2ZXIyLmV4
+YW1wbGUubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1AfDiYOe
+CYMCscfy0DNzHPuGOSPw6/WzLUJrRmbJBvyHCGI2Qr08Z8t5kGKRY9Or4TdLVN9N
++5sZKSyf47OH0ixT8olx3FOZ61FVcoBTG4oa1+sNJcCCqcrnanpp/6EapcAwGofj
+DyRVR7xZHmzCuViWmiLafx9qhEwk0wT5E3IoxYPvLeJNBfslgirwHOP2FLfSRp4p
+RxicWayNCnhhsW21LBaYHSKhwuOCOyK3QjjPyZ/FWwARXkXA0o1tra1dlsKQ+t6L
+Zv61rM26RrZiD2OxBwNhTuHpxA+LYT3KiUCFQCZc9qT+Am63jA7J9BC8nJCUW3Jg
+ZvOyjM5Gd3a9gQIDAQABo4HmMIHjMA4GA1UdDwEB/wQEAwIE8DAgBgNVHSUBAf8E
 FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwTgYDVR0jBEcwRYANQUFidHdDeGNYZ2Iw
 UaExpC8wLTEUMBIGA1UEChMLZXhhbXBsZS5uZXQxFTATBgNVBAMTDGNsaWNhIENB
 IHJzYYIBQjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vc2Nw
 LmV4YW1wbGUubmV0LzApBgNVHREEIjAgghNzZXJ2ZXIyLmV4YW1wbGUubmV0ggkq
-LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBABiKUPn/kz+6qgMxlffaHijAObOT
-991tNFt9zNiPPXboyn/Wmszjg/3NUIaI+hm2d8j3xH3E3Rp/52vXPnqztoI6v3YI
-9Dy+zuvc+1imFF0Wh9ha4hC1u0Z08FlSLLmnGHTpJKb2LlYCi8WdRd7UCkKB3QDG
-/PpTstmxYcOKZd5vfcLQuK4+AvqwS19etWXyS3qgYYYtrA4STiTHx6BQcEMTJklS
-e8zn7SbW4nRK8IX4na+XqOvFoGao9c/cErf1gVUx0nzR80TPSvN9owzWGOKJnjWZ
-AeRBfZ2ZjhOYNAiTdVZFtZYZ1C07Kk2mViUl4KviKTr0a69NOPy/l6YEKjQ=
+LnRlc3QuZXgwDQYJKoZIhvcNAQELBQADggEBAEy7rEhYOPeZjXNOd9SdjeQNt29q
+CyTz/CkaT+We9cl89Wop+NOh1xPpN3KPM8q1l+EEkrF1RjCva9RwHbeGbcFpsow7
+lBNvrebw3I8PAGUqfVwR1m+DuRCtpTsA7vHxelH/v6j6WQSXwP4XR8Or+/bXdyzR
+BElKL00wmi3QNu8pfq33tpdlZLtYTuThL8v/pQaajlf2g+uzQnSIgtCLzbBynbRq
+v6aTU4LuQPu9fXqghiwo1U4iamWqjGDrsaqloxsLoNPhH0P/Mq+85C0cdpydnXqx
+GlkAygbdRlsBxN052aUxkB0Zq55Z3cacfGEXI5eet5FmxrC7gC7HsTFfKpc=
 -----END CERTIFICATE-----
diff --git a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
index 1f3cffedf..a8829623a 100644
--- a/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
+++ b/test/aux-fixed/exim-ca/example.net/server2.example.net/server2.example.net.unlocked.key
@@ -1,27 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAujvIB2q0IClON+Zaemc0jT5QOltf8d5PTmIshxe6SdvyblFR
-UCXo69NtRsDBb1beRoERYXSNIBaPakPsBCF9pDQNnPTCdsJpmwNiUxTmFdcu7ob8
-GUCk3PUWn9UpB5sN9Y2BXVJPtK1jcnZaRVIWg4sG2tk+j4BeleTD3++7Rr3TNe+6
-9NgheJT3M828iiutR4dixNF3gmamo7TZCgLFH4e8DwWf4a/VxEkGvtp77MBlpqGb
-x7Wsa/2eXNWiMX55N1aAABC2bysirIXmXdEs633g6iNyVHH0sh9bDP/dxcKLp7To
-Z6ZBMIRsZhaBcF35iQM5LCyBM85moXZAeXSJMQIDAQABAoIBAA7zL5qQ0UbnqfTI
-1CiRUmGoR+53WVtkOj+Tl/l8SSMWuf5rHrjtYiZUQah1XtHeSlekks2c+ptB1F92
-dmLagWiGGTWpXFcGQk4EVodO3S2RqZ3STjiEvPdT4W4RQYrvwo4cvu7L5cQeSyZs
-I9D+xvnmVjWJTQFeD7m+tI6sgv8pqMbxBVMZzquGt0/euQ6NEiKK+pwogGWzDnvF
-yBJ6KOBXqRfNAJZ2BR0Y/m44HNR0hrV7KTMrkD8duyhSSRck8EVA9Z49tQbgbkTP
-y6awWH6EIhY6Ixgm1ja24Az68apoeTIPOv5lAUP7+hIsa973cQb2VTJKXcSNS+rM
-5y8cCtUCgYEA5x7dpbxdPoExmIp5KXQn6TRfHTUPuACZWeOzxGfzcMKsXx8BI748
-RSdTMT4O2afzs5uD8ma3VU/mImT8xXk1GyxhDLJMHl3FaUrYg9hREoRKbUAtym2M
-wqnWd/XWSqJSoA1eJkZ/DdrKvzjSnqxrToK6jk1enQsZ0tI3eZ4kNfcCgYEAzkfv
-YBo1BaUJZ8fvj1/f0k1l0bIOgaaEpD+5RBzRUc7XTZZVJOrUkJt+yTr9mvEvOVFW
-qHAv2xdS+2fwJneqLjNiTxdNN9a9Zv0LndzxRvt8aZLiRghgbu2EdVIXAP7WkD4C
-n2eQa30tPbz7kzABp9eNg3lemmT97wrQUce90BcCgYA3+UG04emzOZbJWr/9SiRg
-Vk6yxCcKaRq6qmrfJk3PAVa9ssST4361QNDlHCJ8lDBxTzilfDrqbm9N5SdSrAgw
-jI70hDnrIMqutXG6fKkl0uQzkVeFrwJoIrnOU7uSV72rBZHHs0sSD+sKZLidtSRH
-32FPFW3UmtumM0M8MRCUAQKBgQCUOXR0ZeB7sd9UR4KIT6gRAbSMPZnW58SgEXoa
-y2pNkod7JO8BnAwp7NHp3w2kbHI2iY/vcM2ybMwgAsu5mHscv6eAlYnS+ecXPfU+
-9igZjVQUuIsHL7W7f8iSVO5atMOQ2j4gNNa9pjEAD+/mD7Tg2i7BrlCgOLmPLwIK
-AbEO+QKBgDw8AjMGmWG88AGFN5d+d+QLOgwmRT2UMX1DPaxwycfcyxPXg7YzckeK
-q85JXi9VdsZ1Tpa7y9oz2L5a6iW2tdeeOu0SiyhhPS55rk/jPClJwzFY24Nks8yp
-sy8se8Wb447DJx0Tt25GovDfjBXpMDTKspdBWGjrnsUusSGlzaB7
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDUB8OJg54JgwKx
+x/LQM3Mc+4Y5I/Dr9bMtQmtGZskG/IcIYjZCvTxny3mQYpFj06vhN0tU3037mxkp
+LJ/js4fSLFPyiXHcU5nrUVVygFMbihrX6w0lwIKpyudqemn/oRqlwDAah+MPJFVH
+vFkebMK5WJaaItp/H2qETCTTBPkTcijFg+8t4k0F+yWCKvAc4/YUt9JGnilHGJxZ
+rI0KeGGxbbUsFpgdIqHC44I7IrdCOM/Jn8VbABFeRcDSjW2trV2WwpD63otm/rWs
+zbpGtmIPY7EHA2FO4enED4thPcqJQIVAJlz2pP4CbreMDsn0ELyckJRbcmBm87KM
+zkZ3dr2BAgMBAAECggEADghzgxrwbz26BG0w32HAWSc2g3qi++L3mGPAeNjdrjYx
+c7cYU0N2B4KaiZlUeRBt3EqOFFBxN1lVCXoYHPhpYVootjEtlYD8+2uXJaxjk7uI
+ukimxpxeqYEx3sS6Vj5h5p15MZBT0VE8ybIoDdDx9FVuJkZvQqGgKaBmgYbfO0+g
+lkj70M6NRvQwi6mPbmRAilotTXc0aVXhGiQkMH14nJLGibq6XCrQiUpk/RAWutH4
+ew11nbCGCoUMpyaHtgUXQ2dhLp9VLznVG6u+AETdvKZ98LnuZ8y0ln+OLHoBFXw9
+SUO77foGrtKQdsLL2UUGFuNnrxBebDmSwYccy4CQfwKBgQDspK8cTjICCVI4bLTm
+7QRT5wd6gSgy+qSfmrWu4lAsLw00u0UOaqjo15bRjUuSlbvC/uuFYqS39hw7rALF
+sY/qKTA9tUyoxgvw6eRJIqTuiVcad39K7ABFAQoIZpMnHlEHy7b8I01mWDr/v+D7
+e5gsQx4QRrU4RSZj/cOFijj+cwKBgQDlX68D7pHN1ZcpO++cptjwUKU86KLpyLPw
+d/LdSxZojyHJRXPWjDDKeK+9MaC9KGO2ahdz7bmXQelp/U4joQ8A9W12TNQWeXZ7
+Xp2t7laQQ/ZrsvcUmh4lWtAeJC0/FYOk6Nnl7uCv17El/6ERAw7O22Fs405vinl4
+R7HC/FRDOwKBgQC4aoqws1uTbLIvmL/N6s3hmPyiAn9SYzPh0c5esK2sESroejyR
+xJtHgaNeQQ+w95Fwn/rpYvtdBaXw9tbeO8ccw+Z9YImSSWzK3Wtzd1UzM8K2tIN1
+3r9DB1FLRKzO4nhha+d5TQWniYDJCD6LnUD01YVbR884P+NwLzWtHw/VcwJ/OyJv
+/JOFA4wNbJQHMlvRkiM4dnuDhMI5ocVK18KEBHDiRQGi261I5uo2ZJBm4F2JV34C
+jeC7+EMF6k1j18uuEpEzp0wnYaPu5998x1qq9oaPATUifi09mGPRQ/QPtjPVvK5L
+fvwW8T6qbSF6ZOhk6O+mLmxrzFXm+xuAuMRU9QKBgAkgS2FKLrk+h75xfO/uQjhj
+dmhC1ezzKU2EFHHnVjrouMn2jXy3ruIqvUcfOSzZ9F30ZB1xoEHpcNjBGT8ZZj7T
+sVFCOjn8d3dEoudA3LSj1cnc5Bs21TiBJSNn5FO/MoRpyUsF/Nd8K77fPO+hIhlt
+YP5ora6k+7flDzrBbbCq
+-----END PRIVATE KEY-----