[glib-networking/mcatanzaro/#140: 2/2] Stop using SHA-1 signatures for root certificates




commit 5dcc707eedfef2ab219c6354e1a462fdedf1a468
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Oct 12 12:51:00 2020 -0500

    Stop using SHA-1 signatures for root certificates
    
    SHA-1 is still allowed for certificates that are trust roots, but it is
    NOT allowed for the "alternative" CA certificate sent in the chain,
    because that alternative certificate is not a trust root, even though it
    has the same public key as a trust root.
    
    Interestingly, only GnuTLS rejects SHA-1 on the alternative CA
    certificate with F33 crypto policy. OpenSSL allows it. I guess the
    OpenSSL behavior seems reasonable, because there should be no security
    risk to allowing SHA-1 signatures for a certificate that has the same
    public key as a trust root. If the owner of the corresponding private
    key is not trusted, then it should not have any certificates installed
    as trust roots.
    
    Fixes #140

 tls/tests/connection.c                      |   2 +-
 tls/tests/files/ca-alternative.pem          |  34 +++----
 tls/tests/files/ca-key.pem                  |  50 +++++-----
 tls/tests/files/ca-roots-bad.pem            |  36 +++----
 tls/tests/files/ca-roots.pem                |  36 +++----
 tls/tests/files/ca.pem                      |  36 +++----
 tls/tests/files/chain.pem                   |  96 +++++++++----------
 tls/tests/files/client-and-key.pem          |  80 ++++++++--------
 tls/tests/files/client-future.pem           |  26 ++---
 tls/tests/files/client-key.pem              |  50 +++++-----
 tls/tests/files/client-past.pem             |  26 ++---
 tls/tests/files/client.pem                  |  30 +++---
 tls/tests/files/client2-and-key.pem         |  78 +++++++--------
 tls/tests/files/client2-key.pem             |  50 +++++-----
 tls/tests/files/client2.pem                 |  28 +++---
 tls/tests/files/intermediate-ca-csr.pem     |  28 +++---
 tls/tests/files/intermediate-ca-key.pem     |  50 +++++-----
 tls/tests/files/intermediate-ca.pem         |  34 +++----
 tls/tests/files/non-ca.pem                  | 142 ++++++++++++++--------------
 tls/tests/files/old-ca-key.pem              |  50 +++++-----
 tls/tests/files/old-ca.pem                  |  38 ++++----
 tls/tests/files/root-ca-csr.pem             |  28 +++---
 tls/tests/files/server-and-key.pem          |  80 ++++++++--------
 tls/tests/files/server-intermediate-csr.pem |  24 ++---
 tls/tests/files/server-intermediate-key.pem |  50 +++++-----
 tls/tests/files/server-intermediate.pem     |  26 ++---
 tls/tests/files/server-key.der              | Bin 1193 -> 1190 bytes
 tls/tests/files/server-key.pem              |  50 +++++-----
 tls/tests/files/server-self.pem             |  30 +++---
 tls/tests/files/server.der                  | Bin 920 -> 920 bytes
 tls/tests/files/server.pem                  |  30 +++---
 tls/tests/files/ssl/ca.conf                 |   4 +-
 tls/tests/files/ssl/old-ca.conf             |   2 +-
 33 files changed, 661 insertions(+), 663 deletions(-)
---
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index a11f7df8..eb18a588 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 "d/I7Y7MRUTmOTX/SfuxmGZu0WnqqWSl+Zmeg5svzZ80="
+#define SERVER_CERT_DIGEST_B64 "kGOeAZnSeNtf5yzBZzUhbKFpW9qsPV+lIB/4t96OV+E="
 static void
 test_connection_binding_match_tls_server_end_point (TestConnection *test,
                                                     gconstpointer   data)
diff --git a/tls/tests/files/ca-alternative.pem b/tls/tests/files/ca-alternative.pem
index bcf7ede9..3793a1a1 100644
--- a/tls/tests/files/ca-alternative.pem
+++ b/tls/tests/files/ca-alternative.pem
@@ -3,27 +3,27 @@ MIIFAjCCA+qgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBnzETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBV
 bnRydXN0ZWQgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndh
 cy5hLmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNv
-bTAgFw0yMDEwMTIxNTUxNDNaGA8yMDUwMTAwNTE1NTE0M1owgYYxEzARBgoJkiaJ
+bTAgFw0yMDEwMTIxNzQ5NDRaGA8yMDUwMTAwNTE3NDk0NFowgYYxEzARBgoJkiaJ
 k/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVD
 ZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0w
 GwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAK7Tdqbl0uY7TKFF4v2o48E1CU2Yu4RFV8iWtW6I0T6x8VZV
-fEuLqHRFRMWPW3tyd5CSapSQDcmAbNyImYMZh1q+K3IirILgn7tk6ab5UiLtLu9w
-OWztr07mynrznE34J68R9geWxnuTBkR3Sq/BufnB7eubZzpoQLslnnyf5m1g/ikM
-Xjt1RDtObPCAPnuPY2ShHSOCKI/A0/LDAqo4or+JYU+4dwtImXWWLcerF4aVjcBt
-ffIrL1JZ9BZD3sZjlYDHlU6u3ppbWukawNtSPER7S5kc4kXC20qPu4AygHUH7NWg
-t860Lt+EwIQDFlXF2D0QRurF1b7tx1P+RPMxTEECAwEAAaOCAVwwggFYMB0GA1Ud
-DgQWBBRPm1SNYuUEc1owegwTvllpjKe/djCB3wYDVR0jBIHXMIHUgBSNy1feOSOq
-NgHRcOnW62Za0rtrD6GBpaSBojCBnzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUG
+ggEPADCCAQoCggEBAKWFJia5M5GJSnjxTbIW/h5Rl0/uS7jek4Rfk5fsy+2lxPk6
+/a+rdVXNHtLKmF8ouG8QocYr+MQNvGedhqSv8L+ViZXlz/zh/DMk5mzQUOSi5yrj
+jQbOJ8oeEAK2mXF42x4mNiNmBdUsavnaemXAoCX2f05wci0sGDS1fxUyGMV5Bay3
+2YCrFVyhfYUKbs9ItpMuyngIfBOVH7wa9N+XQuQIvT/ZZ2x/0PgbQWv+JFmIfMV4
+KuIZXuJYM0zmoLQEjgF1kdOpyoLot4u1EmgqceZakTTRZvst4rAZqib6F5lBgsZm
+4ige4KAQjGfJlVjiPBiAo/KyJjeu/d0iwLNdsHcCAwEAAaOCAVwwggFYMB0GA1Ud
+DgQWBBSLcFF+Oi4WrdNajz7wc6U4i2X3OzCB3wYDVR0jBIHXMIHUgBQJPzDGBIUp
+4KIn7BhZJbgPBpUEe6GBpaSBojCBnzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUG
 CgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBVbnRydXN0ZWQgQ2Vy
 dGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndhcy5hLmNhLmV4YW1w
-bGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbYIUd5wcnmQZ6GQ4
-7TknLc4CnHGU69EwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwGQYD
+bGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbYIUJMXPCPBYU7Ju
+V+eZvzCqQcLy6H8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwGQYD
 VR0RBBIwEIEOY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAAYeD6KY5KsVVx75990/BZeP0Q5RODyIQcF1
-nyzFfEhvGQhT8ZU/fLSpHzevgof0dgdJyTj69ABWZNI49PAF+AKE3zIQ4RqvSxBW
-diVvLEpZ9b7z8aURHBuNpfrdk5wJvnmOBU7HoVa1ZxhPe+pJyiQF9dVmUoUiTBYF
-qon1dOe4mQkjvrvSx3dgWOY9dokjht9wa+YPERRjUO6Mx+0VLXXCQTfMSPUwnKFb
-GJUC/70Pg7by3Nhp3uM3cjYp/abFolZ3nKO71kAkssmyNQUxlp2JQ0aUC4row6pN
-TKKy4l6lpdUSAxcgkN1MNsHc1vJ0DluVvrS/VWGajBtGKWi0pt4=
+b20wDQYJKoZIhvcNAQELBQADggEBABSrlQqoWp6reJsOYmlxUbDQJ5OuqcZuKEkn
+gscxFXeprhDD7eJmD8qHqFmfgM8e/tbnQw1xSOBgYpifVQRSij+TBWrJpX7980e7
+FKLPI5oOS/3geInW3Rs3EzfpGK1fKNR8mtTZj4hb0FnMpFXgiTYmRAeqQf3PCRge
+5Is8VP8eTtnzLi8gK8i8A97SOWyuqy/dzIz0UPthc0qvq5u7LR8sJZ901kWjBazq
+0KbZ/pyUrmLHaa07q8aU5Z1FPSH5l2PmtXtSfTvHBn8onG1LYF0WhjZ0qxsGvuRR
+9JX4dzGE2D8ub9f7B+ouF9hS6FIFujBNelk9dyirIgx+994qhPU=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/ca-key.pem b/tls/tests/files/ca-key.pem
index d38828b0..1a42c34e 100644
--- a/tls/tests/files/ca-key.pem
+++ b/tls/tests/files/ca-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/ca-roots-bad.pem b/tls/tests/files/ca-roots-bad.pem
index 0ee876d0..1cceb7ab 100644
--- a/tls/tests/files/ca-roots-bad.pem
+++ b/tls/tests/files/ca-roots-bad.pem
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAEczQIV4gb3wa
-lt3FzDZD4Xl9uB5VhyHl1LmWcDwBjTtM9gQh3VsjY/R8X85xz9bN+PsXhcTxKuyG
-MBS0zC+ug+Y6EohMVXFIjp73hcgSose49TfGIQ0I5DnyLTVRQoN3KNYCL1MvTGNW
-6vPOtmS6mun8c9kwa8kgV5q7YwSTUjbJKAwTszJ9ZPL3x8lKwY/VnP0OqqJYfpxz
-tgcPMsOiJmgrxEm1cG1yU1sBYfFKLvuDnC3XXuj7FyR/kkPxMW4fFz6v7jpEmr/8
-u04CYJelLtxmxe+4fE4AyqtWNgUiI5DGv406LfxpniPE5Gvj+UgOVFBurJSlVs8G
-MIn9PM5gxw==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAiUkWAtz07x28
+KiIulj7uhjFuSsylbj4SuMRdZcaGJjZumAlOrO1wc6GK2qz/Vd14lBiPAMm5t0np
+BkTNfRb5euIY6gBZ7LSJYEsOZmYfYPGv1nt5A5XtljaI40ojU6vqAfRUYGYd9OrU
+GzoL7CQv8PG8W1tITWdIi3pv9vDjZqxPj2umM39fH7Xh3Mb20nx2tHQaMfSGjjW4
+ASzr0XSRA3HroTQrbxvUtpijHpzMajqOub0DcSFs7Kk0Rb6Ja+WzH2ALT0LInt2r
+NvfKjk9Abd2rjqFMaYc9rCtqjbq4FQC3ymlDBDsbMC8qsByHAjDBiox+qSGZZTjS
+MbJ0cWIRVg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
diff --git a/tls/tests/files/ca-roots.pem b/tls/tests/files/ca-roots.pem
index 6b421e88..0d2d24c5 100644
--- a/tls/tests/files/ca-roots.pem
+++ b/tls/tests/files/ca-roots.pem
@@ -1,33 +1,33 @@
 These are some CA certificates
 
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-MIn9PM5gxw==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAiUkWAtz07x28
+KiIulj7uhjFuSsylbj4SuMRdZcaGJjZumAlOrO1wc6GK2qz/Vd14lBiPAMm5t0np
+BkTNfRb5euIY6gBZ7LSJYEsOZmYfYPGv1nt5A5XtljaI40ojU6vqAfRUYGYd9OrU
+GzoL7CQv8PG8W1tITWdIi3pv9vDjZqxPj2umM39fH7Xh3Mb20nx2tHQaMfSGjjW4
+ASzr0XSRA3HroTQrbxvUtpijHpzMajqOub0DcSFs7Kk0Rb6Ja+WzH2ALT0LInt2r
+NvfKjk9Abd2rjqFMaYc9rCtqjbq4FQC3ymlDBDsbMC8qsByHAjDBiox+qSGZZTjS
+MbJ0cWIRVg==
 -----END CERTIFICATE-----
 
 GLib shouldn't care about this comment
diff --git a/tls/tests/files/ca.pem b/tls/tests/files/ca.pem
index 137f867d..d5747afe 100644
--- a/tls/tests/files/ca.pem
+++ b/tls/tests/files/ca.pem
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE4zCCA8ugAwIBAgIUUKz5F3Z4HG+WHEFnBiXEuJ7Ixk0wDQYJKoZIhvcNAQEF
+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
-MDEwMTIxNTUxNDNaGA8yMDUwMTAwNTE1NTE0M1owgYYxEzARBgoJkiaJk/IsZAEZ
+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
-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
+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
-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
+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
-EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAEczQIV4gb3wa
-lt3FzDZD4Xl9uB5VhyHl1LmWcDwBjTtM9gQh3VsjY/R8X85xz9bN+PsXhcTxKuyG
-MBS0zC+ug+Y6EohMVXFIjp73hcgSose49TfGIQ0I5DnyLTVRQoN3KNYCL1MvTGNW
-6vPOtmS6mun8c9kwa8kgV5q7YwSTUjbJKAwTszJ9ZPL3x8lKwY/VnP0OqqJYfpxz
-tgcPMsOiJmgrxEm1cG1yU1sBYfFKLvuDnC3XXuj7FyR/kkPxMW4fFz6v7jpEmr/8
-u04CYJelLtxmxe+4fE4AyqtWNgUiI5DGv406LfxpniPE5Gvj+UgOVFBurJSlVs8G
-MIn9PM5gxw==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAiUkWAtz07x28
+KiIulj7uhjFuSsylbj4SuMRdZcaGJjZumAlOrO1wc6GK2qz/Vd14lBiPAMm5t0np
+BkTNfRb5euIY6gBZ7LSJYEsOZmYfYPGv1nt5A5XtljaI40ojU6vqAfRUYGYd9OrU
+GzoL7CQv8PG8W1tITWdIi3pv9vDjZqxPj2umM39fH7Xh3Mb20nx2tHQaMfSGjjW4
+ASzr0XSRA3HroTQrbxvUtpijHpzMajqOub0DcSFs7Kk0Rb6Ja+WzH2ALT0LInt2r
+NvfKjk9Abd2rjqFMaYc9rCtqjbq4FQC3ymlDBDsbMC8qsByHAjDBiox+qSGZZTjS
+MbJ0cWIRVg==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/chain.pem b/tls/tests/files/chain.pem
index 15af02b9..95c96e4a 100644
--- a/tls/tests/files/chain.pem
+++ b/tls/tests/files/chain.pem
@@ -3,78 +3,78 @@ MIIDuzCCAqOgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
 bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
 aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE1MVoXDTQ1MTAwNjE1NTE1MVow
+LWNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE3NDk1MVoXDTQ1MTAwNjE3NDk1MVow
 SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
 GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALA2UdCahuw94BsmB10h8qrY/Kyg5s76oGMa/A2r1TIqk3g7
-bZ0i5K+9yDro4YPkF4tUa71P5/2jLv4i7n7pQK5LlbC/L3UjgXBY5m2jcUh7xZOi
-mmrIZkeHH2aacJJv7H7F49NVlG+FI5QsWedCbJ6basdkU8PSxfsaE01o/KLbIJOR
-6zNZaybVf+drAnImeFsdLyL6wzYGMjyFdH9mCHus048pGpzhyXVkrRIcjARHyA9R
-BKGHW60fWNB3Cc8dgSC7qjdIlnmNcXRXUoRifqSwGL7T8GoavGE51TQ4Waf6XL9S
-YdVmEJea/mac9tHboiZRj5XeD8X6AVWLlRxJwzMCAwEAAaNHMEUwCQYDVR0TBAIw
+ggEPADCCAQoCggEBAN4t3FBzYQk48Bzm7S9JiZqmWVY/FagC9aim8foydtzXXcXj
+IEWc6AChko8FhLJAp5ZJCxm7MbYc5pZfyGgecBawG13fKYoPo+59dUJAw8xkENKC
+i57K0fsfwZf4v0SqawmYUj9AtIsy8Q6xTRfVHA+Pj2qbNNTMIUzgIg3b7TpGnhjN
+DlxYzXLPThiKD8Vm+SrXOm8W+hCpIivyGDNWCxTo1MHj2UUmHPGHfwZXCJ9dt8sc
+QTV1B0TeTJ3Xm/w+aAzUfbdlkCufsk6nLsj+gYMRkGGsYo/GmAv4/PPUop+yNK6V
+LL1nNgp0hP+VwvGU2cpn6BRBmpUu5xHrXkHjU+ECAwEAAaNHMEUwCQYDVR0TBAIw
 ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
-ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBACRYo07Kiituv71ai+fsIHZ0
-oCzhr6SuwqYwywIz0+VvNid0H1dz1MK7R7jeLYUzgEUvwz0goz++j0ZSi+rK8VBG
-abY7QOwLyqv0+81+zhFLL5EFRNG8eO3kC61b20JxLGiRBpo5qJGNI5rV7pqsNbzk
-nfS4aHJcrkGPcSmLHYi9UBjJRbonwb4stUa0ziyptTVkTtvgGmTm1tuoEedAi90H
-oj/9VCf1shs47AjxokZqpnr36Dp8acz9zsaod9ZDAfZdwNrh4Vf958k4wHk3PGcb
-aVqhyPjuIGVJ+7KJWxcmZ/3RQxmEg0xB6i7umhhmmRmYCMPB8fDTdDvnFdC4N+Q=
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAHxnwEN8Xr9TUrHefXPdcDU2
+yd4F3u4bPL4RSSRFIKdqrAaHK0wnzLoF3HneUjKzU/l36kNHBa7dUo8Q2SGd3V4d
+zDR0uT9uUdsZVwmUbAcZs1Z9d1vPMWDqS1zwBKYtLTw2Z7sl9xaLYhxLZSyf1Pxe
+aC8+gNaqJ25aKAbDSMNCyF32vRy4OYy7Hi8Itexkva6XMlF4H4gSXs4QZP9WGhp7
+6YRdcy6Z6lJfkJ9SW6nsoNJvbYGOGbxHg9brxWJV8T7cFBQQVvZKasydS6+6IK/2
+/+n38vEog/7hGQ85iOsu0xOcdkKl/SIj1ckJtGAVif2kbCSzugSafA2jRELyiI0=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFAjCCA+qgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE1MVoXDTQ1MTAw
-NjE1NTE1MVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE3NDk1MVoXDTQ1MTAw
+NjE3NDk1MVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
 FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
 aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
 BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAORh8EDpQkDYMceg6ZiiNh42ltC+qJOm
-qVNlHHla0jp1iYJdNZyRKYlVhp8xq7sxuRheocDM1R8KpiCrE1LyY1i6LGkflFp7
-8y4l37K8bW8Qml3TWfmK/B3Xf+LOPbOvcWbKZ+egNZwhPt+3M+l4+lz2r5a2ZYwK
-Z/kvfQEBe/zM6pDZ8zVrJC1k5/4RvpnPiPk29ji69fvWy8dfhUv3S91tnAW5XP12
-1pOFsVCVBQdDu6P2kRx9etf6cHT5YgUTkBWBUJqu4Fq3gaBoDkqW1GVuI9zdBS2r
-NUvGVQoOrxeiOZPFlaPF5zZ9DYMVWUCeDOU+PrR0YU0LHW3Tr4ngfLcCAwEAAaOC
-AVAwggFMMB0GA1UdDgQWBBRkVk8N43l2EZv18wP70cL7oOmKPjCBxgYDVR0jBIG+
-MIG7gBRPm1SNYuUEc1owegwTvllpjKe/dqGBjKSBiTCBhjETMBEGCgmSJomT8ixk
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBANEiR6aaGVdhIBCTJDbB0KBjAYu1f5on
+K3d+meKkp/K5V2DeatnupjqEkK8qEzzl8a81YblGg/k0mghDQMA+Rm9POPVNugUw
+uOlzlfOshVuNRVGMh+Svu7Sa8y++eMiQnWYk3nQETGa0C+4Lwx/khIfXJ4QQ0SWE
+3RDkNLS052zRXeyTsOnvFRtnLw3Z4rQWJrdJtvcHIL534jEsR8B/6sheYm3uL+Nu
+pH+NdiWnqWFglrvObG4Diyki1A7u1SHIBMwdc1sHu7yDrKsrTijqPbQpdRrip3jH
+RAMjH+KFzeUaJR8hlnIUgwctdw6kgG7OfQPq1hWtfpI8mJ4CFhux3/cCAwEAAaOC
+AVAwggFMMB0GA1UdDgQWBBRwLIOiczD2pbLEqglbtvsAlJFwtjCBxgYDVR0jBIG+
+MIG7gBSLcFF+Oi4WrdNajz7wc6U4i2X3O6GBjKSBiTCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRQrPkXdngcb5YcQWcGJcS4nsjGTTAP
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQ+s67jByiORo59Mf4YWphlAh5esDAP
 BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
 cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAD2YKTWbSnaWS3ICzQqElJi09lsZkZEwSaPd
-hLQcMx8GB/O73/TvEi58HoeIyQPEC8FWBqSLIWdx+Pq0F91X6bIz6ghLQ2oKAqbn
-W4GX/7voIt2OXCLuOs10rrADsjYfj56D/SoG+hV3pS8hoscoBSXLjKXgNkZd2jtl
-F6BhFn1r/kmo/B0xGnFFzM/3djoA4zh4QoxZ5Efq0RtpMsrxYdYop2PThF2p7OQO
-Rxu9dAjriYxcc/PQOfYTuCKaIYGawWoruRT+awf4FTukSkLoLM3xr/kmgqs3Y2fH
-pNRyvnMmyJzJ92Xeo71jfCHF/6DxIdN9ZKJ5pzY3CZOp/a56fiE=
+b20wDQYJKoZIhvcNAQELBQADggEBADb+0KoGV/ZzUQ2moJnOQQRUL9HLtG9OC8Hh
+MZhGO0IhpwOkiT1Jy05n1tXu6x+XC3XI8WmzP6uuuNGmWoq38+AdtofPDXKnnLBN
+L3WU+JGI2cZ9eBv/yv1QeFxPFR9IuVMXc+Pt+2TVoV2ancDeH31GKqkktPO2G50g
+1F8AxaAV/PYIFQVGxH2+Cra3HKOcGWk7qHZBUh/Llvy+UWL6oa2MPBPmawNFq0Jm
+pIIO7SJzIieGTZL/X9GDOyGA4q9onvIJ2NHekIflYDG7hu440rG2evrnkjg63sBA
+QWp62b4ftpTxkvg1aLN92ciNVnajHv6Zc6HP1dBClWI26Hu8TRI=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIE4zCCA8ugAwIBAgIUUKz5F3Z4HG+WHEFnBiXEuJ7Ixk0wDQYJKoZIhvcNAQEF
+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
-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
+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
-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
+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
-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
+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
-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
-MIn9PM5gxw==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAiUkWAtz07x28
+KiIulj7uhjFuSsylbj4SuMRdZcaGJjZumAlOrO1wc6GK2qz/Vd14lBiPAMm5t0np
+BkTNfRb5euIY6gBZ7LSJYEsOZmYfYPGv1nt5A5XtljaI40ojU6vqAfRUYGYd9OrU
+GzoL7CQv8PG8W1tITWdIi3pv9vDjZqxPj2umM39fH7Xh3Mb20nx2tHQaMfSGjjW4
+ASzr0XSRA3HroTQrbxvUtpijHpzMajqOub0DcSFs7Kk0Rb6Ja+WzH2ALT0LInt2r
+NvfKjk9Abd2rjqFMaYc9rCtqjbq4FQC3ymlDBDsbMC8qsByHAjDBiox+qSGZZTjS
+MbJ0cWIRVg==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client-and-key.pem b/tls/tests/files/client-and-key.pem
index a2b78283..1565e9df 100644
--- a/tls/tests/files/client-and-key.pem
+++ b/tls/tests/files/client-and-key.pem
@@ -2,47 +2,47 @@
 MIIDXTCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNTUxNDRaFw00NTEwMDYxNTUx
-NDRaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNzQ5NDVaFw00NTEwMDYxNzQ5
+NDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALB/QctPIfpb
+onzUr4bxSANLsAWPoLyE8a1h2WUz2NJxtSjk0Ch531bGtlXxIMzGeUgJ0WwUh15L
+BJxm6vHcVVar1iV3JUf0XW4Wk0cYmpS36PXa9m0pQAXgzanbh5m5FWnGpO4QZS7d
+O7YYmbVO7lwIkT3B7dw3gCeMeyqSJbgXnBRB7zVff/lW/r0zJ1MF3AZHpDP17CHK
+175MBha29DqfsHkfqQga0eIR9vTqSBwe+m717pLgDoc23SgfHfsI+8F09uT+GEoy
+7Gr1CvT8mCkOHyg8yDIm0h7Az1hjvUPGW7P9PoYBCcto0OjcOPwTFVL8dgX8b6v+
+tOEvQEKIbfcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAnpAITVJnj3JO0K8qk0H6
+0QkygDKnt1WDjRLEWui/oGKGjJOkuiREXWB8l7UM6VrP38xKALdusGX6wj6/9JsO
+H/wGP89YFM8YiP2YXlG9I/7mMNPV6QPai5tW+mYrfrRmqq8Y177Q8HBfNtW8ZXFi
+CsE6GM2fb/lUUSdn3DT7mUMwXcEtIOHKpa7/N2sdbifpNJdnmKzYRJHwIBgdfIj6
+pl6u4baDKiFTClTky+YHuuppGy8cs/ZrXi/b0nyWyZ/Z+cRke9DyWB+QqMPtF1Id
+kvu15eweJB4HbrmSkvA2IpuNIJQy6AQm67FKxiEjP8ksq5RW67CbHM1OZSeTKF4Y
+mQ==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA06tmOzXjt1cfox5YVVtNbqNVUOa6iE3J5MA4SECmzwbXAkXU
-LIpbUOWZGuAR7WjoB9xsf22iCxZff/vTUbXgK3eRD8954dXFJeIulic7Imlx5tf+
-zhUTxSwwlBPQu3jGPklMcVvkgezZ0I6tH7zWiDP3nhxnI1ymia/TkXBiphaej766
-tyBj1XZvEtUhBLA3T+KntZPEfqrjDDXaU2ptE+CJo8caf5n7jJD4u4rl90B4fYmK
-FvGHkP065o2KmZ/LPCMOyP14CxorD2W33+Kn3j+8vprvQadyDdvexSzudcRStrPX
-8Chp/qUfVI9WNafztN5gqlTgvJQefyF5AggQywIDAQABAoIBAQCR6ve328eWrWXu
-8k1c0mtH2StIcTaoHlAO9QAXtxIHaCSyuWayKdMXqp/oag2Rx58lRCw7kF2EHTFK
-rlSYYLQf4vZKmvHf4JlfK1SISJU4fM57n+1VLiyJ4ZO/kQV1J6YqbCdZgkq90oS5
-hJIObgTKsmCCS/xB4W4hPuevvHUVHwKXdRSBKa23X9UEE23RoK/rNvyiegn+VJtA
-N3GVo7lNqhE9vjSC9SYn5gU9obSa5baR1QV58Vj7ZaAzZUBzomrKQTfphXsVcDjl
-4f4FltlPH4KYlC+u/F0mMZuD7X4e07zUy1QqKYct2nmK0NT51W6uH0N+P4PxuJoz
-yowdKcrJAoGBAP31Wyn0aL54/YY2EA16HABvDY0KMgMbbULcSQ3o+O8cTdtXmtzn
-JYuCRq0FHOQhkhLyCrRtB3W7wFFqkQaRywWAI7WqkmNgOQQNBxoBCmyuZQdUxApK
-9xfnhTcDIv+FKVmL9oroLJvyNtcFNA02JW8iedVvP4tlPHhryDTAkFtVAoGBANVf
-A1tTWB+RLAJmsSGiGk+kCHWLMudD3lB/JeBzl72AbK7PACkfQOhAZDrXF0J6iUSh
-tEWwCmhu5+hiirsLuvcnB3HDZE5XDjKs+QCo9Vnknhjoik0E/Y+hmwtLsnHUqlem
-evQvismga7mFoeZ/BHMzi0aKWBw2MmGvqXrhh/ufAoGAWVDWXB4KTJruxynyYVsF
-yB1Gjcj9J9yYg8BHrS23hxjURQU9gN2Gddc+lhFLROyNnD4mB6ikzAJZNAkfskjK
-N0gGxxiTXYH063jNe5bMHMcE3xwvylLtLioNzvg6cdVaYpT4A4h+T+ZS5TJ+SPs3
-FSvx31+94H+dUdjOU8c5vfUCgYEAjvjtfOJp6C0Uej9pbYn7a2YUrP6rCz/01ad9
-L9sE0FwfdzsJdoSUr4uGHc9GrKsDE9PuwctmDfhSuOpe31rK2xVx7Y7pxXyb7OTu
-rLyKOsPwE+ytz1IKvZWiGH2OgqvnwHezZ6/7pYMy68tZYuO1jaP6LThCNhUyyTY1
-sDszLS0CgYEApm2LHebULZJXe3ZCPv8LbOycsgmUqHeQ677v6pflcwwwVzp1W7fD
-yFON/KuSGGBOyiWYwhPn2cxtF64wH+Z0mlp/59T3oLR7dfMOul+fqwp8PNbHwngx
-gGhBi3SGGAhpDgGlTJNXHl/LMgdNwhCVLsuA8MzeSQgSd2ASvF/Lr6M=
+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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 fff55faf..eb149fea 100644
--- a/tls/tests/files/client-future.pem
+++ b/tls/tests/files/client-future.pem
@@ -7,17 +7,17 @@ ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
 AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzIzMDAwMFoYDzIwNjEwNzE3
 MjMwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
 RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-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=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwf0HL
+TyH6W6J81K+G8UgDS7AFj6C8hPGtYdllM9jScbUo5NAoed9WxrZV8SDMxnlICdFs
+FIdeSwScZurx3FVWq9YldyVH9F1uFpNHGJqUt+j12vZtKUAF4M2p24eZuRVpxqTu
+EGUu3Tu2GJm1Tu5cCJE9we3cN4AnjHsqkiW4F5wUQe81X3/5Vv69MydTBdwGR6Qz
+9ewhyte+TAYWtvQ6n7B5H6kIGtHiEfb06kgcHvpu9e6S4A6HNt0oHx37CPvBdPbk
+/hhKMuxq9Qr0/JgpDh8oPMgyJtIewM9YY71Dxluz/T6GAQnLaNDo3Dj8ExVS/HYF
+/G+r/rThL0BCiG33AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKSDFn8ZZ3jeGauc
+xAz66UKVJq4TmY07OcN0TnU0CGn9k4ZdcHxHDQ+kIUsAYZprDPLY02uTGxP925fn
+RwlbTEyQML1be6e082yrmv0Z6rjgv05BnPr7iNIoAQA+W71jNBuHBoFVZpmPnpFY
+zPh4hEb6zLzicb7gXzZvXM1sapCJWqlfSW3tWOv45CfgEje9iYqN3UoueCcQMGXl
+gaqWipLmlgD6qu/EZ+FfxmHkv5eWMb7KYbvJXgaF7PaT2FgrCrybB+RO1RjIMsnD
+OaRnlfBr9Zue4cJMAVHjRg/jxirYiTnz63pirKQvBZ4g8eLIUO3WCDUVFxjhThgR
+uMedPw0=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client-key.pem b/tls/tests/files/client-key.pem
index 90332c37..e048c828 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 126eb81e..66ae45ee 100644
--- a/tls/tests/files/client-past.pem
+++ b/tls/tests/files/client-past.pem
@@ -7,17 +7,17 @@ ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
 AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcyMzAwMDBaFw0wMTA3MTcyMzAw
 MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALB/QctPIfpb
+onzUr4bxSANLsAWPoLyE8a1h2WUz2NJxtSjk0Ch531bGtlXxIMzGeUgJ0WwUh15L
+BJxm6vHcVVar1iV3JUf0XW4Wk0cYmpS36PXa9m0pQAXgzanbh5m5FWnGpO4QZS7d
+O7YYmbVO7lwIkT3B7dw3gCeMeyqSJbgXnBRB7zVff/lW/r0zJ1MF3AZHpDP17CHK
+175MBha29DqfsHkfqQga0eIR9vTqSBwe+m717pLgDoc23SgfHfsI+8F09uT+GEoy
+7Gr1CvT8mCkOHyg8yDIm0h7Az1hjvUPGW7P9PoYBCcto0OjcOPwTFVL8dgX8b6v+
+tOEvQEKIbfcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAgNa0nsEXn2Wdhzwkyhuk
+DvGsoDU8HIXP3hCC8+RIOZlL/rnSF55vizzInXqvkVDnJZ/X3L77v8KWVt7oRtZi
+6bXHpdi8B3JiY5djqVMJuYIHVXNUXL9GcvOqQGQ3c2TIUMGlpAvrppPVKPrqgV/7
+oBj9MFLT/bWQjzKkV5xit6ccrn7I1ncgAUjmUh+p1LbUqU0260oZLDVKlX5Ac9ua
+conXHEqLKcwJgyaANTMb6k9y2nksZIjDD6SFVjyQ8y6f/vc16y+URHBMGz4baNiR
+6OlBcSgjxj/fg0/95nmWS0INA3GV16hXV6tLoSuGLP9z5w8mSYhU7MYiYXn65foE
+mA==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client.pem b/tls/tests/files/client.pem
index 625b3b88..2551a6e5 100644
--- a/tls/tests/files/client.pem
+++ b/tls/tests/files/client.pem
@@ -2,20 +2,20 @@
 MIIDXTCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNTUxNDRaFw00NTEwMDYxNTUx
-NDRaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNzQ5NDVaFw00NTEwMDYxNzQ5
+NDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALB/QctPIfpb
+onzUr4bxSANLsAWPoLyE8a1h2WUz2NJxtSjk0Ch531bGtlXxIMzGeUgJ0WwUh15L
+BJxm6vHcVVar1iV3JUf0XW4Wk0cYmpS36PXa9m0pQAXgzanbh5m5FWnGpO4QZS7d
+O7YYmbVO7lwIkT3B7dw3gCeMeyqSJbgXnBRB7zVff/lW/r0zJ1MF3AZHpDP17CHK
+175MBha29DqfsHkfqQga0eIR9vTqSBwe+m717pLgDoc23SgfHfsI+8F09uT+GEoy
+7Gr1CvT8mCkOHyg8yDIm0h7Az1hjvUPGW7P9PoYBCcto0OjcOPwTFVL8dgX8b6v+
+tOEvQEKIbfcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAnpAITVJnj3JO0K8qk0H6
+0QkygDKnt1WDjRLEWui/oGKGjJOkuiREXWB8l7UM6VrP38xKALdusGX6wj6/9JsO
+H/wGP89YFM8YiP2YXlG9I/7mMNPV6QPai5tW+mYrfrRmqq8Y177Q8HBfNtW8ZXFi
+CsE6GM2fb/lUUSdn3DT7mUMwXcEtIOHKpa7/N2sdbifpNJdnmKzYRJHwIBgdfIj6
+pl6u4baDKiFTClTky+YHuuppGy8cs/ZrXi/b0nyWyZ/Z+cRke9DyWB+QqMPtF1Id
+kvu15eweJB4HbrmSkvA2IpuNIJQy6AQm67FKxiEjP8ksq5RW67CbHM1OZSeTKF4Y
+mQ==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client2-and-key.pem b/tls/tests/files/client2-and-key.pem
index cded5e17..987369c2 100644
--- a/tls/tests/files/client2-and-key.pem
+++ b/tls/tests/files/client2-and-key.pem
@@ -2,47 +2,47 @@
 MIIDXTCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNTUxNTFaFw00NTEwMDYxNTUx
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNzQ5NTFaFw00NTEwMDYxNzQ5
 NTFaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVdmmU1KY3o
+MIgJbckUfm7uy/2Ba/60NeZDAWz2oZSZeiA65u7D0w0DYKceOf2btUY6pX9R7xuH
+jbh8ztV2xR93qqJRy2R/JhsW1XHgftWKLrbxUJ9KFN8xyUtECSROICyaaBl577h7
+hP0ifmCuW6+NJ8FQgfzwuWMseT5y2u01tUPHmF2SqEMvorVfoVUYjsdl56jWxlJ5
+v8D7htZbAwfU0XY3XjdMeCOg1/cy7RKMc+wVeVWAQFfHEqqmYAJBGtpMnHWJTXdq
+Omqp2poNEFgLzXdJIT/XjrxKGXKe9sMhSw4oL3lIAvxkjGEiXOqTRUU3ZuYKKJNk
+4SOABmG1T2cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAbjwRNYbPFq3BXdtRUldW
+56gKwSDd0K/nwSg3lRz89wTQJ4ql3s6CfD9QoTCiq3TcMnOi8lHug+9R2KDRu+CZ
+bCF2gh79TH+kgjDUwVp6lNMu9abVy6QfYnY6BGbhDQp82SdOSKN2/+q0g1aZmGzt
+GYAgP2uPvub9eTbq4fT6xNxctdM7pYFWibECBnw0yailolX+Y7dw2SbQ/8iTFmVQ
+CN6btbpR6PdnF0Ja7mnnVk5GNJh28bbPLvI399PvUJrqlsvcfN5VMVB9IfpQUx9Z
+39hl55qnABIVjWTK/CWIehjpy4306RCe6ug4Szqt61INqeODfPpntRSCGCR3/6uo
+pw==
 -----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 71b30b01..987c866e 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 31582e4a..b034024c 100644
--- a/tls/tests/files/client2.pem
+++ b/tls/tests/files/client2.pem
@@ -2,20 +2,20 @@
 MIIDXTCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNTUxNTFaFw00NTEwMDYxNTUx
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNzQ5NTFaFw00NTEwMDYxNzQ5
 NTFaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVdmmU1KY3o
+MIgJbckUfm7uy/2Ba/60NeZDAWz2oZSZeiA65u7D0w0DYKceOf2btUY6pX9R7xuH
+jbh8ztV2xR93qqJRy2R/JhsW1XHgftWKLrbxUJ9KFN8xyUtECSROICyaaBl577h7
+hP0ifmCuW6+NJ8FQgfzwuWMseT5y2u01tUPHmF2SqEMvorVfoVUYjsdl56jWxlJ5
+v8D7htZbAwfU0XY3XjdMeCOg1/cy7RKMc+wVeVWAQFfHEqqmYAJBGtpMnHWJTXdq
+Omqp2poNEFgLzXdJIT/XjrxKGXKe9sMhSw4oL3lIAvxkjGEiXOqTRUU3ZuYKKJNk
+4SOABmG1T2cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAbjwRNYbPFq3BXdtRUldW
+56gKwSDd0K/nwSg3lRz89wTQJ4ql3s6CfD9QoTCiq3TcMnOi8lHug+9R2KDRu+CZ
+bCF2gh79TH+kgjDUwVp6lNMu9abVy6QfYnY6BGbhDQp82SdOSKN2/+q0g1aZmGzt
+GYAgP2uPvub9eTbq4fT6xNxctdM7pYFWibECBnw0yailolX+Y7dw2SbQ/8iTFmVQ
+CN6btbpR6PdnF0Ja7mnnVk5GNJh28bbPLvI399PvUJrqlsvcfN5VMVB9IfpQUx9Z
+39hl55qnABIVjWTK/CWIehjpy4306RCe6ug4Szqt61INqeODfPpntRSCGCR3/6uo
+pw==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/intermediate-ca-csr.pem b/tls/tests/files/intermediate-ca-csr.pem
index e317797a..0557eede 100644
--- a/tls/tests/files/intermediate-ca-csr.pem
+++ b/tls/tests/files/intermediate-ca-csr.pem
@@ -3,18 +3,18 @@ MIIDRDCCAiwCAQAwga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/Is
 ZAEZFgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUg
 QXV0aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20x
 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
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEiR6aaGVdhIBCTJDbB0KBjAYu1
+f5onK3d+meKkp/K5V2DeatnupjqEkK8qEzzl8a81YblGg/k0mghDQMA+Rm9POPVN
+ugUwuOlzlfOshVuNRVGMh+Svu7Sa8y++eMiQnWYk3nQETGa0C+4Lwx/khIfXJ4QQ
+0SWE3RDkNLS052zRXeyTsOnvFRtnLw3Z4rQWJrdJtvcHIL534jEsR8B/6sheYm3u
+L+NupH+NdiWnqWFglrvObG4Diyki1A7u1SHIBMwdc1sHu7yDrKsrTijqPbQpdRri
+p3jHRAMjH+KFzeUaJR8hlnIUgwctdw6kgG7OfQPq1hWtfpI8mJ4CFhux3/cCAwEA
+AaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFHAsg6JzMPalssSqCVu2+wCU
+kXC2MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+CwUAA4IBAQCP/tVVv0ry4qsvp237Tufq0FRF8iCxdDedPjPyqkTvS60GoU0N3oK7
+/kwJ7BtV6cuPekDmp8gdc3vQ7dkDs0F4rlgnQdYgizDmRyfX+a9PHxqc6uF90qwK
+OcNzGacuqyf4RFMEbVXAGnr2HJCqZPZrD2H5wfKIVkdJwKB6L8x4ZMMCh9MBrYs6
++GekbOKFGnJsBbwK/dttT/wAydNwbm7I9ICNlm/nREti4IjvDtChUik+nVPiBRdx
+KA0JF0xeCXQMT/yqsXNTka797tGVS84e+DBv6l7a9jvkU/RlsKwYlOvmSNzuwT3E
+wgfVrzE/4yQ24iuzaoSC7VEeNb8WhQFq
 -----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/intermediate-ca-key.pem b/tls/tests/files/intermediate-ca-key.pem
index 923d4675..28f24076 100644
--- a/tls/tests/files/intermediate-ca-key.pem
+++ b/tls/tests/files/intermediate-ca-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/intermediate-ca.pem b/tls/tests/files/intermediate-ca.pem
index 31eae06a..c5829fe4 100644
--- a/tls/tests/files/intermediate-ca.pem
+++ b/tls/tests/files/intermediate-ca.pem
@@ -2,28 +2,28 @@
 MIIFAjCCA+qgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE1MVoXDTQ1MTAw
-NjE1NTE1MVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE3NDk1MVoXDTQ1MTAw
+NjE3NDk1MVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
 FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
 aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
 BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAORh8EDpQkDYMceg6ZiiNh42ltC+qJOm
-qVNlHHla0jp1iYJdNZyRKYlVhp8xq7sxuRheocDM1R8KpiCrE1LyY1i6LGkflFp7
-8y4l37K8bW8Qml3TWfmK/B3Xf+LOPbOvcWbKZ+egNZwhPt+3M+l4+lz2r5a2ZYwK
-Z/kvfQEBe/zM6pDZ8zVrJC1k5/4RvpnPiPk29ji69fvWy8dfhUv3S91tnAW5XP12
-1pOFsVCVBQdDu6P2kRx9etf6cHT5YgUTkBWBUJqu4Fq3gaBoDkqW1GVuI9zdBS2r
-NUvGVQoOrxeiOZPFlaPF5zZ9DYMVWUCeDOU+PrR0YU0LHW3Tr4ngfLcCAwEAAaOC
-AVAwggFMMB0GA1UdDgQWBBRkVk8N43l2EZv18wP70cL7oOmKPjCBxgYDVR0jBIG+
-MIG7gBRPm1SNYuUEc1owegwTvllpjKe/dqGBjKSBiTCBhjETMBEGCgmSJomT8ixk
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBANEiR6aaGVdhIBCTJDbB0KBjAYu1f5on
+K3d+meKkp/K5V2DeatnupjqEkK8qEzzl8a81YblGg/k0mghDQMA+Rm9POPVNugUw
+uOlzlfOshVuNRVGMh+Svu7Sa8y++eMiQnWYk3nQETGa0C+4Lwx/khIfXJ4QQ0SWE
+3RDkNLS052zRXeyTsOnvFRtnLw3Z4rQWJrdJtvcHIL534jEsR8B/6sheYm3uL+Nu
+pH+NdiWnqWFglrvObG4Diyki1A7u1SHIBMwdc1sHu7yDrKsrTijqPbQpdRrip3jH
+RAMjH+KFzeUaJR8hlnIUgwctdw6kgG7OfQPq1hWtfpI8mJ4CFhux3/cCAwEAAaOC
+AVAwggFMMB0GA1UdDgQWBBRwLIOiczD2pbLEqglbtvsAlJFwtjCBxgYDVR0jBIG+
+MIG7gBSLcFF+Oi4WrdNajz7wc6U4i2X3O6GBjKSBiTCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRQrPkXdngcb5YcQWcGJcS4nsjGTTAP
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQ+s67jByiORo59Mf4YWphlAh5esDAP
 BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
 cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAD2YKTWbSnaWS3ICzQqElJi09lsZkZEwSaPd
-hLQcMx8GB/O73/TvEi58HoeIyQPEC8FWBqSLIWdx+Pq0F91X6bIz6ghLQ2oKAqbn
-W4GX/7voIt2OXCLuOs10rrADsjYfj56D/SoG+hV3pS8hoscoBSXLjKXgNkZd2jtl
-F6BhFn1r/kmo/B0xGnFFzM/3djoA4zh4QoxZ5Efq0RtpMsrxYdYop2PThF2p7OQO
-Rxu9dAjriYxcc/PQOfYTuCKaIYGawWoruRT+awf4FTukSkLoLM3xr/kmgqs3Y2fH
-pNRyvnMmyJzJ92Xeo71jfCHF/6DxIdN9ZKJ5pzY3CZOp/a56fiE=
+b20wDQYJKoZIhvcNAQELBQADggEBADb+0KoGV/ZzUQ2moJnOQQRUL9HLtG9OC8Hh
+MZhGO0IhpwOkiT1Jy05n1tXu6x+XC3XI8WmzP6uuuNGmWoq38+AdtofPDXKnnLBN
+L3WU+JGI2cZ9eBv/yv1QeFxPFR9IuVMXc+Pt+2TVoV2ancDeH31GKqkktPO2G50g
+1F8AxaAV/PYIFQVGxH2+Cra3HKOcGWk7qHZBUh/Llvy+UWL6oa2MPBPmawNFq0Jm
+pIIO7SJzIieGTZL/X9GDOyGA4q9onvIJ2NHekIflYDG7hu440rG2evrnkjg63sBA
+QWp62b4ftpTxkvg1aLN92ciNVnajHv6Zc6HP1dBClWI26Hu8TRI=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/non-ca.pem b/tls/tests/files/non-ca.pem
index 2bf3fd85..e08453cb 100644
--- a/tls/tests/files/non-ca.pem
+++ b/tls/tests/files/non-ca.pem
@@ -3,22 +3,22 @@ client.pem:
 MIIDXTCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNTUxNDRaFw00NTEwMDYxNTUx
-NDRaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMDEwMTIxNzQ5NDVaFw00NTEwMDYxNzQ5
+NDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALB/QctPIfpb
+onzUr4bxSANLsAWPoLyE8a1h2WUz2NJxtSjk0Ch531bGtlXxIMzGeUgJ0WwUh15L
+BJxm6vHcVVar1iV3JUf0XW4Wk0cYmpS36PXa9m0pQAXgzanbh5m5FWnGpO4QZS7d
+O7YYmbVO7lwIkT3B7dw3gCeMeyqSJbgXnBRB7zVff/lW/r0zJ1MF3AZHpDP17CHK
+175MBha29DqfsHkfqQga0eIR9vTqSBwe+m717pLgDoc23SgfHfsI+8F09uT+GEoy
+7Gr1CvT8mCkOHyg8yDIm0h7Az1hjvUPGW7P9PoYBCcto0OjcOPwTFVL8dgX8b6v+
+tOEvQEKIbfcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAnpAITVJnj3JO0K8qk0H6
+0QkygDKnt1WDjRLEWui/oGKGjJOkuiREXWB8l7UM6VrP38xKALdusGX6wj6/9JsO
+H/wGP89YFM8YiP2YXlG9I/7mMNPV6QPai5tW+mYrfrRmqq8Y177Q8HBfNtW8ZXFi
+CsE6GM2fb/lUUSdn3DT7mUMwXcEtIOHKpa7/N2sdbifpNJdnmKzYRJHwIBgdfIj6
+pl6u4baDKiFTClTky+YHuuppGy8cs/ZrXi/b0nyWyZ/Z+cRke9DyWB+QqMPtF1Id
+kvu15eweJB4HbrmSkvA2IpuNIJQy6AQm67FKxiEjP8ksq5RW67CbHM1OZSeTKF4Y
+mQ==
 -----END CERTIFICATE-----
 
 client-future.pem:
@@ -31,19 +31,19 @@ ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
 AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzIzMDAwMFoYDzIwNjEwNzE3
 MjMwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
 RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-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=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwf0HL
+TyH6W6J81K+G8UgDS7AFj6C8hPGtYdllM9jScbUo5NAoed9WxrZV8SDMxnlICdFs
+FIdeSwScZurx3FVWq9YldyVH9F1uFpNHGJqUt+j12vZtKUAF4M2p24eZuRVpxqTu
+EGUu3Tu2GJm1Tu5cCJE9we3cN4AnjHsqkiW4F5wUQe81X3/5Vv69MydTBdwGR6Qz
+9ewhyte+TAYWtvQ6n7B5H6kIGtHiEfb06kgcHvpu9e6S4A6HNt0oHx37CPvBdPbk
+/hhKMuxq9Qr0/JgpDh8oPMgyJtIewM9YY71Dxluz/T6GAQnLaNDo3Dj8ExVS/HYF
+/G+r/rThL0BCiG33AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKSDFn8ZZ3jeGauc
+xAz66UKVJq4TmY07OcN0TnU0CGn9k4ZdcHxHDQ+kIUsAYZprDPLY02uTGxP925fn
+RwlbTEyQML1be6e082yrmv0Z6rjgv05BnPr7iNIoAQA+W71jNBuHBoFVZpmPnpFY
+zPh4hEb6zLzicb7gXzZvXM1sapCJWqlfSW3tWOv45CfgEje9iYqN3UoueCcQMGXl
+gaqWipLmlgD6qu/EZ+FfxmHkv5eWMb7KYbvJXgaF7PaT2FgrCrybB+RO1RjIMsnD
+OaRnlfBr9Zue4cJMAVHjRg/jxirYiTnz63pirKQvBZ4g8eLIUO3WCDUVFxjhThgR
+uMedPw0=
 -----END CERTIFICATE-----
 
 client-past.pem:
@@ -56,19 +56,19 @@ ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
 AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcyMzAwMDBaFw0wMTA3MTcyMzAw
 MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALB/QctPIfpb
+onzUr4bxSANLsAWPoLyE8a1h2WUz2NJxtSjk0Ch531bGtlXxIMzGeUgJ0WwUh15L
+BJxm6vHcVVar1iV3JUf0XW4Wk0cYmpS36PXa9m0pQAXgzanbh5m5FWnGpO4QZS7d
+O7YYmbVO7lwIkT3B7dw3gCeMeyqSJbgXnBRB7zVff/lW/r0zJ1MF3AZHpDP17CHK
+175MBha29DqfsHkfqQga0eIR9vTqSBwe+m717pLgDoc23SgfHfsI+8F09uT+GEoy
+7Gr1CvT8mCkOHyg8yDIm0h7Az1hjvUPGW7P9PoYBCcto0OjcOPwTFVL8dgX8b6v+
+tOEvQEKIbfcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAgNa0nsEXn2Wdhzwkyhuk
+DvGsoDU8HIXP3hCC8+RIOZlL/rnSF55vizzInXqvkVDnJZ/X3L77v8KWVt7oRtZi
+6bXHpdi8B3JiY5djqVMJuYIHVXNUXL9GcvOqQGQ3c2TIUMGlpAvrppPVKPrqgV/7
+oBj9MFLT/bWQjzKkV5xit6ccrn7I1ncgAUjmUh+p1LbUqU0260oZLDVKlX5Ac9ua
+conXHEqLKcwJgyaANTMb6k9y2nksZIjDD6SFVjyQ8y6f/vc16y+URHBMGz4baNiR
+6OlBcSgjxj/fg0/95nmWS0INA3GV16hXV6tLoSuGLP9z5w8mSYhU7MYiYXn65foE
+mA==
 -----END CERTIFICATE-----
 
 server.pem:
@@ -76,42 +76,42 @@ server.pem:
 MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE0NFoXDTQ1MTAw
-NjE1NTE0NFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE3NDk0NFoXDTQ1MTAw
+NjE3NDk0NFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
 B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALiCHlTCgVnziM0Xyoz462rcLsBHHPTkxcOv
-nivqKdGfo5uLiutIufeuhTCBmjv0Gy5k8kJKlzOddRMFEN1sqhAUNluPg+lKX3c+
-f/rIELIH0n5QZ9cujrPmidlDZ06LB17bRRSH3ikHhVyxc9qQnI1Sxem06NYmZtis
-3tzP+JGP63vh7DMeX2fnqZgfaJ9BFwGhnPb7Po070EdsjPwAuxV1TeSihp0DmvIf
-mTct3cB8hnrSmBV0r8WncTrmpH4r+KDH6nFy8+RiUbVh7nK0VTrwOJE6DoNOhnXE
-/svxYGC580xg1maYmpVycY0ZYBtTV8a1A/oX+06xUOMGmtsEXzECAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBANFcFiZ4ymgxJ9zzPc2q9R36m4dEVXmsYSx/
+fk6uXLMZ7S8eFIDRdM/THTLeZamIlWUsPBFigoxlOy/9j3sWR+0r4Ejba7nSlWmM
+o0MkoHgCsVndWtefQzncEbLLkZ1gz2dwjJFVSnaEGSrfdT4Sz5WtCmOX1L06J9fV
+ZQhdvHV8iPOlh1hSHTbkUP6hnsSA/2X5tGrgk3FaAqydTKX/vQbn5Uc+ygIrZCGQ
+t4etXkyXi6EMI6RNRoogYcV36ef8wYHfoxX/ou5fsUPI1ltgc57PCk5EsF1QMWkx
+cW85DZhInU8md7cZivf9MBlP7iwyWe9qISh+GSpfRs+mP1jVlvcCAwEAAaNHMEUw
 CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAAInl3kqvQgj
-XHOwjeUUEfnXmDZGyJ0apIGELgycnbylWwFri75Lo81XhysWPjJgSk85Mi+nRSaj
-dnBFKwimRQxbw6jeFv/t3OsB2WAcSLDVrFTWNyomODT0Yzv6FTPyg23geHIk7w6e
-yKOPi00CiK08fHwzIFD76H663WbWNocxiFwT5X5V1HMMdC8F5SfBwr8n4gfkjTsh
-HH5zcT7z+EfsE2sS3KXW7TLa1+Rg28lP9Hzl2OF3z6EZ0L/dmYAUH1MtzGyZ9BaN
-Kg60AV4Gumx7dohfq1EmDEiGBkde6MGfyOPCqF14Np+C5o7xzAlV8GLq/EvU7+YE
-iHyOKT7W4eE=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAB94wSkKZiW+
+lYf/FBsDpfXEhVNyKSJUs6OxwDPi94Ye9a9ANImUVbLyQG3vYNyJX23mqh/KR//b
+IfO78aUXvbyyejrR4l55nKlEvd+9gcOhfId/xgYdSF/i0mEVKL2W1Z+pj7WY6Izc
+hHUg9SaLYMLRYhQ7C8mB0Ocu7A1svN8J47YKWunaWkToQgIqXDn6naoE4vbv7JO3
+xZEFeMiBsCc8W3dabGxBznBrrBbOckwb9G858IOpKV7RVCGFbGm5zcpMUN4/8Nyg
+hHcmfCdLL3qojamfJ2YiVrkhXSeoT1MS/5xX9fORgHfO/R1+Iv/jZYgw+qub468V
+TXVlrWigIps=
 -----END CERTIFICATE-----
 
 server-self.pem:
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/old-ca-key.pem b/tls/tests/files/old-ca-key.pem
index faec803d..1db5abf1 100644
--- a/tls/tests/files/old-ca-key.pem
+++ b/tls/tests/files/old-ca-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/old-ca.pem b/tls/tests/files/old-ca.pem
index 1a95df64..cb498dad 100644
--- a/tls/tests/files/old-ca.pem
+++ b/tls/tests/files/old-ca.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFLjCCBBagAwIBAgIUd5wcnmQZ6GQ47TknLc4CnHGU69EwDQYJKoZIhvcNAQEF
+MIIFLjCCBBagAwIBAgIUJMXPCPBYU7JuV+eZvzCqQcLy6H8wDQYJKoZIhvcNAQEL
 BQAwgZ8xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMSwwKgYDVQQLDCNPbGQgVW50cnVzdGVkIENlcnRpZmljYXRlIEF1dGhvcml0
 eTEiMCAGA1UEAwwZb25jZS53YXMuYS5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3
-DQEJARYOY2FAZXhhbXBsZS5jb20wIBcNMjAxMDEyMTU1MTQzWhgPMjA1MDEwMDUx
-NTUxNDNaMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
+DQEJARYOY2FAZXhhbXBsZS5jb20wIBcNMjAxMDEyMTc0OTQ0WhgPMjA1MDEwMDUx
+NzQ5NDRaMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
 RVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZpY2F0ZSBBdXRo
 b3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5jb20xHTAbBgkq
 hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAuHJbS6cniqUUQhwKTHrS0DlcPiaHvSMSW59aV7PiO0PI0t4CZ+6d
-95c+abDyk+84gD19CndoLPyg+tswhfUa2lmzBvqjTtliXJ8nIqctA0Y6Dy8TgoB6
-41HDDb2Gwtfxy1xlp7M8PqpqT/okReiVrFzfSADkD+sZKhhCfQQRhtN8WATu1rAd
-UMxE4plHsNOTLhDICITvSRQlapXAxFfwwB9DxQUueE4BwuHV/7pbqS6/C2l81jtI
-1U7FWYJ/UHqCyfQmvD350smYA//eJmc9SfsshaSijvNX5zSG2VJZvMqmKUMwhxg7
-kPr3jlldhgHUXlI1offXnJbcHIOt0gzkUwIDAQABo4IBXDCCAVgwHQYDVR0OBBYE
-FI3LV945I6o2AdFw6dbrZlrSu2sPMIHfBgNVHSMEgdcwgdSAFI3LV945I6o2AdFw
-6dbrZlrSu2sPoYGlpIGiMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZIm
+MIIBCgKCAQEAuEDVnakqhymgXTkKnf/ahFRD/Ou+JIHX6EJMYeeTRRuFemCfW0NK
+8opOTjivBe8sv9ApcAe5P99HcDxkBqEsnb92JozKMswwUGoKwnJ8UaRaLFkVffP/
+suz9/r/WJre/SnDZv6iOuhmCz3Xe1E+zZ70IsbCdkhk568KHvArDWQhzygqHtaVX
+/PLV2lcMS0GXA4nlNJZ6zF3NwPp9VDFut95BlhGXHo/g1h5W1lzR5QgPBxgciXX3
+n8HHbUUl2xNhWhrhYPh0TW/FR5YzciEMWC3C+UqG0ln6vPwXO+bMEEkc2zYN86fb
+M8Da2NrzbA1OAqoRpICOHhlwR0Lo94G56QIDAQABo4IBXDCCAVgwHQYDVR0OBBYE
+FAk/MMYEhSngoifsGFkluA8GlQR7MIHfBgNVHSMEgdcwgdSAFAk/MMYEhSngoifs
+GFkluA8GlQR7oYGlpIGiMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZIm
 iZPyLGQBGRYHRVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZp
 Y2F0ZSBBdXRob3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5j
-b20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghR3nByeZBnoZDjtOSct
-zgKccZTr0TAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREE
+b20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQkxc8I8FhTsm5X55m/
+MKpBwvLofzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREE
 EjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTAN
-BgkqhkiG9w0BAQUFAAOCAQEANjkMb4Zo808FT/GjAucywTzP60I/0x1+QfXcytTX
-I3u7uDZZbuGzY8Y7Yg6ty9YBMf5RBp1vHfWqll9JoMe0MiF2Vb9AzDfiNIpRs2TO
-2NYfXiAsOhiP7AJcwR3GeqMjJLCtN940/6j/xuN6I2piSXStr5LRzq0u7lOK4mB8
-wnjxKP5maiNWAouzIqNr5N4Y1CderQWqGHBSbTV9ezvrCHPI20mjhzHKcSPdVyEW
-t0VSpU2pfkbz90kMiVMFd5aPSnagpdM3aLs/4cle1UE4mxo2XwRcl5Q/T5EeaGzN
-4M3ktSpVfpykscT8JmSgnGPqOD6+PEd5phBMq1DhgQgymw==
+BgkqhkiG9w0BAQsFAAOCAQEAtOFK+XTv2hm1XqBItwo3nCC/I8zBOrN9nNFUYeBS
+rtMIMmMTje4JUg6M2x0PyFVhDAZSmmhgJHKiZT3BpLaeHSBoMJFhVEKcCZffXefW
+E7IB409LUdinPNGis88KTTlx976NngbWVJQrnzWfxGbsAXumM2wi8sByNPZoY/Db
+rqPuJSw2flFE0oS3cvm8udS3yrEDMWwMVTrzmj4/Mo//tKpXaxf7GfGjy6LYWrqh
+1TSeqZubqfz0awTkkePErmtrhmk0h0wEomyT5KiJHusIjPHBYPpv93vr7Kdu3/YJ
+vIDwbJgiGKUbQ9ei9WZj64KVgczPQX2/lNXALp85s86Kfg==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/root-ca-csr.pem b/tls/tests/files/root-ca-csr.pem
index 99699c5a..9ca15dcc 100644
--- a/tls/tests/files/root-ca-csr.pem
+++ b/tls/tests/files/root-ca-csr.pem
@@ -2,18 +2,18 @@
 MIIDHTCCAgUCAQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/Is
 ZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAV
 BgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxl
-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
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKWFJia5M5GJSnjx
+TbIW/h5Rl0/uS7jek4Rfk5fsy+2lxPk6/a+rdVXNHtLKmF8ouG8QocYr+MQNvGed
+hqSv8L+ViZXlz/zh/DMk5mzQUOSi5yrjjQbOJ8oeEAK2mXF42x4mNiNmBdUsavna
+emXAoCX2f05wci0sGDS1fxUyGMV5Bay32YCrFVyhfYUKbs9ItpMuyngIfBOVH7wa
+9N+XQuQIvT/ZZ2x/0PgbQWv+JFmIfMV4KuIZXuJYM0zmoLQEjgF1kdOpyoLot4u1
+EmgqceZakTTRZvst4rAZqib6F5lBgsZm4ige4KAQjGfJlVjiPBiAo/KyJjeu/d0i
+wLNdsHcCAwEAAaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFItwUX46Lhat
+01qPPvBzpTiLZfc7MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0G
+CSqGSIb3DQEBCwUAA4IBAQBG+2R4zJceqiQGKGqpotYufcbwVmJdwgaL8LNf1RVF
+E3xIhbnIUq/akZzY60zSC1p1rfG1wMIpZgOkAYZY5yDLFNOb9CJK1Ps/3z4FhzTU
+QgUkQA/nxz+v3bemGsFH6o5ncSEKywtH+uSxnciuI4ajMOeuORsEVaCdD42bqEGJ
+38y1MNR+SK4QofFrNZ1x8CTQwo+4plA5kZrviyUz/MNB/ZTKTcRKOreAuejXJRNd
+cra2fXUNcIjrkZ2ChhdSi0oHd7dfzsNRSs8D2lXzZGnRwhGSyyd9j7Hap41RhGXY
+bvljMh4HaCEoezidKppEhlF0PkHooBLrYhBDc0/6emC5
 -----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-and-key.pem b/tls/tests/files/server-and-key.pem
index 07bf06f3..f8dbed6f 100644
--- a/tls/tests/files/server-and-key.pem
+++ b/tls/tests/files/server-and-key.pem
@@ -2,48 +2,48 @@
 MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE0NFoXDTQ1MTAw
-NjE1NTE0NFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE3NDk0NFoXDTQ1MTAw
+NjE3NDk0NFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
 B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALiCHlTCgVnziM0Xyoz462rcLsBHHPTkxcOv
-nivqKdGfo5uLiutIufeuhTCBmjv0Gy5k8kJKlzOddRMFEN1sqhAUNluPg+lKX3c+
-f/rIELIH0n5QZ9cujrPmidlDZ06LB17bRRSH3ikHhVyxc9qQnI1Sxem06NYmZtis
-3tzP+JGP63vh7DMeX2fnqZgfaJ9BFwGhnPb7Po070EdsjPwAuxV1TeSihp0DmvIf
-mTct3cB8hnrSmBV0r8WncTrmpH4r+KDH6nFy8+RiUbVh7nK0VTrwOJE6DoNOhnXE
-/svxYGC580xg1maYmpVycY0ZYBtTV8a1A/oX+06xUOMGmtsEXzECAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBANFcFiZ4ymgxJ9zzPc2q9R36m4dEVXmsYSx/
+fk6uXLMZ7S8eFIDRdM/THTLeZamIlWUsPBFigoxlOy/9j3sWR+0r4Ejba7nSlWmM
+o0MkoHgCsVndWtefQzncEbLLkZ1gz2dwjJFVSnaEGSrfdT4Sz5WtCmOX1L06J9fV
+ZQhdvHV8iPOlh1hSHTbkUP6hnsSA/2X5tGrgk3FaAqydTKX/vQbn5Uc+ygIrZCGQ
+t4etXkyXi6EMI6RNRoogYcV36ef8wYHfoxX/ou5fsUPI1ltgc57PCk5EsF1QMWkx
+cW85DZhInU8md7cZivf9MBlP7iwyWe9qISh+GSpfRs+mP1jVlvcCAwEAAaNHMEUw
 CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAAInl3kqvQgj
-XHOwjeUUEfnXmDZGyJ0apIGELgycnbylWwFri75Lo81XhysWPjJgSk85Mi+nRSaj
-dnBFKwimRQxbw6jeFv/t3OsB2WAcSLDVrFTWNyomODT0Yzv6FTPyg23geHIk7w6e
-yKOPi00CiK08fHwzIFD76H663WbWNocxiFwT5X5V1HMMdC8F5SfBwr8n4gfkjTsh
-HH5zcT7z+EfsE2sS3KXW7TLa1+Rg28lP9Hzl2OF3z6EZ0L/dmYAUH1MtzGyZ9BaN
-Kg60AV4Gumx7dohfq1EmDEiGBkde6MGfyOPCqF14Np+C5o7xzAlV8GLq/EvU7+YE
-iHyOKT7W4eE=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAB94wSkKZiW+
+lYf/FBsDpfXEhVNyKSJUs6OxwDPi94Ye9a9ANImUVbLyQG3vYNyJX23mqh/KR//b
+IfO78aUXvbyyejrR4l55nKlEvd+9gcOhfId/xgYdSF/i0mEVKL2W1Z+pj7WY6Izc
+hHUg9SaLYMLRYhQ7C8mB0Ocu7A1svN8J47YKWunaWkToQgIqXDn6naoE4vbv7JO3
+xZEFeMiBsCc8W3dabGxBznBrrBbOckwb9G858IOpKV7RVCGFbGm5zcpMUN4/8Nyg
+hHcmfCdLL3qojamfJ2YiVrkhXSeoT1MS/5xX9fORgHfO/R1+Iv/jZYgw+qub468V
+TXVlrWigIps=
 -----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 1e3bd3ee..07e86c26 100644
--- a/tls/tests/files/server-intermediate-csr.pem
+++ b/tls/tests/files/server-intermediate-csr.pem
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIICwTCCAakCAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
 ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALA2UdCahuw94BsmB10h8qrY/Kyg5s76
-oGMa/A2r1TIqk3g7bZ0i5K+9yDro4YPkF4tUa71P5/2jLv4i7n7pQK5LlbC/L3Uj
-gXBY5m2jcUh7xZOimmrIZkeHH2aacJJv7H7F49NVlG+FI5QsWedCbJ6basdkU8PS
-xfsaE01o/KLbIJOR6zNZaybVf+drAnImeFsdLyL6wzYGMjyFdH9mCHus048pGpzh
-yXVkrRIcjARHyA9RBKGHW60fWNB3Cc8dgSC7qjdIlnmNcXRXUoRifqSwGL7T8Goa
-vGE51TQ4Waf6XL9SYdVmEJea/mac9tHboiZRj5XeD8X6AVWLlRxJwzMCAwEAAaAx
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4t3FBzYQk48Bzm7S9JiZqmWVY/FagC
+9aim8foydtzXXcXjIEWc6AChko8FhLJAp5ZJCxm7MbYc5pZfyGgecBawG13fKYoP
+o+59dUJAw8xkENKCi57K0fsfwZf4v0SqawmYUj9AtIsy8Q6xTRfVHA+Pj2qbNNTM
+IUzgIg3b7TpGnhjNDlxYzXLPThiKD8Vm+SrXOm8W+hCpIivyGDNWCxTo1MHj2UUm
+HPGHfwZXCJ9dt8scQTV1B0TeTJ3Xm/w+aAzUfbdlkCufsk6nLsj+gYMRkGGsYo/G
+mAv4/PPUop+yNK6VLL1nNgp0hP+VwvGU2cpn6BRBmpUu5xHrXkHjU+ECAwEAAaAx
 MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
-ATANBgkqhkiG9w0BAQsFAAOCAQEAAQQ0wPKWw8jlswzGwNrQeWmDjwQ+7SpZ++WM
-B7Sjq35qw/2tNwJqUPMZL2neuEwQf5Apz2YlTcT0ZAMqPx32a+RewwmuugiUKfad
-YURlq4wx+qNPfxffpotzii1jRVSF5rDSVrvpeePf6caVgPJvCvDVwoHofygrY51O
-7Nsw0H2lfd0UAh4/t8zW1rrFPTlilla3uqo9Iih+kXK/eipz10EWnlrupXnN7vDn
-2thoEe8EJvVVbDuxCkF3VeQcjqjahn6xCIoJNvt+ZXpV2jXColdHkky1r1C3935j
-Um8ZYZFteby1VjR96d+XlepO5dpihwQ4zA0nnoT6TA2UfZXxYw==
+ATANBgkqhkiG9w0BAQsFAAOCAQEAGWiCCA7ksG6NgBhTRKQikJ7mxzzSdEfrd6ow
+WmzG48Cuc/QF6Qhrs/EX0qvU76oWTh2zeogL49PxYf9JGHGkERUDWgin6EmCKRHJ
+JK5+gpKxyNnXeINi5I9JUaE2Twi/4kviGeqhmi8ej0n32YIfruHQ4bEfx6wdVa37
+ymZQFimk2HdDmmPxMr7TlGcBbJ+3rgOfl/EGhrogFwBKf55EITRz0QGKFX4DpR+9
+sgEAzICgYV8BHvgYYdcgPqDjOGIPSPG7ntHZZr8f66dl1om1s94t6rz23fabmC3g
+WHYRENSLiEJR+0dvsn4fR6Yo1fj0o4YntmR83O6H7Sa7iZgw3A==
 -----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-intermediate-key.pem b/tls/tests/files/server-intermediate-key.pem
index b0b2d34c..3356bcdf 100644
--- a/tls/tests/files/server-intermediate-key.pem
+++ b/tls/tests/files/server-intermediate-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/server-intermediate.pem b/tls/tests/files/server-intermediate.pem
index cbcb0d23..c2aad3f8 100644
--- a/tls/tests/files/server-intermediate.pem
+++ b/tls/tests/files/server-intermediate.pem
@@ -3,20 +3,20 @@ MIIDuzCCAqOgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
 bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
 aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE1MVoXDTQ1MTAwNjE1NTE1MVow
+LWNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE3NDk1MVoXDTQ1MTAwNjE3NDk1MVow
 SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
 GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALA2UdCahuw94BsmB10h8qrY/Kyg5s76oGMa/A2r1TIqk3g7
-bZ0i5K+9yDro4YPkF4tUa71P5/2jLv4i7n7pQK5LlbC/L3UjgXBY5m2jcUh7xZOi
-mmrIZkeHH2aacJJv7H7F49NVlG+FI5QsWedCbJ6basdkU8PSxfsaE01o/KLbIJOR
-6zNZaybVf+drAnImeFsdLyL6wzYGMjyFdH9mCHus048pGpzhyXVkrRIcjARHyA9R
-BKGHW60fWNB3Cc8dgSC7qjdIlnmNcXRXUoRifqSwGL7T8GoavGE51TQ4Waf6XL9S
-YdVmEJea/mac9tHboiZRj5XeD8X6AVWLlRxJwzMCAwEAAaNHMEUwCQYDVR0TBAIw
+ggEPADCCAQoCggEBAN4t3FBzYQk48Bzm7S9JiZqmWVY/FagC9aim8foydtzXXcXj
+IEWc6AChko8FhLJAp5ZJCxm7MbYc5pZfyGgecBawG13fKYoPo+59dUJAw8xkENKC
+i57K0fsfwZf4v0SqawmYUj9AtIsy8Q6xTRfVHA+Pj2qbNNTMIUzgIg3b7TpGnhjN
+DlxYzXLPThiKD8Vm+SrXOm8W+hCpIivyGDNWCxTo1MHj2UUmHPGHfwZXCJ9dt8sc
+QTV1B0TeTJ3Xm/w+aAzUfbdlkCufsk6nLsj+gYMRkGGsYo/GmAv4/PPUop+yNK6V
+LL1nNgp0hP+VwvGU2cpn6BRBmpUu5xHrXkHjU+ECAwEAAaNHMEUwCQYDVR0TBAIw
 ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
-ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBACRYo07Kiituv71ai+fsIHZ0
-oCzhr6SuwqYwywIz0+VvNid0H1dz1MK7R7jeLYUzgEUvwz0goz++j0ZSi+rK8VBG
-abY7QOwLyqv0+81+zhFLL5EFRNG8eO3kC61b20JxLGiRBpo5qJGNI5rV7pqsNbzk
-nfS4aHJcrkGPcSmLHYi9UBjJRbonwb4stUa0ziyptTVkTtvgGmTm1tuoEedAi90H
-oj/9VCf1shs47AjxokZqpnr36Dp8acz9zsaod9ZDAfZdwNrh4Vf958k4wHk3PGcb
-aVqhyPjuIGVJ+7KJWxcmZ/3RQxmEg0xB6i7umhhmmRmYCMPB8fDTdDvnFdC4N+Q=
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAHxnwEN8Xr9TUrHefXPdcDU2
+yd4F3u4bPL4RSSRFIKdqrAaHK0wnzLoF3HneUjKzU/l36kNHBa7dUo8Q2SGd3V4d
+zDR0uT9uUdsZVwmUbAcZs1Z9d1vPMWDqS1zwBKYtLTw2Z7sl9xaLYhxLZSyf1Pxe
+aC8+gNaqJ25aKAbDSMNCyF32vRy4OYy7Hi8Itexkva6XMlF4H4gSXs4QZP9WGhp7
+6YRdcy6Z6lJfkJ9SW6nsoNJvbYGOGbxHg9brxWJV8T7cFBQQVvZKasydS6+6IK/2
+/+n38vEog/7hGQ85iOsu0xOcdkKl/SIj1ckJtGAVif2kbCSzugSafA2jRELyiI0=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/server-key.der b/tls/tests/files/server-key.der
index 81d4449c..781d7a88 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 7cfe3394..7fd24135 100644
--- a/tls/tests/files/server-key.pem
+++ b/tls/tests/files/server-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/server-self.pem b/tls/tests/files/server-self.pem
index 09787533..d203ceb7 100644
--- a/tls/tests/files/server-self.pem
+++ b/tls/tests/files/server-self.pem
@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/server.der b/tls/tests/files/server.der
index 469c447d..01133372 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 0b7102a9..44b49a89 100644
--- a/tls/tests/files/server.pem
+++ b/tls/tests/files/server.pem
@@ -2,21 +2,21 @@
 MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE1NTE0NFoXDTQ1MTAw
-NjE1NTE0NFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIwMTAxMjE3NDk0NFoXDTQ1MTAw
+NjE3NDk0NFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
 B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALiCHlTCgVnziM0Xyoz462rcLsBHHPTkxcOv
-nivqKdGfo5uLiutIufeuhTCBmjv0Gy5k8kJKlzOddRMFEN1sqhAUNluPg+lKX3c+
-f/rIELIH0n5QZ9cujrPmidlDZ06LB17bRRSH3ikHhVyxc9qQnI1Sxem06NYmZtis
-3tzP+JGP63vh7DMeX2fnqZgfaJ9BFwGhnPb7Po070EdsjPwAuxV1TeSihp0DmvIf
-mTct3cB8hnrSmBV0r8WncTrmpH4r+KDH6nFy8+RiUbVh7nK0VTrwOJE6DoNOhnXE
-/svxYGC580xg1maYmpVycY0ZYBtTV8a1A/oX+06xUOMGmtsEXzECAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBANFcFiZ4ymgxJ9zzPc2q9R36m4dEVXmsYSx/
+fk6uXLMZ7S8eFIDRdM/THTLeZamIlWUsPBFigoxlOy/9j3sWR+0r4Ejba7nSlWmM
+o0MkoHgCsVndWtefQzncEbLLkZ1gz2dwjJFVSnaEGSrfdT4Sz5WtCmOX1L06J9fV
+ZQhdvHV8iPOlh1hSHTbkUP6hnsSA/2X5tGrgk3FaAqydTKX/vQbn5Uc+ygIrZCGQ
+t4etXkyXi6EMI6RNRoogYcV36ef8wYHfoxX/ou5fsUPI1ltgc57PCk5EsF1QMWkx
+cW85DZhInU8md7cZivf9MBlP7iwyWe9qISh+GSpfRs+mP1jVlvcCAwEAAaNHMEUw
 CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAAInl3kqvQgj
-XHOwjeUUEfnXmDZGyJ0apIGELgycnbylWwFri75Lo81XhysWPjJgSk85Mi+nRSaj
-dnBFKwimRQxbw6jeFv/t3OsB2WAcSLDVrFTWNyomODT0Yzv6FTPyg23geHIk7w6e
-yKOPi00CiK08fHwzIFD76H663WbWNocxiFwT5X5V1HMMdC8F5SfBwr8n4gfkjTsh
-HH5zcT7z+EfsE2sS3KXW7TLa1+Rg28lP9Hzl2OF3z6EZ0L/dmYAUH1MtzGyZ9BaN
-Kg60AV4Gumx7dohfq1EmDEiGBkde6MGfyOPCqF14Np+C5o7xzAlV8GLq/EvU7+YE
-iHyOKT7W4eE=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAB94wSkKZiW+
+lYf/FBsDpfXEhVNyKSJUs6OxwDPi94Ye9a9ANImUVbLyQG3vYNyJX23mqh/KR//b
+IfO78aUXvbyyejrR4l55nKlEvd+9gcOhfId/xgYdSF/i0mEVKL2W1Z+pj7WY6Izc
+hHUg9SaLYMLRYhQ7C8mB0Ocu7A1svN8J47YKWunaWkToQgIqXDn6naoE4vbv7JO3
+xZEFeMiBsCc8W3dabGxBznBrrBbOckwb9G858IOpKV7RVCGFbGm5zcpMUN4/8Nyg
+hHcmfCdLL3qojamfJ2YiVrkhXSeoT1MS/5xX9fORgHfO/R1+Iv/jZYgw+qub468V
+TXVlrWigIps=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/ssl/ca.conf b/tls/tests/files/ssl/ca.conf
index e97c0b09..18f9a217 100644
--- a/tls/tests/files/ssl/ca.conf
+++ b/tls/tests/files/ssl/ca.conf
@@ -1,9 +1,7 @@
 # Root CA
 
 [ req ]
-# 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
+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 b1d155a6..a943c568 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]