[glib-networking/mcatanzaro/#140: 2/4] Upgrade test certificates to RSA-2048




commit 53272dab3ca283f7198f4c09578ce1aa79bff1e1
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Oct 12 11:05:26 2020 -0500

    Upgrade test certificates to RSA-2048
    
    RSA-1024 is now blocked by Fedora 33 system policy.
    
    This exposes an embarassing mistake. Browsers blocked RSA-1024 five
    years ago. It is surprising that it was not blocked before now.

 tls/tests/connection.c                      |   2 +-
 tls/tests/file-database.c                   |   2 +-
 tls/tests/files/ca-alternative.pem          |  43 ++++----
 tls/tests/files/ca-key.pem                  |  38 ++++---
 tls/tests/files/ca-roots-bad.pem            |  48 +++++----
 tls/tests/files/ca-roots.pem                |  48 +++++----
 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 -> 1193 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 +-
 34 files changed, 781 insertions(+), 575 deletions(-)
---
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 0044176e..a11f7df8 100644
--- a/tls/tests/connection.c
+++ b/tls/tests/connection.c
@@ -2493,7 +2493,7 @@ test_connection_binding_match_tls_unique (TestConnection *test,
  * please make sure the string below matches the output of
  * openssl x509 -outform der -in files/server.pem | openssl sha256 -binary | base64
  **/
-#define SERVER_CERT_DIGEST_B64 "jd+Lgj78hyCQXLgZhEKeBPDypjTaLfsPPExqs+6R/n0="
+#define SERVER_CERT_DIGEST_B64 "d/I7Y7MRUTmOTX/SfuxmGZu0WnqqWSl+Zmeg5svzZ80="
 static void
 test_connection_binding_match_tls_server_end_point (TestConnection *test,
                                                     gconstpointer   data)
diff --git a/tls/tests/file-database.c b/tls/tests/file-database.c
index 13468a70..ff761b7e 100644
--- a/tls/tests/file-database.c
+++ b/tls/tests/file-database.c
@@ -470,7 +470,7 @@ test_lookup_certificates_issued_by (void)
   /* This data is generated from the frob-certificate test tool in gcr library.
    * To regenerate (from e.g. a directory containing gcr and glib-networking):
    *
-   * $ gcr/frob-certificate glib-networking/tls/tests/files/ca.pem
+   * $ gcr/_build/ui/test-frob-certificate glib-networking/tls/tests/files/ca.pem
    *
    * Then copy the hex that is printed after "subject" (not "issuer"!) and add
    * the missing 'x's.
diff --git a/tls/tests/files/ca-alternative.pem b/tls/tests/files/ca-alternative.pem
index f3020798..bcf7ede9 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==
+bTAgFw0yMDEwMTIxNTUxNDNaGA8yMDUwMTAwNTE1NTE0M1owgYYxEzARBgoJkiaJ
+k/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVD
+ZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0w
+GwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAK7Tdqbl0uY7TKFF4v2o48E1CU2Yu4RFV8iWtW6I0T6x8VZV
+fEuLqHRFRMWPW3tyd5CSapSQDcmAbNyImYMZh1q+K3IirILgn7tk6ab5UiLtLu9w
+OWztr07mynrznE34J68R9geWxnuTBkR3Sq/BufnB7eubZzpoQLslnnyf5m1g/ikM
+Xjt1RDtObPCAPnuPY2ShHSOCKI/A0/LDAqo4or+JYU+4dwtImXWWLcerF4aVjcBt
+ffIrL1JZ9BZD3sZjlYDHlU6u3ppbWukawNtSPER7S5kc4kXC20qPu4AygHUH7NWg
+t860Lt+EwIQDFlXF2D0QRurF1b7tx1P+RPMxTEECAwEAAaOCAVwwggFYMB0GA1Ud
+DgQWBBRPm1SNYuUEc1owegwTvllpjKe/djCB3wYDVR0jBIHXMIHUgBSNy1feOSOq
+NgHRcOnW62Za0rtrD6GBpaSBojCBnzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUG
+CgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBVbnRydXN0ZWQgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndhcy5hLmNhLmV4YW1w
+bGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbYIUd5wcnmQZ6GQ4
+7TknLc4CnHGU69EwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwGQYD
+VR0RBBIwEIEOY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
+b20wDQYJKoZIhvcNAQELBQADggEBAAYeD6KY5KsVVx75990/BZeP0Q5RODyIQcF1
+nyzFfEhvGQhT8ZU/fLSpHzevgof0dgdJyTj69ABWZNI49PAF+AKE3zIQ4RqvSxBW
+diVvLEpZ9b7z8aURHBuNpfrdk5wJvnmOBU7HoVa1ZxhPe+pJyiQF9dVmUoUiTBYF
+qon1dOe4mQkjvrvSx3dgWOY9dokjht9wa+YPERRjUO6Mx+0VLXXCQTfMSPUwnKFb
+GJUC/70Pg7by3Nhp3uM3cjYp/abFolZ3nKO71kAkssmyNQUxlp2JQ0aUC4row6pN
+TKKy4l6lpdUSAxcgkN1MNsHc1vJ0DluVvrS/VWGajBtGKWi0pt4=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/ca-key.pem b/tls/tests/files/ca-key.pem
index 7a128eaa..d38828b0 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-roots-bad.pem b/tls/tests/files/ca-roots-bad.pem
index de222b9a..0ee876d0 100644
--- a/tls/tests/files/ca-roots-bad.pem
+++ b/tls/tests/files/ca-roots-bad.pem
@@ -1,25 +1,31 @@
 -----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==
+MIIE4zCCA8ugAwIBAgIUUKz5F3Z4HG+WHEFnBiXEuJ7Ixk0wDQYJKoZIhvcNAQEF
+BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
+LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
+MDEwMTIxNTUxNDNaGA8yMDUwMTAwNTE1NTE0M1owgYYxEzARBgoJkiaJk/IsZAEZ
+FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
+hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAK7Tdqbl0uY7TKFF4v2o48E1CU2Yu4RFV8iWtW6I0T6x8VZVfEuLqHRF
+RMWPW3tyd5CSapSQDcmAbNyImYMZh1q+K3IirILgn7tk6ab5UiLtLu9wOWztr07m
+ynrznE34J68R9geWxnuTBkR3Sq/BufnB7eubZzpoQLslnnyf5m1g/ikMXjt1RDtO
+bPCAPnuPY2ShHSOCKI/A0/LDAqo4or+JYU+4dwtImXWWLcerF4aVjcBtffIrL1JZ
+9BZD3sZjlYDHlU6u3ppbWukawNtSPER7S5kc4kXC20qPu4AygHUH7NWgt860Lt+E
+wIQDFlXF2D0QRurF1b7tx1P+RPMxTEECAwEAAaOCAUMwggE/MB0GA1UdDgQWBBRP
+m1SNYuUEc1owegwTvllpjKe/djCBxgYDVR0jBIG+MIG7gBRPm1SNYuUEc1owegwT
+vllpjKe/dqGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
+MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
+bGUuY29tghRQrPkXdngcb5YcQWcGJcS4nsjGTTAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAEczQIV4gb3wa
+lt3FzDZD4Xl9uB5VhyHl1LmWcDwBjTtM9gQh3VsjY/R8X85xz9bN+PsXhcTxKuyG
+MBS0zC+ug+Y6EohMVXFIjp73hcgSose49TfGIQ0I5DnyLTVRQoN3KNYCL1MvTGNW
+6vPOtmS6mun8c9kwa8kgV5q7YwSTUjbJKAwTszJ9ZPL3x8lKwY/VnP0OqqJYfpxz
+tgcPMsOiJmgrxEm1cG1yU1sBYfFKLvuDnC3XXuj7FyR/kkPxMW4fFz6v7jpEmr/8
+u04CYJelLtxmxe+4fE4AyqtWNgUiI5DGv406LfxpniPE5Gvj+UgOVFBurJSlVs8G
+MIn9PM5gxw==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
diff --git a/tls/tests/files/ca-roots.pem b/tls/tests/files/ca-roots.pem
index 713895c4..6b421e88 100644
--- a/tls/tests/files/ca-roots.pem
+++ b/tls/tests/files/ca-roots.pem
@@ -1,27 +1,33 @@
 These are some CA certificates
 
 -----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==
+MIIE4zCCA8ugAwIBAgIUUKz5F3Z4HG+WHEFnBiXEuJ7Ixk0wDQYJKoZIhvcNAQEF
+BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
+LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
+MDEwMTIxNTUxNDNaGA8yMDUwMTAwNTE1NTE0M1owgYYxEzARBgoJkiaJk/IsZAEZ
+FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
+hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAK7Tdqbl0uY7TKFF4v2o48E1CU2Yu4RFV8iWtW6I0T6x8VZVfEuLqHRF
+RMWPW3tyd5CSapSQDcmAbNyImYMZh1q+K3IirILgn7tk6ab5UiLtLu9wOWztr07m
+ynrznE34J68R9geWxnuTBkR3Sq/BufnB7eubZzpoQLslnnyf5m1g/ikMXjt1RDtO
+bPCAPnuPY2ShHSOCKI/A0/LDAqo4or+JYU+4dwtImXWWLcerF4aVjcBtffIrL1JZ
+9BZD3sZjlYDHlU6u3ppbWukawNtSPER7S5kc4kXC20qPu4AygHUH7NWgt860Lt+E
+wIQDFlXF2D0QRurF1b7tx1P+RPMxTEECAwEAAaOCAUMwggE/MB0GA1UdDgQWBBRP
+m1SNYuUEc1owegwTvllpjKe/djCBxgYDVR0jBIG+MIG7gBRPm1SNYuUEc1owegwT
+vllpjKe/dqGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
+MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
+bGUuY29tghRQrPkXdngcb5YcQWcGJcS4nsjGTTAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAEczQIV4gb3wa
+lt3FzDZD4Xl9uB5VhyHl1LmWcDwBjTtM9gQh3VsjY/R8X85xz9bN+PsXhcTxKuyG
+MBS0zC+ug+Y6EohMVXFIjp73hcgSose49TfGIQ0I5DnyLTVRQoN3KNYCL1MvTGNW
+6vPOtmS6mun8c9kwa8kgV5q7YwSTUjbJKAwTszJ9ZPL3x8lKwY/VnP0OqqJYfpxz
+tgcPMsOiJmgrxEm1cG1yU1sBYfFKLvuDnC3XXuj7FyR/kkPxMW4fFz6v7jpEmr/8
+u04CYJelLtxmxe+4fE4AyqtWNgUiI5DGv406LfxpniPE5Gvj+UgOVFBurJSlVs8G
+MIn9PM5gxw==
 -----END CERTIFICATE-----
 
 GLib shouldn't care about this comment
diff --git a/tls/tests/files/ca.pem b/tls/tests/files/ca.pem
index 98f2e7ce..137f867d 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==
+MIIE4zCCA8ugAwIBAgIUUKz5F3Z4HG+WHEFnBiXEuJ7Ixk0wDQYJKoZIhvcNAQEF
+BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
+LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
+MDEwMTIxNTUxNDNaGA8yMDUwMTAwNTE1NTE0M1owgYYxEzARBgoJkiaJk/IsZAEZ
+FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
+hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAK7Tdqbl0uY7TKFF4v2o48E1CU2Yu4RFV8iWtW6I0T6x8VZVfEuLqHRF
+RMWPW3tyd5CSapSQDcmAbNyImYMZh1q+K3IirILgn7tk6ab5UiLtLu9wOWztr07m
+ynrznE34J68R9geWxnuTBkR3Sq/BufnB7eubZzpoQLslnnyf5m1g/ikMXjt1RDtO
+bPCAPnuPY2ShHSOCKI/A0/LDAqo4or+JYU+4dwtImXWWLcerF4aVjcBtffIrL1JZ
+9BZD3sZjlYDHlU6u3ppbWukawNtSPER7S5kc4kXC20qPu4AygHUH7NWgt860Lt+E
+wIQDFlXF2D0QRurF1b7tx1P+RPMxTEECAwEAAaOCAUMwggE/MB0GA1UdDgQWBBRP
+m1SNYuUEc1owegwTvllpjKe/djCBxgYDVR0jBIG+MIG7gBRPm1SNYuUEc1owegwT
+vllpjKe/dqGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
+MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
+bGUuY29tghRQrPkXdngcb5YcQWcGJcS4nsjGTTAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAEczQIV4gb3wa
+lt3FzDZD4Xl9uB5VhyHl1LmWcDwBjTtM9gQh3VsjY/R8X85xz9bN+PsXhcTxKuyG
+MBS0zC+ug+Y6EohMVXFIjp73hcgSose49TfGIQ0I5DnyLTVRQoN3KNYCL1MvTGNW
+6vPOtmS6mun8c9kwa8kgV5q7YwSTUjbJKAwTszJ9ZPL3x8lKwY/VnP0OqqJYfpxz
+tgcPMsOiJmgrxEm1cG1yU1sBYfFKLvuDnC3XXuj7FyR/kkPxMW4fFz6v7jpEmr/8
+u04CYJelLtxmxe+4fE4AyqtWNgUiI5DGv406LfxpniPE5Gvj+UgOVFBurJSlVs8G
+MIn9PM5gxw==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/chain.pem b/tls/tests/files/chain.pem
index 638ac0c4..15af02b9 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
+LWNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE1MVoXDTQ1MTAwNjE1NTE1MVow
 SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
-GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEAl0zF3tH3V9QquvMVFgAGREcxj59CGM9X7TCWWNycgbhITJxR8Wqb
-AlHmpjGVFWtmZPvheg4pEUppzPGiaIfX/cdTXuAB/cQ/iGyabvsQA9d75VjQL3ca
-ZjJvspO2s/lOuP3XZX9QpngKGTbQ0DEzNeadG1ckFuXOWOj5DkgIUV0CAwEAAaNH
-MEUwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTA
-qAEWghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEACXgdI2AC
-f2QByzeXmmMgFm7jLsYw28S6Jvj6vFM9Rzg5Zta64B3kvT2+yk/gaKMBYCBtvRud
-6vjXKrCYlfdJa2yH4HtN1GDL6KYvx0/qJamT71pVvCuLIDzYMf0CcvoYtHZ5HDp3
-RFmQfU4QUk5+0YwwkpBFNQ4oiKjVPTBd5J4=
+GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALA2UdCahuw94BsmB10h8qrY/Kyg5s76oGMa/A2r1TIqk3g7
+bZ0i5K+9yDro4YPkF4tUa71P5/2jLv4i7n7pQK5LlbC/L3UjgXBY5m2jcUh7xZOi
+mmrIZkeHH2aacJJv7H7F49NVlG+FI5QsWedCbJ6basdkU8PSxfsaE01o/KLbIJOR
+6zNZaybVf+drAnImeFsdLyL6wzYGMjyFdH9mCHus048pGpzhyXVkrRIcjARHyA9R
+BKGHW60fWNB3Cc8dgSC7qjdIlnmNcXRXUoRifqSwGL7T8GoavGE51TQ4Waf6XL9S
+YdVmEJea/mac9tHboiZRj5XeD8X6AVWLlRxJwzMCAwEAAaNHMEUwCQYDVR0TBAIw
+ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBACRYo07Kiituv71ai+fsIHZ0
+oCzhr6SuwqYwywIz0+VvNid0H1dz1MK7R7jeLYUzgEUvwz0goz++j0ZSi+rK8VBG
+abY7QOwLyqv0+81+zhFLL5EFRNG8eO3kC61b20JxLGiRBpo5qJGNI5rV7pqsNbzk
+nfS4aHJcrkGPcSmLHYi9UBjJRbonwb4stUa0ziyptTVkTtvgGmTm1tuoEedAi90H
+oj/9VCf1shs47AjxokZqpnr36Dp8acz9zsaod9ZDAfZdwNrh4Vf958k4wHk3PGcb
+aVqhyPjuIGVJ+7KJWxcmZ/3RQxmEg0xB6i7umhhmmRmYCMPB8fDTdDvnFdC4N+Q=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIID8jCCA1ugAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIFAjCCA+qgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDkxMDE1Mjg0OVoXDTQzMDkw
-NDE1Mjg0OVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE1MVoXDTQ1MTAw
+NjE1NTE1MVowga0xEzARBgoJkiaJk/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
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAORh8EDpQkDYMceg6ZiiNh42ltC+qJOm
+qVNlHHla0jp1iYJdNZyRKYlVhp8xq7sxuRheocDM1R8KpiCrE1LyY1i6LGkflFp7
+8y4l37K8bW8Qml3TWfmK/B3Xf+LOPbOvcWbKZ+egNZwhPt+3M+l4+lz2r5a2ZYwK
+Z/kvfQEBe/zM6pDZ8zVrJC1k5/4RvpnPiPk29ji69fvWy8dfhUv3S91tnAW5XP12
+1pOFsVCVBQdDu6P2kRx9etf6cHT5YgUTkBWBUJqu4Fq3gaBoDkqW1GVuI9zdBS2r
+NUvGVQoOrxeiOZPFlaPF5zZ9DYMVWUCeDOU+PrR0YU0LHW3Tr4ngfLcCAwEAAaOC
+AVAwggFMMB0GA1UdDgQWBBRkVk8N43l2EZv18wP70cL7oOmKPjCBxgYDVR0jBIG+
+MIG7gBRPm1SNYuUEc1owegwTvllpjKe/dqGBjKSBiTCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRQrPkXdngcb5YcQWcGJcS4nsjGTTAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
+cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
+b20wDQYJKoZIhvcNAQELBQADggEBAD2YKTWbSnaWS3ICzQqElJi09lsZkZEwSaPd
+hLQcMx8GB/O73/TvEi58HoeIyQPEC8FWBqSLIWdx+Pq0F91X6bIz6ghLQ2oKAqbn
+W4GX/7voIt2OXCLuOs10rrADsjYfj56D/SoG+hV3pS8hoscoBSXLjKXgNkZd2jtl
+F6BhFn1r/kmo/B0xGnFFzM/3djoA4zh4QoxZ5Efq0RtpMsrxYdYop2PThF2p7OQO
+Rxu9dAjriYxcc/PQOfYTuCKaIYGawWoruRT+awf4FTukSkLoLM3xr/kmgqs3Y2fH
+pNRyvnMmyJzJ92Xeo71jfCHF/6DxIdN9ZKJ5pzY3CZOp/a56fiE=
 -----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==
+MIIE4zCCA8ugAwIBAgIUUKz5F3Z4HG+WHEFnBiXEuJ7Ixk0wDQYJKoZIhvcNAQEF
+BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
+LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
+MDEwMTIxNTUxNDNaGA8yMDUwMTAwNTE1NTE0M1owgYYxEzARBgoJkiaJk/IsZAEZ
+FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
+hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAK7Tdqbl0uY7TKFF4v2o48E1CU2Yu4RFV8iWtW6I0T6x8VZVfEuLqHRF
+RMWPW3tyd5CSapSQDcmAbNyImYMZh1q+K3IirILgn7tk6ab5UiLtLu9wOWztr07m
+ynrznE34J68R9geWxnuTBkR3Sq/BufnB7eubZzpoQLslnnyf5m1g/ikMXjt1RDtO
+bPCAPnuPY2ShHSOCKI/A0/LDAqo4or+JYU+4dwtImXWWLcerF4aVjcBtffIrL1JZ
+9BZD3sZjlYDHlU6u3ppbWukawNtSPER7S5kc4kXC20qPu4AygHUH7NWgt860Lt+E
+wIQDFlXF2D0QRurF1b7tx1P+RPMxTEECAwEAAaOCAUMwggE/MB0GA1UdDgQWBBRP
+m1SNYuUEc1owegwTvllpjKe/djCBxgYDVR0jBIG+MIG7gBRPm1SNYuUEc1owegwT
+vllpjKe/dqGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
+MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
+bGUuY29tghRQrPkXdngcb5YcQWcGJcS4nsjGTTAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAEczQIV4gb3wa
+lt3FzDZD4Xl9uB5VhyHl1LmWcDwBjTtM9gQh3VsjY/R8X85xz9bN+PsXhcTxKuyG
+MBS0zC+ug+Y6EohMVXFIjp73hcgSose49TfGIQ0I5DnyLTVRQoN3KNYCL1MvTGNW
+6vPOtmS6mun8c9kwa8kgV5q7YwSTUjbJKAwTszJ9ZPL3x8lKwY/VnP0OqqJYfpxz
+tgcPMsOiJmgrxEm1cG1yU1sBYfFKLvuDnC3XXuj7FyR/kkPxMW4fFz6v7jpEmr/8
+u04CYJelLtxmxe+4fE4AyqtWNgUiI5DGv406LfxpniPE5Gvj+UgOVFBurJSlVs8G
+MIn9PM5gxw==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client-and-key.pem b/tls/tests/files/client-and-key.pem
index 035682da..a2b78283 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
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNTUxNDRaFw00NTEwMDYxNTUx
+NDRaMGIxEzARBgoJkiaJk/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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOrZjs147dX
+H6MeWFVbTW6jVVDmuohNyeTAOEhAps8G1wJF1CyKW1DlmRrgEe1o6AfcbH9togsW
+X3/701G14Ct3kQ/PeeHVxSXiLpYnOyJpcebX/s4VE8UsMJQT0Lt4xj5JTHFb5IHs
+2dCOrR+81ogz954cZyNcpomv05FwYqYWno++urcgY9V2bxLVIQSwN0/ip7WTxH6q
+4ww12lNqbRPgiaPHGn+Z+4yQ+LuK5fdAeH2Jihbxh5D9OuaNipmfyzwjDsj9eAsa
+Kw9lt9/ip94/vL6a70Gncg3b3sUs7nXEUraz1/Aoaf6lH1SPVjWn87TeYKpU4LyU
+Hn8heQIIEMsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAbY1sXNIVZlGbYOBCN/Zl
+UsKSnfZRaRB7QnctxEfn3bVX+v4eW6eD0AGqzWWPIZq1G1m4ptIkuibIOX11QkTN
+HAoSlxrx9f24pwvx4s/TjH6yx7ZDdry440G8ZmOul4HFbu6l67MlRzyK238v6NsK
+lkRmfFmaODP2SV9eB8icw21DD8uCGlK2rbjiIl5cnltKq4B623UGuZbk3ulFhhZA
+uLZ6RzsFpYZw6V1e7ctLRjOQuKjNPolF9ZPWjxr+RTbQZQDEcUd/bkGl8b8XF8n9
+0l6qkNFBAdVs2k/rFPX3ZiApcPjnFQj+fGaCUqYmquXTdTBdfdD6Em3eWid1chbZ
+Kg==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client-future.pem b/tls/tests/files/client-future.pem
index b9f23121..fff55faf 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=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTq2Y7
+NeO3Vx+jHlhVW01uo1VQ5rqITcnkwDhIQKbPBtcCRdQsiltQ5Zka4BHtaOgH3Gx/
+baILFl9/+9NRteArd5EPz3nh1cUl4i6WJzsiaXHm1/7OFRPFLDCUE9C7eMY+SUxx
+W+SB7NnQjq0fvNaIM/eeHGcjXKaJr9ORcGKmFp6Pvrq3IGPVdm8S1SEEsDdP4qe1
+k8R+quMMNdpTam0T4Imjxxp/mfuMkPi7iuX3QHh9iYoW8YeQ/TrmjYqZn8s8Iw7I
+/XgLGisPZbff4qfeP7y+mu9Bp3IN297FLO51xFK2s9fwKGn+pR9Uj1Y1p/O03mCq
+VOC8lB5/IXkCCBDLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIeuFyE6tAq98PlU
+6Bpz7x8XJjIVndH/sC6N3HqYISowET/Ie7qmgs026Hs8tbqh8oyj8fKnkcS0vWyP
+zvocGcsUwfig6tbcOfcm4F3P77stleBx6m4LfWadk+AlWEebi4aph8CHIasC6Mw7
+IFGx6dcT6OAltP1F4ZMHO9DFt34SX6zgcqKgmjGya23JVk+MX7r3B0en3JJ0Q+7j
+QhekjcOu/46hKfPSZqE3kC7pvGcbdkkuGTgaRaL3QOKMJixY06paCz3uMG49eeNw
+dm3u4MmqA2lQG6JTNkTbcd8O5rhAVR1U5aWVYF7Td9AqJX4s31OiqzjPGOanVyuj
+l0zw5YI=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client-key.pem b/tls/tests/files/client-key.pem
index 5ee42030..90332c37 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 ac8deb7e..126eb81e 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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOrZjs147dX
+H6MeWFVbTW6jVVDmuohNyeTAOEhAps8G1wJF1CyKW1DlmRrgEe1o6AfcbH9togsW
+X3/701G14Ct3kQ/PeeHVxSXiLpYnOyJpcebX/s4VE8UsMJQT0Lt4xj5JTHFb5IHs
+2dCOrR+81ogz954cZyNcpomv05FwYqYWno++urcgY9V2bxLVIQSwN0/ip7WTxH6q
+4ww12lNqbRPgiaPHGn+Z+4yQ+LuK5fdAeH2Jihbxh5D9OuaNipmfyzwjDsj9eAsa
+Kw9lt9/ip94/vL6a70Gncg3b3sUs7nXEUraz1/Aoaf6lH1SPVjWn87TeYKpU4LyU
+Hn8heQIIEMsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAgvs1vAZqF/1Up839lOZ+
+5bvZ19B/Z8h25xWM2pVvKDgi/9/tM0YjAWrjpUJQI8ex9LSNQvdxs4DYjV93RaNc
+YL0mf7NL+P1xA/5XLiXxPmpvJW7PfPimqymzfALyA/6os5dQJoYu4AQv7YgXYicH
+L8CDT875DP72L9fUwT8i9+y6uDQe8ETPowrSb8o4eGPT3m/qy0D2bbDMHXE9Sa0F
+UT3zmtI9gX/zLS3nxrB/5p6fQWJJrL02Yk4Q+9pTHkTzQ1D6XRD0K83IFItaRz66
+HOQZ7pHagOMbJ2JwSCw4E8HOCTg+DlB0WBzSRZTYa/4c3DHh4da7sW94xtN+oP0y
+vA==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client.pem b/tls/tests/files/client.pem
index 6f218ae5..625b3b88 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
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNTUxNDRaFw00NTEwMDYxNTUx
+NDRaMGIxEzARBgoJkiaJk/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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOrZjs147dX
+H6MeWFVbTW6jVVDmuohNyeTAOEhAps8G1wJF1CyKW1DlmRrgEe1o6AfcbH9togsW
+X3/701G14Ct3kQ/PeeHVxSXiLpYnOyJpcebX/s4VE8UsMJQT0Lt4xj5JTHFb5IHs
+2dCOrR+81ogz954cZyNcpomv05FwYqYWno++urcgY9V2bxLVIQSwN0/ip7WTxH6q
+4ww12lNqbRPgiaPHGn+Z+4yQ+LuK5fdAeH2Jihbxh5D9OuaNipmfyzwjDsj9eAsa
+Kw9lt9/ip94/vL6a70Gncg3b3sUs7nXEUraz1/Aoaf6lH1SPVjWn87TeYKpU4LyU
+Hn8heQIIEMsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAbY1sXNIVZlGbYOBCN/Zl
+UsKSnfZRaRB7QnctxEfn3bVX+v4eW6eD0AGqzWWPIZq1G1m4ptIkuibIOX11QkTN
+HAoSlxrx9f24pwvx4s/TjH6yx7ZDdry440G8ZmOul4HFbu6l67MlRzyK238v6NsK
+lkRmfFmaODP2SV9eB8icw21DD8uCGlK2rbjiIl5cnltKq4B623UGuZbk3ulFhhZA
+uLZ6RzsFpYZw6V1e7ctLRjOQuKjNPolF9ZPWjxr+RTbQZQDEcUd/bkGl8b8XF8n9
+0l6qkNFBAdVs2k/rFPX3ZiApcPjnFQj+fGaCUqYmquXTdTBdfdD6Em3eWid1chbZ
+Kg==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client2-and-key.pem b/tls/tests/files/client2-and-key.pem
index f2c2178c..cded5e17 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
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNTUxNTFaFw00NTEwMDYxNTUx
+NTFaMGIxEzARBgoJkiaJk/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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOmW9pP4gdMB
+3V/7s/SUTW83FC/ClM2ToWWA5R+R/3b2S35pUjJeSWYCi3zj87R2DpyNGG8nFjck
+27g8MZmdRAS0jYlgAMflhXwFRIdtuWh36142gY8QqywXs2+naiqS31RKlxYMVB2b
+T9qAv74o8/E5FyKkqZut2JCVLoljvdoAm50F9T0F5HdkoAXuOLkBRChZHME6w0HX
+kapLxrfnPOuhD2YZC9iFKTDulzE7tH0SEQByoQNd4gIEToFEr6D61Go4vPLjLLq3
+z8AE470EoisGai5odqWlIjBfZu7d5Qw+0bBIktX34bGZm1uKsNVbPPgqxoYkBC+R
+Sg5u0NRRBqMCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAJ4l1NN5FAh4fctjsQ4wv
+h2w4QomYe6vALKJO7NxFH/JQUsquRiABkXvoFUzkVFk04GY9f0ILv4yZgiAWs317
+SCrMuxC4Xp1seRWhoJKz5UBwGkHmgxYY3eBRf1XF4rpbuTYjb/iYS+A8SQYkWsBz
+gSTpciskzPUr+EwiiBw+8BHqLeJBcIceDWY8V0CtYNgx1CQ8UCTLyAQqV5lPMcU0
+tf7YqXlk47hNLCIARCWy1vHorcBSdrogD7ojEV7Tavu8PoSNWnpazyTekth7Vzmd
+5b5s1mAnynd91jKRuG7YMWygvige7rhLA0MLsfXyI4sw1KlW1hU5LRCUPcU9LCOR
+pQ==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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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 c45cbb6e..71b30b01 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 24f099ab..31582e4a 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
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNTUxNTFaFw00NTEwMDYxNTUx
+NTFaMGIxEzARBgoJkiaJk/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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOmW9pP4gdMB
+3V/7s/SUTW83FC/ClM2ToWWA5R+R/3b2S35pUjJeSWYCi3zj87R2DpyNGG8nFjck
+27g8MZmdRAS0jYlgAMflhXwFRIdtuWh36142gY8QqywXs2+naiqS31RKlxYMVB2b
+T9qAv74o8/E5FyKkqZut2JCVLoljvdoAm50F9T0F5HdkoAXuOLkBRChZHME6w0HX
+kapLxrfnPOuhD2YZC9iFKTDulzE7tH0SEQByoQNd4gIEToFEr6D61Go4vPLjLLq3
+z8AE470EoisGai5odqWlIjBfZu7d5Qw+0bBIktX34bGZm1uKsNVbPPgqxoYkBC+R
+Sg5u0NRRBqMCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAJ4l1NN5FAh4fctjsQ4wv
+h2w4QomYe6vALKJO7NxFH/JQUsquRiABkXvoFUzkVFk04GY9f0ILv4yZgiAWs317
+SCrMuxC4Xp1seRWhoJKz5UBwGkHmgxYY3eBRf1XF4rpbuTYjb/iYS+A8SQYkWsBz
+gSTpciskzPUr+EwiiBw+8BHqLeJBcIceDWY8V0CtYNgx1CQ8UCTLyAQqV5lPMcU0
+tf7YqXlk47hNLCIARCWy1vHorcBSdrogD7ojEV7Tavu8PoSNWnpazyTekth7Vzmd
+5b5s1mAnynd91jKRuG7YMWygvige7rhLA0MLsfXyI4sw1KlW1hU5LRCUPcU9LCOR
+pQ==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/create-files.sh b/tls/tests/files/create-files.sh
index 07df7255..3f6c0ff4 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
@@ -163,7 +163,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
@@ -176,7 +176,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 702c8499..e317797a 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
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAORh8EDpQkDYMceg6ZiiNh42ltC+
+qJOmqVNlHHla0jp1iYJdNZyRKYlVhp8xq7sxuRheocDM1R8KpiCrE1LyY1i6LGkf
+lFp78y4l37K8bW8Qml3TWfmK/B3Xf+LOPbOvcWbKZ+egNZwhPt+3M+l4+lz2r5a2
+ZYwKZ/kvfQEBe/zM6pDZ8zVrJC1k5/4RvpnPiPk29ji69fvWy8dfhUv3S91tnAW5
+XP121pOFsVCVBQdDu6P2kRx9etf6cHT5YgUTkBWBUJqu4Fq3gaBoDkqW1GVuI9zd
+BS2rNUvGVQoOrxeiOZPFlaPF5zZ9DYMVWUCeDOU+PrR0YU0LHW3Tr4ngfLcCAwEA
+AaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFGRWTw3jeXYRm/XzA/vRwvug
+6Yo+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+CwUAA4IBAQDkBgMezXrGUC76G/E2/fy/445HvgYQy3hqfemv0HlHijzvbzqjdK+s
+3GCZBGEe4hZVq4Wbe1KVGkUvBVBm/jbO7udA9Xf7CZfMxKb/WmNgF3xodXBciKJ8
+8f58nun17pwwQy70CEtewrlcthG2lmRcyokqZqV3wdf//bT/GvSePfuTvttvo+Vi
+fnL5e15Cpk+GDB4H4r4L7hDwcp9qYniCv+vReDsHOkxFOTCgfq0xTVj6zsC01CGN
+T5iweKMhTMDkxEW/lOi10zYD9YGhaSXTNDj9Ex7ZOh7F/ReMaqwcVti/G8/TVigH
+XPLGK2sGm1qkwKJEHzceRCug3zwmB26g
 -----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/intermediate-ca-key.pem b/tls/tests/files/intermediate-ca-key.pem
index de97214c..923d4675 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-----
-MIICXgIBAAKBgQC7RXrO7DbOmEg5p6vgVEXcIKQPsjkyItExC8JO3Gb1Nb4yM1f3
-8CCdnKuHPndMzNdml5HMdsF39qVwiw1h65kD1LPs4Zs1WuWx2/5SobG2nP5DI0AF
-s1Uc4xDARShZkY6EfcskUYazb3BknS39icTzvNZg2vA/UkknOoKfYDqw8QIDAQAB
-AoGBAJ53DJRMDZSEB5nB6A7LQNIkTK97gCqMi7eU27cfiX+1GlwgVi/XYcH88Khg
-k1LJgvutBhKd6tg4PYYeJBTX54GDuQzghfqweIqJgItchJDr1c6pw2qbNnMFqP4N
-rfbDyFVrhoMf3QSDtoV6TXZZNXZXAC1nVbmhE0GiGUGFts6BAkEA33gFibdxqHBG
-HNu6ry6oNhpiUMm9X2wNLVi3oxJLYBYQx0OSrs6wlNJvoUpMVuEjriCmT26GtdxI
-DjWz4ffLbwJBANaIfn3EUnB8iNaSUmJpJKHMtiIAAw2XKIt9OUa9QTkCKLoX+Nzr
-i6PV5pPOfcLc8h+YBDkQaja7480xIbYimZ8CQH9k27tb0baVctLmzLErpwdY2S13
-JLcuUQDF78JOHpxDWANQ2WFAQVhF8w9+3LA2nvGYeVcVCkTItGctZEPw0I8CQQDN
-hkwwLqGP9C6f6eQVNYeLnnOqVPqXzYVhROFXXL4cYG4mAgs/kkTf+27/kSY4RbWM
-APWiuZAXyZ7umDAkrjcfAkEAtCGn5fY0AyOEnej7b0ZsTHlLTSHb6drAPDT5b3Ad
-O96DYKvWhlBsGEmDOsBOo/1PCfHWygBJvTDBoRKBdAh4uA==
+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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 4841cc2e..31eae06a 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
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE1MVoXDTQ1MTAw
+NjE1NTE1MVowga0xEzARBgoJkiaJk/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
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAORh8EDpQkDYMceg6ZiiNh42ltC+qJOm
+qVNlHHla0jp1iYJdNZyRKYlVhp8xq7sxuRheocDM1R8KpiCrE1LyY1i6LGkflFp7
+8y4l37K8bW8Qml3TWfmK/B3Xf+LOPbOvcWbKZ+egNZwhPt+3M+l4+lz2r5a2ZYwK
+Z/kvfQEBe/zM6pDZ8zVrJC1k5/4RvpnPiPk29ji69fvWy8dfhUv3S91tnAW5XP12
+1pOFsVCVBQdDu6P2kRx9etf6cHT5YgUTkBWBUJqu4Fq3gaBoDkqW1GVuI9zdBS2r
+NUvGVQoOrxeiOZPFlaPF5zZ9DYMVWUCeDOU+PrR0YU0LHW3Tr4ngfLcCAwEAAaOC
+AVAwggFMMB0GA1UdDgQWBBRkVk8N43l2EZv18wP70cL7oOmKPjCBxgYDVR0jBIG+
+MIG7gBRPm1SNYuUEc1owegwTvllpjKe/dqGBjKSBiTCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRQrPkXdngcb5YcQWcGJcS4nsjGTTAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
+cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
+b20wDQYJKoZIhvcNAQELBQADggEBAD2YKTWbSnaWS3ICzQqElJi09lsZkZEwSaPd
+hLQcMx8GB/O73/TvEi58HoeIyQPEC8FWBqSLIWdx+Pq0F91X6bIz6ghLQ2oKAqbn
+W4GX/7voIt2OXCLuOs10rrADsjYfj56D/SoG+hV3pS8hoscoBSXLjKXgNkZd2jtl
+F6BhFn1r/kmo/B0xGnFFzM/3djoA4zh4QoxZ5Efq0RtpMsrxYdYop2PThF2p7OQO
+Rxu9dAjriYxcc/PQOfYTuCKaIYGawWoruRT+awf4FTukSkLoLM3xr/kmgqs3Y2fH
+pNRyvnMmyJzJ92Xeo71jfCHF/6DxIdN9ZKJ5pzY3CZOp/a56fiE=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/non-ca.pem b/tls/tests/files/non-ca.pem
index cb76d6ec..2bf3fd85 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
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNTUxNDRaFw00NTEwMDYxNTUx
+NDRaMGIxEzARBgoJkiaJk/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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOrZjs147dX
+H6MeWFVbTW6jVVDmuohNyeTAOEhAps8G1wJF1CyKW1DlmRrgEe1o6AfcbH9togsW
+X3/701G14Ct3kQ/PeeHVxSXiLpYnOyJpcebX/s4VE8UsMJQT0Lt4xj5JTHFb5IHs
+2dCOrR+81ogz954cZyNcpomv05FwYqYWno++urcgY9V2bxLVIQSwN0/ip7WTxH6q
+4ww12lNqbRPgiaPHGn+Z+4yQ+LuK5fdAeH2Jihbxh5D9OuaNipmfyzwjDsj9eAsa
+Kw9lt9/ip94/vL6a70Gncg3b3sUs7nXEUraz1/Aoaf6lH1SPVjWn87TeYKpU4LyU
+Hn8heQIIEMsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAbY1sXNIVZlGbYOBCN/Zl
+UsKSnfZRaRB7QnctxEfn3bVX+v4eW6eD0AGqzWWPIZq1G1m4ptIkuibIOX11QkTN
+HAoSlxrx9f24pwvx4s/TjH6yx7ZDdry440G8ZmOul4HFbu6l67MlRzyK238v6NsK
+lkRmfFmaODP2SV9eB8icw21DD8uCGlK2rbjiIl5cnltKq4B623UGuZbk3ulFhhZA
+uLZ6RzsFpYZw6V1e7ctLRjOQuKjNPolF9ZPWjxr+RTbQZQDEcUd/bkGl8b8XF8n9
+0l6qkNFBAdVs2k/rFPX3ZiApcPjnFQj+fGaCUqYmquXTdTBdfdD6Em3eWid1chbZ
+Kg==
 -----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=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTq2Y7
+NeO3Vx+jHlhVW01uo1VQ5rqITcnkwDhIQKbPBtcCRdQsiltQ5Zka4BHtaOgH3Gx/
+baILFl9/+9NRteArd5EPz3nh1cUl4i6WJzsiaXHm1/7OFRPFLDCUE9C7eMY+SUxx
+W+SB7NnQjq0fvNaIM/eeHGcjXKaJr9ORcGKmFp6Pvrq3IGPVdm8S1SEEsDdP4qe1
+k8R+quMMNdpTam0T4Imjxxp/mfuMkPi7iuX3QHh9iYoW8YeQ/TrmjYqZn8s8Iw7I
+/XgLGisPZbff4qfeP7y+mu9Bp3IN297FLO51xFK2s9fwKGn+pR9Uj1Y1p/O03mCq
+VOC8lB5/IXkCCBDLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIeuFyE6tAq98PlU
+6Bpz7x8XJjIVndH/sC6N3HqYISowET/Ie7qmgs026Hs8tbqh8oyj8fKnkcS0vWyP
+zvocGcsUwfig6tbcOfcm4F3P77stleBx6m4LfWadk+AlWEebi4aph8CHIasC6Mw7
+IFGx6dcT6OAltP1F4ZMHO9DFt34SX6zgcqKgmjGya23JVk+MX7r3B0en3JJ0Q+7j
+QhekjcOu/46hKfPSZqE3kC7pvGcbdkkuGTgaRaL3QOKMJixY06paCz3uMG49eeNw
+dm3u4MmqA2lQG6JTNkTbcd8O5rhAVR1U5aWVYF7Td9AqJX4s31OiqzjPGOanVyuj
+l0zw5YI=
 -----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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOrZjs147dX
+H6MeWFVbTW6jVVDmuohNyeTAOEhAps8G1wJF1CyKW1DlmRrgEe1o6AfcbH9togsW
+X3/701G14Ct3kQ/PeeHVxSXiLpYnOyJpcebX/s4VE8UsMJQT0Lt4xj5JTHFb5IHs
+2dCOrR+81ogz954cZyNcpomv05FwYqYWno++urcgY9V2bxLVIQSwN0/ip7WTxH6q
+4ww12lNqbRPgiaPHGn+Z+4yQ+LuK5fdAeH2Jihbxh5D9OuaNipmfyzwjDsj9eAsa
+Kw9lt9/ip94/vL6a70Gncg3b3sUs7nXEUraz1/Aoaf6lH1SPVjWn87TeYKpU4LyU
+Hn8heQIIEMsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAgvs1vAZqF/1Up839lOZ+
+5bvZ19B/Z8h25xWM2pVvKDgi/9/tM0YjAWrjpUJQI8ex9LSNQvdxs4DYjV93RaNc
+YL0mf7NL+P1xA/5XLiXxPmpvJW7PfPimqymzfALyA/6os5dQJoYu4AQv7YgXYicH
+L8CDT875DP72L9fUwT8i9+y6uDQe8ETPowrSb8o4eGPT3m/qy0D2bbDMHXE9Sa0F
+UT3zmtI9gX/zLS3nxrB/5p6fQWJJrL02Yk4Q+9pTHkTzQ1D6XRD0K83IFItaRz66
+HOQZ7pHagOMbJ2JwSCw4E8HOCTg+DlB0WBzSRZTYa/4c3DHh4da7sW94xtN+oP0y
+vA==
 -----END CERTIFICATE-----
 
 server.pem:
 -----BEGIN CERTIFICATE-----
-MIICjzCCAfigAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDkxMDE1MjgzMloXDTQzMDkw
-NDE1MjgzMlowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
-B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA4ueKvOZqXR49sF2exsExLpbVK32rMPtZwN28NYCd
-GnMWRIYF2JB6lPWiTzWPUdEy4AmifEsiWE2ThsmBeX4cPz8YoEYt2aCenrAuFHiT
-7jwX433CEH8PgKQ5tbWKHxwz5PiktkRUWXP49KA27REJvQZMphwvRJ3uBZrxydtL
-zeMCAwEAAaNHMEUwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNV
-HREEHDAahwTAqAEKghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQAD
-gYEAc8/9nm5UksO7kuhco3BbqjzkY4YSU9w55XznhYsnKI50qAcNpjnrH5qoIzW7
-8XXCfv9JQYiE7xpNyqjcf+BrZniwsYfmDvbADcodnZMgstOdbFL9PniCZyJYEGK9
-0C5iusx4Pwc1cqvwewy5oX7HW7T4uF9s3ZJALotCTVtJSqA=
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE0NFoXDTQ1MTAw
+NjE1NTE0NFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALiCHlTCgVnziM0Xyoz462rcLsBHHPTkxcOv
+nivqKdGfo5uLiutIufeuhTCBmjv0Gy5k8kJKlzOddRMFEN1sqhAUNluPg+lKX3c+
+f/rIELIH0n5QZ9cujrPmidlDZ06LB17bRRSH3ikHhVyxc9qQnI1Sxem06NYmZtis
+3tzP+JGP63vh7DMeX2fnqZgfaJ9BFwGhnPb7Po070EdsjPwAuxV1TeSihp0DmvIf
+mTct3cB8hnrSmBV0r8WncTrmpH4r+KDH6nFy8+RiUbVh7nK0VTrwOJE6DoNOhnXE
+/svxYGC580xg1maYmpVycY0ZYBtTV8a1A/oX+06xUOMGmtsEXzECAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAAInl3kqvQgj
+XHOwjeUUEfnXmDZGyJ0apIGELgycnbylWwFri75Lo81XhysWPjJgSk85Mi+nRSaj
+dnBFKwimRQxbw6jeFv/t3OsB2WAcSLDVrFTWNyomODT0Yzv6FTPyg23geHIk7w6e
+yKOPi00CiK08fHwzIFD76H663WbWNocxiFwT5X5V1HMMdC8F5SfBwr8n4gfkjTsh
+HH5zcT7z+EfsE2sS3KXW7TLa1+Rg28lP9Hzl2OF3z6EZ0L/dmYAUH1MtzGyZ9BaN
+Kg60AV4Gumx7dohfq1EmDEiGBkde6MGfyOPCqF14Np+C5o7xzAlV8GLq/EvU7+YE
+iHyOKT7W4eE=
 -----END CERTIFICATE-----
 
 server-self.pem:
 -----BEGIN CERTIFICATE-----
-MIICDTCCAXYCCQDyTgBiXvBOyDANBgkqhkiG9w0BAQsFADBLMRMwEQYKCZImiZPy
-LGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEbMBkGA1UEAwwSc2Vy
-dmVyLmV4YW1wbGUuY29tMB4XDTE4MDkxMDE1MjgzMloXDTQzMDkwNDE1MjgzMlow
-SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
-GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEA4ueKvOZqXR49sF2exsExLpbVK32rMPtZwN28NYCdGnMWRIYF2JB6
-lPWiTzWPUdEy4AmifEsiWE2ThsmBeX4cPz8YoEYt2aCenrAuFHiT7jwX433CEH8P
-gKQ5tbWKHxwz5PiktkRUWXP49KA27REJvQZMphwvRJ3uBZrxydtLzeMCAwEAATAN
-BgkqhkiG9w0BAQsFAAOBgQAbZGd5kU53gt31RWnnqurK6UgbM3tjJuy6sfy2bSYm
-vAkOeUqXmwwE10f4q6zboBalXHiyPymhq8Ybq0EKko4KdIboe8oVbadwgS6NtR4w
-SqRDpJvb1AboHq/IERnYX9IPAg7v4HTxpIsAt6KWhecUoXWUhbfxfVRcLmcRl3qs
-wA==
+MIIDHTCCAgUCFFqspSI++V5kQNb7koLDFUDGnrJ2MA0GCSqGSIb3DQEBCwUAMEsx
+EzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMRsw
+GQYDVQQDDBJzZXJ2ZXIuZXhhbXBsZS5jb20wHhcNMjAxMDEyMTU1MTQ0WhcNNDUx
+MDA2MTU1MTQ0WjBLMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQB
+GRYHRVhBTVBMRTEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUuY29tMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuIIeVMKBWfOIzRfKjPjratwuwEcc9OTF
+w6+eK+op0Z+jm4uK60i5966FMIGaO/QbLmTyQkqXM511EwUQ3WyqEBQ2W4+D6Upf
+dz5/+sgQsgfSflBn1y6Os+aJ2UNnTosHXttFFIfeKQeFXLFz2pCcjVLF6bTo1iZm
+2Kze3M/4kY/re+HsMx5fZ+epmB9on0EXAaGc9vs+jTvQR2yM/AC7FXVN5KKGnQOa
+8h+ZNy3dwHyGetKYFXSvxadxOuakfiv4oMfqcXLz5GJRtWHucrRVOvA4kToOg06G
+dcT+y/FgYLnzTGDWZpialXJxjRlgG1NXxrUD+hf7TrFQ4waa2wRfMQIDAQABMA0G
+CSqGSIb3DQEBCwUAA4IBAQCFVv8RjkvrsG+PeQZdqPeIefoa1DcuF5vJk1Q0kuLx
+AIyZ4ruRDYfSqsyYQt3acxdyN1b/5PWczwFw0OCC69MRHW0tNZ8m+tPF/g1LIyF5
+yasy1QzBWlI4FMbpOZtWW9EO2dJ0/3m5Po/sFpgcSqZd8tojmWbbF0byQUkyzG/s
+6/llucIZFe6fUuB8CUWcSgMsh0rb5ZxP4rVqyc5fhhaKvgNdCN3VMk+Vpjb9E6QB
+tacbaPXLfd81hrl+nZp6TPqCaGwB/ZQxL880J4knM0WMyyn2UWsxpKVPSGgH5qmO
+hOF8ABiWYTqHYkfq1QegPIp9T8JAoefj8pYdKt0QE0rN
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/old-ca-key.pem b/tls/tests/files/old-ca-key.pem
index 89052477..faec803d 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 584fe4ab..1a95df64 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==
+MIIFLjCCBBagAwIBAgIUd5wcnmQZ6GQ47TknLc4CnHGU69EwDQYJKoZIhvcNAQEF
+BQAwgZ8xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+UExFMSwwKgYDVQQLDCNPbGQgVW50cnVzdGVkIENlcnRpZmljYXRlIEF1dGhvcml0
+eTEiMCAGA1UEAwwZb25jZS53YXMuYS5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3
+DQEJARYOY2FAZXhhbXBsZS5jb20wIBcNMjAxMDEyMTU1MTQzWhgPMjA1MDEwMDUx
+NTUxNDNaMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
+RVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZpY2F0ZSBBdXRo
+b3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAuHJbS6cniqUUQhwKTHrS0DlcPiaHvSMSW59aV7PiO0PI0t4CZ+6d
+95c+abDyk+84gD19CndoLPyg+tswhfUa2lmzBvqjTtliXJ8nIqctA0Y6Dy8TgoB6
+41HDDb2Gwtfxy1xlp7M8PqpqT/okReiVrFzfSADkD+sZKhhCfQQRhtN8WATu1rAd
+UMxE4plHsNOTLhDICITvSRQlapXAxFfwwB9DxQUueE4BwuHV/7pbqS6/C2l81jtI
+1U7FWYJ/UHqCyfQmvD350smYA//eJmc9SfsshaSijvNX5zSG2VJZvMqmKUMwhxg7
+kPr3jlldhgHUXlI1offXnJbcHIOt0gzkUwIDAQABo4IBXDCCAVgwHQYDVR0OBBYE
+FI3LV945I6o2AdFw6dbrZlrSu2sPMIHfBgNVHSMEgdcwgdSAFI3LV945I6o2AdFw
+6dbrZlrSu2sPoYGlpIGiMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZIm
+iZPyLGQBGRYHRVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5j
+b20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghR3nByeZBnoZDjtOSct
+zgKccZTr0TAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREE
+EjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTAN
+BgkqhkiG9w0BAQUFAAOCAQEANjkMb4Zo808FT/GjAucywTzP60I/0x1+QfXcytTX
+I3u7uDZZbuGzY8Y7Yg6ty9YBMf5RBp1vHfWqll9JoMe0MiF2Vb9AzDfiNIpRs2TO
+2NYfXiAsOhiP7AJcwR3GeqMjJLCtN940/6j/xuN6I2piSXStr5LRzq0u7lOK4mB8
+wnjxKP5maiNWAouzIqNr5N4Y1CderQWqGHBSbTV9ezvrCHPI20mjhzHKcSPdVyEW
+t0VSpU2pfkbz90kMiVMFd5aPSnagpdM3aLs/4cle1UE4mxo2XwRcl5Q/T5EeaGzN
+4M3ktSpVfpykscT8JmSgnGPqOD6+PEd5phBMq1DhgQgymw==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/root-ca-csr.pem b/tls/tests/files/root-ca-csr.pem
index a07fbac7..99699c5a 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
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7Tdqbl0uY7TKFF
+4v2o48E1CU2Yu4RFV8iWtW6I0T6x8VZVfEuLqHRFRMWPW3tyd5CSapSQDcmAbNyI
+mYMZh1q+K3IirILgn7tk6ab5UiLtLu9wOWztr07mynrznE34J68R9geWxnuTBkR3
+Sq/BufnB7eubZzpoQLslnnyf5m1g/ikMXjt1RDtObPCAPnuPY2ShHSOCKI/A0/LD
+Aqo4or+JYU+4dwtImXWWLcerF4aVjcBtffIrL1JZ9BZD3sZjlYDHlU6u3ppbWuka
+wNtSPER7S5kc4kXC20qPu4AygHUH7NWgt860Lt+EwIQDFlXF2D0QRurF1b7tx1P+
+RPMxTEECAwEAAaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFE+bVI1i5QRz
+WjB6DBO+WWmMp792MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0G
+CSqGSIb3DQEBBQUAA4IBAQABFFKEMAniFkgENqWpKsdQQ6yiiXYVP1N4kYZjyfn2
+MYPN5E55b+FhvI8sFO3yFok3F/UQv1jDeoA/PC/C6rghxlOUXVrpqmPFLKKiOVqU
+0vbAgqkDrUH5iWJEG88usvyoBWyDW+25QuRtaJarss5clCdkV4TCkpxaA70JNil4
++C2cxC1XLgiMzYEIbSzw+pjWQtznW27hXbAOrKQ/ZaOcqW55Vex+5WGdPPfKXIOx
+xJqCdhlLgQd/7YogQe7zw1aIjYhK1EaO0ko6rTJek8tnVEoh4SmOh8CML6t8Y7/4
+oB9RICsQZYrXWAZIoOrfxxdpD+qycdvx+gQBEfjIi3zt
 -----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-and-key.pem b/tls/tests/files/server-and-key.pem
index 1fa3d70a..07bf06f3 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=
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE0NFoXDTQ1MTAw
+NjE1NTE0NFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALiCHlTCgVnziM0Xyoz462rcLsBHHPTkxcOv
+nivqKdGfo5uLiutIufeuhTCBmjv0Gy5k8kJKlzOddRMFEN1sqhAUNluPg+lKX3c+
+f/rIELIH0n5QZ9cujrPmidlDZ06LB17bRRSH3ikHhVyxc9qQnI1Sxem06NYmZtis
+3tzP+JGP63vh7DMeX2fnqZgfaJ9BFwGhnPb7Po070EdsjPwAuxV1TeSihp0DmvIf
+mTct3cB8hnrSmBV0r8WncTrmpH4r+KDH6nFy8+RiUbVh7nK0VTrwOJE6DoNOhnXE
+/svxYGC580xg1maYmpVycY0ZYBtTV8a1A/oX+06xUOMGmtsEXzECAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAAInl3kqvQgj
+XHOwjeUUEfnXmDZGyJ0apIGELgycnbylWwFri75Lo81XhysWPjJgSk85Mi+nRSaj
+dnBFKwimRQxbw6jeFv/t3OsB2WAcSLDVrFTWNyomODT0Yzv6FTPyg23geHIk7w6e
+yKOPi00CiK08fHwzIFD76H663WbWNocxiFwT5X5V1HMMdC8F5SfBwr8n4gfkjTsh
+HH5zcT7z+EfsE2sS3KXW7TLa1+Rg28lP9Hzl2OF3z6EZ0L/dmYAUH1MtzGyZ9BaN
+Kg60AV4Gumx7dohfq1EmDEiGBkde6MGfyOPCqF14Np+C5o7xzAlV8GLq/EvU7+YE
+iHyOKT7W4eE=
 -----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 aea69db0..1e3bd3ee 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
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALA2UdCahuw94BsmB10h8qrY/Kyg5s76
+oGMa/A2r1TIqk3g7bZ0i5K+9yDro4YPkF4tUa71P5/2jLv4i7n7pQK5LlbC/L3Uj
+gXBY5m2jcUh7xZOimmrIZkeHH2aacJJv7H7F49NVlG+FI5QsWedCbJ6basdkU8PS
+xfsaE01o/KLbIJOR6zNZaybVf+drAnImeFsdLyL6wzYGMjyFdH9mCHus048pGpzh
+yXVkrRIcjARHyA9RBKGHW60fWNB3Cc8dgSC7qjdIlnmNcXRXUoRifqSwGL7T8Goa
+vGE51TQ4Waf6XL9SYdVmEJea/mac9tHboiZRj5XeD8X6AVWLlRxJwzMCAwEAAaAx
+MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
+ATANBgkqhkiG9w0BAQsFAAOCAQEAAQQ0wPKWw8jlswzGwNrQeWmDjwQ+7SpZ++WM
+B7Sjq35qw/2tNwJqUPMZL2neuEwQf5Apz2YlTcT0ZAMqPx32a+RewwmuugiUKfad
+YURlq4wx+qNPfxffpotzii1jRVSF5rDSVrvpeePf6caVgPJvCvDVwoHofygrY51O
+7Nsw0H2lfd0UAh4/t8zW1rrFPTlilla3uqo9Iih+kXK/eipz10EWnlrupXnN7vDn
+2thoEe8EJvVVbDuxCkF3VeQcjqjahn6xCIoJNvt+ZXpV2jXColdHkky1r1C3935j
+Um8ZYZFteby1VjR96d+XlepO5dpihwQ4zA0nnoT6TA2UfZXxYw==
 -----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-intermediate-key.pem b/tls/tests/files/server-intermediate-key.pem
index c5ce4f74..b0b2d34c 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 e23848d5..cbcb0d23 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
+LWNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE1MVoXDTQ1MTAwNjE1NTE1MVow
 SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
-GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEAl0zF3tH3V9QquvMVFgAGREcxj59CGM9X7TCWWNycgbhITJxR8Wqb
-AlHmpjGVFWtmZPvheg4pEUppzPGiaIfX/cdTXuAB/cQ/iGyabvsQA9d75VjQL3ca
-ZjJvspO2s/lOuP3XZX9QpngKGTbQ0DEzNeadG1ckFuXOWOj5DkgIUV0CAwEAAaNH
-MEUwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTA
-qAEWghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADgYEACXgdI2AC
-f2QByzeXmmMgFm7jLsYw28S6Jvj6vFM9Rzg5Zta64B3kvT2+yk/gaKMBYCBtvRud
-6vjXKrCYlfdJa2yH4HtN1GDL6KYvx0/qJamT71pVvCuLIDzYMf0CcvoYtHZ5HDp3
-RFmQfU4QUk5+0YwwkpBFNQ4oiKjVPTBd5J4=
+GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALA2UdCahuw94BsmB10h8qrY/Kyg5s76oGMa/A2r1TIqk3g7
+bZ0i5K+9yDro4YPkF4tUa71P5/2jLv4i7n7pQK5LlbC/L3UjgXBY5m2jcUh7xZOi
+mmrIZkeHH2aacJJv7H7F49NVlG+FI5QsWedCbJ6basdkU8PSxfsaE01o/KLbIJOR
+6zNZaybVf+drAnImeFsdLyL6wzYGMjyFdH9mCHus048pGpzhyXVkrRIcjARHyA9R
+BKGHW60fWNB3Cc8dgSC7qjdIlnmNcXRXUoRifqSwGL7T8GoavGE51TQ4Waf6XL9S
+YdVmEJea/mac9tHboiZRj5XeD8X6AVWLlRxJwzMCAwEAAaNHMEUwCQYDVR0TBAIw
+ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBACRYo07Kiituv71ai+fsIHZ0
+oCzhr6SuwqYwywIz0+VvNid0H1dz1MK7R7jeLYUzgEUvwz0goz++j0ZSi+rK8VBG
+abY7QOwLyqv0+81+zhFLL5EFRNG8eO3kC61b20JxLGiRBpo5qJGNI5rV7pqsNbzk
+nfS4aHJcrkGPcSmLHYi9UBjJRbonwb4stUa0ziyptTVkTtvgGmTm1tuoEedAi90H
+oj/9VCf1shs47AjxokZqpnr36Dp8acz9zsaod9ZDAfZdwNrh4Vf958k4wHk3PGcb
+aVqhyPjuIGVJ+7KJWxcmZ/3RQxmEg0xB6i7umhhmmRmYCMPB8fDTdDvnFdC4N+Q=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/server-key.der b/tls/tests/files/server-key.der
index c1f9a917..81d4449c 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 6f6fe996..7cfe3394 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 e1215b39..09787533 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==
+MIIDHTCCAgUCFFqspSI++V5kQNb7koLDFUDGnrJ2MA0GCSqGSIb3DQEBCwUAMEsx
+EzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMRsw
+GQYDVQQDDBJzZXJ2ZXIuZXhhbXBsZS5jb20wHhcNMjAxMDEyMTU1MTQ0WhcNNDUx
+MDA2MTU1MTQ0WjBLMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQB
+GRYHRVhBTVBMRTEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUuY29tMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuIIeVMKBWfOIzRfKjPjratwuwEcc9OTF
+w6+eK+op0Z+jm4uK60i5966FMIGaO/QbLmTyQkqXM511EwUQ3WyqEBQ2W4+D6Upf
+dz5/+sgQsgfSflBn1y6Os+aJ2UNnTosHXttFFIfeKQeFXLFz2pCcjVLF6bTo1iZm
+2Kze3M/4kY/re+HsMx5fZ+epmB9on0EXAaGc9vs+jTvQR2yM/AC7FXVN5KKGnQOa
+8h+ZNy3dwHyGetKYFXSvxadxOuakfiv4oMfqcXLz5GJRtWHucrRVOvA4kToOg06G
+dcT+y/FgYLnzTGDWZpialXJxjRlgG1NXxrUD+hf7TrFQ4waa2wRfMQIDAQABMA0G
+CSqGSIb3DQEBCwUAA4IBAQCFVv8RjkvrsG+PeQZdqPeIefoa1DcuF5vJk1Q0kuLx
+AIyZ4ruRDYfSqsyYQt3acxdyN1b/5PWczwFw0OCC69MRHW0tNZ8m+tPF/g1LIyF5
+yasy1QzBWlI4FMbpOZtWW9EO2dJ0/3m5Po/sFpgcSqZd8tojmWbbF0byQUkyzG/s
+6/llucIZFe6fUuB8CUWcSgMsh0rb5ZxP4rVqyc5fhhaKvgNdCN3VMk+Vpjb9E6QB
+tacbaPXLfd81hrl+nZp6TPqCaGwB/ZQxL880J4knM0WMyyn2UWsxpKVPSGgH5qmO
+hOF8ABiWYTqHYkfq1QegPIp9T8JAoefj8pYdKt0QE0rN
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/server.der b/tls/tests/files/server.der
index 8e36caac..469c447d 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 573827c4..0b7102a9 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=
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE0NFoXDTQ1MTAw
+NjE1NTE0NFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALiCHlTCgVnziM0Xyoz462rcLsBHHPTkxcOv
+nivqKdGfo5uLiutIufeuhTCBmjv0Gy5k8kJKlzOddRMFEN1sqhAUNluPg+lKX3c+
+f/rIELIH0n5QZ9cujrPmidlDZ06LB17bRRSH3ikHhVyxc9qQnI1Sxem06NYmZtis
+3tzP+JGP63vh7DMeX2fnqZgfaJ9BFwGhnPb7Po070EdsjPwAuxV1TeSihp0DmvIf
+mTct3cB8hnrSmBV0r8WncTrmpH4r+KDH6nFy8+RiUbVh7nK0VTrwOJE6DoNOhnXE
+/svxYGC580xg1maYmpVycY0ZYBtTV8a1A/oX+06xUOMGmtsEXzECAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAAInl3kqvQgj
+XHOwjeUUEfnXmDZGyJ0apIGELgycnbylWwFri75Lo81XhysWPjJgSk85Mi+nRSaj
+dnBFKwimRQxbw6jeFv/t3OsB2WAcSLDVrFTWNyomODT0Yzv6FTPyg23geHIk7w6e
+yKOPi00CiK08fHwzIFD76H663WbWNocxiFwT5X5V1HMMdC8F5SfBwr8n4gfkjTsh
+HH5zcT7z+EfsE2sS3KXW7TLa1+Rg28lP9Hzl2OF3z6EZ0L/dmYAUH1MtzGyZ9BaN
+Kg60AV4Gumx7dohfq1EmDEiGBkde6MGfyOPCqF14Np+C5o7xzAlV8GLq/EvU7+YE
+iHyOKT7W4eE=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/ssl/ca.conf b/tls/tests/files/ssl/ca.conf
index bf776ec5..e97c0b09 100644
--- a/tls/tests/files/ssl/ca.conf
+++ b/tls/tests/files/ssl/ca.conf
@@ -1,7 +1,8 @@
 # Root CA
 
 [ req ]
-# Use SHA-1 to verify that it does not affect the trust of root certificates.
+# Use SHA-1 to verify that it does not affect the trust of trust roots,
+# even if SHA-1 is disallowed for all other certificates.
 default_md              = sha1
 utf8                    = yes
 string_mask             = utf8only


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]