[56a3a46a3ba4fb713fd3e4cfa51a5748abf2c2662fefb0b5a863fdef34572255/mcatanzaro/ci] Renegerate test CAs with sha256 and see if it passes new crypto policy
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [56a3a46a3ba4fb713fd3e4cfa51a5748abf2c2662fefb0b5a863fdef34572255/mcatanzaro/ci] Renegerate test CAs with sha256 and see if it passes new crypto policy
- Date: Tue, 7 Jul 2020 22:57:18 +0000 (UTC)
commit c59433ded59ff6de2e60d778de63366b61224423
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Tue Jul 7 17:56:44 2020 -0500
Renegerate test CAs with sha256 and see if it passes new crypto policy
.gitlab-ci.yml | 2 +-
tls/tests/files/ca-alternative.pem | 43 ++++----
tls/tests/files/ca-key.pem | 38 ++++---
tls/tests/files/ca.pem | 48 +++++----
tls/tests/files/chain.pem | 116 ++++++++++++----------
tls/tests/files/client-and-key.pem | 79 ++++++++-------
tls/tests/files/client-future.pem | 31 +++---
tls/tests/files/client-key.pem | 50 +++++-----
tls/tests/files/client-past.pem | 29 +++---
tls/tests/files/client.pem | 29 +++---
tls/tests/files/client2-and-key.pem | 79 ++++++++-------
tls/tests/files/client2-key.pem | 50 +++++-----
tls/tests/files/client2.pem | 29 +++---
tls/tests/files/create-files.sh | 10 +-
tls/tests/files/intermediate-ca-csr.pem | 27 ++---
tls/tests/files/intermediate-ca-key.pem | 38 ++++---
tls/tests/files/intermediate-ca.pem | 41 ++++----
tls/tests/files/non-ca.pem | 148 ++++++++++++++++------------
tls/tests/files/old-ca-key.pem | 38 ++++---
tls/tests/files/old-ca.pem | 50 +++++-----
tls/tests/files/root-ca-csr.pem | 25 +++--
tls/tests/files/server-and-key.pem | 68 ++++++++-----
tls/tests/files/server-intermediate-csr.pem | 25 +++--
tls/tests/files/server-intermediate-key.pem | 38 ++++---
tls/tests/files/server-intermediate.pem | 27 ++---
tls/tests/files/server-key.der | Bin 609 -> 1192 bytes
tls/tests/files/server-key.pem | 38 ++++---
tls/tests/files/server-self.pem | 29 +++---
tls/tests/files/server.der | Bin 659 -> 920 bytes
tls/tests/files/server.pem | 30 +++---
tls/tests/files/ssl/ca.conf | 3 +-
tls/tests/files/ssl/old-ca.conf | 2 +-
32 files changed, 726 insertions(+), 534 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb48c2e..57ba3ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib-networking/master:v11
+image: registry.gitlab.gnome.org/gnome/glib-networking/master:v10
fedora-x86_64:
tags: [ privileged ]
diff --git a/tls/tests/files/ca-alternative.pem b/tls/tests/files/ca-alternative.pem
index f302079..477a9db 100644
--- a/tls/tests/files/ca-alternative.pem
+++ b/tls/tests/files/ca-alternative.pem
@@ -1,24 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIID8DCCA1mgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBnzETMBEGCgmSJomT8ixk
+MIIFAjCCA+qgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBnzETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBV
bnRydXN0ZWQgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndh
cy5hLmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNv
-bTAeFw0xODA5MTAxNTI4MzJaFw00ODA5MDIxNTI4MzJaMIGGMRMwEQYKCZImiZPy
-LGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2Vy
-dGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsG
-CSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBAMSfoB1yH62ZHjebrIGf05R9NEmN66395f7hAm5vRfyd0PBYvs8dVnwA
-caE/9mPGSVSePunIMwdTadbB8c8Um9YDmw5j3HWrR81YDt/Jmvr3N+tcqEnHLyG2
-bY/HbkhcZFyHlxXQzOTgZxZJJHDb1myCw6asXuWulNd6DKG9wy17AgMBAAGjggFR
-MIIBTTAdBgNVHQ4EFgQUdW0S6PvoW0vcssGVI0BEspCij3UwgdQGA1UdIwSBzDCB
-yYAUpB+h4wjjUruJVMGfZCqWMDl0UoihgaWkgaIwgZ8xEzARBgoJkiaJk/IsZAEZ
-FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMSwwKgYDVQQLDCNPbGQgVW50
-cnVzdGVkIENlcnRpZmljYXRlIEF1dGhvcml0eTEiMCAGA1UEAwwZb25jZS53YXMu
-YS5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb22C
-CQDYFKygp++FMjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNV
-HREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNv
-bTANBgkqhkiG9w0BAQsFAAOBgQCDoGn5OWNDG4IpR5dlJapoVcS2r5NOmk5cpVyG
-YfsuH6NW8GenpXuG9Xt7YJBkdGqLGWw/NWoECjcruafJrQvIGQsQ2imVXqnu2v36
-iUvMH+4aZC96aoncBqoC77tYuKVHFnbsqzk6vu36Wg1dkENN74iDHH7Z58NYbHK7
-g3YHLQ==
+bTAgFw0yMDA3MDcyMjU2MDFaGA8yMDUwMDYzMDIyNTYwMVowgYYxEzARBgoJkiaJ
+k/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVD
+ZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0w
+GwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALkTwJQClmI2oOYofPjhue0gCiD6BV/luhNZwvu7I0d+QylI
+tH/ft7tRKk8YaF24r3xt9a1WlYnnIEj8NbP7y+exR32Geqfy1qFG6H8IvUxPDOTh
+soBihiB6cfbFI/REhdbEORwQ7FHSd3d5WxpHh8lxG34qHR9lccPeThvd1YpdxAIm
+6CJOmECbMTQG5b1/5G8XsquQBWaCUtgRgi+6BS/gwAoEjhfis831BHYcuSxDgf4h
+5gCZK6t6dcNqET6Q57dcSGNdQNxd7wH7Q202II2kW6CZOc1EMzoWefzoC7UM//6+
+Wz3c1+IA2x9flrjXQfVEj8Me0RJFU18WKvozRj0CAwEAAaOCAVwwggFYMB0GA1Ud
+DgQWBBSWYFL9SVeh7/gUv5SY+B6yZBtBtjCB3wYDVR0jBIHXMIHUgBTnzuwuH9oQ
+B3+kKag+oE2zE6Wb7aGBpaSBojCBnzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUG
+CgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBVbnRydXN0ZWQgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndhcy5hLmNhLmV4YW1w
+bGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbYIUKUScryOFiYPg
+4IWWvN2QUatH7h4wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwGQYD
+VR0RBBIwEIEOY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
+b20wDQYJKoZIhvcNAQELBQADggEBAJZygcY3cyXeds6hwTun9Z8lWmE6gNgFyGHd
+oanR0H6Srv68qyr/ZUUQcYDGHELMMogHgyUBAqk+8sim7dC1e2jRLS4IzxQ40aPg
+VZ9qFJeMs5mEj3/ztEvKS+lGbWr4LcMYReEwSAdFh45jEBdnODwlJtq+ivKhpqxP
+nI1uJRiuWModoeTsy0YtYlvvGrlpt024MKgJ4D1hVjKz822L72QXEj/wePIiYWzj
++3PDjRNrolR0CbEkiMMs+kdWj7GlqXhyolmpVnOoE8HKJ7CELqTob1gl9h1kijI4
+Pa9gbxgDirKGYs6UHqAkgsCGIJUlTQNyzVWXlQz1hC5nkMiucjw=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/ca-key.pem b/tls/tests/files/ca-key.pem
index 7a128ea..5c85120 100644
--- a/tls/tests/files/ca-key.pem
+++ b/tls/tests/files/ca-key.pem
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/ca.pem b/tls/tests/files/ca.pem
index 98f2e7c..c290db6 100644
--- a/tls/tests/files/ca.pem
+++ b/tls/tests/files/ca.pem
@@ -1,23 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIDxjCCAy+gAwIBAgIJAJKCrbnWYIO3MA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
-CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UE
-CwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTgwOTEwMTUyODMy
-WhcNNDgwOTAyMTUyODMyWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
-JomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0
-eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEn6Adch+tmR43
-m6yBn9OUfTRJjeut/eX+4QJub0X8ndDwWL7PHVZ8AHGhP/ZjxklUnj7pyDMHU2nW
-wfHPFJvWA5sOY9x1q0fNWA7fyZr69zfrXKhJxy8htm2Px25IXGRch5cV0Mzk4GcW
-SSRw29ZsgsOmrF7lrpTXegyhvcMtewIDAQABo4IBODCCATQwHQYDVR0OBBYEFHVt
-Euj76FtL3LLBlSNARLKQoo91MIG7BgNVHSMEgbMwgbCAFHVtEuj76FtL3LLBlSNA
-RLKQoo91oYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
-LGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcw
-FQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBs
-ZS5jb22CCQCSgq251mCDtzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQCOmEBg99b83DeqeTzquZi5/RCxtecp
-Z0ip5kVZXapqJRa7OjIv6XYU4GWDuboIioLIfCyjKUYRziXL+gdwKItetqRE5A6w
-0Odr9jxecEtCA+J0XH6CbG/t1m6PzEITuKFxZ97FXjv3d33FYnugfZVIVrgzYTbt
-FJW+6MauX6dEeQ==
+MIIE4zCCA8ugAwIBAgIUBmf679C2Ijpvo2DnLmGEIwazRGwwDQYJKoZIhvcNAQEL
+BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
+LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
+MDA3MDcyMjU2MDFaGA8yMDUwMDYzMDIyNTYwMVowgYYxEzARBgoJkiaJk/IsZAEZ
+FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
+hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALkTwJQClmI2oOYofPjhue0gCiD6BV/luhNZwvu7I0d+QylItH/ft7tR
+Kk8YaF24r3xt9a1WlYnnIEj8NbP7y+exR32Geqfy1qFG6H8IvUxPDOThsoBihiB6
+cfbFI/REhdbEORwQ7FHSd3d5WxpHh8lxG34qHR9lccPeThvd1YpdxAIm6CJOmECb
+MTQG5b1/5G8XsquQBWaCUtgRgi+6BS/gwAoEjhfis831BHYcuSxDgf4h5gCZK6t6
+dcNqET6Q57dcSGNdQNxd7wH7Q202II2kW6CZOc1EMzoWefzoC7UM//6+Wz3c1+IA
+2x9flrjXQfVEj8Me0RJFU18WKvozRj0CAwEAAaOCAUMwggE/MB0GA1UdDgQWBBSW
+YFL9SVeh7/gUv5SY+B6yZBtBtjCBxgYDVR0jBIG+MIG7gBSWYFL9SVeh7/gUv5SY
++B6yZBtBtqGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
+MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
+bGUuY29tghQGZ/rv0LYiOm+jYOcuYYQjBrNEbDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEANHAy8kw8lts0
+3usE3nsEt517bSpVBcm25anHKw2sDbwsc8TV9NFSBxrwdHBRFSQ/pv/5qh4GgUzy
+L1WvkJxpPsC+m4EGUSI+kbosMCl2RvzzUEVtQcrn2h1T7SiNe8+pYq5EtH3TBq+S
+ZMNhSgS2OlbNVwgFIXk2DEoAxQk5BD7PFNrzdNFTQjeeK1vwQhskU5ltRsCeadEr
+OMgmrX9oQ5tBMw5o/ZUw6w7nQ62lXBBD3OkCVFbmDzJdGvBIS9+BDSK8PZn3FTMe
+qGzx4db6KQXwd5zNqXK2f6miD0IhvBaAcWnWXBX7n0MZqrIyFri7tPmuUwIIvr3F
+NHLHnAew2Q==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/chain.pem b/tls/tests/files/chain.pem
index 638ac0c..b7db5ac 100644
--- a/tls/tests/files/chain.pem
+++ b/tls/tests/files/chain.pem
@@ -1,64 +1,80 @@
-----BEGIN CERTIFICATE-----
-MIICtjCCAh+gAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
+MIIDuzCCAqOgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTE4MDkxMDE1Mjg0OVoXDTQzMDkwNDE1Mjg0OVow
+LWNhQGV4YW1wbGUuY29tMB4XDTIwMDcwNzIyNTYwNloXDTQ1MDcwMTIyNTYwNlow
SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
-GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEAl0zF3tH3V9QquvMVFgAGREcxj59CGM9X7TCWWNycgbhITJxR8Wqb
-AlHmpjGVFWtmZPvheg4pEUppzPGiaIfX/cdTXuAB/cQ/iGyabvsQA9d75VjQL3ca
-ZjJvspO2s/lOuP3XZX9QpngKGTbQ0DEzNeadG1ckFuXOWOj5DkgIUV0CAwEAAaNH
-MEUwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTA
-qAEWghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEACXgdI2AC
-f2QByzeXmmMgFm7jLsYw28S6Jvj6vFM9Rzg5Zta64B3kvT2+yk/gaKMBYCBtvRud
-6vjXKrCYlfdJa2yH4HtN1GDL6KYvx0/qJamT71pVvCuLIDzYMf0CcvoYtHZ5HDp3
-RFmQfU4QUk5+0YwwkpBFNQ4oiKjVPTBd5J4=
+GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOh+/vQy1et7/sAQencV/WJS9+qdvWl0q7mzQMfoocJMRNC/
+2oCWueaQfq8C27JiWVUTTJqIwovivtqtTEXjd7I3RLPPgQ0Gh4dbPQx0zLmO97cL
+qNcK2vLGjpwk1TZV2F6bEpfE1B2b63VF/L9kM57O83EUIbma8x+yr+aW9LWyn3bG
+J2umUdneRfgtZXwDEXKQPv6JfxL5omWJm/5CZwOsyMoAQqYchpZc1jl/fP3B8Atr
+AHib080LUZtraIar7ywT5UBx6p0xHM3Fl21If61f77Q4lfWFvWLmNmzq0xbjDA+A
+fUoNQcyb4ySy99IkBgAicdqI8KwnPA7J78SKiPkCAwEAAaNHMEUwCQYDVR0TBAIw
+ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAAEI5zoGocO4wiUB8TEhHPe9
+2ePS9Kji/NZohAtz0+HkNFQdNsHXxewBQ7WMNTzeOpjH85Uh7CLhFcl8NORs8qaw
+UZL+yZa/N3XsiyoKg7AgBAr9FolMxNOvWVvG9j2gF4t8ooLUlyaG7U1qGPbWVGQ1
+gdulqNJg/s6upz1xoMQoE+10+WE96fKOZ9LjBk/+LIfKx/eJxjplsDWj4nwWdO98
+H86baBwXvqqoT6FfSxljtLnezUkbKrhwMh2otkn06iqn+1lCyPuWdjZHtmVLd4Rs
+EXV9Fi5x/TBk/EfUYTd0TASdAHfw0uowdWDpwwjid1Ed5IMUkq5z5HcLmokMebw=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIID8jCCA1ugAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIFAjCCA+qgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDkxMDE1Mjg0OVoXDTQzMDkw
-NDE1Mjg0OVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMDcwNzIyNTYwNloXDTQ1MDcw
+MTIyNTYwNlowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
-BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEAu0V6zuw2zphIOaer4FRF3CCkD7I5MiLRMQvC
-Ttxm9TW+MjNX9/AgnZyrhz53TMzXZpeRzHbBd/alcIsNYeuZA9Sz7OGbNVrlsdv+
-UqGxtpz+QyNABbNVHOMQwEUoWZGOhH3LJFGGs29wZJ0t/YnE87zWYNrwP1JJJzqC
-n2A6sPECAwEAAaOCAUUwggFBMB0GA1UdDgQWBBQcld7s7kDEF1aDLm+aLf0rdSZy
-tDCBuwYDVR0jBIGzMIGwgBR1bRLo++hbS9yywZUjQESykKKPdaGBjKSBiTCBhjET
-MBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAc
-BgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBs
-ZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tggkAkoKtudZgg7cw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwJgYDVR0RBB8wHYEbaW50
-ZXJtZWRpYXRlLWNhQGV4YW1wbGUuY29tMBkGA1UdEgQSMBCBDmNhQGV4YW1wbGUu
-Y29tMA0GCSqGSIb3DQEBCwUAA4GBAKW00RiG2BO+ni+mtOP/svum1pC0mxU6oSoO
-uSptJ9NUf88yySwtlXRN34/0SEqznh/ebQzOICtc5su1sQ4+mm9c0VmK1+kEHztW
-Kvsl+3NHy8zvXwZY6EFHUtZ6lB3DNOd+uoSpbfACDctCXMPwdJB/xerulcvRVGUR
-KpspdWQy
+BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM40uJssdYI01t/LatabeqVxr7euKbCt
+XshrFdP99SF+4AGELVaqEuYVFj9iv8WIEfl3nH8L3x+b3LfIO4hg8mdhOOS8GPVC
+JUlH1fV1rrEVVv2W63/nsQj1THtulmpI2ewXcQiM5tz/kLmP4UrLaRKVKlVZ+bQa
+3GaXifYm8YlzJvVHLE1OQ2Ee3qZndtG/pf6UIW5EZo4W/u4ayQX9iLfTwWqkIuME
+1EFx2eJ7XvAN5iASxI0RRCdol/IkNh+Rf6VP7LQDMtru0oRLnw6/3pFquelUGine
+y8T8LYvYq7NqHoYIGHxZEdqvi5n2UCOs6VMcmUqUqxkZZlnvZSugw9UCAwEAAaOC
+AVAwggFMMB0GA1UdDgQWBBScU/uNq44yxUSv+c0CFX1AyzntQzCBxgYDVR0jBIG+
+MIG7gBSWYFL9SVeh7/gUv5SY+B6yZBtBtqGBjKSBiTCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQGZ/rv0LYiOm+jYOcuYYQjBrNEbDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
+cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
+b20wDQYJKoZIhvcNAQELBQADggEBAJ+9RoNFvyk4caCnCUB88nZ+vTppHep2S1RE
+hzeBNnvQXC0jlVHQsyZP2CsIDEmJAR/c8Ljd6htICnC+m3jx5zrXzo1/Q4GK/QQa
+fGxUZVkycuRQntXLiA1XgdHvcghRByKd3yeBM03C1NMuCVHtN0TNbmu/q0c5RfQ8
+Q9hA5NB2w2myjSsFWPSTh25OaniuQ+npKdpSWKQSDTGL6dwPh9Sf0k7cq3u7wPFK
+iOh69Hz3k8VDV6aruxKJhx0UJAbxaLsBWDRsfPnei5SAytR8YFo3XnYDnS5pitYa
+SWelydKe8FxyIN98ae4mSoRmQBZQvnKBH2T4MW57YwmYxVXASG0=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIDxjCCAy+gAwIBAgIJAJKCrbnWYIO3MA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
-CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UE
-CwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTgwOTEwMTUyODMy
-WhcNNDgwOTAyMTUyODMyWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
-JomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0
-eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDEn6Adch+tmR43
-m6yBn9OUfTRJjeut/eX+4QJub0X8ndDwWL7PHVZ8AHGhP/ZjxklUnj7pyDMHU2nW
-wfHPFJvWA5sOY9x1q0fNWA7fyZr69zfrXKhJxy8htm2Px25IXGRch5cV0Mzk4GcW
-SSRw29ZsgsOmrF7lrpTXegyhvcMtewIDAQABo4IBODCCATQwHQYDVR0OBBYEFHVt
-Euj76FtL3LLBlSNARLKQoo91MIG7BgNVHSMEgbMwgbCAFHVtEuj76FtL3LLBlSNA
-RLKQoo91oYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
-LGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcw
-FQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBs
-ZS5jb22CCQCSgq251mCDtzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQCOmEBg99b83DeqeTzquZi5/RCxtecp
-Z0ip5kVZXapqJRa7OjIv6XYU4GWDuboIioLIfCyjKUYRziXL+gdwKItetqRE5A6w
-0Odr9jxecEtCA+J0XH6CbG/t1m6PzEITuKFxZ97FXjv3d33FYnugfZVIVrgzYTbt
-FJW+6MauX6dEeQ==
+MIIE4zCCA8ugAwIBAgIUBmf679C2Ijpvo2DnLmGEIwazRGwwDQYJKoZIhvcNAQEL
+BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
+LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
+MDA3MDcyMjU2MDFaGA8yMDUwMDYzMDIyNTYwMVowgYYxEzARBgoJkiaJk/IsZAEZ
+FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
+hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALkTwJQClmI2oOYofPjhue0gCiD6BV/luhNZwvu7I0d+QylItH/ft7tR
+Kk8YaF24r3xt9a1WlYnnIEj8NbP7y+exR32Geqfy1qFG6H8IvUxPDOThsoBihiB6
+cfbFI/REhdbEORwQ7FHSd3d5WxpHh8lxG34qHR9lccPeThvd1YpdxAIm6CJOmECb
+MTQG5b1/5G8XsquQBWaCUtgRgi+6BS/gwAoEjhfis831BHYcuSxDgf4h5gCZK6t6
+dcNqET6Q57dcSGNdQNxd7wH7Q202II2kW6CZOc1EMzoWefzoC7UM//6+Wz3c1+IA
+2x9flrjXQfVEj8Me0RJFU18WKvozRj0CAwEAAaOCAUMwggE/MB0GA1UdDgQWBBSW
+YFL9SVeh7/gUv5SY+B6yZBtBtjCBxgYDVR0jBIG+MIG7gBSWYFL9SVeh7/gUv5SY
++B6yZBtBtqGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
+MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
+bGUuY29tghQGZ/rv0LYiOm+jYOcuYYQjBrNEbDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEANHAy8kw8lts0
+3usE3nsEt517bSpVBcm25anHKw2sDbwsc8TV9NFSBxrwdHBRFSQ/pv/5qh4GgUzy
+L1WvkJxpPsC+m4EGUSI+kbosMCl2RvzzUEVtQcrn2h1T7SiNe8+pYq5EtH3TBq+S
+ZMNhSgS2OlbNVwgFIXk2DEoAxQk5BD7PFNrzdNFTQjeeK1vwQhskU5ltRsCeadEr
+OMgmrX9oQ5tBMw5o/ZUw6w7nQ62lXBBD3OkCVFbmDzJdGvBIS9+BDSK8PZn3FTMe
+qGzx4db6KQXwd5zNqXK2f6miD0IhvBaAcWnWXBX7n0MZqrIyFri7tPmuUwIIvr3F
+NHLHnAew2Q==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client-and-key.pem b/tls/tests/files/client-and-key.pem
index 035682d..807fa72 100644
--- a/tls/tests/files/client-and-key.pem
+++ b/tls/tests/files/client-and-key.pem
@@ -1,45 +1,48 @@
-----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xODA5MTAxNTI4MzJaFw00MzA5MDQxNTI4
-MzJaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDA3MDcyMjU2MDFaFw00NTA3MDEyMjU2
+MDFaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLDXDADh65c
-NrIqEWsflxKyb/yiyJoxDKP/1j3WeBB9pPNr2gk+Lz9dwy6XLd18XGN56UCxDHBI
-7Ol+UU+mpUbImxubHZO074/1K2Rf//qa2maAnV8cJ4EvBxBtehT+OPT3vohkfTHo
-vSNTcL2kMIehO609sZ+n84H3q0ZsoIqKzt+cZUWT5vdXtvYp+5yLQIyc6fWIyFXv
-ch3fcFfiBFA8aSMfm2PpJlKPCPt6bX3fBBtlZQAZPZtZG0uBEU9iXY37fD9udrhR
-w6L6Iv0tQcCl83xFeocXLBW6NKdcwOp+UbwSyM9JvUuAyHMxKOoVubWmVWO0y1mH
-sOoY/9vFit0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQCrCl/LnuXiUQvdKmDYYpVq
-7HDaVkMMm0hIn342kiGK0ZTt2PpWN33xTGCOVP7hCA8ikZCXbJ32P60LFoivIHk2
-hNPx9memYT1wBwz+aFuo0jSDC3lZwffb/lr+smEl8LTBH2yP2IgRc/ppqX387m9h
-EYAdq5BPvzzFcEvXhbQ7/g==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM9+jKp6g3fv
+Ev/Cca5f7p1dNRaY5HRBxcwIY6XzhX8RkDCD/0XvL5q3Y5FxSIwkU6TOOZZJ3DGM
+8pCiEy0zmuIlp3KuZIVWvWc6NTk8Y74snCqf8j1M8t5hiVlLwvR5iFzPXdcTszuc
+osSB6RL2nStsX6lZYNZps4ssFB8FWbuAhEvOjq7kGAQuYbRlDjD6SvrG7znUUums
+WaMbeZ6+UDzYn0JHnA/UHUldMysnT2Ubm3O6jzfv0JlmFRMDG8dR/r4tasVgQ4sA
+YMeKKAojoWlfSSUivhj9ZqNonHkPxEvp5hxDOXnA658chJt9TFYTyZvQ3tsfoDHS
+jLI/EJQPd98CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAG/L1MnCszDTYmCDfmQrc
+WRhARjPuXLcfMZPtZCsJ6Lcj6xMO+bRuZkbdoiQ1huv7GnWbAY10Q+ib3/E7aorW
+LEt/Hl+o2M0jdf24f378Kl7ZrYESl7nOPqFGxjxT3UpiawvalW64uAAodHK26sJL
+42+Cvsg4sEzDUm3+nyd60WQ+KrKY5ev1lgBdPaIa/OVnJKEGhirCuuV+O1HscE+M
+p/JlrpM28A8GFN68+AlfH5srXHNNLTGVx2G3GY9PhzD+ivn7HfElPzlx8iSB7hk4
+zRhoY0VOO9NsR9NlxKmI4rDW5JnjWHNunXHFL4aG2w6MoSD6Lnl3ePHMPU6S3pt7
+VA==
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
-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
+MIIEowIBAAKCAQEAz36MqnqDd+8S/8Jxrl/unV01FpjkdEHFzAhjpfOFfxGQMIP/
+Re8vmrdjkXFIjCRTpM45lkncMYzykKITLTOa4iWncq5khVa9Zzo1OTxjviycKp/y
+PUzy3mGJWUvC9HmIXM9d1xOzO5yixIHpEvadK2xfqVlg1mmziywUHwVZu4CES86O
+ruQYBC5htGUOMPpK+sbvOdRS6axZoxt5nr5QPNifQkecD9QdSV0zKydPZRubc7qP
+N+/QmWYVEwMbx1H+vi1qxWBDiwBgx4ooCiOhaV9JJSK+GP1mo2iceQ/ES+nmHEM5
+ecDrnxyEm31MVhPJm9De2x+gMdKMsj8QlA933wIDAQABAoIBAFOPCua8X6U0ydnl
+XBJ034rPtklbWOTYd+cqmbaC0wfQ8tgWz/5BzFHp+Fbh3+1P079SrS4woFP0Btrn
+6gER/xWDRGOShziLLcscTcK25xP2sw0XTF4TVtrnPICRWflJ1/hIKeorLMqc0Y+B
+IXNZjQGnqv5v1+eAuaUaIyA671/qLvtZgKNUedqUSY7xhnbdTtR9KOBtWs6zi3Tk
+q8S4HysESSIQ/btoB/gqeFfUlWv0vsFUa1iH/MrOiHmWkUpB2atP8vZ89K7NRPsF
+b70TpVgZCKC/3A6uzJGGY6C7DcJt8FbEIUTqRk1BLnRo9MfRG2bfKExeBc7u1NvO
+Ah3YvQECgYEA/CrVN2wsb/7Yo57ZxKxlLOhn6s+VmUrxpUvdlJvcbmLdwUSrlk7q
+z5cOnF/KieRsVsKsqf4fAVSB00okW/Wv6arP+hwa0Y2V4O3ekt8EO/I2MRSyCb27
+5NwcW0x52OF/cuBkvWs0wuIS3I1HZmU+8vSPNSpn/X5O1cYsDxW7GZECgYEA0qXl
+l4slQPppVcJnxZhpS9aA4Eb0WoWGiWyUkQkNdI+vFwrH3jZ+9bJwQx6723VBq/6z
+Sq173UmXyjP3Zd+SDwzol6GW+KpxhjXpjsfq/ky6vaTOKj5wWGo6R3fepQ68NoFu
+qehpcOkKoRhN3WW3ZatETyzkd4IJ7KxChEnYQm8CgYBc8/UQrwFab1iwR7gCdYH+
+IdVcixScIzIcOnD9fM6uqicQPR37FDAeQZKTNgRU/CyrdqtrJk+Lj/kjR6tLcq9b
+tSlhCscgA88B0O1AupC3ADvVr8lJKfV/EVwqk3A+8DCoyeqYoFIcnHVTc4ikSCIC
+MQAxGuamXM72okxPazVC4QKBgDRQZxifwfzFM+vMgCEenOfsucz5Ui45AxSWFr9+
+VA0isgUy9DhHqHg0fJTuyRDTqh+g/b4KH7zxTfU1urdeMtPyDMG7q9bN3avLL9n5
+5G6Ld8UpbNoo75XFq/ub1XuAkVWoB2fDBIy6E522f4AAhu+E/U38hDD55qUUkuBv
+xnmZAoGBAPFXGUgT72BvaPK5/OMfzvJ6tLcp13zT4m6QzUo0FWcLa5Gj0zn7l7X8
+UUM4ArTcJnh4ZOBoTgDUqQqZnOUbylBzyaH8nZPFx8PALfWZV46rZBM+/aVtD0WS
+viGuXuBxa3SPxR7s4cJKDNeocNcHlnrq67IzicsClkwpNU9hjbL8
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client-future.pem b/tls/tests/files/client-future.pem
index b9f2312..85d6f79 100644
--- a/tls/tests/files/client-future.pem
+++ b/tls/tests/files/client-future.pem
@@ -1,18 +1,23 @@
+notBefore=Jul 17 23:00:00 2060 GMT
+notAfter=Jul 17 23:00:00 2061 GMT
-----BEGIN CERTIFICATE-----
-MIIC4DCCAkkCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDYTCCAkkCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzE2MDAwMFoYDzIwNjEwNzE3
-MTYwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
+AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzIzMDAwMFoYDzIwNjEwNzE3
+MjMwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyw1ww
-A4euXDayKhFrH5cSsm/8osiaMQyj/9Y91ngQfaTza9oJPi8/XcMuly3dfFxjeelA
-sQxwSOzpflFPpqVGyJsbmx2TtO+P9StkX//6mtpmgJ1fHCeBLwcQbXoU/jj0976I
-ZH0x6L0jU3C9pDCHoTutPbGfp/OB96tGbKCKis7fnGVFk+b3V7b2Kfuci0CMnOn1
-iMhV73Id33BX4gRQPGkjH5tj6SZSjwj7em193wQbZWUAGT2bWRtLgRFPYl2N+3w/
-bna4UcOi+iL9LUHApfN8RXqHFywVujSnXMDqflG8EsjPSb1LgMhzMSjqFbm1plVj
-tMtZh7DqGP/bxYrdAgMBAAEwDQYJKoZIhvcNAQELBQADgYEABzPPPH3DCjosUii6
-h5Fe+/9re6Ka/8JBZ5V9G1H+uBky7L07BQ5JhV7OIBuej0JQQXrDvicv0n7ImmHP
-O3iHxSLOe5sp7kNeQYpgm4DYbJUddcUBwltI5Lvux6IbR6rZybhVRnxjNd1jUBvj
-p42OS5M0tNYKC3jFDcuNwRIhiCw=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPfoyq
+eoN37xL/wnGuX+6dXTUWmOR0QcXMCGOl84V/EZAwg/9F7y+at2ORcUiMJFOkzjmW
+SdwxjPKQohMtM5riJadyrmSFVr1nOjU5PGO+LJwqn/I9TPLeYYlZS8L0eYhcz13X
+E7M7nKLEgekS9p0rbF+pWWDWabOLLBQfBVm7gIRLzo6u5BgELmG0ZQ4w+kr6xu85
+1FLprFmjG3mevlA82J9CR5wP1B1JXTMrJ09lG5tzuo8379CZZhUTAxvHUf6+LWrF
+YEOLAGDHiigKI6FpX0klIr4Y/WajaJx5D8RL6eYcQzl5wOufHISbfUxWE8mb0N7b
+H6Ax0oyyPxCUD3ffAgMBAAEwDQYJKoZIhvcNAQELBQADggEBALItOFuKoUfqBz6T
+r5X9gL3n0pRpgTOVufmY5kufIGKA7/9GRTrkB43gEeIyVXrlbffuEfhwKGoBXKIy
+YFOYvwOdPuHSjILHHY6oNu5XHM6/Vlyx/BlGkF/cnYtw7PMess7w5qcfQBQ4qIF+
+gBJRJF1YlOWs0LWBPjkaFf4YNoKKkC2oCg3DuJTCXi7BMWbFHNgYN2ujr/ZoNJp9
+1uv44qKwlH1WOeEIDtIb2tS/3ZupXVH+efBT0/E1RRR9jEba1hHBNhPqo7XAT1UR
+wQPETSssYwuPfpoeMFeox7q494/kVVvX1rnnuOQdobDqfd1CfxlDuVbHnald51ml
+QglQVvw=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client-key.pem b/tls/tests/files/client-key.pem
index 5ee4203..c000310 100644
--- a/tls/tests/files/client-key.pem
+++ b/tls/tests/files/client-key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client-past.pem b/tls/tests/files/client-past.pem
index ac8deb7..b01ad64 100644
--- a/tls/tests/files/client-past.pem
+++ b/tls/tests/files/client-past.pem
@@ -1,18 +1,23 @@
+notBefore=Jul 17 23:00:00 2000 GMT
+notAfter=Jul 17 23:00:00 2001 GMT
-----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcxNjAwMDBaFw0wMTA3MTcxNjAw
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcyMzAwMDBaFw0wMTA3MTcyMzAw
MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLDXDADh65c
-NrIqEWsflxKyb/yiyJoxDKP/1j3WeBB9pPNr2gk+Lz9dwy6XLd18XGN56UCxDHBI
-7Ol+UU+mpUbImxubHZO074/1K2Rf//qa2maAnV8cJ4EvBxBtehT+OPT3vohkfTHo
-vSNTcL2kMIehO609sZ+n84H3q0ZsoIqKzt+cZUWT5vdXtvYp+5yLQIyc6fWIyFXv
-ch3fcFfiBFA8aSMfm2PpJlKPCPt6bX3fBBtlZQAZPZtZG0uBEU9iXY37fD9udrhR
-w6L6Iv0tQcCl83xFeocXLBW6NKdcwOp+UbwSyM9JvUuAyHMxKOoVubWmVWO0y1mH
-sOoY/9vFit0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQCXBZanjJI96eWgPGv2LIgu
-9ZtEAd2C01lMc2UQHUMicPDFW1oQeptIruRGPVv+2ct9OhnC4JzBi18EAzxklsuF
-PsQZ+Lq/38hvdlX5bHGoRSJtFdB+ZkyFETr9AZNIYnxdSKrmUEwLPz/4rzB5KAoc
-wYNLbNWS2XqATA1rJ+cxmg==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM9+jKp6g3fv
+Ev/Cca5f7p1dNRaY5HRBxcwIY6XzhX8RkDCD/0XvL5q3Y5FxSIwkU6TOOZZJ3DGM
+8pCiEy0zmuIlp3KuZIVWvWc6NTk8Y74snCqf8j1M8t5hiVlLwvR5iFzPXdcTszuc
+osSB6RL2nStsX6lZYNZps4ssFB8FWbuAhEvOjq7kGAQuYbRlDjD6SvrG7znUUums
+WaMbeZ6+UDzYn0JHnA/UHUldMysnT2Ubm3O6jzfv0JlmFRMDG8dR/r4tasVgQ4sA
+YMeKKAojoWlfSSUivhj9ZqNonHkPxEvp5hxDOXnA658chJt9TFYTyZvQ3tsfoDHS
+jLI/EJQPd98CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAsbsF+FxXXnlpavU0PQD7
+gYHnIh0LrIA+/3GII0ckbXDvNfwgOf/leoI8i22/XrfYuhuc8ppXJs0f9Rw7rpLG
+yzf4oKGL5BrdackUbet+DEMbO6J8uFcygj9z0lrT7zNc8rLBXVT0OMLU+HtwbAU7
+nXxgFfnDGayPcpqcArKScqmPoTv6MC9bxWxmMoW+HOYot98vJZiX6KK4tVzD7ceU
+qr9WQJQkyGfHniADTX8kMAxycjjHmakwpQKjIboPyXCAhoI/3vbaB79xm0j9YZOO
+QTvZmtQG71bHzd6RYe9VUTgBwuMarbVS9wB2IER4xGiOwQHBMcpLcImsAuLXdPYa
+ww==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client.pem b/tls/tests/files/client.pem
index 6f218ae..fc806d5 100644
--- a/tls/tests/files/client.pem
+++ b/tls/tests/files/client.pem
@@ -1,18 +1,21 @@
-----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xODA5MTAxNTI4MzJaFw00MzA5MDQxNTI4
-MzJaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDA3MDcyMjU2MDFaFw00NTA3MDEyMjU2
+MDFaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLDXDADh65c
-NrIqEWsflxKyb/yiyJoxDKP/1j3WeBB9pPNr2gk+Lz9dwy6XLd18XGN56UCxDHBI
-7Ol+UU+mpUbImxubHZO074/1K2Rf//qa2maAnV8cJ4EvBxBtehT+OPT3vohkfTHo
-vSNTcL2kMIehO609sZ+n84H3q0ZsoIqKzt+cZUWT5vdXtvYp+5yLQIyc6fWIyFXv
-ch3fcFfiBFA8aSMfm2PpJlKPCPt6bX3fBBtlZQAZPZtZG0uBEU9iXY37fD9udrhR
-w6L6Iv0tQcCl83xFeocXLBW6NKdcwOp+UbwSyM9JvUuAyHMxKOoVubWmVWO0y1mH
-sOoY/9vFit0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQCrCl/LnuXiUQvdKmDYYpVq
-7HDaVkMMm0hIn342kiGK0ZTt2PpWN33xTGCOVP7hCA8ikZCXbJ32P60LFoivIHk2
-hNPx9memYT1wBwz+aFuo0jSDC3lZwffb/lr+smEl8LTBH2yP2IgRc/ppqX387m9h
-EYAdq5BPvzzFcEvXhbQ7/g==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM9+jKp6g3fv
+Ev/Cca5f7p1dNRaY5HRBxcwIY6XzhX8RkDCD/0XvL5q3Y5FxSIwkU6TOOZZJ3DGM
+8pCiEy0zmuIlp3KuZIVWvWc6NTk8Y74snCqf8j1M8t5hiVlLwvR5iFzPXdcTszuc
+osSB6RL2nStsX6lZYNZps4ssFB8FWbuAhEvOjq7kGAQuYbRlDjD6SvrG7znUUums
+WaMbeZ6+UDzYn0JHnA/UHUldMysnT2Ubm3O6jzfv0JlmFRMDG8dR/r4tasVgQ4sA
+YMeKKAojoWlfSSUivhj9ZqNonHkPxEvp5hxDOXnA658chJt9TFYTyZvQ3tsfoDHS
+jLI/EJQPd98CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAG/L1MnCszDTYmCDfmQrc
+WRhARjPuXLcfMZPtZCsJ6Lcj6xMO+bRuZkbdoiQ1huv7GnWbAY10Q+ib3/E7aorW
+LEt/Hl+o2M0jdf24f378Kl7ZrYESl7nOPqFGxjxT3UpiawvalW64uAAodHK26sJL
+42+Cvsg4sEzDUm3+nyd60WQ+KrKY5ev1lgBdPaIa/OVnJKEGhirCuuV+O1HscE+M
+p/JlrpM28A8GFN68+AlfH5srXHNNLTGVx2G3GY9PhzD+ivn7HfElPzlx8iSB7hk4
+zRhoY0VOO9NsR9NlxKmI4rDW5JnjWHNunXHFL4aG2w6MoSD6Lnl3ePHMPU6S3pt7
+VA==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client2-and-key.pem b/tls/tests/files/client2-and-key.pem
index f2c2178..68be04a 100644
--- a/tls/tests/files/client2-and-key.pem
+++ b/tls/tests/files/client2-and-key.pem
@@ -1,45 +1,48 @@
-----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xODA5MTAxNTI4NDlaFw00MzA5MDQxNTI4
-NDlaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDA3MDcyMjU2MDZaFw00NTA3MDEyMjU2
+MDZaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKoflA8RApzA
-4xDqTXTB9S95EREe5XgJM5AX+euLl77pxnwJNhjIsSAbkLgnQ9tVRs2dKQdhzN1I
-XlzEjz+WHqxSQqh/CEp5Dlp5SvZrYezHJHuQVVj1uuPWU3yB7CjoCkKT+VPrOLQo
-zITCu9Xl/SI79GOOUb0TUKm3z7Y0H6ooqXzW77DGEEFWpf72+lnEWSYjleJPtY0b
-TJB3vlFHE456gBKlJwit+fywmEMu03Wjci5IpTmPFnp1LhIi9P4tbEOw3l+qazgh
-bY30eDVvVBHx8wK3OF5w1VSdt6TXM664G0xyCDihunt50BOVw2JxTlXyRP+kr3tY
-hSZRNr2J2c0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQA/0rpbeNv1JlT8nBjhYnNr
-72DkVhu5cj06zolC87Zk/fvqC8I4OtrfCbDZ1TIzJPFTdIxRdd8eGJlKtGWW2EJ+
-2z/Jmkx3Dh5QbHpAenYHI59kBF+BPnrk64o0f304jRZZQznEMqQBb+/q9iW1iT/9
-lw0YLQ1pI3OlOCLGaUKj1A==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALi8AUEk8CwR
+wlRc1FtUfkGnUrSkp/3/O3EJArF4foqLl/7hq+GEy7Qfrof2ip8T1MjOIS87LJYp
+LXI7iWjZiFrkVb035uC9gRKIye752exBVRVDGB9S9E/f0SXzfN3z3dQ6j08mdJ/w
+NxRX+hTZiX6lC3uG84pqul2ZW5a2c5Lu0eQ/tL6ff+Hfh7B70YV6xjNXE5CP7HEq
+GBT3dB2Rvv1sbr4AFoWNIWbxK+SMiBsGBX3FOorXWoO65d94bt3NqOGyapjljt3J
+wK8FjNy4xVO/hKep23lenEfC+NnoGAVW0CyBNEjeLeJ8UKmfmt0EgFnhOcLg4qb/
+qM10ogl0AcUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAdbnpa4C2nglS9ksUlFtm
+5PAM4B3EXmfkziog0jov+g4B2gSIQJM+CrVpnLWIs53gyGwJvWmMwbBkKnoUfdq7
+3aWTkHd9pz7qL640sjLBbwR02YIXv6s5h6il/TbtKajZdr1DOwjHjaDFA6KDJRE6
+RiNoa8l/9xeLmrm2d587fwzcYCO7meKF3cqQ6xkw8ajCEZt3ihPXnqIFFXnxqgwU
+wuobRfa3aZNihTccvnavpGEydf8x2agcu6hQifiPiFAD50YapcRgAHCVlXp3569G
+p9inaPhao9ZxwbCWqN2PIiqyHyWjlys12TTqRcQS0rEW7uCXOQwTNtS1rPON4A4v
+2Q==
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAqh+UDxECnMDjEOpNdMH1L3kRER7leAkzkBf564uXvunGfAk2
-GMixIBuQuCdD21VGzZ0pB2HM3UheXMSPP5YerFJCqH8ISnkOWnlK9mth7Mcke5BV
-WPW649ZTfIHsKOgKQpP5U+s4tCjMhMK71eX9Ijv0Y45RvRNQqbfPtjQfqiipfNbv
-sMYQQVal/vb6WcRZJiOV4k+1jRtMkHe+UUcTjnqAEqUnCK35/LCYQy7TdaNyLkil
-OY8WenUuEiL0/i1sQ7DeX6prOCFtjfR4NW9UEfHzArc4XnDVVJ23pNczrrgbTHII
-OKG6e3nQE5XDYnFOVfJE/6Sve1iFJlE2vYnZzQIDAQABAoIBAC13+y57sWML+qRO
-uxz1qf5iMTmONG58pxdgER/vU0NnX/FO1PKS0SRvuaI+fFhm1mGmG40pioOqD+5j
-apXoHZKY+c/nA+RDrp5nxK1PzgBmyU1tKiJ4qtayNeYVI3Vbb0KUIhNXzvP345Go
-KmPk8F7x/0OMijQqsWhrBE0CaWQkwm5wBdWlNb82kz6KyJCzcMmS9SwfqRclz8Qp
-JDiyllxiYj+OjYFg1ntcR3vMkVbK88NVSZWwPOZdMmYd4PC0pIcHg/j/kTN/mrs4
-w3MzSd5+Lvg234bofH3XRPbxdu0MOUEEMwbyLHjXXa4g3je0cABwCvo6b9sShKYi
-ktLpzoECgYEA1rQVY+O6Hlf9n8msTRMGsiEu9IKuadPs+Ixnhxerh4WBem1ivx58
-vXOhkeblKYLrDP9alm++nprlBAP3xRK3iX6r388a+e5UPbsHCk8KaZKkCTezpTS2
-1TqQFcc6Kc8BKJui7UhsALeKAFgcgmagXd2qMRm1lLgNY3Xc4KNBlRUCgYEAythj
-Pqqvhvr/ixLFKlTjZXhNc2DYdw9tP3egjMjpmyIKo4UYH4qTGhlbrxPLqgQUMyp4
-tqT1FdrbCp0K/TJKuURnsNzbwp73mMc+H+nrmBmU6/q/4Yhu1BrvBCoaaOT9ET9f
-raEJTc133xXvDCBuq8P82ODEzpD7gxNStRRtT9kCgYBLb0Y8rFxOIPg5VfA1vEOT
-/lizC98fy5fs09fj/QsFOID/dMNHBv0oyyGvU4KcjSTskiNPy78blqx0NritAyB9
-LIZSwj9mJLhwX+/fTVoJMb50hp+VoenDDSpmnHLxEYwEqnoaCGH59oKEEHEj187s
-a99KFRBZSjlaAqUyP+ng6QKBgQCpoaftQiQjx0do8Dt+GRtJQf/TGwwrFPWRe+MB
-mQryttcaxDTWO7akvswTb4SEG4EhAMWOSAjFTA6do5MLBsHCiVgFac1FxlbcptJn
-MeHZgpstdLZ+TvAP5K45V1RaoBSaFdtXgjIbpFY4c0lDZOPoNLAAVod/D3Olu8UQ
-tZJskQKBgFxFnovacjyccFHI0SjjbqedOQn7mUlvYv/uPkMe8O4wu7wael7iMb8w
-/MK6ZRK5Ec9c1lotoEhaZbGoTvUIX2eA+gdGYWDhxFbce7/1bPNvhRLoEsFLvXuU
-53H2rvqRiFX8scM3Pc/toWylzRLLVowcRAZ+joprIMfrrtFkekD9
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client2-key.pem b/tls/tests/files/client2-key.pem
index c45cbb6..97a91c6 100644
--- a/tls/tests/files/client2-key.pem
+++ b/tls/tests/files/client2-key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client2.pem b/tls/tests/files/client2.pem
index 24f099a..f7dba51 100644
--- a/tls/tests/files/client2.pem
+++ b/tls/tests/files/client2.pem
@@ -1,18 +1,21 @@
-----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xODA5MTAxNTI4NDlaFw00MzA5MDQxNTI4
-NDlaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDA3MDcyMjU2MDZaFw00NTA3MDEyMjU2
+MDZaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKoflA8RApzA
-4xDqTXTB9S95EREe5XgJM5AX+euLl77pxnwJNhjIsSAbkLgnQ9tVRs2dKQdhzN1I
-XlzEjz+WHqxSQqh/CEp5Dlp5SvZrYezHJHuQVVj1uuPWU3yB7CjoCkKT+VPrOLQo
-zITCu9Xl/SI79GOOUb0TUKm3z7Y0H6ooqXzW77DGEEFWpf72+lnEWSYjleJPtY0b
-TJB3vlFHE456gBKlJwit+fywmEMu03Wjci5IpTmPFnp1LhIi9P4tbEOw3l+qazgh
-bY30eDVvVBHx8wK3OF5w1VSdt6TXM664G0xyCDihunt50BOVw2JxTlXyRP+kr3tY
-hSZRNr2J2c0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQA/0rpbeNv1JlT8nBjhYnNr
-72DkVhu5cj06zolC87Zk/fvqC8I4OtrfCbDZ1TIzJPFTdIxRdd8eGJlKtGWW2EJ+
-2z/Jmkx3Dh5QbHpAenYHI59kBF+BPnrk64o0f304jRZZQznEMqQBb+/q9iW1iT/9
-lw0YLQ1pI3OlOCLGaUKj1A==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALi8AUEk8CwR
+wlRc1FtUfkGnUrSkp/3/O3EJArF4foqLl/7hq+GEy7Qfrof2ip8T1MjOIS87LJYp
+LXI7iWjZiFrkVb035uC9gRKIye752exBVRVDGB9S9E/f0SXzfN3z3dQ6j08mdJ/w
+NxRX+hTZiX6lC3uG84pqul2ZW5a2c5Lu0eQ/tL6ff+Hfh7B70YV6xjNXE5CP7HEq
+GBT3dB2Rvv1sbr4AFoWNIWbxK+SMiBsGBX3FOorXWoO65d94bt3NqOGyapjljt3J
+wK8FjNy4xVO/hKep23lenEfC+NnoGAVW0CyBNEjeLeJ8UKmfmt0EgFnhOcLg4qb/
+qM10ogl0AcUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAdbnpa4C2nglS9ksUlFtm
+5PAM4B3EXmfkziog0jov+g4B2gSIQJM+CrVpnLWIs53gyGwJvWmMwbBkKnoUfdq7
+3aWTkHd9pz7qL640sjLBbwR02YIXv6s5h6il/TbtKajZdr1DOwjHjaDFA6KDJRE6
+RiNoa8l/9xeLmrm2d587fwzcYCO7meKF3cqQ6xkw8ajCEZt3ihPXnqIFFXnxqgwU
+wuobRfa3aZNihTccvnavpGEydf8x2agcu6hQifiPiFAD50YapcRgAHCVlXp3569G
+p9inaPhao9ZxwbCWqN2PIiqyHyWjlys12TTqRcQS0rEW7uCXOQwTNtS1rPON4A4v
+2Q==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/create-files.sh b/tls/tests/files/create-files.sh
index 8fda797..3953a07 100755
--- a/tls/tests/files/create-files.sh
+++ b/tls/tests/files/create-files.sh
@@ -38,7 +38,7 @@ read -p "Press [Enter] key to continue..." key
echo "00" > serial
msg "Creating CA private key for obsolete/untrusted CA"
-openssl genrsa -out old-ca-key.pem 1024
+openssl genrsa -out old-ca-key.pem 2048
msg "Creating CA certificate for obsolete/untrusted CA"
openssl req -x509 -new -config ssl/old-ca.conf -days 10950 -key old-ca-key.pem -out old-ca.pem
@@ -48,7 +48,7 @@ openssl req -x509 -new -config ssl/old-ca.conf -days 10950 -key old-ca-key.pem -
#######################################################################
msg "Creating CA private key"
-openssl genrsa -out ca-key.pem 1024
+openssl genrsa -out ca-key.pem 2048
msg "Creating CA certificate"
openssl req -x509 -new -config ssl/ca.conf -days 10950 -key ca-key.pem -out ca.pem
@@ -68,7 +68,7 @@ openssl x509 -req -in root-ca-csr.pem -days 10950 -CA old-ca.pem -CAkey old-ca-k
#######################################################################
msg "Creating server private key"
-openssl genrsa -out server-key.pem 1024
+openssl genrsa -out server-key.pem 2048
msg "Creating server certificate request"
openssl req -config ssl/server.conf -key server-key.pem -new -out server-csr.pem
@@ -159,7 +159,7 @@ cat server-self.pem >> non-ca.pem
echo "00" > intermediate-serial
msg "Creating intermediate CA private key"
-openssl genrsa -out intermediate-ca-key.pem 1024
+openssl genrsa -out intermediate-ca-key.pem 2048
msg "Creating intermediate CA certificate request"
openssl req -config ssl/intermediate-ca.conf -key intermediate-ca-key.pem -new -out intermediate-ca-csr.pem
@@ -172,7 +172,7 @@ openssl x509 -req -in intermediate-ca-csr.pem -days 9125 -CA ca.pem -CAkey ca-ke
#######################################################################
msg "Creating server (intermediate CA) private key"
-openssl genrsa -out server-intermediate-key.pem 1024
+openssl genrsa -out server-intermediate-key.pem 2048
msg "Creating server (intermediate CA) certificate request"
openssl req -config ssl/server-intermediate.conf -key server-intermediate-key.pem -new -out
server-intermediate-csr.pem
diff --git a/tls/tests/files/intermediate-ca-csr.pem b/tls/tests/files/intermediate-ca-csr.pem
index 702c849..ea8b2cb 100644
--- a/tls/tests/files/intermediate-ca-csr.pem
+++ b/tls/tests/files/intermediate-ca-csr.pem
@@ -1,15 +1,20 @@
-----BEGIN CERTIFICATE REQUEST-----
-MIICPzCCAagCAQAwga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/Is
+MIIDRDCCAiwCAQAwga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/Is
ZAEZFgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUg
QXV0aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20x
-KjAoBgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAu0V6zuw2zphIOaer4FRF3CCkD7I5MiLR
-MQvCTtxm9TW+MjNX9/AgnZyrhz53TMzXZpeRzHbBd/alcIsNYeuZA9Sz7OGbNVrl
-sdv+UqGxtpz+QyNABbNVHOMQwEUoWZGOhH3LJFGGs29wZJ0t/YnE87zWYNrwP1JJ
-JzqCn2A6sPECAwEAAaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFByV3uzu
-QMQXVoMub5ot/St1JnK0MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
-MA0GCSqGSIb3DQEBCwUAA4GBAG7IynHI8OVb/MJbcbLOYg0OaRDMGTbT6IqPxp70
-sVgTN9nlJe9QDs2hJpNFkwMtJqLcS5Qq9/fU02LpsFzABSz0s3Ie6yC0iSxa+tF/
-Zy/dQfgPYclXIvt7Cy1KRYPcb8c825QOE7dc4ZhBUStFK8YddSCLhXjlGTpbDm3u
-QP5a
+KjAoBgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM40uJssdYI01t/LatabeqVxr7eu
+KbCtXshrFdP99SF+4AGELVaqEuYVFj9iv8WIEfl3nH8L3x+b3LfIO4hg8mdhOOS8
+GPVCJUlH1fV1rrEVVv2W63/nsQj1THtulmpI2ewXcQiM5tz/kLmP4UrLaRKVKlVZ
++bQa3GaXifYm8YlzJvVHLE1OQ2Ee3qZndtG/pf6UIW5EZo4W/u4ayQX9iLfTwWqk
+IuME1EFx2eJ7XvAN5iASxI0RRCdol/IkNh+Rf6VP7LQDMtru0oRLnw6/3pFquelU
+Giney8T8LYvYq7NqHoYIGHxZEdqvi5n2UCOs6VMcmUqUqxkZZlnvZSugw9UCAwEA
+AaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFJxT+42rjjLFRK/5zQIVfUDL
+Oe1DMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+CwUAA4IBAQCi7u9dd6F2LX59qNhvvpeQf9diZ39aO6p32OcLm4MvTwGMPA//pjul
+L1He5AZWYJ12E2IghLPOC4igdZ1PIQLXfU9j8IQI3Rec2kmtX/W+npfNZLMg4zoB
+O1ku8Tf/qz8LDmIt0mSwQ76z8hW608PQah9QGMG2CWl3WiC/NkjsCmWGAaQ3w7G8
+Sxl1sjXr7eKlf1YEVGxznJNbTTpCGJJ0wHk3L5HLxXGGuBs5vI5dKhMPs1vJXL7m
+EapqQo7MBjccRpGaH3UwP44XwntcR0xKAtQIuLa/KVDsSoTf8w7sHaSSWEvMhNSR
+JS8q36oo/F1R2f9A0/RqII84KIZBbSDB
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/intermediate-ca-key.pem b/tls/tests/files/intermediate-ca-key.pem
index de97214..1800077 100644
--- a/tls/tests/files/intermediate-ca-key.pem
+++ b/tls/tests/files/intermediate-ca-key.pem
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/intermediate-ca.pem b/tls/tests/files/intermediate-ca.pem
index 4841cc2..b0f384f 100644
--- a/tls/tests/files/intermediate-ca.pem
+++ b/tls/tests/files/intermediate-ca.pem
@@ -1,24 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIID8jCCA1ugAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIFAjCCA+qgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDkxMDE1Mjg0OVoXDTQzMDkw
-NDE1Mjg0OVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMDcwNzIyNTYwNloXDTQ1MDcw
+MTIyNTYwNlowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
-BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEAu0V6zuw2zphIOaer4FRF3CCkD7I5MiLRMQvC
-Ttxm9TW+MjNX9/AgnZyrhz53TMzXZpeRzHbBd/alcIsNYeuZA9Sz7OGbNVrlsdv+
-UqGxtpz+QyNABbNVHOMQwEUoWZGOhH3LJFGGs29wZJ0t/YnE87zWYNrwP1JJJzqC
-n2A6sPECAwEAAaOCAUUwggFBMB0GA1UdDgQWBBQcld7s7kDEF1aDLm+aLf0rdSZy
-tDCBuwYDVR0jBIGzMIGwgBR1bRLo++hbS9yywZUjQESykKKPdaGBjKSBiTCBhjET
-MBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAc
-BgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBs
-ZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tggkAkoKtudZgg7cw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwJgYDVR0RBB8wHYEbaW50
-ZXJtZWRpYXRlLWNhQGV4YW1wbGUuY29tMBkGA1UdEgQSMBCBDmNhQGV4YW1wbGUu
-Y29tMA0GCSqGSIb3DQEBCwUAA4GBAKW00RiG2BO+ni+mtOP/svum1pC0mxU6oSoO
-uSptJ9NUf88yySwtlXRN34/0SEqznh/ebQzOICtc5su1sQ4+mm9c0VmK1+kEHztW
-Kvsl+3NHy8zvXwZY6EFHUtZ6lB3DNOd+uoSpbfACDctCXMPwdJB/xerulcvRVGUR
-KpspdWQy
+BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM40uJssdYI01t/LatabeqVxr7euKbCt
+XshrFdP99SF+4AGELVaqEuYVFj9iv8WIEfl3nH8L3x+b3LfIO4hg8mdhOOS8GPVC
+JUlH1fV1rrEVVv2W63/nsQj1THtulmpI2ewXcQiM5tz/kLmP4UrLaRKVKlVZ+bQa
+3GaXifYm8YlzJvVHLE1OQ2Ee3qZndtG/pf6UIW5EZo4W/u4ayQX9iLfTwWqkIuME
+1EFx2eJ7XvAN5iASxI0RRCdol/IkNh+Rf6VP7LQDMtru0oRLnw6/3pFquelUGine
+y8T8LYvYq7NqHoYIGHxZEdqvi5n2UCOs6VMcmUqUqxkZZlnvZSugw9UCAwEAAaOC
+AVAwggFMMB0GA1UdDgQWBBScU/uNq44yxUSv+c0CFX1AyzntQzCBxgYDVR0jBIG+
+MIG7gBSWYFL9SVeh7/gUv5SY+B6yZBtBtqGBjKSBiTCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQGZ/rv0LYiOm+jYOcuYYQjBrNEbDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
+cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
+b20wDQYJKoZIhvcNAQELBQADggEBAJ+9RoNFvyk4caCnCUB88nZ+vTppHep2S1RE
+hzeBNnvQXC0jlVHQsyZP2CsIDEmJAR/c8Ljd6htICnC+m3jx5zrXzo1/Q4GK/QQa
+fGxUZVkycuRQntXLiA1XgdHvcghRByKd3yeBM03C1NMuCVHtN0TNbmu/q0c5RfQ8
+Q9hA5NB2w2myjSsFWPSTh25OaniuQ+npKdpSWKQSDTGL6dwPh9Sf0k7cq3u7wPFK
+iOh69Hz3k8VDV6aruxKJhx0UJAbxaLsBWDRsfPnei5SAytR8YFo3XnYDnS5pitYa
+SWelydKe8FxyIN98ae4mSoRmQBZQvnKBH2T4MW57YwmYxVXASG0=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/non-ca.pem b/tls/tests/files/non-ca.pem
index cb76d6e..6b8a0cc 100644
--- a/tls/tests/files/non-ca.pem
+++ b/tls/tests/files/non-ca.pem
@@ -1,93 +1,117 @@
client.pem:
-----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xODA5MTAxNTI4MzJaFw00MzA5MDQxNTI4
-MzJaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDA3MDcyMjU2MDFaFw00NTA3MDEyMjU2
+MDFaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLDXDADh65c
-NrIqEWsflxKyb/yiyJoxDKP/1j3WeBB9pPNr2gk+Lz9dwy6XLd18XGN56UCxDHBI
-7Ol+UU+mpUbImxubHZO074/1K2Rf//qa2maAnV8cJ4EvBxBtehT+OPT3vohkfTHo
-vSNTcL2kMIehO609sZ+n84H3q0ZsoIqKzt+cZUWT5vdXtvYp+5yLQIyc6fWIyFXv
-ch3fcFfiBFA8aSMfm2PpJlKPCPt6bX3fBBtlZQAZPZtZG0uBEU9iXY37fD9udrhR
-w6L6Iv0tQcCl83xFeocXLBW6NKdcwOp+UbwSyM9JvUuAyHMxKOoVubWmVWO0y1mH
-sOoY/9vFit0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQCrCl/LnuXiUQvdKmDYYpVq
-7HDaVkMMm0hIn342kiGK0ZTt2PpWN33xTGCOVP7hCA8ikZCXbJ32P60LFoivIHk2
-hNPx9memYT1wBwz+aFuo0jSDC3lZwffb/lr+smEl8LTBH2yP2IgRc/ppqX387m9h
-EYAdq5BPvzzFcEvXhbQ7/g==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM9+jKp6g3fv
+Ev/Cca5f7p1dNRaY5HRBxcwIY6XzhX8RkDCD/0XvL5q3Y5FxSIwkU6TOOZZJ3DGM
+8pCiEy0zmuIlp3KuZIVWvWc6NTk8Y74snCqf8j1M8t5hiVlLwvR5iFzPXdcTszuc
+osSB6RL2nStsX6lZYNZps4ssFB8FWbuAhEvOjq7kGAQuYbRlDjD6SvrG7znUUums
+WaMbeZ6+UDzYn0JHnA/UHUldMysnT2Ubm3O6jzfv0JlmFRMDG8dR/r4tasVgQ4sA
+YMeKKAojoWlfSSUivhj9ZqNonHkPxEvp5hxDOXnA658chJt9TFYTyZvQ3tsfoDHS
+jLI/EJQPd98CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAG/L1MnCszDTYmCDfmQrc
+WRhARjPuXLcfMZPtZCsJ6Lcj6xMO+bRuZkbdoiQ1huv7GnWbAY10Q+ib3/E7aorW
+LEt/Hl+o2M0jdf24f378Kl7ZrYESl7nOPqFGxjxT3UpiawvalW64uAAodHK26sJL
+42+Cvsg4sEzDUm3+nyd60WQ+KrKY5ev1lgBdPaIa/OVnJKEGhirCuuV+O1HscE+M
+p/JlrpM28A8GFN68+AlfH5srXHNNLTGVx2G3GY9PhzD+ivn7HfElPzlx8iSB7hk4
+zRhoY0VOO9NsR9NlxKmI4rDW5JnjWHNunXHFL4aG2w6MoSD6Lnl3ePHMPU6S3pt7
+VA==
-----END CERTIFICATE-----
client-future.pem:
+notBefore=Jul 17 23:00:00 2060 GMT
+notAfter=Jul 17 23:00:00 2061 GMT
-----BEGIN CERTIFICATE-----
-MIIC4DCCAkkCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDYTCCAkkCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzE2MDAwMFoYDzIwNjEwNzE3
-MTYwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
+AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzIzMDAwMFoYDzIwNjEwNzE3
+MjMwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyw1ww
-A4euXDayKhFrH5cSsm/8osiaMQyj/9Y91ngQfaTza9oJPi8/XcMuly3dfFxjeelA
-sQxwSOzpflFPpqVGyJsbmx2TtO+P9StkX//6mtpmgJ1fHCeBLwcQbXoU/jj0976I
-ZH0x6L0jU3C9pDCHoTutPbGfp/OB96tGbKCKis7fnGVFk+b3V7b2Kfuci0CMnOn1
-iMhV73Id33BX4gRQPGkjH5tj6SZSjwj7em193wQbZWUAGT2bWRtLgRFPYl2N+3w/
-bna4UcOi+iL9LUHApfN8RXqHFywVujSnXMDqflG8EsjPSb1LgMhzMSjqFbm1plVj
-tMtZh7DqGP/bxYrdAgMBAAEwDQYJKoZIhvcNAQELBQADgYEABzPPPH3DCjosUii6
-h5Fe+/9re6Ka/8JBZ5V9G1H+uBky7L07BQ5JhV7OIBuej0JQQXrDvicv0n7ImmHP
-O3iHxSLOe5sp7kNeQYpgm4DYbJUddcUBwltI5Lvux6IbR6rZybhVRnxjNd1jUBvj
-p42OS5M0tNYKC3jFDcuNwRIhiCw=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPfoyq
+eoN37xL/wnGuX+6dXTUWmOR0QcXMCGOl84V/EZAwg/9F7y+at2ORcUiMJFOkzjmW
+SdwxjPKQohMtM5riJadyrmSFVr1nOjU5PGO+LJwqn/I9TPLeYYlZS8L0eYhcz13X
+E7M7nKLEgekS9p0rbF+pWWDWabOLLBQfBVm7gIRLzo6u5BgELmG0ZQ4w+kr6xu85
+1FLprFmjG3mevlA82J9CR5wP1B1JXTMrJ09lG5tzuo8379CZZhUTAxvHUf6+LWrF
+YEOLAGDHiigKI6FpX0klIr4Y/WajaJx5D8RL6eYcQzl5wOufHISbfUxWE8mb0N7b
+H6Ax0oyyPxCUD3ffAgMBAAEwDQYJKoZIhvcNAQELBQADggEBALItOFuKoUfqBz6T
+r5X9gL3n0pRpgTOVufmY5kufIGKA7/9GRTrkB43gEeIyVXrlbffuEfhwKGoBXKIy
+YFOYvwOdPuHSjILHHY6oNu5XHM6/Vlyx/BlGkF/cnYtw7PMess7w5qcfQBQ4qIF+
+gBJRJF1YlOWs0LWBPjkaFf4YNoKKkC2oCg3DuJTCXi7BMWbFHNgYN2ujr/ZoNJp9
+1uv44qKwlH1WOeEIDtIb2tS/3ZupXVH+efBT0/E1RRR9jEba1hHBNhPqo7XAT1UR
+wQPETSssYwuPfpoeMFeox7q494/kVVvX1rnnuOQdobDqfd1CfxlDuVbHnald51ml
+QglQVvw=
-----END CERTIFICATE-----
client-past.pem:
+notBefore=Jul 17 23:00:00 2000 GMT
+notAfter=Jul 17 23:00:00 2001 GMT
-----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcxNjAwMDBaFw0wMTA3MTcxNjAw
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcyMzAwMDBaFw0wMTA3MTcyMzAw
MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLDXDADh65c
-NrIqEWsflxKyb/yiyJoxDKP/1j3WeBB9pPNr2gk+Lz9dwy6XLd18XGN56UCxDHBI
-7Ol+UU+mpUbImxubHZO074/1K2Rf//qa2maAnV8cJ4EvBxBtehT+OPT3vohkfTHo
-vSNTcL2kMIehO609sZ+n84H3q0ZsoIqKzt+cZUWT5vdXtvYp+5yLQIyc6fWIyFXv
-ch3fcFfiBFA8aSMfm2PpJlKPCPt6bX3fBBtlZQAZPZtZG0uBEU9iXY37fD9udrhR
-w6L6Iv0tQcCl83xFeocXLBW6NKdcwOp+UbwSyM9JvUuAyHMxKOoVubWmVWO0y1mH
-sOoY/9vFit0CAwEAATANBgkqhkiG9w0BAQsFAAOBgQCXBZanjJI96eWgPGv2LIgu
-9ZtEAd2C01lMc2UQHUMicPDFW1oQeptIruRGPVv+2ct9OhnC4JzBi18EAzxklsuF
-PsQZ+Lq/38hvdlX5bHGoRSJtFdB+ZkyFETr9AZNIYnxdSKrmUEwLPz/4rzB5KAoc
-wYNLbNWS2XqATA1rJ+cxmg==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM9+jKp6g3fv
+Ev/Cca5f7p1dNRaY5HRBxcwIY6XzhX8RkDCD/0XvL5q3Y5FxSIwkU6TOOZZJ3DGM
+8pCiEy0zmuIlp3KuZIVWvWc6NTk8Y74snCqf8j1M8t5hiVlLwvR5iFzPXdcTszuc
+osSB6RL2nStsX6lZYNZps4ssFB8FWbuAhEvOjq7kGAQuYbRlDjD6SvrG7znUUums
+WaMbeZ6+UDzYn0JHnA/UHUldMysnT2Ubm3O6jzfv0JlmFRMDG8dR/r4tasVgQ4sA
+YMeKKAojoWlfSSUivhj9ZqNonHkPxEvp5hxDOXnA658chJt9TFYTyZvQ3tsfoDHS
+jLI/EJQPd98CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAsbsF+FxXXnlpavU0PQD7
+gYHnIh0LrIA+/3GII0ckbXDvNfwgOf/leoI8i22/XrfYuhuc8ppXJs0f9Rw7rpLG
+yzf4oKGL5BrdackUbet+DEMbO6J8uFcygj9z0lrT7zNc8rLBXVT0OMLU+HtwbAU7
+nXxgFfnDGayPcpqcArKScqmPoTv6MC9bxWxmMoW+HOYot98vJZiX6KK4tVzD7ceU
+qr9WQJQkyGfHniADTX8kMAxycjjHmakwpQKjIboPyXCAhoI/3vbaB79xm0j9YZOO
+QTvZmtQG71bHzd6RYe9VUTgBwuMarbVS9wB2IER4xGiOwQHBMcpLcImsAuLXdPYa
+ww==
-----END CERTIFICATE-----
server.pem:
-----BEGIN CERTIFICATE-----
-MIICjzCCAfigAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDkxMDE1MjgzMloXDTQzMDkw
-NDE1MjgzMlowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
-B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA4ueKvOZqXR49sF2exsExLpbVK32rMPtZwN28NYCd
-GnMWRIYF2JB6lPWiTzWPUdEy4AmifEsiWE2ThsmBeX4cPz8YoEYt2aCenrAuFHiT
-7jwX433CEH8PgKQ5tbWKHxwz5PiktkRUWXP49KA27REJvQZMphwvRJ3uBZrxydtL
-zeMCAwEAAaNHMEUwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNV
-HREEHDAahwTAqAEKghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQAD
-gYEAc8/9nm5UksO7kuhco3BbqjzkY4YSU9w55XznhYsnKI50qAcNpjnrH5qoIzW7
-8XXCfv9JQYiE7xpNyqjcf+BrZniwsYfmDvbADcodnZMgstOdbFL9PniCZyJYEGK9
-0C5iusx4Pwc1cqvwewy5oX7HW7T4uF9s3ZJALotCTVtJSqA=
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMDcwNzIyNTYwMVoXDTQ1MDcw
+MTIyNTYwMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALWt+C2fsSG3att+MBFBmvOOeQAzUbudyCe9
+9xUwCdJRsbcZCzKKuBMIBq6hEyZ2pmTPL5ThjGc6CrfwIjJC7LCKXKdZJzvuD72Q
+W4mJc7aUa2n8UxBCuqoPaXjYYJkw4ffrpQGFPuncEgWo0Qm/d9v3Je3uFo5SAs5t
+aPY31MH2QB1tHMdQ0ZOti8ZQyBEQHY+kq4KewesotMv4EnBThELgTQ8uJ3H3Os0e
+LrPjz0LJZbsdEh2hjM7+06uLw18g17Io7AXDlSlXNF7ZyRK6MxEJv9GutwNxVK3p
+D2YYTsH+SqNj8bOhtd3tsQ6aEj2hd7JT3x3PgQoSD0nbCIHNrKUCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAJaEEVW79mGy
+xCx8AWnoXgYL222KxOx4mZKVpGOrSqSm4W1RnjpySwNYuYQ/cA8YABdlxqbn+2Qj
+V5g0/aU51hzBqjd2j8XL9YlB8r7+yoK0FEfRwqZV5Gav0aITj4RmR7IcrFlveBC8
+HaATN2W6aYIWEUplSpCEf66x4hWqEE4ERsl6/cjcjbb5q5Qu3J7qDymjrttNtyHD
+OCwfG+Y1Oz977PquaLnt5vWt1m3s0lNCShPYhwwmHfChZCA+aZWCn7qVeu0z9F8n
+trU5uk9+usXDr0sT0CxkIgKlSyfpKq8NHN3TFOj30xYO0bjrWm79ip4wbXCUF9+3
+Mli0LH1AQMU=
-----END CERTIFICATE-----
server-self.pem:
-----BEGIN CERTIFICATE-----
-MIICDTCCAXYCCQDyTgBiXvBOyDANBgkqhkiG9w0BAQsFADBLMRMwEQYKCZImiZPy
-LGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEbMBkGA1UEAwwSc2Vy
-dmVyLmV4YW1wbGUuY29tMB4XDTE4MDkxMDE1MjgzMloXDTQzMDkwNDE1MjgzMlow
-SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
-GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEA4ueKvOZqXR49sF2exsExLpbVK32rMPtZwN28NYCdGnMWRIYF2JB6
-lPWiTzWPUdEy4AmifEsiWE2ThsmBeX4cPz8YoEYt2aCenrAuFHiT7jwX433CEH8P
-gKQ5tbWKHxwz5PiktkRUWXP49KA27REJvQZMphwvRJ3uBZrxydtLzeMCAwEAATAN
-BgkqhkiG9w0BAQsFAAOBgQAbZGd5kU53gt31RWnnqurK6UgbM3tjJuy6sfy2bSYm
-vAkOeUqXmwwE10f4q6zboBalXHiyPymhq8Ybq0EKko4KdIboe8oVbadwgS6NtR4w
-SqRDpJvb1AboHq/IERnYX9IPAg7v4HTxpIsAt6KWhecUoXWUhbfxfVRcLmcRl3qs
-wA==
+MIIDHTCCAgUCFGQVhoU1QE1uDWFYDpqS66PNpDuwMA0GCSqGSIb3DQEBCwUAMEsx
+EzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMRsw
+GQYDVQQDDBJzZXJ2ZXIuZXhhbXBsZS5jb20wHhcNMjAwNzA3MjI1NjAxWhcNNDUw
+NzAxMjI1NjAxWjBLMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQB
+GRYHRVhBTVBMRTEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUuY29tMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAta34LZ+xIbdq234wEUGa8455ADNRu53I
+J733FTAJ0lGxtxkLMoq4EwgGrqETJnamZM8vlOGMZzoKt/AiMkLssIpcp1knO+4P
+vZBbiYlztpRrafxTEEK6qg9peNhgmTDh9+ulAYU+6dwSBajRCb932/cl7e4WjlIC
+zm1o9jfUwfZAHW0cx1DRk62LxlDIERAdj6Srgp7B6yi0y/gScFOEQuBNDy4ncfc6
+zR4us+PPQsllux0SHaGMzv7Tq4vDXyDXsijsBcOVKVc0XtnJErozEQm/0a63A3FU
+rekPZhhOwf5Ko2Pxs6G13e2xDpoSPaF3slPfHc+BChIPSdsIgc2spQIDAQABMA0G
+CSqGSIb3DQEBCwUAA4IBAQAdUFx7gWoLdf6cdnALEpbERESpB3H3MsJnMRFYCF3m
+vROUpZmUVUARD8CMMNCpgCB6c7/XTJlBLlkW4T3Usi8wIONN6x/VrFKd84gV9I+I
+mlxUCX9C+5dOPYAChLMfDweXxaPrKQZWJlhDHJxJuBnlXxqTF+RKJCVR31nr+NLB
+Rg5A8xJ9CZUlo6oDpvR4Hbf3NstgmxBa/AiZ2HtcFoB95WH/p7ekK3uNXwrEhCVH
+UJXvY+lDGsv6M0SAi3xaGn7W3hGWjQQDPAvt2aOScLwIASEaBzK5jMRwqzIY/Bnj
+G6VhXPZG7JccwPDlEe5wudtxJj2nlK035zuHQ8sK1/DJ
-----END CERTIFICATE-----
diff --git a/tls/tests/files/old-ca-key.pem b/tls/tests/files/old-ca-key.pem
index 8905247..fbcd387 100644
--- a/tls/tests/files/old-ca-key.pem
+++ b/tls/tests/files/old-ca-key.pem
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/old-ca.pem b/tls/tests/files/old-ca.pem
index 584fe4a..1f8116e 100644
--- a/tls/tests/files/old-ca.pem
+++ b/tls/tests/files/old-ca.pem
@@ -1,24 +1,30 @@
-----BEGIN CERTIFICATE-----
-MIIEETCCA3qgAwIBAgIJANgUrKCn74UyMA0GCSqGSIb3DQEBBQUAMIGfMRMwEQYK
-CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEsMCoGA1UE
-CwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxIjAgBgNVBAMM
-GW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMB4XDTE4MDkxMDE1MjgzMloXDTQ4MDkwMjE1MjgzMlowgZ8xEzAR
-BgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMSwwKgYD
-VQQLDCNPbGQgVW50cnVzdGVkIENlcnRpZmljYXRlIEF1dGhvcml0eTEiMCAGA1UE
-AwwZb25jZS53YXMuYS5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FA
-ZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMzwG6N+vkJg
-snFyw2uwi/MnW+MiO0VvIW5nrR3x9Fn2BRODTn/A6y8hFOIkQSZiIvw5ZmJlVTZ3
-bM5siq9KF/dAP801jYHwXXCV2E/aq62ou0vkn+Gu5a+Xc9WYzEGlMAeZFvEUrTrf
-JdzmKXLLsbn7cWtRXB5NUSMAbVSyXGH/AgMBAAGjggFRMIIBTTAdBgNVHQ4EFgQU
-pB+h4wjjUruJVMGfZCqWMDl0UogwgdQGA1UdIwSBzDCByYAUpB+h4wjjUruJVMGf
-ZCqWMDl0UoihgaWkgaIwgZ8xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJ
-k/IsZAEZFgdFWEFNUExFMSwwKgYDVQQLDCNPbGQgVW50cnVzdGVkIENlcnRpZmlj
-YXRlIEF1dGhvcml0eTEiMCAGA1UEAwwZb25jZS53YXMuYS5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb22CCQDYFKygp++FMjAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFt
-cGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUF
-AAOBgQA9/ayjyidZN9pCQUrEZv0SU+lcb+zm2X4hg+HNfJrwTpjjB2h3/KE2NaVu
-x5KIkNTEbZoE8t4CctxSBWC0BFXLrDFrGiJsDG+cQQ2krKmdH0pX9SmLano51QVd
-jz+6LlQu/AxWOJbN7aMt7LKsURNTIqyJ1JBOIjeEJan8PwKAyA==
+MIIFLjCCBBagAwIBAgIUKUScryOFiYPg4IWWvN2QUatH7h4wDQYJKoZIhvcNAQEL
+BQAwgZ8xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+UExFMSwwKgYDVQQLDCNPbGQgVW50cnVzdGVkIENlcnRpZmljYXRlIEF1dGhvcml0
+eTEiMCAGA1UEAwwZb25jZS53YXMuYS5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3
+DQEJARYOY2FAZXhhbXBsZS5jb20wIBcNMjAwNzA3MjI1NjAxWhgPMjA1MDA2MzAy
+MjU2MDFaMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
+RVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZpY2F0ZSBBdXRo
+b3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA9xu3wYg3Tq4be/w/RjBLtetdlSEmxQPM5tfxrDpbb2OdJepeHEtr
+QzCZiByjC/FE8IVbuHeXVJveGaG3kJlVnfmnjVpo1zIwMKSfsVOhfhoAAqHhNC1c
+DKvH7ct7m9/cIP0kQXnOBX2UK4BlQw5BpTQhG+h1+eaWIZnztiKdxc0QQ87M0Gde
+hldOirIrkqp0AVnOHSMMkEN/Tx5U+urYj18KTapeuq8GuScjFBgFaE98XS6orjQN
+yZ5s3fe09h0HTUybXltthAWjJRRZsjh1OegeOI7RFCSfe9ItPZ04rFZYOaRcyMwo
+PETEb21JcolMGmVkfgBdWBBZjaZ/1ZsLsQIDAQABo4IBXDCCAVgwHQYDVR0OBBYE
+FOfO7C4f2hAHf6QpqD6gTbMTpZvtMIHfBgNVHSMEgdcwgdSAFOfO7C4f2hAHf6Qp
+qD6gTbMTpZvtoYGlpIGiMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZIm
+iZPyLGQBGRYHRVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5j
+b20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQpRJyvI4WJg+DghZa8
+3ZBRq0fuHjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREE
+EjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTAN
+BgkqhkiG9w0BAQsFAAOCAQEAo27jhTDXuQkJNCt/503AVsYuLonTaiDyq3SHlpZj
++QqtZltxgOEN+e4b9GYfcqp3BK32Ae6Lv/4DS79ZOnkT+fWCPMv7ocXqa7Qj+HAE
+pY90mDQKwDnkPu8PXK8PYV51nH8luLP8EnXlov0qkgjGU+jzj7mu4BvIb0eKd+RV
+FSiniC8xW5nxxa4+OLy5Cgm9Cyr7cYwRT8ScfqdfgGiMAz5dQtpfz9iWMFbxDX8j
+2OofXiIRVu5v6b2mPNx+1JIV7gyKTIBui2WisPv54v4HcCFTBMxT0wyK/l+uiPFx
+zsgU4Dw0D0knXjjsRlzo4mdpqtdIrgTdZZgHd8+ChpxkZg==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/root-ca-csr.pem b/tls/tests/files/root-ca-csr.pem
index a07fbac..3dfccbd 100644
--- a/tls/tests/files/root-ca-csr.pem
+++ b/tls/tests/files/root-ca-csr.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE REQUEST-----
-MIICGDCCAYECAQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/Is
+MIIDHTCCAgUCAQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/Is
ZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAV
BgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxl
-LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxJ+gHXIfrZkeN5usgZ/T
-lH00SY3rrf3l/uECbm9F/J3Q8Fi+zx1WfABxoT/2Y8ZJVJ4+6cgzB1Np1sHxzxSb
-1gObDmPcdatHzVgO38ma+vc361yoSccvIbZtj8duSFxkXIeXFdDM5OBnFkkkcNvW
-bILDpqxe5a6U13oMob3DLXsCAwEAAaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0O
-BBYEFHVtEuj76FtL3LLBlSNARLKQoo91MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAGidrp63DbPcV6NuKmG/gjTlWw54
-Oj7wSgz2ie1TEOB87JeGJGo9bjbiZF9deHfeXdm0Ot59RsuIfVxhn5oOUn+2++Fd
-Gv+DqCbbRn2KSznKi+w7u99hz+pMmq0TAZXhCtQFXFwLjj6AlKyzNnP7eVTO28U5
-xHVq6H4QGmnfPnVO
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALkTwJQClmI2oOYo
+fPjhue0gCiD6BV/luhNZwvu7I0d+QylItH/ft7tRKk8YaF24r3xt9a1WlYnnIEj8
+NbP7y+exR32Geqfy1qFG6H8IvUxPDOThsoBihiB6cfbFI/REhdbEORwQ7FHSd3d5
+WxpHh8lxG34qHR9lccPeThvd1YpdxAIm6CJOmECbMTQG5b1/5G8XsquQBWaCUtgR
+gi+6BS/gwAoEjhfis831BHYcuSxDgf4h5gCZK6t6dcNqET6Q57dcSGNdQNxd7wH7
+Q202II2kW6CZOc1EMzoWefzoC7UM//6+Wz3c1+IA2x9flrjXQfVEj8Me0RJFU18W
+KvozRj0CAwEAAaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFJZgUv1JV6Hv
++BS/lJj4HrJkG0G2MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0G
+CSqGSIb3DQEBCwUAA4IBAQBbYPqHfSd3nFvjGKVt3s1chlxbIBhhrrSzWmxjEQEn
+VDl1Ss33lsJ/7xT/DWM6wYunxH2KB4YycPrmWQt6zXJQmLoj0fpwjD0n8px5EMxL
+KliESlD11mWumU6a7oTIVeBAS5HhK89pRVYcMOy4WrwJBEDQKFxhrqvjQspPH3aU
+TcDwEQJUmut0ueyKceNAzxqxVE5TgVlJ/KdCHioVGJ4PxVPNDekrZ63hz82w2ZMT
+p6E3CnLMj7OhYyApq8r1apWLepExTfCCJ2UdVxvILYjeTw9uImGORH8AL4fKVmmm
+6F5c+o82cuwQUi3aChKuVn6Ko3rySJ5kD7NFY+jEY+J6
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-and-key.pem b/tls/tests/files/server-and-key.pem
index 1fa3d70..569da6b 100644
--- a/tls/tests/files/server-and-key.pem
+++ b/tls/tests/files/server-and-key.pem
@@ -1,31 +1,49 @@
-----BEGIN CERTIFICATE-----
-MIICjzCCAfigAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDkxMDE1MjgzMloXDTQzMDkw
-NDE1MjgzMlowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
-B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA4ueKvOZqXR49sF2exsExLpbVK32rMPtZwN28NYCd
-GnMWRIYF2JB6lPWiTzWPUdEy4AmifEsiWE2ThsmBeX4cPz8YoEYt2aCenrAuFHiT
-7jwX433CEH8PgKQ5tbWKHxwz5PiktkRUWXP49KA27REJvQZMphwvRJ3uBZrxydtL
-zeMCAwEAAaNHMEUwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNV
-HREEHDAahwTAqAEKghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQAD
-gYEAc8/9nm5UksO7kuhco3BbqjzkY4YSU9w55XznhYsnKI50qAcNpjnrH5qoIzW7
-8XXCfv9JQYiE7xpNyqjcf+BrZniwsYfmDvbADcodnZMgstOdbFL9PniCZyJYEGK9
-0C5iusx4Pwc1cqvwewy5oX7HW7T4uF9s3ZJALotCTVtJSqA=
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMDcwNzIyNTYwMVoXDTQ1MDcw
+MTIyNTYwMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALWt+C2fsSG3att+MBFBmvOOeQAzUbudyCe9
+9xUwCdJRsbcZCzKKuBMIBq6hEyZ2pmTPL5ThjGc6CrfwIjJC7LCKXKdZJzvuD72Q
+W4mJc7aUa2n8UxBCuqoPaXjYYJkw4ffrpQGFPuncEgWo0Qm/d9v3Je3uFo5SAs5t
+aPY31MH2QB1tHMdQ0ZOti8ZQyBEQHY+kq4KewesotMv4EnBThELgTQ8uJ3H3Os0e
+LrPjz0LJZbsdEh2hjM7+06uLw18g17Io7AXDlSlXNF7ZyRK6MxEJv9GutwNxVK3p
+D2YYTsH+SqNj8bOhtd3tsQ6aEj2hd7JT3x3PgQoSD0nbCIHNrKUCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAJaEEVW79mGy
+xCx8AWnoXgYL222KxOx4mZKVpGOrSqSm4W1RnjpySwNYuYQ/cA8YABdlxqbn+2Qj
+V5g0/aU51hzBqjd2j8XL9YlB8r7+yoK0FEfRwqZV5Gav0aITj4RmR7IcrFlveBC8
+HaATN2W6aYIWEUplSpCEf66x4hWqEE4ERsl6/cjcjbb5q5Qu3J7qDymjrttNtyHD
+OCwfG+Y1Oz977PquaLnt5vWt1m3s0lNCShPYhwwmHfChZCA+aZWCn7qVeu0z9F8n
+trU5uk9+usXDr0sT0CxkIgKlSyfpKq8NHN3TFOj30xYO0bjrWm79ip4wbXCUF9+3
+Mli0LH1AQMU=
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-intermediate-csr.pem b/tls/tests/files/server-intermediate-csr.pem
index aea69db..5b3cb8e 100644
--- a/tls/tests/files/server-intermediate-csr.pem
+++ b/tls/tests/files/server-intermediate-csr.pem
@@ -1,12 +1,17 @@
-----BEGIN CERTIFICATE REQUEST-----
-MIIBvDCCASUCAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
-ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkq
-hkiG9w0BAQEFAAOBjQAwgYkCgYEAl0zF3tH3V9QquvMVFgAGREcxj59CGM9X7TCW
-WNycgbhITJxR8WqbAlHmpjGVFWtmZPvheg4pEUppzPGiaIfX/cdTXuAB/cQ/iGya
-bvsQA9d75VjQL3caZjJvspO2s/lOuP3XZX9QpngKGTbQ0DEzNeadG1ckFuXOWOj5
-DkgIUV0CAwEAAaAxMC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUE
-DDAKBggrBgEFBQcDATANBgkqhkiG9w0BAQsFAAOBgQA0ftvjH1S90rK5/wahpUPL
-K9ml0Wumf2+g+Ce2EExxHKdiYRmpnHgUG0pV7jOmZlv37Dm77pFUyu5I8V4UHgVB
-WcSdLhMVqZpF6TCekKSy5bUDqCgoYp/XsJX+Ka/NUKVrmNz9ymb4pA13hC+DYi0C
-KHSaH8M/EP0XSUW5Lez1nw==
+MIICwTCCAakCAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
+ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOh+/vQy1et7/sAQencV/WJS9+qdvWl0
+q7mzQMfoocJMRNC/2oCWueaQfq8C27JiWVUTTJqIwovivtqtTEXjd7I3RLPPgQ0G
+h4dbPQx0zLmO97cLqNcK2vLGjpwk1TZV2F6bEpfE1B2b63VF/L9kM57O83EUIbma
+8x+yr+aW9LWyn3bGJ2umUdneRfgtZXwDEXKQPv6JfxL5omWJm/5CZwOsyMoAQqYc
+hpZc1jl/fP3B8AtrAHib080LUZtraIar7ywT5UBx6p0xHM3Fl21If61f77Q4lfWF
+vWLmNmzq0xbjDA+AfUoNQcyb4ySy99IkBgAicdqI8KwnPA7J78SKiPkCAwEAAaAx
+MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
+ATANBgkqhkiG9w0BAQsFAAOCAQEAf6IYHvmMjJANnVl4d9WAPo/l2hg+F2hfI8mr
+DGJA1b7kRGyG8m1ln/GMwc0t8bIp+fp+IpP+Kcdp++aBGJDe7zSqem3JQOvpJpR7
+06ncF8IZd7TVtUsOug/9TlFNDIEOk47Q7f9byiD5rrC8x2rSHtvxY3Xv81rSMEE2
+MbY6As6+Q/0oJ8vdAI6dvWrZ5vxZm2QF0rJD2aux1Yf2mybkMnbtxngrztMBhLz1
+2sKqjaP2uAqwrEAl3TDw8FM86CTHYXB4sG+SL8WJm2MjZbj5XqMYjjUpUhd4rkm3
+IZqWOIIbh2jlYbL7K77VLkPiiuloS5Narleax4iwM1OQ6w9s3Q==
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-intermediate-key.pem b/tls/tests/files/server-intermediate-key.pem
index c5ce4f7..cc0c163 100644
--- a/tls/tests/files/server-intermediate-key.pem
+++ b/tls/tests/files/server-intermediate-key.pem
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-intermediate.pem b/tls/tests/files/server-intermediate.pem
index e23848d..078337b 100644
--- a/tls/tests/files/server-intermediate.pem
+++ b/tls/tests/files/server-intermediate.pem
@@ -1,17 +1,22 @@
-----BEGIN CERTIFICATE-----
-MIICtjCCAh+gAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
+MIIDuzCCAqOgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTE4MDkxMDE1Mjg0OVoXDTQzMDkwNDE1Mjg0OVow
+LWNhQGV4YW1wbGUuY29tMB4XDTIwMDcwNzIyNTYwNloXDTQ1MDcwMTIyNTYwNlow
SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
-GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEAl0zF3tH3V9QquvMVFgAGREcxj59CGM9X7TCWWNycgbhITJxR8Wqb
-AlHmpjGVFWtmZPvheg4pEUppzPGiaIfX/cdTXuAB/cQ/iGyabvsQA9d75VjQL3ca
-ZjJvspO2s/lOuP3XZX9QpngKGTbQ0DEzNeadG1ckFuXOWOj5DkgIUV0CAwEAAaNH
-MEUwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTA
-qAEWghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEACXgdI2AC
-f2QByzeXmmMgFm7jLsYw28S6Jvj6vFM9Rzg5Zta64B3kvT2+yk/gaKMBYCBtvRud
-6vjXKrCYlfdJa2yH4HtN1GDL6KYvx0/qJamT71pVvCuLIDzYMf0CcvoYtHZ5HDp3
-RFmQfU4QUk5+0YwwkpBFNQ4oiKjVPTBd5J4=
+GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOh+/vQy1et7/sAQencV/WJS9+qdvWl0q7mzQMfoocJMRNC/
+2oCWueaQfq8C27JiWVUTTJqIwovivtqtTEXjd7I3RLPPgQ0Gh4dbPQx0zLmO97cL
+qNcK2vLGjpwk1TZV2F6bEpfE1B2b63VF/L9kM57O83EUIbma8x+yr+aW9LWyn3bG
+J2umUdneRfgtZXwDEXKQPv6JfxL5omWJm/5CZwOsyMoAQqYchpZc1jl/fP3B8Atr
+AHib080LUZtraIar7ywT5UBx6p0xHM3Fl21If61f77Q4lfWFvWLmNmzq0xbjDA+A
+fUoNQcyb4ySy99IkBgAicdqI8KwnPA7J78SKiPkCAwEAAaNHMEUwCQYDVR0TBAIw
+ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAAEI5zoGocO4wiUB8TEhHPe9
+2ePS9Kji/NZohAtz0+HkNFQdNsHXxewBQ7WMNTzeOpjH85Uh7CLhFcl8NORs8qaw
+UZL+yZa/N3XsiyoKg7AgBAr9FolMxNOvWVvG9j2gF4t8ooLUlyaG7U1qGPbWVGQ1
+gdulqNJg/s6upz1xoMQoE+10+WE96fKOZ9LjBk/+LIfKx/eJxjplsDWj4nwWdO98
+H86baBwXvqqoT6FfSxljtLnezUkbKrhwMh2otkn06iqn+1lCyPuWdjZHtmVLd4Rs
+EXV9Fi5x/TBk/EfUYTd0TASdAHfw0uowdWDpwwjid1Ed5IMUkq5z5HcLmokMebw=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/server-key.der b/tls/tests/files/server-key.der
index c1f9a91..691b3be 100644
Binary files a/tls/tests/files/server-key.der and b/tls/tests/files/server-key.der differ
diff --git a/tls/tests/files/server-key.pem b/tls/tests/files/server-key.pem
index 6f6fe99..b30b230 100644
--- a/tls/tests/files/server-key.pem
+++ b/tls/tests/files/server-key.pem
@@ -1,15 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-self.pem b/tls/tests/files/server-self.pem
index e1215b3..474dd5b 100644
--- a/tls/tests/files/server-self.pem
+++ b/tls/tests/files/server-self.pem
@@ -1,14 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIICDTCCAXYCCQDyTgBiXvBOyDANBgkqhkiG9w0BAQsFADBLMRMwEQYKCZImiZPy
-LGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEbMBkGA1UEAwwSc2Vy
-dmVyLmV4YW1wbGUuY29tMB4XDTE4MDkxMDE1MjgzMloXDTQzMDkwNDE1MjgzMlow
-SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
-GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEA4ueKvOZqXR49sF2exsExLpbVK32rMPtZwN28NYCdGnMWRIYF2JB6
-lPWiTzWPUdEy4AmifEsiWE2ThsmBeX4cPz8YoEYt2aCenrAuFHiT7jwX433CEH8P
-gKQ5tbWKHxwz5PiktkRUWXP49KA27REJvQZMphwvRJ3uBZrxydtLzeMCAwEAATAN
-BgkqhkiG9w0BAQsFAAOBgQAbZGd5kU53gt31RWnnqurK6UgbM3tjJuy6sfy2bSYm
-vAkOeUqXmwwE10f4q6zboBalXHiyPymhq8Ybq0EKko4KdIboe8oVbadwgS6NtR4w
-SqRDpJvb1AboHq/IERnYX9IPAg7v4HTxpIsAt6KWhecUoXWUhbfxfVRcLmcRl3qs
-wA==
+MIIDHTCCAgUCFGQVhoU1QE1uDWFYDpqS66PNpDuwMA0GCSqGSIb3DQEBCwUAMEsx
+EzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMRsw
+GQYDVQQDDBJzZXJ2ZXIuZXhhbXBsZS5jb20wHhcNMjAwNzA3MjI1NjAxWhcNNDUw
+NzAxMjI1NjAxWjBLMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQB
+GRYHRVhBTVBMRTEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUuY29tMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAta34LZ+xIbdq234wEUGa8455ADNRu53I
+J733FTAJ0lGxtxkLMoq4EwgGrqETJnamZM8vlOGMZzoKt/AiMkLssIpcp1knO+4P
+vZBbiYlztpRrafxTEEK6qg9peNhgmTDh9+ulAYU+6dwSBajRCb932/cl7e4WjlIC
+zm1o9jfUwfZAHW0cx1DRk62LxlDIERAdj6Srgp7B6yi0y/gScFOEQuBNDy4ncfc6
+zR4us+PPQsllux0SHaGMzv7Tq4vDXyDXsijsBcOVKVc0XtnJErozEQm/0a63A3FU
+rekPZhhOwf5Ko2Pxs6G13e2xDpoSPaF3slPfHc+BChIPSdsIgc2spQIDAQABMA0G
+CSqGSIb3DQEBCwUAA4IBAQAdUFx7gWoLdf6cdnALEpbERESpB3H3MsJnMRFYCF3m
+vROUpZmUVUARD8CMMNCpgCB6c7/XTJlBLlkW4T3Usi8wIONN6x/VrFKd84gV9I+I
+mlxUCX9C+5dOPYAChLMfDweXxaPrKQZWJlhDHJxJuBnlXxqTF+RKJCVR31nr+NLB
+Rg5A8xJ9CZUlo6oDpvR4Hbf3NstgmxBa/AiZ2HtcFoB95WH/p7ekK3uNXwrEhCVH
+UJXvY+lDGsv6M0SAi3xaGn7W3hGWjQQDPAvt2aOScLwIASEaBzK5jMRwqzIY/Bnj
+G6VhXPZG7JccwPDlEe5wudtxJj2nlK035zuHQ8sK1/DJ
-----END CERTIFICATE-----
diff --git a/tls/tests/files/server.der b/tls/tests/files/server.der
index 8e36caa..169d334 100644
Binary files a/tls/tests/files/server.der and b/tls/tests/files/server.der differ
diff --git a/tls/tests/files/server.pem b/tls/tests/files/server.pem
index 573827c..5688012 100644
--- a/tls/tests/files/server.pem
+++ b/tls/tests/files/server.pem
@@ -1,16 +1,22 @@
-----BEGIN CERTIFICATE-----
-MIICjzCCAfigAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDkxMDE1MjgzMloXDTQzMDkw
-NDE1MjgzMlowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
-B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA4ueKvOZqXR49sF2exsExLpbVK32rMPtZwN28NYCd
-GnMWRIYF2JB6lPWiTzWPUdEy4AmifEsiWE2ThsmBeX4cPz8YoEYt2aCenrAuFHiT
-7jwX433CEH8PgKQ5tbWKHxwz5PiktkRUWXP49KA27REJvQZMphwvRJ3uBZrxydtL
-zeMCAwEAAaNHMEUwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNV
-HREEHDAahwTAqAEKghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQAD
-gYEAc8/9nm5UksO7kuhco3BbqjzkY4YSU9w55XznhYsnKI50qAcNpjnrH5qoIzW7
-8XXCfv9JQYiE7xpNyqjcf+BrZniwsYfmDvbADcodnZMgstOdbFL9PniCZyJYEGK9
-0C5iusx4Pwc1cqvwewy5oX7HW7T4uF9s3ZJALotCTVtJSqA=
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMDcwNzIyNTYwMVoXDTQ1MDcw
+MTIyNTYwMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALWt+C2fsSG3att+MBFBmvOOeQAzUbudyCe9
+9xUwCdJRsbcZCzKKuBMIBq6hEyZ2pmTPL5ThjGc6CrfwIjJC7LCKXKdZJzvuD72Q
+W4mJc7aUa2n8UxBCuqoPaXjYYJkw4ffrpQGFPuncEgWo0Qm/d9v3Je3uFo5SAs5t
+aPY31MH2QB1tHMdQ0ZOti8ZQyBEQHY+kq4KewesotMv4EnBThELgTQ8uJ3H3Os0e
+LrPjz0LJZbsdEh2hjM7+06uLw18g17Io7AXDlSlXNF7ZyRK6MxEJv9GutwNxVK3p
+D2YYTsH+SqNj8bOhtd3tsQ6aEj2hd7JT3x3PgQoSD0nbCIHNrKUCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAJaEEVW79mGy
+xCx8AWnoXgYL222KxOx4mZKVpGOrSqSm4W1RnjpySwNYuYQ/cA8YABdlxqbn+2Qj
+V5g0/aU51hzBqjd2j8XL9YlB8r7+yoK0FEfRwqZV5Gav0aITj4RmR7IcrFlveBC8
+HaATN2W6aYIWEUplSpCEf66x4hWqEE4ERsl6/cjcjbb5q5Qu3J7qDymjrttNtyHD
+OCwfG+Y1Oz977PquaLnt5vWt1m3s0lNCShPYhwwmHfChZCA+aZWCn7qVeu0z9F8n
+trU5uk9+usXDr0sT0CxkIgKlSyfpKq8NHN3TFOj30xYO0bjrWm79ip4wbXCUF9+3
+Mli0LH1AQMU=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/ssl/ca.conf b/tls/tests/files/ssl/ca.conf
index bf776ec..18f9a21 100644
--- a/tls/tests/files/ssl/ca.conf
+++ b/tls/tests/files/ssl/ca.conf
@@ -1,8 +1,7 @@
# Root CA
[ req ]
-# Use SHA-1 to verify that it does not affect the trust of root certificates.
-default_md = sha1
+default_md = sha256
utf8 = yes
string_mask = utf8only
prompt = no
diff --git a/tls/tests/files/ssl/old-ca.conf b/tls/tests/files/ssl/old-ca.conf
index b1d155a..a943c56 100644
--- a/tls/tests/files/ssl/old-ca.conf
+++ b/tls/tests/files/ssl/old-ca.conf
@@ -1,7 +1,7 @@
# Root CA
[ req ]
-default_md = sha1
+default_md = sha256
utf8 = yes
string_mask = utf8only
prompt = no
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
