[glib-networking/mcatanzaro/openssl-ocsp: 2/3] Update tests for OCSP stapling
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking/mcatanzaro/openssl-ocsp: 2/3] Update tests for OCSP stapling
- Date: Thu, 16 Dec 2021 14:26:28 +0000 (UTC)
commit 9f848d425c64b9f7498c05e90eaa4402ce425324
Author: Michael Catanzaro <mcatanzaro redhat com>
Date: Wed Dec 15 16:53:14 2021 -0600
Update tests for OCSP stapling
We will have two tests:
(a) Test that Must-Staple extension is respected if set by a CA
certificate. This is the existing test, just renamed. It can only pass
for GnuTLS.
(b) New test: ensure the Must-Staple extension is respected if set by a
server certificate. This test can pass for OpenSSL.
Part-of: <https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/197>
tls/tests/certificate.h | 4 +-
tls/tests/connection.c | 55 +++++++-
tls/tests/files/ca-alternative.pem | 34 ++---
tls/tests/files/ca-key.pem | 50 +++----
tls/tests/files/ca-ocsp.pem | 34 ++---
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 | 98 +++++++-------
tls/tests/files/client-and-key.pem | 82 ++++++------
tls/tests/files/client-csr.pem | 24 ++--
tls/tests/files/client-future.pem | 28 ++--
tls/tests/files/client-key.pem | 50 +++----
tls/tests/files/client-past.pem | 28 ++--
tls/tests/files/client.pem | 32 ++---
tls/tests/files/client2-and-key.pem | 82 ++++++------
tls/tests/files/client2-csr.pem | 24 ++--
tls/tests/files/client2-key.pem | 50 +++----
tls/tests/files/client2.pem | 32 ++---
tls/tests/files/create-files.sh | 24 ++--
tls/tests/files/intermediate-ca-csr.pem | 28 ++--
tls/tests/files/intermediate-ca-key.pem | 50 +++----
tls/tests/files/intermediate-ca.pem | 36 ++---
tls/tests/files/non-ca.pem | 148 ++++++++++-----------
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-csr.pem | 24 ++--
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-pkcs8.der | Bin 1216 -> 1219 bytes
tls/tests/files/server-key-pkcs8.pem | 52 ++++----
tls/tests/files/server-key.der | Bin 1190 -> 1193 bytes
tls/tests/files/server-key.pem | 50 +++----
tls/tests/files/server-ocsp-missing-and-key.pem | 80 +++++------
tls/tests/files/server-ocsp-missing-csr.pem | 29 ++--
tls/tests/files/server-ocsp-missing.pem | 30 ++---
.../files/server-ocsp-required-by-ca-and-key.pem | 49 +++++++
tls/tests/files/server-ocsp-required-by-ca-csr.pem | 17 +++
tls/tests/files/server-ocsp-required-by-ca.pem | 22 +++
.../server-ocsp-required-by-server-and-key.pem | 49 +++++++
.../files/server-ocsp-required-by-server-csr.pem | 18 +++
tls/tests/files/server-ocsp-required-by-server.pem | 22 +++
tls/tests/files/server-ocsp-required-csr.pem | 18 +++
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/server-muststaple.conf | 29 ++++
50 files changed, 1114 insertions(+), 832 deletions(-)
---
diff --git a/tls/tests/certificate.h b/tls/tests/certificate.h
index 63c341b1..8640ae70 100644
--- a/tls/tests/certificate.h
+++ b/tls/tests/certificate.h
@@ -1,4 +1,4 @@
/* This file is generated from update-certificate-test.py */
-#define EXPECTED_NOT_VALID_BEFORE "2021-07-31T18:13:10Z"
-#define EXPECTED_NOT_VALID_AFTER "2046-07-25T18:13:10Z"
+#define EXPECTED_NOT_VALID_BEFORE "2021-12-15T23:20:04Z"
+#define EXPECTED_NOT_VALID_AFTER "2046-12-09T23:20:04Z"
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 2127cbfe..f9940986 100644
--- a/tls/tests/connection.c
+++ b/tls/tests/connection.c
@@ -2638,7 +2638,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 "AX+tOuSPoSSzxau7zBGSOxAfrO/E6eLYvCv3O8MYTfE="
+#define SERVER_CERT_DIGEST_B64 "sdRMUK4PwcHXUPAMwglrSy4Fi8Ybfim61hfucliJ19s="
static void
test_connection_binding_match_tls_server_end_point (TestConnection *test,
gconstpointer data)
@@ -2979,8 +2979,55 @@ test_connection_oscp_must_staple (TestConnection *test,
GIOStream *connection;
GError *error = NULL;
+ test->database = g_tls_file_database_new (tls_test_file_path ("ca.pem"), &error);
+ g_assert_no_error (error);
+ g_assert_nonnull (test->database);
+
+ test->server_certificate = g_tls_certificate_new_from_file (tls_test_file_path
("server-ocsp-required-by-server-and-key.pem"), &error);
+ g_assert_no_error (error);
+ start_async_server_service (test, G_TLS_AUTHENTICATION_NONE, WRITE_THEN_WAIT);
+
+ client = g_socket_client_new ();
+ connection = G_IO_STREAM (g_socket_client_connect (client, G_SOCKET_CONNECTABLE (test->address),
+ NULL, &error));
+ g_assert_no_error (error);
+ g_object_unref (client);
+
+ test->client_connection = g_tls_client_connection_new (connection, test->identity, &error);
+ g_assert_no_error (error);
+ g_assert_nonnull (test->client_connection);
+ g_object_unref (connection);
+
+ g_tls_connection_set_database (G_TLS_CONNECTION (test->client_connection), test->database);
+
+ g_tls_client_connection_set_validation_flags (G_TLS_CLIENT_CONNECTION (test->client_connection),
+ G_TLS_CERTIFICATE_VALIDATE_ALL);
+
+ read_test_data_async (test);
+ g_main_loop_run (test->loop);
+
+ close_server_connection (test);
+ wait_until_server_finished (test);
+
+ /* The server certificate states it supports status_request but our server does not
+ * actually set or support that.
+ * To be secure this must error as a bad certificate. */
+ g_assert_error (test->read_error, G_TLS_ERROR, G_TLS_ERROR_BAD_CERTIFICATE);
+
+ g_clear_error (&test->read_error);
+ g_clear_error (&test->server_error);
+}
+
+static void
+test_connection_oscp_must_staple_intermediate_certificate (TestConnection *test,
+ gconstpointer data)
+{
+ GSocketClient *client;
+ GIOStream *connection;
+ GError *error = NULL;
+
#ifdef BACKEND_IS_OPENSSL
- g_test_skip ("OCSP Must-Staple is not supported with the openssl backend");
+ g_test_skip ("OCSP Must-Staple on intermediate certificates is not supported with the OpenSSL backend");
return;
#endif
@@ -2988,7 +3035,7 @@ test_connection_oscp_must_staple (TestConnection *test,
g_assert_no_error (error);
g_assert_nonnull (test->database);
- test->server_certificate = g_tls_certificate_new_from_file (tls_test_file_path
("server-ocsp-missing-and-key.pem"), &error);
+ test->server_certificate = g_tls_certificate_new_from_file (tls_test_file_path
("server-ocsp-required-by-ca-and-key.pem"), &error);
g_assert_no_error (error);
start_async_server_service (test, G_TLS_AUTHENTICATION_NONE, WRITE_THEN_WAIT);
@@ -3157,6 +3204,8 @@ main (int argc,
setup_connection, test_tls_info, teardown_connection);
g_test_add ("/tls/" BACKEND "/connection/oscp/must-staple", TestConnection, NULL,
setup_connection, test_connection_oscp_must_staple, teardown_connection);
+ g_test_add ("/tls/" BACKEND "/connection/oscp/must-staple-intermediate-certificate", TestConnection, NULL,
+ setup_connection, test_connection_oscp_must_staple_intermediate_certificate,
teardown_connection);
ret = g_test_run ();
diff --git a/tls/tests/files/ca-alternative.pem b/tls/tests/files/ca-alternative.pem
index 31cf4df0..770d3007 100644
--- a/tls/tests/files/ca-alternative.pem
+++ b/tls/tests/files/ca-alternative.pem
@@ -3,27 +3,27 @@ MIIFAjCCA+qgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBnzETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBV
bnRydXN0ZWQgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndh
cy5hLmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNv
-bTAgFw0yMTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJ
+bTAgFw0yMTEyMTUyMzIwMDRaGA8yMDUxMTIwODIzMjAwNFowgYYxEzARBgoJkiaJ
k/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVD
ZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0w
GwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALk97CGeG3O95ZKKTbZ25xkZdeKkXm1fQZRwjK1FwC+XMG1e
-hGtI40zGrb8ayC/olqoMFqz4yUrkb4qpzau8Uml+jZSOx+E3VsLS41lrgMf4k4lg
-YqghgXpu+ErDwL2crJR1IQsKSk/xWeltSZuDkZjUSUqK6SfhC7XZ9PAJmb+Km5Yq
-Z2BnnioxK1lMC25BFtYyXMje0/+15r/Am0+5ek2HMHmD2nCAaHeXEU4mn30lPGEk
-q9l7nNpovH9Rei8mCuZtXkeuzpcO7icRTusI8VBAPXvYB5d3GRmcECnV6jBwWZ0M
-AQ6ib+tdT/PkjEkR4oncAsyO8cRw25gltPo+DpECAwEAAaOCAVwwggFYMB0GA1Ud
-DgQWBBR9MHdtjvb0Yq9WTAKv4wB756MpeTCB3wYDVR0jBIHXMIHUgBTceGApUpyJ
-pj8+VM2B+0qtAGSA3aGBpaSBojCBnzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUG
+ggEPADCCAQoCggEBAOv1mSZzV8MgD68upS8LiIMw8Xb+F3hUTzLarMB+Axy22R2t
+lL8rFqxnnF0eUi/FX8cMDxIL2PMr4dG8kg/PaCSaoke3jbRGsdx1FxCFj6YWn/D5
+9DsoRc93r+Cqxo0mMFTTu5whlzDLVIgxm+WaqkwPzycCc4CB+qfTTR+EMVEKLqSQ
+2X7p6kj5lO6ShER6iSOd3dKdJIkIq0NLB2sZrl+U9lXoVEZwONR2Hjv/wnIX4JXx
+IEeCEvAb61nJiCeVc38GSE5R0Bma2hPVemQQq6iccqb0U0ZUZ+pLLH8dCH4fH8VW
+V5x9vpyZYkshCD7MfW91mLlSuMziLrM9ceeu2Q0CAwEAAaOCAVwwggFYMB0GA1Ud
+DgQWBBT6FH3OnCOvKyXsfc72EJ4xxG0S+jCB3wYDVR0jBIHXMIHUgBQPbuCFuCI1
+4jSFOMAVBE86MzMGvKGBpaSBojCBnzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUG
CgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBVbnRydXN0ZWQgQ2Vy
dGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndhcy5hLmNhLmV4YW1w
-bGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbYIUGx5sD75kSqNK
-hP/0OQ7QuzKrM70wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwGQYD
+bGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbYIUDC99Qdqjkm3R
+eQ5gR30oDqs3mhIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwGQYD
VR0RBBIwEIEOY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAEKW1WUf/Gv+Dqnc7KYoXtS0CJUPJRUze7i7
-L+hEf83wQ7YMnUPE7y5kBibX8c/1BR4h1ITN8CsSYKnJRVH0NVTrX3FIecAMoltI
-r6kg9FUzic3st2JnzcVC7kKokU9ZjjN+iZmEi6tHRmoofB+FdqjcQTUwyTv6FEgV
-qajlizSRwU4pI+hAwRrC3WCFFdTg1QN06r5Gg0g0lp9dIt0mGbOWxlqSmunKDe+Z
-7UtnsHjOzcqHzqABF/uz1PLT73a8b/OOjQ8U3/mqgWjeE94Dc049MiGN/BYb+50j
-rF8ftm/eCiG+VrojoNYGYt76rFCVQ+3SJdw6q6MH3BpE4KjqDIw=
+b20wDQYJKoZIhvcNAQELBQADggEBAC52UDX1nf8rFjWcVL5gc6r5LEEIz+X2/2hg
+44WWkg1LxDCT/rcpIboTu9mamPZAh9PaWegbWJK4hLccAIcV1McfTEDE0X93CpS5
+AJO+iJ8SnHqn1auFKAtGnJF9OubQGTj13ch8zsSLNkBsQNTu4Ckp4XE5EiN+aRh+
+K7mv6QUNplKt6byEke/SnNd1Ro3qxnZMRBWdKfJjUAjdsFKZ2zDH7z600Dq0eiMt
+hfJbIH8m07W8z2KvYLB4/kJBRj0qVcrch/AsuDk4Go3YrM5g6+ozxb5Tdrm4h54x
+U10iLsrdOKHyV0G2OLHlBHQulek+SRgce9NEMtvtSWLGITUZsM0=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/ca-key.pem b/tls/tests/files/ca-key.pem
index 750ec21d..4e072afc 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-ocsp.pem b/tls/tests/files/ca-ocsp.pem
index 9b6ef96d..37f541f8 100644
--- a/tls/tests/files/ca-ocsp.pem
+++ b/tls/tests/files/ca-ocsp.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE9jCCA96gAwIBAgIUUnrK8xF95zauX9lNEPBSQqx/z4UwDQYJKoZIhvcNAQEL
+MIIE9jCCA96gAwIBAgIUG5sl4eOrOocnk3CY8lz2MH3DSw4wDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/IsZAEZ
+MTEyMTUyMzIwMDRaGA8yMDUxMTIwODIzMjAwNFowgYYxEzARBgoJkiaJk/IsZAEZ
FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALk97CGeG3O95ZKKTbZ25xkZdeKkXm1fQZRwjK1FwC+XMG1ehGtI40zG
-rb8ayC/olqoMFqz4yUrkb4qpzau8Uml+jZSOx+E3VsLS41lrgMf4k4lgYqghgXpu
-+ErDwL2crJR1IQsKSk/xWeltSZuDkZjUSUqK6SfhC7XZ9PAJmb+Km5YqZ2Bnniox
-K1lMC25BFtYyXMje0/+15r/Am0+5ek2HMHmD2nCAaHeXEU4mn30lPGEkq9l7nNpo
-vH9Rei8mCuZtXkeuzpcO7icRTusI8VBAPXvYB5d3GRmcECnV6jBwWZ0MAQ6ib+td
-T/PkjEkR4oncAsyO8cRw25gltPo+DpECAwEAAaOCAVYwggFSMB0GA1UdDgQWBBR9
-MHdtjvb0Yq9WTAKv4wB756MpeTCBxgYDVR0jBIG+MIG7gBR9MHdtjvb0Yq9WTAKv
-4wB756MpeaGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+AQoCggEBAOv1mSZzV8MgD68upS8LiIMw8Xb+F3hUTzLarMB+Axy22R2tlL8rFqxn
+nF0eUi/FX8cMDxIL2PMr4dG8kg/PaCSaoke3jbRGsdx1FxCFj6YWn/D59DsoRc93
+r+Cqxo0mMFTTu5whlzDLVIgxm+WaqkwPzycCc4CB+qfTTR+EMVEKLqSQ2X7p6kj5
+lO6ShER6iSOd3dKdJIkIq0NLB2sZrl+U9lXoVEZwONR2Hjv/wnIX4JXxIEeCEvAb
+61nJiCeVc38GSE5R0Bma2hPVemQQq6iccqb0U0ZUZ+pLLH8dCH4fH8VWV5x9vpyZ
+YkshCD7MfW91mLlSuMziLrM9ceeu2Q0CAwEAAaOCAVYwggFSMB0GA1UdDgQWBBT6
+FH3OnCOvKyXsfc72EJ4xxG0S+jCBxgYDVR0jBIG+MIG7gBT6FH3OnCOvKyXsfc72
+EJ4xxG0S+qGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-bGUuY29tghRSesrzEX3nNq5f2U0Q8FJCrH/PhTAPBgNVHRMBAf8EBTADAQH/MA4G
+bGUuY29tghQbmyXh46s6hyeTcJjyXPYwfcNLDjAPBgNVHRMBAf8EBTADAQH/MA4G
A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
EjAQgQ5jYUBleGFtcGxlLmNvbTARBggrBgEFBQcBGAQFMAMCAQUwDQYJKoZIhvcN
-AQELBQADggEBAC6beOO8UJu7kQsicLZuHkbQv1tcymAHBQ4KG3e6DuPS7Cpiv48j
-nYZWIeApxyYX0WC9USS1Hxibjg1nGYUNg00MN1QcSpr5ivEmm697wYAF37Yc+sv+
-h62oLltkVENPRC9UcoOMDRW4E39Ag1nOxptLEfz7WlOUTjgBmfyy1i9G78M8YF4O
-Cpi38qbUC8PRSz9n8XCIcheb9umPcZkxLeQ4+W5zosg8W4FpjHrQ2j5EVtWu1oaZ
-eAyxghHym6J6z5p2Le9K4sZ2pFVppJXvOPw58QZBZnP8h/v8vidr4fr/CPAh9gmp
-IwnAKK2sIsc1wqcltHWwGgLYp1WPs4Pa9FI=
+AQELBQADggEBALjc1+vMMWdASPpLaSd24sAGccD/6c47Lcmj0UpYNIo+lnTG1ATO
+FduqpkXXppGuF6oXZmlwlp88dV8XlT4iTvI1MA3WkkY2PudnyeDEH7I2sn0sOMXB
+RA+Zo8RVG1ZjCDPs9gBGm2meZz5ZoEsvBvpFm+uPTnQuYJV6DJFY+Qegmn0v8vc1
+jXmYh4q2m9PlDOG+kfUWnQzaW6h4zscpYcqdrh1RdnxE6zYmj/ElyHrI0eb0eNhW
+YzJ7WPhbwGWx0LYVK8x/oBFNk42fT3hjkEVddKK88uPabo62NgxY4v9ROaxYdLP+
+vsjgkBWLEjWMzdkqbafWudnoVg/kxfOA2Ig=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/ca-roots-bad.pem b/tls/tests/files/ca-roots-bad.pem
index a1648bcf..f04492a0 100644
--- a/tls/tests/files/ca-roots-bad.pem
+++ b/tls/tests/files/ca-roots-bad.pem
@@ -1,31 +1,31 @@
-----BEGIN CERTIFICATE-----
-MIIE4zCCA8ugAwIBAgIUQL/y3nsri2som8J5/D+Hm8ljMwcwDQYJKoZIhvcNAQEL
+MIIE4zCCA8ugAwIBAgIUMMlTpxMo883UF2roJtqGgZLPoJkwDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/IsZAEZ
+MTEyMTUyMzIwMDRaGA8yMDUxMTIwODIzMjAwNFowgYYxEzARBgoJkiaJk/IsZAEZ
FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALk97CGeG3O95ZKKTbZ25xkZdeKkXm1fQZRwjK1FwC+XMG1ehGtI40zG
-rb8ayC/olqoMFqz4yUrkb4qpzau8Uml+jZSOx+E3VsLS41lrgMf4k4lgYqghgXpu
-+ErDwL2crJR1IQsKSk/xWeltSZuDkZjUSUqK6SfhC7XZ9PAJmb+Km5YqZ2Bnniox
-K1lMC25BFtYyXMje0/+15r/Am0+5ek2HMHmD2nCAaHeXEU4mn30lPGEkq9l7nNpo
-vH9Rei8mCuZtXkeuzpcO7icRTusI8VBAPXvYB5d3GRmcECnV6jBwWZ0MAQ6ib+td
-T/PkjEkR4oncAsyO8cRw25gltPo+DpECAwEAAaOCAUMwggE/MB0GA1UdDgQWBBR9
-MHdtjvb0Yq9WTAKv4wB756MpeTCBxgYDVR0jBIG+MIG7gBR9MHdtjvb0Yq9WTAKv
-4wB756MpeaGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+AQoCggEBAOv1mSZzV8MgD68upS8LiIMw8Xb+F3hUTzLarMB+Axy22R2tlL8rFqxn
+nF0eUi/FX8cMDxIL2PMr4dG8kg/PaCSaoke3jbRGsdx1FxCFj6YWn/D59DsoRc93
+r+Cqxo0mMFTTu5whlzDLVIgxm+WaqkwPzycCc4CB+qfTTR+EMVEKLqSQ2X7p6kj5
+lO6ShER6iSOd3dKdJIkIq0NLB2sZrl+U9lXoVEZwONR2Hjv/wnIX4JXxIEeCEvAb
+61nJiCeVc38GSE5R0Bma2hPVemQQq6iccqb0U0ZUZ+pLLH8dCH4fH8VWV5x9vpyZ
+YkshCD7MfW91mLlSuMziLrM9ceeu2Q0CAwEAAaOCAUMwggE/MB0GA1UdDgQWBBT6
+FH3OnCOvKyXsfc72EJ4xxG0S+jCBxgYDVR0jBIG+MIG7gBT6FH3OnCOvKyXsfc72
+EJ4xxG0S+qGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-bGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAPBgNVHRMBAf8EBTADAQH/MA4G
+bGUuY29tghQwyVOnEyjzzdQXaugm2oaBks+gmTAPBgNVHRMBAf8EBTADAQH/MA4G
A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
-EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
-Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
-H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
-Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
-cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
-uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
-QSNhrzqDvA==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAT+qReYaoLH6l
+nOtZvP2a7N1yCPb894UnixhHAQ0ZAJ6gmNCZpPuUj0c00Zj4LVor7xtDhaeegJ/F
+HiyslURfA/2MURJb2h+dVmrfjytDGr4t8NPMEfa9kBmkfP3n1zOzDReRFqt0X9dL
+nnUPYpcOj0f4tWgjiMkgZaL78Ba3797zCJDMKfxt28u2xRQzi1OxR393btPAat0k
+8RPRo0Lza1K+Buj3rk6z2HvsIKJUJKw8tKVXKfp9yhh9mkJq8BFa8yIH4IIxo/ID
+ai07ooXGfo9CWrgeqhOxlqjpo2QcmXD947B6Oso2oENNwX52/fRVb45qGd8iM21q
+IuV9437xPQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
diff --git a/tls/tests/files/ca-roots.pem b/tls/tests/files/ca-roots.pem
index cb431a62..5a3c02a9 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-----
-MIIE4zCCA8ugAwIBAgIUQL/y3nsri2som8J5/D+Hm8ljMwcwDQYJKoZIhvcNAQEL
+MIIE4zCCA8ugAwIBAgIUMMlTpxMo883UF2roJtqGgZLPoJkwDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/IsZAEZ
+MTEyMTUyMzIwMDRaGA8yMDUxMTIwODIzMjAwNFowgYYxEzARBgoJkiaJk/IsZAEZ
FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALk97CGeG3O95ZKKTbZ25xkZdeKkXm1fQZRwjK1FwC+XMG1ehGtI40zG
-rb8ayC/olqoMFqz4yUrkb4qpzau8Uml+jZSOx+E3VsLS41lrgMf4k4lgYqghgXpu
-+ErDwL2crJR1IQsKSk/xWeltSZuDkZjUSUqK6SfhC7XZ9PAJmb+Km5YqZ2Bnniox
-K1lMC25BFtYyXMje0/+15r/Am0+5ek2HMHmD2nCAaHeXEU4mn30lPGEkq9l7nNpo
-vH9Rei8mCuZtXkeuzpcO7icRTusI8VBAPXvYB5d3GRmcECnV6jBwWZ0MAQ6ib+td
-T/PkjEkR4oncAsyO8cRw25gltPo+DpECAwEAAaOCAUMwggE/MB0GA1UdDgQWBBR9
-MHdtjvb0Yq9WTAKv4wB756MpeTCBxgYDVR0jBIG+MIG7gBR9MHdtjvb0Yq9WTAKv
-4wB756MpeaGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+AQoCggEBAOv1mSZzV8MgD68upS8LiIMw8Xb+F3hUTzLarMB+Axy22R2tlL8rFqxn
+nF0eUi/FX8cMDxIL2PMr4dG8kg/PaCSaoke3jbRGsdx1FxCFj6YWn/D59DsoRc93
+r+Cqxo0mMFTTu5whlzDLVIgxm+WaqkwPzycCc4CB+qfTTR+EMVEKLqSQ2X7p6kj5
+lO6ShER6iSOd3dKdJIkIq0NLB2sZrl+U9lXoVEZwONR2Hjv/wnIX4JXxIEeCEvAb
+61nJiCeVc38GSE5R0Bma2hPVemQQq6iccqb0U0ZUZ+pLLH8dCH4fH8VWV5x9vpyZ
+YkshCD7MfW91mLlSuMziLrM9ceeu2Q0CAwEAAaOCAUMwggE/MB0GA1UdDgQWBBT6
+FH3OnCOvKyXsfc72EJ4xxG0S+jCBxgYDVR0jBIG+MIG7gBT6FH3OnCOvKyXsfc72
+EJ4xxG0S+qGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-bGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAPBgNVHRMBAf8EBTADAQH/MA4G
+bGUuY29tghQwyVOnEyjzzdQXaugm2oaBks+gmTAPBgNVHRMBAf8EBTADAQH/MA4G
A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
-EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
-Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
-H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
-Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
-cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
-uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
-QSNhrzqDvA==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAT+qReYaoLH6l
+nOtZvP2a7N1yCPb894UnixhHAQ0ZAJ6gmNCZpPuUj0c00Zj4LVor7xtDhaeegJ/F
+HiyslURfA/2MURJb2h+dVmrfjytDGr4t8NPMEfa9kBmkfP3n1zOzDReRFqt0X9dL
+nnUPYpcOj0f4tWgjiMkgZaL78Ba3797zCJDMKfxt28u2xRQzi1OxR393btPAat0k
+8RPRo0Lza1K+Buj3rk6z2HvsIKJUJKw8tKVXKfp9yhh9mkJq8BFa8yIH4IIxo/ID
+ai07ooXGfo9CWrgeqhOxlqjpo2QcmXD947B6Oso2oENNwX52/fRVb45qGd8iM21q
+IuV9437xPQ==
-----END CERTIFICATE-----
GLib shouldn't care about this comment
diff --git a/tls/tests/files/ca.pem b/tls/tests/files/ca.pem
index 93ec59a2..e95f13d6 100644
--- a/tls/tests/files/ca.pem
+++ b/tls/tests/files/ca.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE4zCCA8ugAwIBAgIUQL/y3nsri2som8J5/D+Hm8ljMwcwDQYJKoZIhvcNAQEL
+MIIE4zCCA8ugAwIBAgIUMMlTpxMo883UF2roJtqGgZLPoJkwDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/IsZAEZ
+MTEyMTUyMzIwMDRaGA8yMDUxMTIwODIzMjAwNFowgYYxEzARBgoJkiaJk/IsZAEZ
FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALk97CGeG3O95ZKKTbZ25xkZdeKkXm1fQZRwjK1FwC+XMG1ehGtI40zG
-rb8ayC/olqoMFqz4yUrkb4qpzau8Uml+jZSOx+E3VsLS41lrgMf4k4lgYqghgXpu
-+ErDwL2crJR1IQsKSk/xWeltSZuDkZjUSUqK6SfhC7XZ9PAJmb+Km5YqZ2Bnniox
-K1lMC25BFtYyXMje0/+15r/Am0+5ek2HMHmD2nCAaHeXEU4mn30lPGEkq9l7nNpo
-vH9Rei8mCuZtXkeuzpcO7icRTusI8VBAPXvYB5d3GRmcECnV6jBwWZ0MAQ6ib+td
-T/PkjEkR4oncAsyO8cRw25gltPo+DpECAwEAAaOCAUMwggE/MB0GA1UdDgQWBBR9
-MHdtjvb0Yq9WTAKv4wB756MpeTCBxgYDVR0jBIG+MIG7gBR9MHdtjvb0Yq9WTAKv
-4wB756MpeaGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+AQoCggEBAOv1mSZzV8MgD68upS8LiIMw8Xb+F3hUTzLarMB+Axy22R2tlL8rFqxn
+nF0eUi/FX8cMDxIL2PMr4dG8kg/PaCSaoke3jbRGsdx1FxCFj6YWn/D59DsoRc93
+r+Cqxo0mMFTTu5whlzDLVIgxm+WaqkwPzycCc4CB+qfTTR+EMVEKLqSQ2X7p6kj5
+lO6ShER6iSOd3dKdJIkIq0NLB2sZrl+U9lXoVEZwONR2Hjv/wnIX4JXxIEeCEvAb
+61nJiCeVc38GSE5R0Bma2hPVemQQq6iccqb0U0ZUZ+pLLH8dCH4fH8VWV5x9vpyZ
+YkshCD7MfW91mLlSuMziLrM9ceeu2Q0CAwEAAaOCAUMwggE/MB0GA1UdDgQWBBT6
+FH3OnCOvKyXsfc72EJ4xxG0S+jCBxgYDVR0jBIG+MIG7gBT6FH3OnCOvKyXsfc72
+EJ4xxG0S+qGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-bGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAPBgNVHRMBAf8EBTADAQH/MA4G
+bGUuY29tghQwyVOnEyjzzdQXaugm2oaBks+gmTAPBgNVHRMBAf8EBTADAQH/MA4G
A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
-EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
-Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
-H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
-Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
-cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
-uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
-QSNhrzqDvA==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAT+qReYaoLH6l
+nOtZvP2a7N1yCPb894UnixhHAQ0ZAJ6gmNCZpPuUj0c00Zj4LVor7xtDhaeegJ/F
+HiyslURfA/2MURJb2h+dVmrfjytDGr4t8NPMEfa9kBmkfP3n1zOzDReRFqt0X9dL
+nnUPYpcOj0f4tWgjiMkgZaL78Ba3797zCJDMKfxt28u2xRQzi1OxR393btPAat0k
+8RPRo0Lza1K+Buj3rk6z2HvsIKJUJKw8tKVXKfp9yhh9mkJq8BFa8yIH4IIxo/ID
+ai07ooXGfo9CWrgeqhOxlqjpo2QcmXD947B6Oso2oENNwX52/fRVb45qGd8iM21q
+IuV9437xPQ==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/chain.pem b/tls/tests/files/chain.pem
index f5302357..10304144 100644
--- a/tls/tests/files/chain.pem
+++ b/tls/tests/files/chain.pem
@@ -3,78 +3,78 @@ MIIDuzCCAqOgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcyNTE4MTMxMFow
+LWNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNVoXDTQ2MTIwOTIzMjAwNVow
SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKdl434MfWmQOdgVOK52liMyCIrv8pDdrFTIwhk3aj59dpB/
-Rx8C7FbOHA8tyIBWpKaNNNT3S/y4buWHcJywr+3oqy31+KFf/hKnDDgR86j822PK
-azfwcjrR05GBfKN3oKo6HEtsJ9jiicGFVp5gZkr18OsSbJiVuWbjEhOgUe4etHU+
-oWwnvKfpwwc3R9mDkqEtP+58lrGXmvUmVICfDW8Hymm4SXGMH05p02+an6rqciFk
-0GNMbeUeYK8fyVprqZIO8aTRAr6+Lb5PpBm6BTKI3KVGpRsevCJTVH867phwp7Qj
-ImbsEpxbUo9sJsIHshhNsLwi0bl7w4QhFrGlKO0CAwEAAaNHMEUwCQYDVR0TBAIw
+ggEPADCCAQoCggEBAO9xlq1UYoCohgHoTqJnelmNo5UlVhnChFwGZupCakXpq3ry
+KBPVW2oANk2oOZf9vsJEnXs2LXB6kMaCFUUDgw+bR6+OCk2rcmQOsJkXCjzxWBWW
+UNd8YEbiptn1RGohS/6vlw2OPTyS4gLX1VV8YMos4u3PikdmtZZuLHniYFGDDNyn
+zZAHzcrsuKZzkpkGWqpXjDkZ6eH4gd5WGFivJKMmbNB/e7K+ShZ+wDfnbDCxlBmf
+r/6zdoZt2Zc2K6T4bVdR2u40DTcfRCZqer9GCnKvqzeBAJoC3WQbUIGwFjq0kiZG
+tdthOKZVQ59aWlBMXT5+GuWRqPY7zBZIig2skw8CAwEAAaNHMEUwCQYDVR0TBAIw
ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
-ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAH44AdGFIuKyXGruD3XnuNZF
-eGOxLd3epXbWBsuY5tfol7ACO/hV6301VIrCHDGf4uovfyasLhu26kI6gCNZkROf
-NzODOhNOdNy6rSDApFn3TVIgEsmQ9Zm1MHfXc7Xz18L/1Cb1mjmXGRa+fMetNwSD
-jQLgxIKbA1LN4QPGQ9FnGeq/1KvXNHykAbV7dA8uRCkZnkgmXKVH5bjMZIi51Uo1
-Ls49sFAsrxL49rz4yvTVZe/13Gu7KCIVl1echy0nDk6J4C2qLrS5+WV/vyGdV6nk
-WZm6baVMEaGu/ygmJ8H6rUmrZy/rdIFv4yyQgOME8K6ZDW0/lYFqozDMxB5NucY=
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEtYVbiVHhRswFlaiG6dM1XD
+9XgtbTRutcdyLy1moxvfLiJpiRk0Uy8wXYTpjXe/iVtoNchT6g4ZOz1/shLjJ8tX
+30vpUcjULqV+eIcBPqmq9NgPNswH5BGqX0BWtMJAa3dR8FBWkikd3/WuSLd3uvSz
+8f/hJjqq7ovIAKxeSjGwqRqk6/8lbrdLYRDNKV7qAbtsRUfN7PlOxgGIAsqeZAsi
+SGOSW8uAwTLqHTwnovaN4ec4efUc6mpsvW+Na4YhR/U2RZAvoQtRBEHRwQNDOByD
+Xe29ZXe3jdQhUcKnJ0iaj/z32Y1/2dU3bTsDLDROBnJKICnS9wDBVbNXycvnekY=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIFAjCCA+qgAwIBAgIBCDANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIFAjCCA+qgAwIBAgIBCTANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
-NTE4MTMxMFowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNVoXDTQ2MTIw
+OTIzMjAwNVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN/FYEl72F6SHmdAd3SYk4gEgGg71gUj
-fIk8HhQ19L8VlK9a08SbdxwA+H7bBAZzFTIdj535Wl3x1T19Tqe+w7RBLCJlqC9J
-3d7fz5uMYz1UFa/R39kAxO38wQpHcVHdEwqjGtg+Cp1TMT9myFU9+0oWPH9SKqvz
-SE7vHq7fVgC7vs0kIcMZjQvCugxC1VYyBNh/EimzLxmPaMc+4KspcVXEl4ig8tkE
-mUK06sh79Ul9eC+8xL782ZC7Cdo5UVvS+I+a23E/C1/utmXdc+SotwKQlgF+K6e2
-vvk96WKVBFPlw5dxW/LM5/YaGlukFiYxG5UXFJbvB4jr8gL56orxPokCAwEAAaOC
-AVAwggFMMB0GA1UdDgQWBBRMhOX0fYE8FyFR3KPRc/AaPEYC2jCBxgYDVR0jBIG+
-MIG7gBR9MHdtjvb0Yq9WTAKv4wB756MpeaGBjKSBiTCBhjETMBEGCgmSJomT8ixk
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM38HyX7bWXgx0vo3FouVlOL2zu26NWk
+fBOlayVaNSwz0vQBqzH00V1DfldicevLLUjcxKeezlYRwI3cGHuFqWoZOjiJ/Nq9
+SsmpW/y7JCUqSA3CXrVVXSrulmXiaozYoQA1fWOpiwcr3Jhz/8VCSYGbZYJYqwN8
+PyyZWUfOMklkgeJrhKDX2JWzjMSBSqcj25hEPRvqB/Fmqpx/qnMl1/ssosnRKCcx
+zHv94uBapF3XyjBAmvw29OwjWDN4F50pAkgOHB04CW5b14WWc6APUS6jpc4H4ZTT
+buX2cR07G4I2IVFmtgwxXlEHL+XCtyWojwg9edN9ML7ir3oHJkRR4mECAwEAAaOC
+AVAwggFMMB0GA1UdDgQWBBSvkF5c8hOL+tkT2zVlslNkMpbAijCBxgYDVR0jBIG+
+MIG7gBT6FH3OnCOvKyXsfc72EJ4xxG0S+qGBjKSBiTCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAP
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQwyVOnEyjzzdQXaugm2oaBks+gmTAP
BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAJArQW4HGrmrCNYdA3C6LwwqhuzJzwR87HPg
-jmK+1f/E4qPlaT8PhgoxmU2bOCoI/eNHPSfXk5sOl8k6HUZyF/hRdFBUgUtUEO81
-udRrFXRwUeRY30p8BXm8sbxNGk9FMCO/czdS2MD6T7fdLI8Z6g9hz+eOOyEHVy6D
-Z/LkUgIMQwVibdMuNs2fxgpmReZgraqQOeHAyCCo0SkZXGkN2rHV3kYJkuc522kq
-K11ldkrxKhHU77ebxrHvgYtv0D90rspFEcY16/0iYAFdthZX1gJOgpMivD7lXykX
-IHU1jn7fIdjT+uaoB+5ScQKYrlngZcaij16rX0nj7GMwrls/Awc=
+b20wDQYJKoZIhvcNAQELBQADggEBAK8ukSalZ6OrwTAtgm7HLFwhC+NENJb0lnOk
+wpgv4Z3Bhb4S1drgrwsZfFGNsq3jLO2gURtNchC9eTAdHPZpNWoW+s1Ja+ZmbAS6
+PmPMdOclPnemljNuoR79I4sbCMxiyArkVw1EbJZSmpGocVFzB9bVoj5G5/In4CYT
+yiF2GxsqBUps7ID6lmAdJYWdzJ7PYbnlerqyWdql2Z2OwkFZCXyFSuQprwCV6SsX
+0un1xUqdgS1+iffl2Oi/9S+pK1Y3NGtn25sDT5bPMpoc8jwRf8n4rtS8pHyEJyoz
+ZnwhqAHALcxUFoWVqjrqHZmNXbNtjuGBGuRU755FyE5pVcRMoH0=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIE4zCCA8ugAwIBAgIUQL/y3nsri2som8J5/D+Hm8ljMwcwDQYJKoZIhvcNAQEL
+MIIE4zCCA8ugAwIBAgIUMMlTpxMo883UF2roJtqGgZLPoJkwDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/IsZAEZ
+MTEyMTUyMzIwMDRaGA8yMDUxMTIwODIzMjAwNFowgYYxEzARBgoJkiaJk/IsZAEZ
FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZp
Y2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZI
hvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALk97CGeG3O95ZKKTbZ25xkZdeKkXm1fQZRwjK1FwC+XMG1ehGtI40zG
-rb8ayC/olqoMFqz4yUrkb4qpzau8Uml+jZSOx+E3VsLS41lrgMf4k4lgYqghgXpu
-+ErDwL2crJR1IQsKSk/xWeltSZuDkZjUSUqK6SfhC7XZ9PAJmb+Km5YqZ2Bnniox
-K1lMC25BFtYyXMje0/+15r/Am0+5ek2HMHmD2nCAaHeXEU4mn30lPGEkq9l7nNpo
-vH9Rei8mCuZtXkeuzpcO7icRTusI8VBAPXvYB5d3GRmcECnV6jBwWZ0MAQ6ib+td
-T/PkjEkR4oncAsyO8cRw25gltPo+DpECAwEAAaOCAUMwggE/MB0GA1UdDgQWBBR9
-MHdtjvb0Yq9WTAKv4wB756MpeTCBxgYDVR0jBIG+MIG7gBR9MHdtjvb0Yq9WTAKv
-4wB756MpeaGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
+AQoCggEBAOv1mSZzV8MgD68upS8LiIMw8Xb+F3hUTzLarMB+Axy22R2tlL8rFqxn
+nF0eUi/FX8cMDxIL2PMr4dG8kg/PaCSaoke3jbRGsdx1FxCFj6YWn/D59DsoRc93
+r+Cqxo0mMFTTu5whlzDLVIgxm+WaqkwPzycCc4CB+qfTTR+EMVEKLqSQ2X7p6kj5
+lO6ShER6iSOd3dKdJIkIq0NLB2sZrl+U9lXoVEZwONR2Hjv/wnIX4JXxIEeCEvAb
+61nJiCeVc38GSE5R0Bma2hPVemQQq6iccqb0U0ZUZ+pLLH8dCH4fH8VWV5x9vpyZ
+YkshCD7MfW91mLlSuMziLrM9ceeu2Q0CAwEAAaOCAUMwggE/MB0GA1UdDgQWBBT6
+FH3OnCOvKyXsfc72EJ4xxG0S+jCBxgYDVR0jBIG+MIG7gBT6FH3OnCOvKyXsfc72
+EJ4xxG0S+qGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-bGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAPBgNVHRMBAf8EBTADAQH/MA4G
+bGUuY29tghQwyVOnEyjzzdQXaugm2oaBks+gmTAPBgNVHRMBAf8EBTADAQH/MA4G
A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
-EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
-Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
-H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
-Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
-cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
-uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
-QSNhrzqDvA==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAT+qReYaoLH6l
+nOtZvP2a7N1yCPb894UnixhHAQ0ZAJ6gmNCZpPuUj0c00Zj4LVor7xtDhaeegJ/F
+HiyslURfA/2MURJb2h+dVmrfjytDGr4t8NPMEfa9kBmkfP3n1zOzDReRFqt0X9dL
+nnUPYpcOj0f4tWgjiMkgZaL78Ba3797zCJDMKfxt28u2xRQzi1OxR393btPAat0k
+8RPRo0Lza1K+Buj3rk6z2HvsIKJUJKw8tKVXKfp9yhh9mkJq8BFa8yIH4IIxo/ID
+ai07ooXGfo9CWrgeqhOxlqjpo2QcmXD947B6Oso2oENNwX52/fRVb45qGd8iM21q
+IuV9437xPQ==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client-and-key.pem b/tls/tests/files/client-and-key.pem
index 4f35914c..31f88944 100644
--- a/tls/tests/files/client-and-key.pem
+++ b/tls/tests/files/client-and-key.pem
@@ -1,48 +1,48 @@
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA3MzExODEzMTBaFw00NjA3MjUxODEz
-MTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTEyMTUyMzIwMDVaFw00NjEyMDkyMzIw
+MDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPbuZMMuAYN
-HHfO9oXuDJG2vNcphC4nEoldJrS4Wr7X5RUXlVUHyHiwY2S7qXstZP25m6H9Obl4
-2AysGDYccKSm0/Ne97CGkTuMSoJFfm8EP1W5hn2FyiAmcJJDEA4s9AG7ZNuZtbi7
-LMp5M0J7Qyj/7AKruaKYXfB1CWHAR5B9mAqE11hGZJcUAN4gxV7IVNPYk6bnhUgj
-EH8eiCfs6yUB3CqZ1S7LICvC9jwg2J/+Qkfm0tfHbvtoyAEb7tFVWbZ3GcgUfntN
-ixe+1Um3s8pyB+wVznv65cEjCPvgqMMJVfS9oMV7Lg7TuNqjirzaSSGSVWGuR3Iy
-VmjtfpGk9R8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZs33954DJg4+NJzt8QKI
-5+aDeBb5FcnwvIbx7QpsSPuJJOuamLX8fo4x7VZut3y5VqyK1QFIE8dWNCotVP5r
-I4xFFYG6CEKkzc/fZ8FTMCYFoGVxUce2PMX/XcZuYWaO+F7Gz8LzW1CbYzbFmAyZ
-ZUl0WOeFbWl/yQmwym5ZFKLogZXL0ZHtwNKHH0LiKOyUssiWbN1cD7BQaiuXcsKS
-JjWsl2j5pi+07WaGZGk+MB8mFl56I9u/43qdaxf1lWicyj6QiwvZf/WVxi5dT3zA
-8IEOS5j2Ahg2xP/ot24R/7+d4eV5m27qfqzB4HT7y1bl0Hi5lXl1O6qzmqJo7Z49
-zg==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIW1UfdO4nP
+dGKo9YjM/EGVtzWyoNCz0+y5uqRvr2NagBfGrwkC2Z5t6kwrjgaGyhz3tQ1cCozO
+/DqIGERSdJgsNQXrayaZjoOBBmRUerkRlVU1nX+tUOcV5JyE6vMPspJI56RSlxVM
+oFE/k/9+jK/CnKZss9dfBY67VjX4avs+EJKbX4bpgNv7EpsaMTJWrvdYLXTDHY6e
+gpjyLxuyzpagXEXi0fnSM0jimvvOkFVqZt/bdGbk/nxUbOaANkdWPzIK71PCT30l
+7t4F+3UaV2Nl8jrGaKGgLKdiqGxEQhJO9XjJtG7R3S+9CMvzcVeVtle8s2cIEvR4
+ATILn+xegCUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAErxcL62i04myJ5L1M7zR
+Q5E9ctb78R+0A3GDAUo8qx2eO9pwmNH0DTrDPKUu0iAIyZlS5grS3fq5I3yy/wl8
+P6ClIxV/BryDXlgM0m/pjr79qtlILOpO4/Fxgp5tSNKomOOGjzP7jgcNqTuor+Z+
+d0Q8m60fwgCbThtF7ivsLcdGPwDknN3uuYvkyvsTMWOedbW2LA1LwtuF3qZiAcIe
+5yVqkV2zJtr+N122Wbnl/26UOBabtYXki0xsPtAvzP3f9Fp6zo+lmp5mTZRoVJOd
+GrDLnf+1YhlfoB05+nefI4M46WAkXRs6hCrORyOKza0l3SXhP/Kgt9uR3DvLz/B2
+7Q==
-----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-csr.pem b/tls/tests/files/client-csr.pem
index 7197ec74..96b634d7 100644
--- a/tls/tests/files/client-csr.pem
+++ b/tls/tests/files/client-csr.pem
@@ -2,16 +2,16 @@
MIICpzCCAY8CAQAwYjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
ARkWB0VYQU1QTEUxDzANBgNVBAMMBkNsaWVudDEhMB8GCSqGSIb3DQEJARYSY2xp
ZW50QGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-49u5kwy4Bg0cd872he4Mkba81ymELicSiV0mtLhavtflFReVVQfIeLBjZLupey1k
-/bmbof05uXjYDKwYNhxwpKbT8173sIaRO4xKgkV+bwQ/VbmGfYXKICZwkkMQDiz0
-Abtk25m1uLssynkzQntDKP/sAqu5ophd8HUJYcBHkH2YCoTXWEZklxQA3iDFXshU
-09iTpueFSCMQfx6IJ+zrJQHcKpnVLssgK8L2PCDYn/5CR+bS18du+2jIARvu0VVZ
-tncZyBR+e02LF77VSbezynIH7BXOe/rlwSMI++CowwlV9L2gxXsuDtO42qOKvNpJ
-IZJVYa5HcjJWaO1+kaT1HwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAL1cb2Va
-kt0vxRnH1GjKrXUGhQbHWv5OwKxmNhplsQkupG6d9ReC0F1DCSEgx0bJ7NrsAiH9
-iyZkuIKCU44VgZgUvwm5UzzEYzE56bYw5G0iphlSwX9hQOjVUi/813MmiqEQghzG
-6f1bQo5NPu949d4S8r73y1fK2qxC7rNcVECEyt+6brz22PRl8e8D9sirZiFfdqnt
-wzzQoJfSU1d237y3OzqFeEQfm6oK/m/BJNFynY4ZcwJeLUxkbz7ze8dU80r7cIMq
-OKq4gzhu8eMYqaYdWDlYmArHAm83As/N4XGuarP77h6Rge7UZZShkklxPU3C9jHC
-I7zegO9U8s7ZByg=
+whbVR907ic90Yqj1iMz8QZW3NbKg0LPT7Lm6pG+vY1qAF8avCQLZnm3qTCuOBobK
+HPe1DVwKjM78OogYRFJ0mCw1BetrJpmOg4EGZFR6uRGVVTWdf61Q5xXknITq8w+y
+kkjnpFKXFUygUT+T/36Mr8Kcpmyz118FjrtWNfhq+z4QkptfhumA2/sSmxoxMlau
+91gtdMMdjp6CmPIvG7LOlqBcReLR+dIzSOKa+86QVWpm39t0ZuT+fFRs5oA2R1Y/
+MgrvU8JPfSXu3gX7dRpXY2XyOsZooaAsp2KobERCEk71eMm0btHdL70Iy/NxV5W2
+V7yzZwgS9HgBMguf7F6AJQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBALlJL9a0
+pgMeRu2hAoqnUvFuBndsQMfD24NROBftNjet6BH02iM8s6ZvTsIDw7LG+uHpkoUm
+f0n+6MkJhk5WB+20dmWCpOD7F1a6Gx2kPFeZ2vEGZnbGGqcQpCY8sX80c9Q7bSyz
+5Y38MobpmHnfhjcfXkD6x7m5HKgkesqyfKQNfkDtxDTetE8XTj50g8FmoluOrOAZ
+oTI/G72AXi+oVbPc/l/97C1ndpJ04OjyIFGBPJJtjwFsx9s9UkmMghTNGyqsLReg
+oWxHO20VCS7wCV+NCqkXGkrr/ZykwH3JUx8FSasMUlvU6wzMDKtsHD7tI50/HjJ1
+lcmD6eEHQv3M2lw=
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/client-future.pem b/tls/tests/files/client-future.pem
index e4a1f960..8b7c11e5 100644
--- a/tls/tests/files/client-future.pem
+++ b/tls/tests/files/client-future.pem
@@ -1,23 +1,23 @@
notBefore=Jul 17 23:00:00 2060 GMT
notAfter=Jul 17 23:00:00 2061 GMT
-----BEGIN CERTIFICATE-----
-MIIDYTCCAkkCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDYTCCAkkCAQcwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzIzMDAwMFoYDzIwNjEwNzE3
MjMwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj27mT
-DLgGDRx3zvaF7gyRtrzXKYQuJxKJXSa0uFq+1+UVF5VVB8h4sGNku6l7LWT9uZuh
-/Tm5eNgMrBg2HHCkptPzXvewhpE7jEqCRX5vBD9VuYZ9hcogJnCSQxAOLPQBu2Tb
-mbW4uyzKeTNCe0Mo/+wCq7mimF3wdQlhwEeQfZgKhNdYRmSXFADeIMVeyFTT2JOm
-54VIIxB/Hogn7OslAdwqmdUuyyArwvY8INif/kJH5tLXx277aMgBG+7RVVm2dxnI
-FH57TYsXvtVJt7PKcgfsFc57+uXBIwj74KjDCVX0vaDFey4O07jao4q82kkhklVh
-rkdyMlZo7X6RpPUfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACIIO8EbUN/sBb1J
-44OjBFdYQiHmQ3bJbKaYoBEK7JwyRLiiX53uOHRRB4LvvdnjFde3gKTmUKP0pDDx
-asKv3yrIs+euvZDjGrBFHe4J3A1IKe+HKT5dsMtl9PTUGJ3nZ7pD6IaV07iun5D8
-wBpHYb8iYHODVMQIylp+mEfTeDxBnEiOlZzY7NYS3dgt54OmwIHviaCnO7Pujt1o
-jMfNeeZ8DYR7WM4aht+QkIJUMNdV4q60cjR5ubJzN7loEh0BIAD6YPVqQnQAN/R0
-HNhmjOnIJMTi5uXi792VstyHt97zBgGb5z1QBcbELZT87ncXlbB3udq7zZUg/sxP
-MYpvb9k=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCFtVH
+3TuJz3RiqPWIzPxBlbc1sqDQs9Psubqkb69jWoAXxq8JAtmebepMK44Ghsoc97UN
+XAqMzvw6iBhEUnSYLDUF62smmY6DgQZkVHq5EZVVNZ1/rVDnFeSchOrzD7KSSOek
+UpcVTKBRP5P/foyvwpymbLPXXwWOu1Y1+Gr7PhCSm1+G6YDb+xKbGjEyVq73WC10
+wx2OnoKY8i8bss6WoFxF4tH50jNI4pr7zpBVambf23Rm5P58VGzmgDZHVj8yCu9T
+wk99Je7eBft1GldjZfI6xmihoCynYqhsREISTvV4ybRu0d0vvQjL83FXlbZXvLNn
+CBL0eAEyC5/sXoAlAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADwQYLzW/dqcc8qF
+VPJfQCffJlIEYFxYnUxPDZFRaSV4zUoS6BiUGU9fYsi7cV/Sqc9YGYJzgF/z2Kug
+2nN0O1q/U/9AzzagLC2tfh7Yl/M2SudxhFLxLfy8iI/cxswUgcxS4xbp2fItsPYs
+WpG3ZVlMpDc4tZ76wyXYZMLm+pMIOQlxXOQ4S+ckNyVAVU+6IrocAwl2FEw0tVyD
+oJTJa6/739bmy/GbKV9BGaIkLg2uhozkame8yltXfb7i2Mo4Wfj0hQ6NedYUiYCg
+ZhWyCh9pAXPbeFj6VdYZzwLhCJjJ2EpVQ7hCQYCoEMzGcidinbZPKPaa4H+LjVII
+AJTeE9Y=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client-key.pem b/tls/tests/files/client-key.pem
index c3d0a958..2cbb9abc 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 f1e738dc..8641c098 100644
--- a/tls/tests/files/client-past.pem
+++ b/tls/tests/files/client-past.pem
@@ -1,23 +1,23 @@
notBefore=Jul 17 23:00:00 2000 GMT
notAfter=Jul 17 23:00:00 2001 GMT
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcyMzAwMDBaFw0wMTA3MTcyMzAw
MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPbuZMMuAYN
-HHfO9oXuDJG2vNcphC4nEoldJrS4Wr7X5RUXlVUHyHiwY2S7qXstZP25m6H9Obl4
-2AysGDYccKSm0/Ne97CGkTuMSoJFfm8EP1W5hn2FyiAmcJJDEA4s9AG7ZNuZtbi7
-LMp5M0J7Qyj/7AKruaKYXfB1CWHAR5B9mAqE11hGZJcUAN4gxV7IVNPYk6bnhUgj
-EH8eiCfs6yUB3CqZ1S7LICvC9jwg2J/+Qkfm0tfHbvtoyAEb7tFVWbZ3GcgUfntN
-ixe+1Um3s8pyB+wVznv65cEjCPvgqMMJVfS9oMV7Lg7TuNqjirzaSSGSVWGuR3Iy
-VmjtfpGk9R8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAOHjfKW9PTATwiYvUp2se
-pT3JL+BTqcjJgTp+GgCh9C5q6WI+ZSyCmHQb9t4Uf0tZzMfLP3pLDekKTWwYlYvw
-wAhcMjJta90S1K924oncdQ7YLMnpkb5YfgEQZfl0ur5ZA8Y+bnkw7bFUMr01LbGM
-g8ByeyRgK0CGltZPmlhFHe9sIW5vbh6KkQcpogKY/UzhOXw7YU4sHxKXEd9Vl9y9
-66+Jp7Hk9NTXLPIGYfQzp4zREKyNAqF/lF8kEouPUecQA1KIP8KG6ESB3k5YvQMQ
-RE+cD9gJGqThFm0MY8ZXLdQJSF6Ty3ri67xJ3kgwcztmMbaR1Z9QrLrKtjjMYI2w
-wg==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIW1UfdO4nP
+dGKo9YjM/EGVtzWyoNCz0+y5uqRvr2NagBfGrwkC2Z5t6kwrjgaGyhz3tQ1cCozO
+/DqIGERSdJgsNQXrayaZjoOBBmRUerkRlVU1nX+tUOcV5JyE6vMPspJI56RSlxVM
+oFE/k/9+jK/CnKZss9dfBY67VjX4avs+EJKbX4bpgNv7EpsaMTJWrvdYLXTDHY6e
+gpjyLxuyzpagXEXi0fnSM0jimvvOkFVqZt/bdGbk/nxUbOaANkdWPzIK71PCT30l
+7t4F+3UaV2Nl8jrGaKGgLKdiqGxEQhJO9XjJtG7R3S+9CMvzcVeVtle8s2cIEvR4
+ATILn+xegCUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAwn9yUJMw0ymJQsT5snJm
+77AaMtOe7L1OFFl97DxO+5kAgPccTQOrjAbalj/Ip15jAdOyt65oGpzQzfPA3tE5
+8v+1Oz778LkfSoBV9jCsDrCR8Uidb0dtjDlGPzQwZt/33ogkHDObg+IsGkgYeg7Z
+yOgAPHOT70OkdVdUY++sAkMfYxjcFYpp5Y5qUl6hAZwHHO+nCYVax55HbEqYfaLn
+60RKhJrNVumczxxRf+/iw7cN4Mka7fUES7KkL+0tfpmjfDM5hakDzJJGRh4l4pRI
+R87tWJHrHoew1kSU00Ul0PYbYmLpI2Np19eq74Z/WEkaDyMym7KSBPaH2A/jZPm0
+oQ==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client.pem b/tls/tests/files/client.pem
index e2646c8d..b3938ff4 100644
--- a/tls/tests/files/client.pem
+++ b/tls/tests/files/client.pem
@@ -1,21 +1,21 @@
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA3MzExODEzMTBaFw00NjA3MjUxODEz
-MTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTEyMTUyMzIwMDVaFw00NjEyMDkyMzIw
+MDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPbuZMMuAYN
-HHfO9oXuDJG2vNcphC4nEoldJrS4Wr7X5RUXlVUHyHiwY2S7qXstZP25m6H9Obl4
-2AysGDYccKSm0/Ne97CGkTuMSoJFfm8EP1W5hn2FyiAmcJJDEA4s9AG7ZNuZtbi7
-LMp5M0J7Qyj/7AKruaKYXfB1CWHAR5B9mAqE11hGZJcUAN4gxV7IVNPYk6bnhUgj
-EH8eiCfs6yUB3CqZ1S7LICvC9jwg2J/+Qkfm0tfHbvtoyAEb7tFVWbZ3GcgUfntN
-ixe+1Um3s8pyB+wVznv65cEjCPvgqMMJVfS9oMV7Lg7TuNqjirzaSSGSVWGuR3Iy
-VmjtfpGk9R8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZs33954DJg4+NJzt8QKI
-5+aDeBb5FcnwvIbx7QpsSPuJJOuamLX8fo4x7VZut3y5VqyK1QFIE8dWNCotVP5r
-I4xFFYG6CEKkzc/fZ8FTMCYFoGVxUce2PMX/XcZuYWaO+F7Gz8LzW1CbYzbFmAyZ
-ZUl0WOeFbWl/yQmwym5ZFKLogZXL0ZHtwNKHH0LiKOyUssiWbN1cD7BQaiuXcsKS
-JjWsl2j5pi+07WaGZGk+MB8mFl56I9u/43qdaxf1lWicyj6QiwvZf/WVxi5dT3zA
-8IEOS5j2Ahg2xP/ot24R/7+d4eV5m27qfqzB4HT7y1bl0Hi5lXl1O6qzmqJo7Z49
-zg==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIW1UfdO4nP
+dGKo9YjM/EGVtzWyoNCz0+y5uqRvr2NagBfGrwkC2Z5t6kwrjgaGyhz3tQ1cCozO
+/DqIGERSdJgsNQXrayaZjoOBBmRUerkRlVU1nX+tUOcV5JyE6vMPspJI56RSlxVM
+oFE/k/9+jK/CnKZss9dfBY67VjX4avs+EJKbX4bpgNv7EpsaMTJWrvdYLXTDHY6e
+gpjyLxuyzpagXEXi0fnSM0jimvvOkFVqZt/bdGbk/nxUbOaANkdWPzIK71PCT30l
+7t4F+3UaV2Nl8jrGaKGgLKdiqGxEQhJO9XjJtG7R3S+9CMvzcVeVtle8s2cIEvR4
+ATILn+xegCUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAErxcL62i04myJ5L1M7zR
+Q5E9ctb78R+0A3GDAUo8qx2eO9pwmNH0DTrDPKUu0iAIyZlS5grS3fq5I3yy/wl8
+P6ClIxV/BryDXlgM0m/pjr79qtlILOpO4/Fxgp5tSNKomOOGjzP7jgcNqTuor+Z+
+d0Q8m60fwgCbThtF7ivsLcdGPwDknN3uuYvkyvsTMWOedbW2LA1LwtuF3qZiAcIe
+5yVqkV2zJtr+N122Wbnl/26UOBabtYXki0xsPtAvzP3f9Fp6zo+lmp5mTZRoVJOd
+GrDLnf+1YhlfoB05+nefI4M46WAkXRs6hCrORyOKza0l3SXhP/Kgt9uR3DvLz/B2
+7Q==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client2-and-key.pem b/tls/tests/files/client2-and-key.pem
index c77a0313..6c8dbc17 100644
--- a/tls/tests/files/client2-and-key.pem
+++ b/tls/tests/files/client2-and-key.pem
@@ -1,48 +1,48 @@
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQcwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQgwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA3MzExODEzMTBaFw00NjA3MjUxODEz
-MTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTEyMTUyMzIwMDVaFw00NjEyMDkyMzIw
+MDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyvCeaJLmsD
-NmOcOr+a0UdR6VLWMMOhDh96pxQTsOEIFZgHbPJmq6VQA7THvqqiDQRFlgr9Q6HP
-qQK26VddXYtvAwotSLxNQabG5YKdv6e1/TwiYwESI+2TVzFJmC/v3W0ES/YH8O8v
-+yrmCjl59GSMKHeiUA8uX8zwsoMhQ49aWtgWx9YMId0cC1Bgb2PU4QAWMdX+aA9w
-M3q93BuyP/ARKzTRUgLAHCc4/lkpVEnWBE0jTEP9wsUMbiq2u/YgWcMgV8wYIWHZ
-yQwBcqdwlANiSnObnSmvjXtSYhKZ0AE+XwP43cRDiG8ZmPpW2I9RXAs127HnsDC1
-wjmnkTAqjuECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAN2YARmgUw92+Bja0gVU3
-9s3cI08uwdM5GmunYe0OaNR19Bi1tXljSpr7u4HpIxQghCQu3vawPU/Wo4FT9V1v
-+X0gm1GcjiHl2BcDgrJYgcqXyMvXHelwT5hAtfhjdPCVi36EjXq9N+F1yXkoAMOW
-2R8w7aZ8P4Bsxg/rU9yXTaQt5MpOssjC2cCuyH13BGW6zYsO3OEPz1cg+Iu4E/um
-3M3DQMr3V9TYdODuhbWSMmTwzFryjbVQxl2S99QxjuvL72FtTgVpexuim7FEZEAz
-MfttpNbyZGLFmFyF2kWlznqfvqEA6J1UifjuaH4tuNfbjfmdy5WtlQ9nP4Gsnj+q
-2g==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCHBNIrDecV
+4afipmhQa6ASF0PX8Fy4dzjjZOImHKF+uXx3Ti5VvD/XMEIG5quohxmTp0OQBZTb
+jMdsYZ6RpIL4riLQ/Gkzk88OhR+9mcCQluRLncFhpkz7Gb/6/h8gv20+gys0j9CI
+Io3aPlcst5BFxEDTpmP2st/VJfDw7D5G/CMgnYghr/b4O1d9hKKccXR/WNDGkaD5
+i1jpxUagy3LaJop0ZwE43W1m7ZNyqiJUZFBkzC5F+BftADfc1WvwKrx8IdG4U9gN
+Dbeg3SystiY27TePw7bsQlJQ6c4WSk1CeN52/qNtC57G7uXuOqbv8VwJtH0WdlV7
+Snyj1sHd2GECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAoMCKngqBz/PQtuOQITty
+DTH596wUz/uCkGvyXBt5jL9C2Alx4uLqsBHvkeK1jve1P7dsBHY9FQ6ed4Vqxthb
+6sg4Ob5pvXldUMoq6W61fHKpIK75C+uJxlpbKq6lJfnB45RbXJa13RxTaMfOsGml
+rhYsUdui2sgCAnbnlxp+OvUNHLa0P5sdJYhvbOTGsSZCH2fcs4E2oepzkeI2Lbwj
+PM9J4K1XaoW4IDbDHr27HPNkyk2Gpc8BGfqf+nFRp3dSiRbYu8NPQZo4RvasfOjF
+n4AoE9d5KMTSUWn7NURgikgPCtlsh+xF+IEdn/h67U0HzhI6zt5M42Wr6kIPhCxC
+jg==
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAzK8J5okuawM2Y5w6v5rRR1HpUtYww6EOH3qnFBOw4QgVmAds
-8marpVADtMe+qqINBEWWCv1Doc+pArbpV11di28DCi1IvE1Bpsblgp2/p7X9PCJj
-ARIj7ZNXMUmYL+/dbQRL9gfw7y/7KuYKOXn0ZIwod6JQDy5fzPCygyFDj1pa2BbH
-1gwh3RwLUGBvY9ThABYx1f5oD3Azer3cG7I/8BErNNFSAsAcJzj+WSlUSdYETSNM
-Q/3CxQxuKra79iBZwyBXzBghYdnJDAFyp3CUA2JKc5udKa+Ne1JiEpnQAT5fA/jd
-xEOIbxmY+lbYj1FcCzXbseewMLXCOaeRMCqO4QIDAQABAoIBAQCDOGhRenresiWJ
-QJxNQBSQ84twxs5mbHcgaUJ51ZHdApDNcV1AHeBG0ABAQpoSzGcp6O6jRvC36OiC
-S/9WOg4BmP7K5HMv/RtsrzBuR3GaNEsP5T+xbQ7JfV81wuelO9Kp1EpahYbJ4OnV
-+7psVKoAV/aNk+pdgS57tYfMF2Q3nuEC6TZb+oJIuvbr7LHsQ9KmeZDyQeEVyyNi
-vIC9pqtjGaA04lF7IzGwv4GN9g0oG1fFWzPXJ6qHVOgdRK5tyHnsWFf35XHgVMdH
-FcUdnMlcogBprsU+hywU31/uZR5VJlQxZTBaNcGcfqBl6Q8IfZ7TH2ZCodWhb34l
-SJMKdctRAoGBAOWDLAw6FE7lmI0mskoeUGwf2oN7taTuRzyfeM5IWgr/bBRDOTvZ
-zc2KaEcBL+balDkXpFPvrz/Y2IqcHgD43lfhLrg5iSXYZAj1b/N3NqFate/xtWS4
-qlDvyZu8QcDMui89dLB4euUtHQ9wDt1OG+Lcf8xDPkG3Z0KM+W1l2ghFAoGBAORO
-URg6jZDJ5LQixedDQJk/6tFF6Pu5UImiEAqdE8Z/owQgEAtnJX72G6Dn+VwXwGJM
-6vl14FnM9G7bBFwwyyVL6zlEvdPRUUq2VZBynGGnVKAXlJFbEIqgm35sGhzmlQHq
-Jv2+S8xOIOUtMdbxXIWaCHLF+x6fZMPsnc701TvtAoGBALhf7/rCjZ30A+EgvQmd
-4K17yWbm8r1UThX9ZmcQ6IT9PC3q8weJqTL9hVfFNF4YKgrTW0eyvO5lnU98qv3M
-75FZbNbCIdMtSu+HfC/yDQkCfjYLztTjJK9wcl2RlqDz1n4suJkrsE57N2U3eDmA
-jhZpXKETQ+g3FdT4u0ePEuChAoGBAKWKpAKNcliqC8sR663kddKpJfrYVjcwB9XE
-TR1lCBHGOs2i8f9Sqz2D9kSV75l3H2gnnbmEX0i98/7tkBvIxYQlqEm+LmaIQAmM
-bD5w3DNywUnTz0YWYcgi7JyehdCu4RyiS+NxOETL4c5LFvhjylKVfcq7A3sQ2F+4
-EjUeEf+BAoGATZKsh6yT48Oh2BG1lrVDJWP8rFiKFEW1EYANjSod/zF0CXNkqHfY
-b8qBHoNeT4vlH7H2YIAP/5xpVZFG6nNUP2im3P+rBB0fQt6FemOqMaGeL3fzStJR
-kQeY1Vl1TDcQHQUXZX09z3MgKBe+ZS5dSyWSmdH6RXq6iRRNiWRhHhk=
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client2-csr.pem b/tls/tests/files/client2-csr.pem
index 341c6174..601da8ba 100644
--- a/tls/tests/files/client2-csr.pem
+++ b/tls/tests/files/client2-csr.pem
@@ -2,16 +2,16 @@
MIICpzCCAY8CAQAwYjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
ARkWB0VYQU1QTEUxDzANBgNVBAMMBkNsaWVudDEhMB8GCSqGSIb3DQEJARYSY2xp
ZW50QGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-zK8J5okuawM2Y5w6v5rRR1HpUtYww6EOH3qnFBOw4QgVmAds8marpVADtMe+qqIN
-BEWWCv1Doc+pArbpV11di28DCi1IvE1Bpsblgp2/p7X9PCJjARIj7ZNXMUmYL+/d
-bQRL9gfw7y/7KuYKOXn0ZIwod6JQDy5fzPCygyFDj1pa2BbH1gwh3RwLUGBvY9Th
-ABYx1f5oD3Azer3cG7I/8BErNNFSAsAcJzj+WSlUSdYETSNMQ/3CxQxuKra79iBZ
-wyBXzBghYdnJDAFyp3CUA2JKc5udKa+Ne1JiEpnQAT5fA/jdxEOIbxmY+lbYj1Fc
-CzXbseewMLXCOaeRMCqO4QIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAAvFZq/e
-oG3tbpzGDU6KG0pdjeE1vR2RxbYjAtXiqiNcBk8dvkrvW0/AOLNpBNxvFDei4i2a
-vsejaR21K25mKIG416bIOQ8Y86CDvPlJoSCQqPYMQiAlHUJ6iQIXeV9+L1b3OkGQ
-hJuw85PO3/GSGscEMdJhiFJq6oePlYqkRurA1nvWlttx1uUzqUE0JL7Y+y2Q7I8j
-c3WwV975OEMT3RGtYogzjXFhO0zEtGHJGTMVF7r/VuUdGIZbSBc/d81uJlr6JqED
-FThNR7rEEtK55ge47ZGDKb/+8QK9USS+2bZdS5UgBVXKQZVB9LZSskl7IpHGPwTl
-sWsGaMz7jmE1gOc=
+4IcE0isN5xXhp+KmaFBroBIXQ9fwXLh3OONk4iYcoX65fHdOLlW8P9cwQgbmq6iH
+GZOnQ5AFlNuMx2xhnpGkgviuItD8aTOTzw6FH72ZwJCW5EudwWGmTPsZv/r+HyC/
+bT6DKzSP0Igijdo+Vyy3kEXEQNOmY/ay39Ul8PDsPkb8IyCdiCGv9vg7V32Eopxx
+dH9Y0MaRoPmLWOnFRqDLctominRnATjdbWbtk3KqIlRkUGTMLkX4F+0AN9zVa/Aq
+vHwh0bhT2A0Nt6DdLKy2JjbtN4/DtuxCUlDpzhZKTUJ43nb+o20Lnsbu5e46pu/x
+XAm0fRZ2VXtKfKPWwd3YYQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBALuctJyW
+s64nFW4jGDij7hUm18dsBxeoezKSUiHQNXgITk6Cko/ECLE34w8GpoYCNPW3EI7I
+Q9GxZ1+46tqV86LAVm++YRSTXz/4jgLXSyVqlqSwwzUxgAeWTUMbaeAFKc46vO+7
+tYUjAsZJ6usJcqNO44fP5E18gMc8lQNC3zTor5/7/jMrFMJLrsdC2h00XxVsJfpz
+doucwYrsv0KJAGxOlV+Q4uu85XfjVOZ6x8EsTnWgqg9w6eF2iHo+sp7P7ijff/wU
+aQ98ivXgK953i7cy2ZCgYiblS7tRYndG5msXUBX9VlxP/Pk8w0qexZGTqTlW/rat
+yWUIk/91HJJO/7M=
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/client2-key.pem b/tls/tests/files/client2-key.pem
index c48c3ba2..64eb6951 100644
--- a/tls/tests/files/client2-key.pem
+++ b/tls/tests/files/client2-key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAzK8J5okuawM2Y5w6v5rRR1HpUtYww6EOH3qnFBOw4QgVmAds
-8marpVADtMe+qqINBEWWCv1Doc+pArbpV11di28DCi1IvE1Bpsblgp2/p7X9PCJj
-ARIj7ZNXMUmYL+/dbQRL9gfw7y/7KuYKOXn0ZIwod6JQDy5fzPCygyFDj1pa2BbH
-1gwh3RwLUGBvY9ThABYx1f5oD3Azer3cG7I/8BErNNFSAsAcJzj+WSlUSdYETSNM
-Q/3CxQxuKra79iBZwyBXzBghYdnJDAFyp3CUA2JKc5udKa+Ne1JiEpnQAT5fA/jd
-xEOIbxmY+lbYj1FcCzXbseewMLXCOaeRMCqO4QIDAQABAoIBAQCDOGhRenresiWJ
-QJxNQBSQ84twxs5mbHcgaUJ51ZHdApDNcV1AHeBG0ABAQpoSzGcp6O6jRvC36OiC
-S/9WOg4BmP7K5HMv/RtsrzBuR3GaNEsP5T+xbQ7JfV81wuelO9Kp1EpahYbJ4OnV
-+7psVKoAV/aNk+pdgS57tYfMF2Q3nuEC6TZb+oJIuvbr7LHsQ9KmeZDyQeEVyyNi
-vIC9pqtjGaA04lF7IzGwv4GN9g0oG1fFWzPXJ6qHVOgdRK5tyHnsWFf35XHgVMdH
-FcUdnMlcogBprsU+hywU31/uZR5VJlQxZTBaNcGcfqBl6Q8IfZ7TH2ZCodWhb34l
-SJMKdctRAoGBAOWDLAw6FE7lmI0mskoeUGwf2oN7taTuRzyfeM5IWgr/bBRDOTvZ
-zc2KaEcBL+balDkXpFPvrz/Y2IqcHgD43lfhLrg5iSXYZAj1b/N3NqFate/xtWS4
-qlDvyZu8QcDMui89dLB4euUtHQ9wDt1OG+Lcf8xDPkG3Z0KM+W1l2ghFAoGBAORO
-URg6jZDJ5LQixedDQJk/6tFF6Pu5UImiEAqdE8Z/owQgEAtnJX72G6Dn+VwXwGJM
-6vl14FnM9G7bBFwwyyVL6zlEvdPRUUq2VZBynGGnVKAXlJFbEIqgm35sGhzmlQHq
-Jv2+S8xOIOUtMdbxXIWaCHLF+x6fZMPsnc701TvtAoGBALhf7/rCjZ30A+EgvQmd
-4K17yWbm8r1UThX9ZmcQ6IT9PC3q8weJqTL9hVfFNF4YKgrTW0eyvO5lnU98qv3M
-75FZbNbCIdMtSu+HfC/yDQkCfjYLztTjJK9wcl2RlqDz1n4suJkrsE57N2U3eDmA
-jhZpXKETQ+g3FdT4u0ePEuChAoGBAKWKpAKNcliqC8sR663kddKpJfrYVjcwB9XE
-TR1lCBHGOs2i8f9Sqz2D9kSV75l3H2gnnbmEX0i98/7tkBvIxYQlqEm+LmaIQAmM
-bD5w3DNywUnTz0YWYcgi7JyehdCu4RyiS+NxOETL4c5LFvhjylKVfcq7A3sQ2F+4
-EjUeEf+BAoGATZKsh6yT48Oh2BG1lrVDJWP8rFiKFEW1EYANjSod/zF0CXNkqHfY
-b8qBHoNeT4vlH7H2YIAP/5xpVZFG6nNUP2im3P+rBB0fQt6FemOqMaGeL3fzStJR
-kQeY1Vl1TDcQHQUXZX09z3MgKBe+ZS5dSyWSmdH6RXq6iRRNiWRhHhk=
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client2.pem b/tls/tests/files/client2.pem
index 720bc188..8b3f3861 100644
--- a/tls/tests/files/client2.pem
+++ b/tls/tests/files/client2.pem
@@ -1,21 +1,21 @@
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQcwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQgwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA3MzExODEzMTBaFw00NjA3MjUxODEz
-MTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTEyMTUyMzIwMDVaFw00NjEyMDkyMzIw
+MDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyvCeaJLmsD
-NmOcOr+a0UdR6VLWMMOhDh96pxQTsOEIFZgHbPJmq6VQA7THvqqiDQRFlgr9Q6HP
-qQK26VddXYtvAwotSLxNQabG5YKdv6e1/TwiYwESI+2TVzFJmC/v3W0ES/YH8O8v
-+yrmCjl59GSMKHeiUA8uX8zwsoMhQ49aWtgWx9YMId0cC1Bgb2PU4QAWMdX+aA9w
-M3q93BuyP/ARKzTRUgLAHCc4/lkpVEnWBE0jTEP9wsUMbiq2u/YgWcMgV8wYIWHZ
-yQwBcqdwlANiSnObnSmvjXtSYhKZ0AE+XwP43cRDiG8ZmPpW2I9RXAs127HnsDC1
-wjmnkTAqjuECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAN2YARmgUw92+Bja0gVU3
-9s3cI08uwdM5GmunYe0OaNR19Bi1tXljSpr7u4HpIxQghCQu3vawPU/Wo4FT9V1v
-+X0gm1GcjiHl2BcDgrJYgcqXyMvXHelwT5hAtfhjdPCVi36EjXq9N+F1yXkoAMOW
-2R8w7aZ8P4Bsxg/rU9yXTaQt5MpOssjC2cCuyH13BGW6zYsO3OEPz1cg+Iu4E/um
-3M3DQMr3V9TYdODuhbWSMmTwzFryjbVQxl2S99QxjuvL72FtTgVpexuim7FEZEAz
-MfttpNbyZGLFmFyF2kWlznqfvqEA6J1UifjuaH4tuNfbjfmdy5WtlQ9nP4Gsnj+q
-2g==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCHBNIrDecV
+4afipmhQa6ASF0PX8Fy4dzjjZOImHKF+uXx3Ti5VvD/XMEIG5quohxmTp0OQBZTb
+jMdsYZ6RpIL4riLQ/Gkzk88OhR+9mcCQluRLncFhpkz7Gb/6/h8gv20+gys0j9CI
+Io3aPlcst5BFxEDTpmP2st/VJfDw7D5G/CMgnYghr/b4O1d9hKKccXR/WNDGkaD5
+i1jpxUagy3LaJop0ZwE43W1m7ZNyqiJUZFBkzC5F+BftADfc1WvwKrx8IdG4U9gN
+Dbeg3SystiY27TePw7bsQlJQ6c4WSk1CeN52/qNtC57G7uXuOqbv8VwJtH0WdlV7
+Snyj1sHd2GECAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAoMCKngqBz/PQtuOQITty
+DTH596wUz/uCkGvyXBt5jL9C2Alx4uLqsBHvkeK1jve1P7dsBHY9FQ6ed4Vqxthb
+6sg4Ob5pvXldUMoq6W61fHKpIK75C+uJxlpbKq6lJfnB45RbXJa13RxTaMfOsGml
+rhYsUdui2sgCAnbnlxp+OvUNHLa0P5sdJYhvbOTGsSZCH2fcs4E2oepzkeI2Lbwj
+PM9J4K1XaoW4IDbDHr27HPNkyk2Gpc8BGfqf+nFRp3dSiRbYu8NPQZo4RvasfOjF
+n4AoE9d5KMTSUWn7NURgikgPCtlsh+xF+IEdn/h67U0HzhI6zt5M42Wr6kIPhCxC
+jg==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/create-files.sh b/tls/tests/files/create-files.sh
index b699e7c8..ca1b8428 100755
--- a/tls/tests/files/create-files.sh
+++ b/tls/tests/files/create-files.sh
@@ -88,18 +88,26 @@ openssl pkcs8 -topk8 -in server-key.pem -outform PEM -nocrypt -out server-key-pk
openssl pkcs8 -topk8 -in server-key.pem -outform DER -nocrypt -out server-key-pkcs8.der
#######################################################################
-### Server (OCSP Missing)
+### Server (OCSP required by CA)
#######################################################################
-msg "Creating server (OCSP Missing) certificate request"
-openssl req -config ssl/server.conf -key server-key.pem -new -out server-ocsp-missing-csr.pem
+msg "Creating server (OCSP required by CA) certificate"
+openssl x509 -req -in server-csr.pem -days 9125 -CA ca-ocsp.pem -CAkey ca-key.pem -CAserial serial -extfile
ssl/server.conf -extensions v3_req_ext -out server-ocsp-required-by-ca.pem
-msg "Creating server (OCSP Missing) certificate"
-openssl x509 -req -in server-ocsp-missing-csr.pem -days 9125 -CA ca-ocsp.pem -CAkey ca-key.pem -CAserial
serial -extfile ssl/server.conf -extensions v3_req_ext -out server-ocsp-missing.pem
+msg "Concatenating server (OCSP required by CA) certificate and private key into a single file"
+cat server-ocsp-required-by-ca.pem > server-ocsp-required-by-ca-and-key.pem
+cat server-key.pem >> server-ocsp-required-by-ca-and-key.pem
-msg "Concatenating server (OCSP Missing) certificate and private key into a single file"
-cat server-ocsp-missing.pem > server-ocsp-missing-and-key.pem
-cat server-key.pem >> server-ocsp-missing-and-key.pem
+#######################################################################
+### Server (OCSP required by server)
+#######################################################################
+
+msg "Creating server (OCSP required by server) certificate"
+openssl x509 -req -in server-csr.pem -days 9125 -CA ca.pem -CAkey ca-key.pem -CAserial serial -extfile
ssl/server-muststaple.conf -extensions v3_req_ext -out server-ocsp-required-by-server.pem
+
+msg "Concatenating server (OCSP required by server) certificate and private key into a single file"
+cat server-ocsp-required-by-server.pem > server-ocsp-required-by-server-and-key.pem
+cat server-key.pem >> server-ocsp-required-by-server-and-key.pem
#######################################################################
### Server (self-signed)
diff --git a/tls/tests/files/intermediate-ca-csr.pem b/tls/tests/files/intermediate-ca-csr.pem
index 2f8bd1da..f4f1de48 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
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN/FYEl72F6SHmdAd3SYk4gEgGg7
-1gUjfIk8HhQ19L8VlK9a08SbdxwA+H7bBAZzFTIdj535Wl3x1T19Tqe+w7RBLCJl
-qC9J3d7fz5uMYz1UFa/R39kAxO38wQpHcVHdEwqjGtg+Cp1TMT9myFU9+0oWPH9S
-KqvzSE7vHq7fVgC7vs0kIcMZjQvCugxC1VYyBNh/EimzLxmPaMc+4KspcVXEl4ig
-8tkEmUK06sh79Ul9eC+8xL782ZC7Cdo5UVvS+I+a23E/C1/utmXdc+SotwKQlgF+
-K6e2vvk96WKVBFPlw5dxW/LM5/YaGlukFiYxG5UXFJbvB4jr8gL56orxPokCAwEA
-AaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFEyE5fR9gTwXIVHco9Fz8Bo8
-RgLaMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
-CwUAA4IBAQAvTCWFO1+DeUI3UCt451bbwQ0WgX9nPAu39qzo3lV0vww50Cq0aPdy
-j+BAT0w1V2Szwnoim4nnB3UNHnHpsBMDQ0Hoys4FQm22asnL01VsmUHyhdw1qDsQ
-P/LNkOG8O25Dl+CSRccyFK7gypSAuFpIpYqaR4hVejnWmUlWe0vsv0U3EYPPPkU8
-AynDJYLsaCIh6xBaVLeOh6BDoYEgbbgn0gvGk/cVnsie9bcCtJtzgJNz+ysGlq/k
-Rp8Qjvsmu0a3Rqhei7RKcNYky1GENX84oOe8lrTtnb4xtH3n8LP1JuAF0eW8VwwL
-4ZWvt2myv8mvIJ+S0aYkv7NYd+whJOij
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM38HyX7bWXgx0vo3FouVlOL2zu2
+6NWkfBOlayVaNSwz0vQBqzH00V1DfldicevLLUjcxKeezlYRwI3cGHuFqWoZOjiJ
+/Nq9SsmpW/y7JCUqSA3CXrVVXSrulmXiaozYoQA1fWOpiwcr3Jhz/8VCSYGbZYJY
+qwN8PyyZWUfOMklkgeJrhKDX2JWzjMSBSqcj25hEPRvqB/Fmqpx/qnMl1/ssosnR
+KCcxzHv94uBapF3XyjBAmvw29OwjWDN4F50pAkgOHB04CW5b14WWc6APUS6jpc4H
+4ZTTbuX2cR07G4I2IVFmtgwxXlEHL+XCtyWojwg9edN9ML7ir3oHJkRR4mECAwEA
+AaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFK+QXlzyE4v62RPbNWWyU2Qy
+lsCKMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+CwUAA4IBAQCylR6/62q5T6C0lZmwq2gKFNOECceE+IwfC0jBLko6OnnVac0CFEe+
+HiVIqxeIcBBQ3/L20ilagVrFWhQfb7/vtaa5+m2pRrq1SluW8jdq1Ap8qLWUE5bp
+YxhBvgeW8TxqWjACCkxEnz3vfG5LchFvrSGtpkUqky6VGg4H8NXShAt5qmDHZAha
+wDK6APNinMxiIXDCmOCXcXjS1708UVQRRUS5YWtUUFrOlpqsTFQ2ATAHoeerv+cw
+yon1qd9XbH/mXFH9Yg7005fDWwGlB8o66TC/U5jg9AYf6SvCQ24/Ikdfhnyr9qjA
+KAsKP8O1G5EjITP+wpc5VjYRzsERDF+Z
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/intermediate-ca-key.pem b/tls/tests/files/intermediate-ca-key.pem
index e72c90c2..3d1bf651 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-----
-MIIEowIBAAKCAQEA38VgSXvYXpIeZ0B3dJiTiASAaDvWBSN8iTweFDX0vxWUr1rT
-xJt3HAD4ftsEBnMVMh2PnflaXfHVPX1Op77DtEEsImWoL0nd3t/Pm4xjPVQVr9Hf
-2QDE7fzBCkdxUd0TCqMa2D4KnVMxP2bIVT37ShY8f1Iqq/NITu8ert9WALu+zSQh
-wxmNC8K6DELVVjIE2H8SKbMvGY9oxz7gqylxVcSXiKDy2QSZQrTqyHv1SX14L7zE
-vvzZkLsJ2jlRW9L4j5rbcT8LX+62Zd1z5Ki3ApCWAX4rp7a++T3pYpUEU+XDl3Fb
-8szn9hoaW6QWJjEblRcUlu8HiOvyAvnqivE+iQIDAQABAoIBAQC8zqw0tJNXEFEo
-66MfNRHeRXYW/M3TXiLZJGl4wiH1DP98idV+4XI5pbQGTUPzMS0kMP8Z2uhdtgwn
-qtAwB2zXbdoQV9f1tozHXe6tH2IowAbgZ+RJFDYVXBuBUdCSs0c6xW6EIK0SG7zE
-8zN7gSXDWEnJYAnzNf2/5FDuWjEVwb+qkgEhEhjs/4eHYjm6L/1nnlYNdjS1Rh2J
-ZVXMlPN7mEHqW/EUbfS+etQNauBds0o1e9mf1Z/UVamG6fNhL0pekEE/PdON2G+Y
-/rZ/tsyPb5mDAdnSFL1+jMlFk9FRpOaBHvz6cY9O8FwR2AkujccgRdn7XyJ4wScK
-a6KgtH4RAoGBAPo5WyrxVHHIIOrJinK3RGvZ6TJ6A94kUEAkBfcvnhsfIJpOrwij
-bSug0DSGwUZTBJHham2IgGD841/dsxZd8ux3rmLDDmJt6Sgd89Kgd0e3slBz7OXH
-TCZyQg1344fpohjh54eXTgEA/xu2DmG1s0Thtmf0YF1Av5bLasylWB59AoGBAOTv
-s5h1rGAfpP4HWPOGEGsYJqezvTaeSBEd/A0WvLEq5+gouBb+bPl5nktJC1OWNjKS
-+j/J7nTkgDB7OAppyprxgm2LSHAwTZNZJ/81B6ua5zFs8P6GwN1fNcjlnBH4bpm9
-40f5Q3W/tIY43TG1I36cBYzBQVkMPHyR/B6FMSH9AoGAGogcX5hJMOtceii2kmVW
-Tu1DKcQARvyoubRYIZad+Bg718DCFHNnrvmVOgyTz8YbtPAm3chcfGw0G8UhKRz7
-FhG2nug5zTwEPem3Ib08CJG0yY0RMGgKbgUtdcohiRa/xk2lxB3J+pdFdYW/TqL6
-iDI6qhkiYqDr76xP/bUGe+0CgYBtUUBS5q2+4J1qZ5vD/RpN6SRcI+mP8Ri8g7Ld
-lSPY/YHrS7ZL1IW4wqghjumHqkyK7b/tQcFJs+q6O7xQzJ9gST5cjIu0dnw0hfgh
-VvMosDkBUuHox/PEQThvi6RwuE4nv5KNxaq+ySGsje6hU7t1M4863PUVTlB7s0HO
-WQ9TCQKBgEQikSr+wqoCdTq5LsqZZ0zFmSFxR/zaEJCJe32eOo4wXMnygb1pjAS5
-5uXYW3dLgWPgQYbAGBScGaFHNbH22ZO4G8g3QSnuNQLOtvq8VQEGAmRLE0wft4bu
-P3YRNU8KhJvCUxU0NKCaNVu5qoDj21b0XADCIzZrkGjeSfgngeVx
+MIIEowIBAAKCAQEAzfwfJfttZeDHS+jcWi5WU4vbO7bo1aR8E6VrJVo1LDPS9AGr
+MfTRXUN+V2Jx68stSNzEp57OVhHAjdwYe4Wpahk6OIn82r1Kyalb/LskJSpIDcJe
+tVVdKu6WZeJqjNihADV9Y6mLByvcmHP/xUJJgZtlglirA3w/LJlZR84ySWSB4muE
+oNfYlbOMxIFKpyPbmEQ9G+oH8WaqnH+qcyXX+yyiydEoJzHMe/3i4FqkXdfKMECa
+/Db07CNYM3gXnSkCSA4cHTgJblvXhZZzoA9RLqOlzgfhlNNu5fZxHTsbgjYhUWa2
+DDFeUQcv5cK3JaiPCD15030wvuKvegcmRFHiYQIDAQABAoIBAGJge2/keQcjJ4v1
+lufrIYedUANhBCqk+C1Z36ZjQunthl7LPTwKtMNaLMkHV2lKDEK0TafQjLNGnzQh
+XgAAgj0N92RxYrYFmeZeYHR/3G9zlh4cKqdoMasDcAkQ7dp+y8YRxeUHYEL4i86z
+9//5/KlN0llCh8qOWI2wX5ePvyyVXGn1xfaUyU7aQMJ9x+41R/qfgthvd19V4P6E
+vbJ5Ogpp/jv5RVhZXZwCpZbsOvQJBRrmi3+1tkNvruRolYW/TpW8EQF/MddAMplM
+NCTDedorVWVVN3bnW2vp/Rqduq9p5GL6J9qvTNoJibelY7PWgkqnjxS2N8NO1rWV
+UVzNc1ECgYEA8OHLmWEqY9hdSgF16Ah9frimbZXbQ2fVB0mVM95npz86NeK2vxhZ
+vYH5FyFK4B2y1TVHDHdR3pmOdAS4d0x0HM+SvEiZbKU2FmhO/F5lsN7mB1JKGaxr
+oOz4czJu9StBLvgBjRo0bfGd4Asc2GlXitFm0d7w6/gzUc3QqoVd7AMCgYEA2umj
+8Y9ZtHCfUWmUP2ry/2fZPjN/R0doWR8c4FMPBsuu1F3EUyAQHftbpJKmzKgETCKx
+yqouSefhQ2rJOpVN+F8ryZZkjC3MAAwMPRzksHWmAH531Ata/mXTWuPfDHwmWVS6
+jq8fyPB8Wr0c7Xr3GK9IS8sFaS0YsZ4ctkoilMsCgYBXhIIXmQDww9SpJbyz8BnA
+Z9A38oF2jQwOGML31G9uiX9ZwqRI68z3GHjq2XK92Kx34GKO+e8p5Dqolmp7FbD+
+IsCaXfo4ShJLs9w2vwlNaL7EnDZF+6ojDtX57LH5q5yENyFBJes0otuMYh0515Qx
+4IDt8YUxBr2GlDOjMM9+BwKBgQCS1ETe/6xGR4fEflEt3BkST+A5RScocu+9Xw3q
+NCuO/kzMKfxFWOsWgQJttuNjv4nqWxbu/QhBD+NaaaSAw6XhYkwnUNUt5IXAvlPz
+JY8KAE8QY8MRmXA106xYeSCg6iB6qEbc7v8dspdl8RQXAPP9PYv7Mjf13IaEk61k
+YwMg0wKBgCgjKfsR1eCQArwnWhxw5S3OvougLysiA269QS1JspEq/Jy54VF6syhF
+xFCVubFPyuqaSrsWkE9Cjlfo40Uvb/3xfj4XJK9MfVb4UnSIbUcKJtrJLlsu8yYr
+7FgqzKJVJvFjnWh5UiAUNXNVHh0fEpmWG0ngdQv49HIDNL8CpWOo
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/intermediate-ca.pem b/tls/tests/files/intermediate-ca.pem
index deb1b892..8a744427 100644
--- a/tls/tests/files/intermediate-ca.pem
+++ b/tls/tests/files/intermediate-ca.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIFAjCCA+qgAwIBAgIBCDANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIFAjCCA+qgAwIBAgIBCTANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
-NTE4MTMxMFowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNVoXDTQ2MTIw
+OTIzMjAwNVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN/FYEl72F6SHmdAd3SYk4gEgGg71gUj
-fIk8HhQ19L8VlK9a08SbdxwA+H7bBAZzFTIdj535Wl3x1T19Tqe+w7RBLCJlqC9J
-3d7fz5uMYz1UFa/R39kAxO38wQpHcVHdEwqjGtg+Cp1TMT9myFU9+0oWPH9SKqvz
-SE7vHq7fVgC7vs0kIcMZjQvCugxC1VYyBNh/EimzLxmPaMc+4KspcVXEl4ig8tkE
-mUK06sh79Ul9eC+8xL782ZC7Cdo5UVvS+I+a23E/C1/utmXdc+SotwKQlgF+K6e2
-vvk96WKVBFPlw5dxW/LM5/YaGlukFiYxG5UXFJbvB4jr8gL56orxPokCAwEAAaOC
-AVAwggFMMB0GA1UdDgQWBBRMhOX0fYE8FyFR3KPRc/AaPEYC2jCBxgYDVR0jBIG+
-MIG7gBR9MHdtjvb0Yq9WTAKv4wB756MpeaGBjKSBiTCBhjETMBEGCgmSJomT8ixk
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM38HyX7bWXgx0vo3FouVlOL2zu26NWk
+fBOlayVaNSwz0vQBqzH00V1DfldicevLLUjcxKeezlYRwI3cGHuFqWoZOjiJ/Nq9
+SsmpW/y7JCUqSA3CXrVVXSrulmXiaozYoQA1fWOpiwcr3Jhz/8VCSYGbZYJYqwN8
+PyyZWUfOMklkgeJrhKDX2JWzjMSBSqcj25hEPRvqB/Fmqpx/qnMl1/ssosnRKCcx
+zHv94uBapF3XyjBAmvw29OwjWDN4F50pAkgOHB04CW5b14WWc6APUS6jpc4H4ZTT
+buX2cR07G4I2IVFmtgwxXlEHL+XCtyWojwg9edN9ML7ir3oHJkRR4mECAwEAAaOC
+AVAwggFMMB0GA1UdDgQWBBSvkF5c8hOL+tkT2zVlslNkMpbAijCBxgYDVR0jBIG+
+MIG7gBT6FH3OnCOvKyXsfc72EJ4xxG0S+qGBjKSBiTCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAP
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQwyVOnEyjzzdQXaugm2oaBks+gmTAP
BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAJArQW4HGrmrCNYdA3C6LwwqhuzJzwR87HPg
-jmK+1f/E4qPlaT8PhgoxmU2bOCoI/eNHPSfXk5sOl8k6HUZyF/hRdFBUgUtUEO81
-udRrFXRwUeRY30p8BXm8sbxNGk9FMCO/czdS2MD6T7fdLI8Z6g9hz+eOOyEHVy6D
-Z/LkUgIMQwVibdMuNs2fxgpmReZgraqQOeHAyCCo0SkZXGkN2rHV3kYJkuc522kq
-K11ldkrxKhHU77ebxrHvgYtv0D90rspFEcY16/0iYAFdthZX1gJOgpMivD7lXykX
-IHU1jn7fIdjT+uaoB+5ScQKYrlngZcaij16rX0nj7GMwrls/Awc=
+b20wDQYJKoZIhvcNAQELBQADggEBAK8ukSalZ6OrwTAtgm7HLFwhC+NENJb0lnOk
+wpgv4Z3Bhb4S1drgrwsZfFGNsq3jLO2gURtNchC9eTAdHPZpNWoW+s1Ja+ZmbAS6
+PmPMdOclPnemljNuoR79I4sbCMxiyArkVw1EbJZSmpGocVFzB9bVoj5G5/In4CYT
+yiF2GxsqBUps7ID6lmAdJYWdzJ7PYbnlerqyWdql2Z2OwkFZCXyFSuQprwCV6SsX
+0un1xUqdgS1+iffl2Oi/9S+pK1Y3NGtn25sDT5bPMpoc8jwRf8n4rtS8pHyEJyoz
+ZnwhqAHALcxUFoWVqjrqHZmNXbNtjuGBGuRU755FyE5pVcRMoH0=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/non-ca.pem b/tls/tests/files/non-ca.pem
index 4a0f253f..d351711e 100644
--- a/tls/tests/files/non-ca.pem
+++ b/tls/tests/files/non-ca.pem
@@ -1,74 +1,74 @@
client.pem:
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA3MzExODEzMTBaFw00NjA3MjUxODEz
-MTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTEyMTUyMzIwMDVaFw00NjEyMDkyMzIw
+MDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPbuZMMuAYN
-HHfO9oXuDJG2vNcphC4nEoldJrS4Wr7X5RUXlVUHyHiwY2S7qXstZP25m6H9Obl4
-2AysGDYccKSm0/Ne97CGkTuMSoJFfm8EP1W5hn2FyiAmcJJDEA4s9AG7ZNuZtbi7
-LMp5M0J7Qyj/7AKruaKYXfB1CWHAR5B9mAqE11hGZJcUAN4gxV7IVNPYk6bnhUgj
-EH8eiCfs6yUB3CqZ1S7LICvC9jwg2J/+Qkfm0tfHbvtoyAEb7tFVWbZ3GcgUfntN
-ixe+1Um3s8pyB+wVznv65cEjCPvgqMMJVfS9oMV7Lg7TuNqjirzaSSGSVWGuR3Iy
-VmjtfpGk9R8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZs33954DJg4+NJzt8QKI
-5+aDeBb5FcnwvIbx7QpsSPuJJOuamLX8fo4x7VZut3y5VqyK1QFIE8dWNCotVP5r
-I4xFFYG6CEKkzc/fZ8FTMCYFoGVxUce2PMX/XcZuYWaO+F7Gz8LzW1CbYzbFmAyZ
-ZUl0WOeFbWl/yQmwym5ZFKLogZXL0ZHtwNKHH0LiKOyUssiWbN1cD7BQaiuXcsKS
-JjWsl2j5pi+07WaGZGk+MB8mFl56I9u/43qdaxf1lWicyj6QiwvZf/WVxi5dT3zA
-8IEOS5j2Ahg2xP/ot24R/7+d4eV5m27qfqzB4HT7y1bl0Hi5lXl1O6qzmqJo7Z49
-zg==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIW1UfdO4nP
+dGKo9YjM/EGVtzWyoNCz0+y5uqRvr2NagBfGrwkC2Z5t6kwrjgaGyhz3tQ1cCozO
+/DqIGERSdJgsNQXrayaZjoOBBmRUerkRlVU1nX+tUOcV5JyE6vMPspJI56RSlxVM
+oFE/k/9+jK/CnKZss9dfBY67VjX4avs+EJKbX4bpgNv7EpsaMTJWrvdYLXTDHY6e
+gpjyLxuyzpagXEXi0fnSM0jimvvOkFVqZt/bdGbk/nxUbOaANkdWPzIK71PCT30l
+7t4F+3UaV2Nl8jrGaKGgLKdiqGxEQhJO9XjJtG7R3S+9CMvzcVeVtle8s2cIEvR4
+ATILn+xegCUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAErxcL62i04myJ5L1M7zR
+Q5E9ctb78R+0A3GDAUo8qx2eO9pwmNH0DTrDPKUu0iAIyZlS5grS3fq5I3yy/wl8
+P6ClIxV/BryDXlgM0m/pjr79qtlILOpO4/Fxgp5tSNKomOOGjzP7jgcNqTuor+Z+
+d0Q8m60fwgCbThtF7ivsLcdGPwDknN3uuYvkyvsTMWOedbW2LA1LwtuF3qZiAcIe
+5yVqkV2zJtr+N122Wbnl/26UOBabtYXki0xsPtAvzP3f9Fp6zo+lmp5mTZRoVJOd
+GrDLnf+1YhlfoB05+nefI4M46WAkXRs6hCrORyOKza0l3SXhP/Kgt9uR3DvLz/B2
+7Q==
-----END CERTIFICATE-----
client-future.pem:
notBefore=Jul 17 23:00:00 2060 GMT
notAfter=Jul 17 23:00:00 2061 GMT
-----BEGIN CERTIFICATE-----
-MIIDYTCCAkkCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDYTCCAkkCAQcwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzIzMDAwMFoYDzIwNjEwNzE3
MjMwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj27mT
-DLgGDRx3zvaF7gyRtrzXKYQuJxKJXSa0uFq+1+UVF5VVB8h4sGNku6l7LWT9uZuh
-/Tm5eNgMrBg2HHCkptPzXvewhpE7jEqCRX5vBD9VuYZ9hcogJnCSQxAOLPQBu2Tb
-mbW4uyzKeTNCe0Mo/+wCq7mimF3wdQlhwEeQfZgKhNdYRmSXFADeIMVeyFTT2JOm
-54VIIxB/Hogn7OslAdwqmdUuyyArwvY8INif/kJH5tLXx277aMgBG+7RVVm2dxnI
-FH57TYsXvtVJt7PKcgfsFc57+uXBIwj74KjDCVX0vaDFey4O07jao4q82kkhklVh
-rkdyMlZo7X6RpPUfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACIIO8EbUN/sBb1J
-44OjBFdYQiHmQ3bJbKaYoBEK7JwyRLiiX53uOHRRB4LvvdnjFde3gKTmUKP0pDDx
-asKv3yrIs+euvZDjGrBFHe4J3A1IKe+HKT5dsMtl9PTUGJ3nZ7pD6IaV07iun5D8
-wBpHYb8iYHODVMQIylp+mEfTeDxBnEiOlZzY7NYS3dgt54OmwIHviaCnO7Pujt1o
-jMfNeeZ8DYR7WM4aht+QkIJUMNdV4q60cjR5ubJzN7loEh0BIAD6YPVqQnQAN/R0
-HNhmjOnIJMTi5uXi792VstyHt97zBgGb5z1QBcbELZT87ncXlbB3udq7zZUg/sxP
-MYpvb9k=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCFtVH
+3TuJz3RiqPWIzPxBlbc1sqDQs9Psubqkb69jWoAXxq8JAtmebepMK44Ghsoc97UN
+XAqMzvw6iBhEUnSYLDUF62smmY6DgQZkVHq5EZVVNZ1/rVDnFeSchOrzD7KSSOek
+UpcVTKBRP5P/foyvwpymbLPXXwWOu1Y1+Gr7PhCSm1+G6YDb+xKbGjEyVq73WC10
+wx2OnoKY8i8bss6WoFxF4tH50jNI4pr7zpBVambf23Rm5P58VGzmgDZHVj8yCu9T
+wk99Je7eBft1GldjZfI6xmihoCynYqhsREISTvV4ybRu0d0vvQjL83FXlbZXvLNn
+CBL0eAEyC5/sXoAlAgMBAAEwDQYJKoZIhvcNAQELBQADggEBADwQYLzW/dqcc8qF
+VPJfQCffJlIEYFxYnUxPDZFRaSV4zUoS6BiUGU9fYsi7cV/Sqc9YGYJzgF/z2Kug
+2nN0O1q/U/9AzzagLC2tfh7Yl/M2SudxhFLxLfy8iI/cxswUgcxS4xbp2fItsPYs
+WpG3ZVlMpDc4tZ76wyXYZMLm+pMIOQlxXOQ4S+ckNyVAVU+6IrocAwl2FEw0tVyD
+oJTJa6/739bmy/GbKV9BGaIkLg2uhozkame8yltXfb7i2Mo4Wfj0hQ6NedYUiYCg
+ZhWyCh9pAXPbeFj6VdYZzwLhCJjJ2EpVQ7hCQYCoEMzGcidinbZPKPaa4H+LjVII
+AJTeE9Y=
-----END CERTIFICATE-----
client-past.pem:
notBefore=Jul 17 23:00:00 2000 GMT
notAfter=Jul 17 23:00:00 2001 GMT
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcyMzAwMDBaFw0wMTA3MTcyMzAw
MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPbuZMMuAYN
-HHfO9oXuDJG2vNcphC4nEoldJrS4Wr7X5RUXlVUHyHiwY2S7qXstZP25m6H9Obl4
-2AysGDYccKSm0/Ne97CGkTuMSoJFfm8EP1W5hn2FyiAmcJJDEA4s9AG7ZNuZtbi7
-LMp5M0J7Qyj/7AKruaKYXfB1CWHAR5B9mAqE11hGZJcUAN4gxV7IVNPYk6bnhUgj
-EH8eiCfs6yUB3CqZ1S7LICvC9jwg2J/+Qkfm0tfHbvtoyAEb7tFVWbZ3GcgUfntN
-ixe+1Um3s8pyB+wVznv65cEjCPvgqMMJVfS9oMV7Lg7TuNqjirzaSSGSVWGuR3Iy
-VmjtfpGk9R8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAOHjfKW9PTATwiYvUp2se
-pT3JL+BTqcjJgTp+GgCh9C5q6WI+ZSyCmHQb9t4Uf0tZzMfLP3pLDekKTWwYlYvw
-wAhcMjJta90S1K924oncdQ7YLMnpkb5YfgEQZfl0ur5ZA8Y+bnkw7bFUMr01LbGM
-g8ByeyRgK0CGltZPmlhFHe9sIW5vbh6KkQcpogKY/UzhOXw7YU4sHxKXEd9Vl9y9
-66+Jp7Hk9NTXLPIGYfQzp4zREKyNAqF/lF8kEouPUecQA1KIP8KG6ESB3k5YvQMQ
-RE+cD9gJGqThFm0MY8ZXLdQJSF6Ty3ri67xJ3kgwcztmMbaR1Z9QrLrKtjjMYI2w
-wg==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIW1UfdO4nP
+dGKo9YjM/EGVtzWyoNCz0+y5uqRvr2NagBfGrwkC2Z5t6kwrjgaGyhz3tQ1cCozO
+/DqIGERSdJgsNQXrayaZjoOBBmRUerkRlVU1nX+tUOcV5JyE6vMPspJI56RSlxVM
+oFE/k/9+jK/CnKZss9dfBY67VjX4avs+EJKbX4bpgNv7EpsaMTJWrvdYLXTDHY6e
+gpjyLxuyzpagXEXi0fnSM0jimvvOkFVqZt/bdGbk/nxUbOaANkdWPzIK71PCT30l
+7t4F+3UaV2Nl8jrGaKGgLKdiqGxEQhJO9XjJtG7R3S+9CMvzcVeVtle8s2cIEvR4
+ATILn+xegCUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAwn9yUJMw0ymJQsT5snJm
+77AaMtOe7L1OFFl97DxO+5kAgPccTQOrjAbalj/Ip15jAdOyt65oGpzQzfPA3tE5
+8v+1Oz778LkfSoBV9jCsDrCR8Uidb0dtjDlGPzQwZt/33ogkHDObg+IsGkgYeg7Z
+yOgAPHOT70OkdVdUY++sAkMfYxjcFYpp5Y5qUl6hAZwHHO+nCYVax55HbEqYfaLn
+60RKhJrNVumczxxRf+/iw7cN4Mka7fUES7KkL+0tfpmjfDM5hakDzJJGRh4l4pRI
+R87tWJHrHoew1kSU00Ul0PYbYmLpI2Np19eq74Z/WEkaDyMym7KSBPaH2A/jZPm0
+oQ==
-----END CERTIFICATE-----
server.pem:
@@ -76,42 +76,42 @@ server.pem:
MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
-NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNFoXDTQ2MTIw
+OTIzMjAwNFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
-Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
-DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
-2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
-tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
-/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBALHpg/Tl52dVofqqwEtQhuFq9+Jd+/XW3Svd
+RvqZNVrnjL7UzqZ2r/bQ3peoVxeo1eKbv07EuHsL6MNR1elhhlfs70EgaGjATOiX
+lIzrqOaGV+nVehvWVGnKDobj1i8vZ6IHuf4Zf7pfLTOZpwKAwaxrnbRM501g7WNz
+JKutkoGvXRm0y1jvVWfnEO6CQ0OSxrFQc4MAaSlBfASUHZfC2XwWfZnUT/q9PVp3
+1OjeSlFPGvkyKxd74faOyhFQFRPK8sGNEy4MRuAFaPn8PyFVdU1FrDdJhexLmX9+
+JzO+nUYtsYq1+DDLZugKWYaMwH3Ku4fAMwPzkuL8WoJAcWrQQEUCAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEjEBhx+ib3+
-u7O2OYD6z6pVLLTiQpXjESRfFF8sf/epSmmNtE/PpiUhWAXG2dOinup/40rjimAF
-j/8okMGvtTHst16vcV+LYu8AthBq4F41WVlC8/aLmIbkofbBulEUlD02HEBNszHJ
-rCkFBupwDTnbKStdLRPtjchuGLDobePDF7NEBDT4rWxoaQH7ZM3LOHnWoDjgF4ar
-3J6w2YpTl4vFf/e31Ikc+ctVy7tU1/X/II58fbxKqWjtKL67VESRBpHhCGNRlXfF
-ejxfiyHBKPzZbh6jqmyI4GqfotBq/vvbpt2XocKFHB6UDvW7M+oCrEgf/gL1uMLy
-/vq3kChJRdM=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAApNqCn6XQjg
+N2/HN8H+6JaWePIg0WiXoMTVB+wGxGO2FNMxHJNkpRHdqGxyl79dGMpSiwEdt2T+
+TfLyEYixxHxH0Wf74lVZ1/NEy/WNHHV+/kylo9b5P1odvvzwyipgi/+wYGHl1LrI
+X2V3sIFjF3WKoVNpdSpPux4IWO4ssUp/dQTE7qHkAJKR5rz6eJheoJDKarhHDodo
+Q4snW8JO9oHAz4l02TuEsHUtttdH9L5fbwaQQkxpBO1UXKTD/0H/H+Ta21y8Uxh4
+8no49oumb2FPcPvJUHDSYXybgq16p0H/mNXBXWyrgxIA4MFNqJfW+3qryTxYnHRZ
+GF6jub4BTMc=
-----END CERTIFICATE-----
server-self.pem:
-----BEGIN CERTIFICATE-----
-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
+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
-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
+GQYDVQQDDBJzZXJ2ZXIuZXhhbXBsZS5jb20wHhcNMjExMjE1MjMyMDA1WhcNNDYx
+MjA5MjMyMDA1WjBLMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQB
GRYHRVhBTVBMRTEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUuY29tMIIBIjANBgkq
-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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 e3fdec1a..2cdd5ef9 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-----
-MIIEogIBAAKCAQEApyKgqX9NJBzu8uCA/ksWSdo2r9nCktkUmR4ycfgLshqY4+tL
-1YBu2hL7ZflZ9b9NZimqrA0JMEH+WpxchYYXuZTCax0GRlJairtH+WayrsP6qUhe
-uAhRvoBxT0cdnTQ/nUs66cRRMItq7W+yU+mhCTgNag4gMRWN6w4BaFXm+VbCV3l+
-k9rfVOlTM/r+CCfKClxvtDDmbx2L/ifDj+rdURnzYx4JU83giG7XTKoSyY7KEeKf
-SC/VoEVKLCBEE3A6T7uohH+Vz7BSMsJES7CTpwpauH6ysyUZYcJRxFGUvDSBpt3g
-sE+pexU8kCHOMPYhTd0Wb40vXwH4sRz+18KDWwIDAQABAoIBACuwLoT/5L863O8Z
-5j4SjJnzc3YWGvldyzeXICKQbyY4M5zoRaNidheE/LgULQLC5c19uMJOigdWSNGQ
-q9KvUYZOL1/mb1x0bHx1JgQ4Zx6t1djoNPIwIoYEdxn9Ae202agZISY4Dez9lI7K
-MrgiitipEUCWvq117+nweEe4pK6qJb+ES2rftJ0NwUkIbnI3Jgz9chQU7no8TmsR
-oBQyUbnsDGDnw8KMB6/JWRhNqrG5ok3JBGtgtHD8Sv4ejukhWPcs4qGyVdJ2u9ID
-nosgmT/wcclkWHUWolSjlAmTKzNhw84UzC0ewHqApXMDH4kT9oUtRcYpQtmdkKV4
-8aCVb0ECgYEA25VoN9pDhEfaIPrJtotE7U6w9xU/iIdMJZEropgwo0h6RwG92uOh
-nxMb5g917HBTh+fleI33UK3gJi9il31ubvt9rmqTl2WCnLNdY1OlwNvqqjcYSI4y
-D2Jfye+SDpXy/rscg+jerUc194RazcZB8U3foZz75O4hIXbb3zb6FGECgYEAwtp8
-HAsXmE8HuCMFNAWB2+EU0rGEhhJWAB2iIsN6emhL5QhTAY7EBSX8zw2cl1TwD7zh
-XjFCm+erZB6M2k2lWe2+5hzlaSzi4bwS3+G+g/FPNuV1/Plumhw6P06gKR3q+Eae
-Z8OOnAlLt3W4K1jS40buRjjAd8CBw+PPtuzBcTsCgYBJa456Rl+W5lN3/YLep3h3
-hH1FUHR62QpL8VtOtWZl4kEIZvutKbmLr97/MKI0WWaEpbQjeAx+jHTLL8LedlEr
-iKmAXSBWWdmvPYX3RSvB7YZsPZnAANOaM0FmCtWiTN7/715ceMuj0pCn3zhhX24D
-Gg+xQQU0ia7IOq7P1tkNYQKBgCEBWzZw1o1RDbCuFeqK6EUzahCKSzVek7yvSFB1
-JiDn27su3siLwz5QAfOcjaLAm20/BDmtRGgeJNTvq9IqhtClyck2qdFX7hJohhXw
-KhI1ZMKauZKhOY/XKjKhAdYVIEDvzVMsN9LMbEvmH80P3aDr2d6BLHDcZd6ljwCg
-N+ATAoGAb0z2YSc7xi2ylfsl32opYM9OU9jvefrcMoV8hovYhAqLySKTP0eNNycY
-03Ih3oBzYzF6Omeme5LbmnpJX65OHS4G9kwAAGWxKRO5K5gKY69uoj0HGM8v8M3e
-Byf8qrf+iYJeo2fouBrvlCe9P1Fpfd56KZlfUO90Sm6buQsJgeo=
+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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 49eafe53..f38b4910 100644
--- a/tls/tests/files/old-ca.pem
+++ b/tls/tests/files/old-ca.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-MIIFLjCCBBagAwIBAgIUGx5sD75kSqNKhP/0OQ7QuzKrM70wDQYJKoZIhvcNAQEL
+MIIFLjCCBBagAwIBAgIUDC99Qdqjkm3ReQ5gR30oDqs3mhIwDQYJKoZIhvcNAQEL
BQAwgZ8xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMSwwKgYDVQQLDCNPbGQgVW50cnVzdGVkIENlcnRpZmljYXRlIEF1dGhvcml0
eTEiMCAGA1UEAwwZb25jZS53YXMuYS5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3
-DQEJARYOY2FAZXhhbXBsZS5jb20wIBcNMjEwNzMxMTgxMzEwWhgPMjA1MTA3MjQx
-ODEzMTBaMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
+DQEJARYOY2FAZXhhbXBsZS5jb20wIBcNMjExMjE1MjMyMDA0WhgPMjA1MTEyMDgy
+MzIwMDRaMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
RVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZpY2F0ZSBBdXRo
b3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5jb20xHTAbBgkq
hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEApyKgqX9NJBzu8uCA/ksWSdo2r9nCktkUmR4ycfgLshqY4+tL1YBu
-2hL7ZflZ9b9NZimqrA0JMEH+WpxchYYXuZTCax0GRlJairtH+WayrsP6qUheuAhR
-voBxT0cdnTQ/nUs66cRRMItq7W+yU+mhCTgNag4gMRWN6w4BaFXm+VbCV3l+k9rf
-VOlTM/r+CCfKClxvtDDmbx2L/ifDj+rdURnzYx4JU83giG7XTKoSyY7KEeKfSC/V
-oEVKLCBEE3A6T7uohH+Vz7BSMsJES7CTpwpauH6ysyUZYcJRxFGUvDSBpt3gsE+p
-exU8kCHOMPYhTd0Wb40vXwH4sRz+18KDWwIDAQABo4IBXDCCAVgwHQYDVR0OBBYE
-FNx4YClSnImmPz5UzYH7Sq0AZIDdMIHfBgNVHSMEgdcwgdSAFNx4YClSnImmPz5U
-zYH7Sq0AZIDdoYGlpIGiMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZIm
+MIIBCgKCAQEA13j8Qz0nNLwdkmslszXjA94VglvHcuuG3gA6HzxLj4Hm6RbttdFC
+FKvuNh0XtGz4FMebqHwo8w9ACV0LGklytxqR1HWMFJlDq/UGZE7HATGCcHxL8Gtg
+/T7VAyIlObNwNOwlKYJvxLA8cYGQ4DaClBxfdD/UhGVGPvfGSZmAonum0pEZWt5M
+Kqs9V88/dOk5nEX0heMoACaEjtbsjVq7cmNEyRlclzdfKagozD6jTcnBehLH/2YY
+xl3A0w+1QMUiSMy/WzOYP+iuNHr2tBhGk6hWVV5JAD1jU6ap70aLhxB9wZOSQjUc
+HTPRmw89J6l4Yj2kUnsrxy00VrNVLLDG6QIDAQABo4IBXDCCAVgwHQYDVR0OBBYE
+FA9u4IW4IjXiNIU4wBUETzozMwa8MIHfBgNVHSMEgdcwgdSAFA9u4IW4IjXiNIU4
+wBUETzozMwa8oYGlpIGiMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZIm
iZPyLGQBGRYHRVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZp
Y2F0ZSBBdXRob3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5j
-b20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQbHmwPvmRKo0qE//Q5
-DtC7MqszvTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREE
+b20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQML31B2qOSbdF5DmBH
+fSgOqzeaEjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREE
EjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTAN
-BgkqhkiG9w0BAQsFAAOCAQEAEgsx0U8ZVbj2+Y6aYEyTeKocfUfdtz3TtK7fRbPr
-8NlBD75y4f0MuIBYfXa/GvxZaCVruPEQdOtqH35PhPTED9rCoVFKXCEY/yQvDas9
-bGk5Fu5Sjjp0qJhnnlUYNNpGkw4VoGf9e/jtNlaXnr/7qz4GGVN3n9rp8GLrIsjY
-O8wXC1aikT+/UK1AofAUtlK/9ejdBvXCFCoSLEK/fnWzXP5G0cGFP0Ai+ezwvHTW
-QaSaPiLKNC4+DE677zujQkbdXSiRHCt6o6SD2N0fPFmnF3bwHdva3EER3JGirZhX
-d3xmaHSx/LoybaEk1/f8G7t116WvOXpDSz4vgISIt2HPag==
+BgkqhkiG9w0BAQsFAAOCAQEAFYEIYBdnPsPe4xKRH9a8Qc9dtYegotdW5xW5sRAr
+fajrP1OislE72cNMElFh6dsc1ncHorXNkTOCQv8KpVdRtcMvk7PM9V9tvjfp14CD
+g6J2zoDun0jnX0Q7Z6aO4NK71EmBvU0AkDKkFmr0AMF+FFE0tk9VI7lZQcSKLTHB
+JNqMOgN0xo55JmecRpNfiHOhKxhDnQcZS7PbnQo20ruAk7oyRkZromPrVRuJz/kC
+QYH3ATmwKm+1x1mUXqTXqKNKQRKSnmqv4v0Tmm4/oTdKFOCrIi0Eyd4eWSjgCyA8
+CPCrdxIWJi1l962NVZQTc+kuShTVgsbOogIAOuyOhYQffg==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/root-ca-csr.pem b/tls/tests/files/root-ca-csr.pem
index 4f558906..182166de 100644
--- a/tls/tests/files/root-ca-csr.pem
+++ b/tls/tests/files/root-ca-csr.pem
@@ -2,18 +2,18 @@
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
-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
+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
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-and-key.pem b/tls/tests/files/server-and-key.pem
index 428ca553..f27bb18f 100644
--- a/tls/tests/files/server-and-key.pem
+++ b/tls/tests/files/server-and-key.pem
@@ -2,48 +2,48 @@
MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
-NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNFoXDTQ2MTIw
+OTIzMjAwNFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
-Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
-DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
-2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
-tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
-/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBALHpg/Tl52dVofqqwEtQhuFq9+Jd+/XW3Svd
+RvqZNVrnjL7UzqZ2r/bQ3peoVxeo1eKbv07EuHsL6MNR1elhhlfs70EgaGjATOiX
+lIzrqOaGV+nVehvWVGnKDobj1i8vZ6IHuf4Zf7pfLTOZpwKAwaxrnbRM501g7WNz
+JKutkoGvXRm0y1jvVWfnEO6CQ0OSxrFQc4MAaSlBfASUHZfC2XwWfZnUT/q9PVp3
+1OjeSlFPGvkyKxd74faOyhFQFRPK8sGNEy4MRuAFaPn8PyFVdU1FrDdJhexLmX9+
+JzO+nUYtsYq1+DDLZugKWYaMwH3Ku4fAMwPzkuL8WoJAcWrQQEUCAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEjEBhx+ib3+
-u7O2OYD6z6pVLLTiQpXjESRfFF8sf/epSmmNtE/PpiUhWAXG2dOinup/40rjimAF
-j/8okMGvtTHst16vcV+LYu8AthBq4F41WVlC8/aLmIbkofbBulEUlD02HEBNszHJ
-rCkFBupwDTnbKStdLRPtjchuGLDobePDF7NEBDT4rWxoaQH7ZM3LOHnWoDjgF4ar
-3J6w2YpTl4vFf/e31Ikc+ctVy7tU1/X/II58fbxKqWjtKL67VESRBpHhCGNRlXfF
-ejxfiyHBKPzZbh6jqmyI4GqfotBq/vvbpt2XocKFHB6UDvW7M+oCrEgf/gL1uMLy
-/vq3kChJRdM=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAApNqCn6XQjg
+N2/HN8H+6JaWePIg0WiXoMTVB+wGxGO2FNMxHJNkpRHdqGxyl79dGMpSiwEdt2T+
+TfLyEYixxHxH0Wf74lVZ1/NEy/WNHHV+/kylo9b5P1odvvzwyipgi/+wYGHl1LrI
+X2V3sIFjF3WKoVNpdSpPux4IWO4ssUp/dQTE7qHkAJKR5rz6eJheoJDKarhHDodo
+Q4snW8JO9oHAz4l02TuEsHUtttdH9L5fbwaQQkxpBO1UXKTD/0H/H+Ta21y8Uxh4
+8no49oumb2FPcPvJUHDSYXybgq16p0H/mNXBXWyrgxIA4MFNqJfW+3qryTxYnHRZ
+GF6jub4BTMc=
-----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-csr.pem b/tls/tests/files/server-csr.pem
index 193dfff3..892daaac 100644
--- a/tls/tests/files/server-csr.pem
+++ b/tls/tests/files/server-csr.pem
@@ -1,17 +1,17 @@
-----BEGIN CERTIFICATE REQUEST-----
MIICwTCCAakCAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OY
-gYIbEit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7
-vUZRDC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEY
-O5Vx2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6m
-qhbWtbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L5
-3Igw/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaAx
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALHpg/Tl52dVofqqwEtQhuFq9+Jd+/XW
+3SvdRvqZNVrnjL7UzqZ2r/bQ3peoVxeo1eKbv07EuHsL6MNR1elhhlfs70EgaGjA
+TOiXlIzrqOaGV+nVehvWVGnKDobj1i8vZ6IHuf4Zf7pfLTOZpwKAwaxrnbRM501g
+7WNzJKutkoGvXRm0y1jvVWfnEO6CQ0OSxrFQc4MAaSlBfASUHZfC2XwWfZnUT/q9
+PVp31OjeSlFPGvkyKxd74faOyhFQFRPK8sGNEy4MRuAFaPn8PyFVdU1FrDdJhexL
+mX9+JzO+nUYtsYq1+DDLZugKWYaMwH3Ku4fAMwPzkuL8WoJAcWrQQEUCAwEAAaAx
MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
-ATANBgkqhkiG9w0BAQsFAAOCAQEAadheCKyi4LjlDjgFf6TM0urbVbsXfsPkFM3R
-G1p+eOWtjFMZLeNdKOdRHwmYPMiMcshmf0Yw7cEVQxZBj4P0wBveKcvPVdonk2Bh
-Z5aST4LnMfLbsvxntb8DE/wrrFNWnJ1G9+ZD44xJ8TZYMV1vPsjYL6mk7iMJnm1r
-8kwy/RP1m5MSUhcxU1yiPQ2ed7bAbHCw28CwQRuAYazsD5v5fjfWVQfW9CfnEV3R
-T30kEiG1IWAeu7KasxEjcujQ+oGVm7ANhTeJmgkd47DlUt9oNvcUF1wJauJ/EA3z
-BwaXqWtsQ27kSGM8xlLlz7e0DQi5t29YlemiOF8qIjpzAgrbqQ==
+ATANBgkqhkiG9w0BAQsFAAOCAQEAhSx0p/Yo4YshMf40aDv3dOI7kLUyYNTAlzpo
+EswG2HVjU1eF82BDJ4nis4PdBv3+faK2jVQNV87ikLMxP5kUiDZVP3QVUMJLA8TT
+JYpMWyMXA+HjneOUNpPLbEVYOu/ruQJ08FPUHJrPyu5Hd8F7GcAhsHLMAVfmbSvs
+yrlArU1Rjm9q36OH9dvRb3bhe6MVVxk9Dkv6dD5I4USkBmNzsFE+CbrFoPPVc9o8
+O/jTY6Hwg/S6iVtVj1S8VfOviF9T23wHtgsjkpMMr+FMwciva96LlepCS54wXGiX
+eyShajp/6dbcQeSrMEz0Do9dDCjPTst8O2eoaF3/dl05+qp5ww==
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-intermediate-csr.pem b/tls/tests/files/server-intermediate-csr.pem
index 9cfcaabc..f5336446 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
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdl434MfWmQOdgVOK52liMyCIrv8pDd
-rFTIwhk3aj59dpB/Rx8C7FbOHA8tyIBWpKaNNNT3S/y4buWHcJywr+3oqy31+KFf
-/hKnDDgR86j822PKazfwcjrR05GBfKN3oKo6HEtsJ9jiicGFVp5gZkr18OsSbJiV
-uWbjEhOgUe4etHU+oWwnvKfpwwc3R9mDkqEtP+58lrGXmvUmVICfDW8Hymm4SXGM
-H05p02+an6rqciFk0GNMbeUeYK8fyVprqZIO8aTRAr6+Lb5PpBm6BTKI3KVGpRse
-vCJTVH867phwp7QjImbsEpxbUo9sJsIHshhNsLwi0bl7w4QhFrGlKO0CAwEAAaAx
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAO9xlq1UYoCohgHoTqJnelmNo5UlVhnC
+hFwGZupCakXpq3ryKBPVW2oANk2oOZf9vsJEnXs2LXB6kMaCFUUDgw+bR6+OCk2r
+cmQOsJkXCjzxWBWWUNd8YEbiptn1RGohS/6vlw2OPTyS4gLX1VV8YMos4u3Pikdm
+tZZuLHniYFGDDNynzZAHzcrsuKZzkpkGWqpXjDkZ6eH4gd5WGFivJKMmbNB/e7K+
+ShZ+wDfnbDCxlBmfr/6zdoZt2Zc2K6T4bVdR2u40DTcfRCZqer9GCnKvqzeBAJoC
+3WQbUIGwFjq0kiZGtdthOKZVQ59aWlBMXT5+GuWRqPY7zBZIig2skw8CAwEAAaAx
MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
-ATANBgkqhkiG9w0BAQsFAAOCAQEAFQW7JWbf4zEZ6kYkmMnK7mie0bBuBbnPiWqL
-z8NSAt70yTXvhcNpfEbiIdA2WbJYzVz5eH9+SSXr4R+2yWjOD/05Ad0khX/rSUIv
-7FboubLE+zNeJPrNm6Cb+W1+v/s6awr69AOhycXUJWgvSXHiU/d31DKFnC3xlqAw
-MFVO9a9mNmyLwsq9WZGc/MtNcJIICOzN81enFsQSCWlu1h+rhk/8H1lIv5SqG17G
-wCNL5kXt/K7X5Wy49L+hLOTva6tT+wUyHu3TAiViTH/Gu7mMHANDbFs0NBO/GlAi
-H1sDLHtynL4n7g+xd0x/OD/XzMrbUE+Z+9o+7BeUtacGIu8DrA==
+ATANBgkqhkiG9w0BAQsFAAOCAQEA4s7IpiFADBVCuK6GFT24IT/cLpl+KGUSuX1R
+nSP+UidKfBYBE1yaBQp8ncsFX1YwBiqzf4ytMEJUUpcO8cL6FSPkodjSLCMptXfk
+RC9hkFsx7AviBaIHbdJJpogjsWBOjp21o8KGhlQeQPTLavoa+ZEVYOVJUTgb2hCo
+f3upUZ0vad5AGBmOGZY03xjmAAou+JOdT3TaKlTXEQgot39vnbSElvEpDY5WEtK4
+L32WAptTq84z+MY5G2QYUfdvo6QkBx9HxZI9KDA4/DOKKEqPeBXlyhlqilyfsM3m
+PCw5yuU4bO3W2qTiFYqwNw5eHT3B0q9jkxcwvcngehKv24c5rg==
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-intermediate-key.pem b/tls/tests/files/server-intermediate-key.pem
index cb4bfa7e..8812bc7c 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 d98ddc95..ccd6336c 100644
--- a/tls/tests/files/server-intermediate.pem
+++ b/tls/tests/files/server-intermediate.pem
@@ -3,20 +3,20 @@ MIIDuzCCAqOgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcyNTE4MTMxMFow
+LWNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNVoXDTQ2MTIwOTIzMjAwNVow
SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKdl434MfWmQOdgVOK52liMyCIrv8pDdrFTIwhk3aj59dpB/
-Rx8C7FbOHA8tyIBWpKaNNNT3S/y4buWHcJywr+3oqy31+KFf/hKnDDgR86j822PK
-azfwcjrR05GBfKN3oKo6HEtsJ9jiicGFVp5gZkr18OsSbJiVuWbjEhOgUe4etHU+
-oWwnvKfpwwc3R9mDkqEtP+58lrGXmvUmVICfDW8Hymm4SXGMH05p02+an6rqciFk
-0GNMbeUeYK8fyVprqZIO8aTRAr6+Lb5PpBm6BTKI3KVGpRsevCJTVH867phwp7Qj
-ImbsEpxbUo9sJsIHshhNsLwi0bl7w4QhFrGlKO0CAwEAAaNHMEUwCQYDVR0TBAIw
+ggEPADCCAQoCggEBAO9xlq1UYoCohgHoTqJnelmNo5UlVhnChFwGZupCakXpq3ry
+KBPVW2oANk2oOZf9vsJEnXs2LXB6kMaCFUUDgw+bR6+OCk2rcmQOsJkXCjzxWBWW
+UNd8YEbiptn1RGohS/6vlw2OPTyS4gLX1VV8YMos4u3PikdmtZZuLHniYFGDDNyn
+zZAHzcrsuKZzkpkGWqpXjDkZ6eH4gd5WGFivJKMmbNB/e7K+ShZ+wDfnbDCxlBmf
+r/6zdoZt2Zc2K6T4bVdR2u40DTcfRCZqer9GCnKvqzeBAJoC3WQbUIGwFjq0kiZG
+tdthOKZVQ59aWlBMXT5+GuWRqPY7zBZIig2skw8CAwEAAaNHMEUwCQYDVR0TBAIw
ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
-ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAH44AdGFIuKyXGruD3XnuNZF
-eGOxLd3epXbWBsuY5tfol7ACO/hV6301VIrCHDGf4uovfyasLhu26kI6gCNZkROf
-NzODOhNOdNy6rSDApFn3TVIgEsmQ9Zm1MHfXc7Xz18L/1Cb1mjmXGRa+fMetNwSD
-jQLgxIKbA1LN4QPGQ9FnGeq/1KvXNHykAbV7dA8uRCkZnkgmXKVH5bjMZIi51Uo1
-Ls49sFAsrxL49rz4yvTVZe/13Gu7KCIVl1echy0nDk6J4C2qLrS5+WV/vyGdV6nk
-WZm6baVMEaGu/ygmJ8H6rUmrZy/rdIFv4yyQgOME8K6ZDW0/lYFqozDMxB5NucY=
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEtYVbiVHhRswFlaiG6dM1XD
+9XgtbTRutcdyLy1moxvfLiJpiRk0Uy8wXYTpjXe/iVtoNchT6g4ZOz1/shLjJ8tX
+30vpUcjULqV+eIcBPqmq9NgPNswH5BGqX0BWtMJAa3dR8FBWkikd3/WuSLd3uvSz
+8f/hJjqq7ovIAKxeSjGwqRqk6/8lbrdLYRDNKV7qAbtsRUfN7PlOxgGIAsqeZAsi
+SGOSW8uAwTLqHTwnovaN4ec4efUc6mpsvW+Na4YhR/U2RZAvoQtRBEHRwQNDOByD
+Xe29ZXe3jdQhUcKnJ0iaj/z32Y1/2dU3bTsDLDROBnJKICnS9wDBVbNXycvnekY=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/server-key-pkcs8.der b/tls/tests/files/server-key-pkcs8.der
index b901ee38..5fdfe57d 100644
Binary files a/tls/tests/files/server-key-pkcs8.der and b/tls/tests/files/server-key-pkcs8.der differ
diff --git a/tls/tests/files/server-key-pkcs8.pem b/tls/tests/files/server-key-pkcs8.pem
index c73ac7ff..db088eb9 100644
--- a/tls/tests/files/server-key-pkcs8.pem
+++ b/tls/tests/files/server-key-pkcs8.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDKorWd8WPx0ReY
-qxK5JZuW/7qQuXvjmIGCGxIrdvFBm+FTCplAtKO7WYpQtkC242sRFM0TFtXCslPM
-azVoYKxaYeA144rh+71GUQwtYdfzOoxJcwyggNflfMtzWsz+hUtX/3e1OHE6QS+2
-3T9QWDjjwOlpwVDxGDuVcdvow+93MtV1+eiut6a2wyw4+eAq2kkFJd9BT4H3JacK
-eQSs2nQMCloFYRyOpqoW1rW3pzarQwN0HIO7w2FCOR64UT2betv+4eJiFRjVhUS/
-h3l7H52Js8JOpGtC+dyIMP3ZR/GcDEtRGhgdBE28VD+eq9Tbs1FSe3DRidnXZbK2
-DqMYdAglAgMBAAECggEAGgGV44ZmeFOIfrx986si89cwP4C+qLAa9vK4e0GRpwT1
-fy3eC1LjrJjKSp+JYK+BPzj3NNr6Zjlyzcp4mUPG+vaSyvfADE69tPeT44MqLvo1
-pPuSBEtk6fwBNHXT11qOF+Yem/B5f6t8DzEH/izEaF6K1lrMI5UjmIN7YL08z4RJ
-CoUBg9aOPEOOXxNrUp9gjNbk4wFw5KksdvDKugvwZ0ZTuYSSH5Nhy+ggJcmYcmMz
-A57g5+TyX8QminsAlde6L9k41Wy5cFkgC2Cx8crtUwrpuwOhiJO/xd6wQQGqlJiT
-pfJL1L+q54cs3/k4nl7Inw9XvhyQpmwhNTmjL14rxQKBgQD0oNcQgEDV/1Ho7kYE
-hl+FpkS2yTntM0yEPRt+wAh5N9ngnPiWzYRDWTH5xmPv9RjF5nBZB1drl4W/Iznz
-396BkzHeQp5Ze+MMMNyafvbuZpYyXmn/RT6tMdZcIfrchzmMVCddcZmfeEBOevu2
-ybG1vT+/FwhVabi/mpJNn6NWSwKBgQDUDiRVtKfgXciI8PuNyPtZ9oe+lYlk+hVt
-L2SYMRlep03QnNdSV88tVD6t8cHx8mjGXsX9wdk/kzAXlMzuGAGFzirGh9Ako9nJ
-JR9Hu2Txyy18xAYN/1XxaTXkKvYrM1iY/NP+yOT0O6zPtz2JfhqYoqgdTqFUnQLC
-y0pn4sDVTwKBgE/P4hsKHR00rf63LrTvOl8afjS8tl+DayWB4mSaNqmF5Vn5HMnm
-x45JnZqGdbimWKzIoEMLuCPsTcCst42vrqLL6WtAhPVhDBTAJFlrrxjc84f/ccnN
-R8OuDOgGVhh5LfdwxV8hXyO+UgzI5zMd3xMSaafo1dk4IwSwY6dbvCi9AoGAO4Nw
-jSEzkFOhyVUgtG04pcn71PAw7EcHpmoLqG73OMppm2e5QqHkQkuHf9f+34FyCGJm
-3M3/w8jyUVvwm83e94eiF6/cKbxWjg4+FiqwrO+h54c4T8teem9VsaChEATME7u5
-X6NQJn9tA6rguWrL2hSka/06Z/3c3YCidD9+cR8CgYBpNknp/rU4wqdrwfzXb7eX
-K8+4iEubotnygG8FUHdmyNxTexA9LzNbDTbNLOSV65mzC1xlxMad5d0lGnMXKtax
-hwZCVJ9iw1a7vG8Yo+3jldaM0nH71LbHCflHDD3BAZJP64ACdleklEHIFwCZbXH0
-q0FIV9ytHeTvrBt/U3OjHQ==
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCx6YP05ednVaH6
+qsBLUIbhavfiXfv11t0r3Ub6mTVa54y+1M6mdq/20N6XqFcXqNXim79OxLh7C+jD
+UdXpYYZX7O9BIGhowEzol5SM66jmhlfp1Xob1lRpyg6G49YvL2eiB7n+GX+6Xy0z
+macCgMGsa520TOdNYO1jcySrrZKBr10ZtMtY71Vn5xDugkNDksaxUHODAGkpQXwE
+lB2Xwtl8Fn2Z1E/6vT1ad9To3kpRTxr5MisXe+H2jsoRUBUTyvLBjRMuDEbgBWj5
+/D8hVXVNRaw3SYXsS5l/ficzvp1GLbGKtfgwy2boClmGjMB9yruHwDMD85Li/FqC
+QHFq0EBFAgMBAAECggEBAIfPZjfQOHEdYWTka54SfqQc79URQYFM39DYPZKW2a/n
+Cf2ynX1dJL4Ye5LxomohLASsN8F9UgY79RcEpXJeTBtadtkUUB+GjC8RZwib7Hbt
+HrcViv0tA4st/yDhU2L5oPaDR2u9M0+lz++P33l9qFpiXCSCgB8FWrGL9/ZFrYzo
+dp5HMf7nqxzJwFEanJR02q55oEeHZHd1rK5Vl3CJ2XmgkMlFUQ7yPECzWvNieQ+8
+p4hWG9hXN1QSdgn7gVYbC9uTTRYb4rU46O4WREfePNPmx+ItDjjTN4dxg2VPzVhp
+mt2g1tH0ffbzNqXlVMRwRId5dVwIF2Hh8xqCG0qAsoECgYEA4h+vKNVrsAzmB/hT
+BDNK0jvAgCDrUUBPjXqkpBMfy91KEiOZyoSKwzPJM1zcxj5OhWB4fQncSmzC3q1h
+s+MoXljaQONQMN+wMKUzG1LRz7pyK+/hQGfHcrbKO5pgmxyaXDwu+Kpe4Ai6LiEF
+osfKwP1LcuA+doAHSUX3U87exB0CgYEAyWskcEXvtaAprgvYgzVH5d5cEcCmEnNi
+Hn8dzm5hiygSD9XTjXvpWN/spwn2RsJ4Y/SPKnLN330jSfPmImJfJXTCQFgTQdwV
+xuuPobKfirU3H2BAVdzE6YIPgKLzWpCemDjqAI4ANS9rxf1iTMzL7BdkaZIGhGsD
+3GygSC47ZEkCgYEA0iRR2ufkCRsjl5qOQ+QLD6+Z6Tkulzbl93xXj2d6cDH5yTuu
+i8d7UYdJ32LYhZ+Xx1ns/37va3cB7oFAwDVF6dA3HIBjoNfw3HRaN3VTKPKDchOe
+yQTpFNGMxbFlQCFnznnbyRpDy34wz/e+ThXQdmOu/1YolmXK36yW+hrRaX0CgYBv
+Lbv0WTZCzACVuKYvbqacJMwvZGaHArejW8lJHDatiFXH9eCLVV1tmFTZsy8Eye2I
+RwMLjElFVp63AHEEg8Y/N57Nw5AFp4VBwt8Kgz17ZCHkKM36Vx0+Q3NpLwki8XcJ
+UUkhO0C0GtPjesTa3aSmUhc0Cs2cJDICZtdmYFaaOQKBgQDUHvYRzsqKnuQQdKVL
+82na+vZStYFR1gDw2HT/L0gjUo2lzugJFQh4j/zV4WKkYwtLRxmenGD2KnnprChm
+xgj8PLrPDxveXKrCJxgMCAZptGGieT7/AMWe5kVKWDaLQjaiIje6Kp3aTtJURni/
+5wC2QS/j1kt1CvTCjtaDLFMpwQ==
-----END PRIVATE KEY-----
diff --git a/tls/tests/files/server-key.der b/tls/tests/files/server-key.der
index a6017543..e007ddc6 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 cbb15119..ed5bf07b 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-ocsp-missing-and-key.pem b/tls/tests/files/server-ocsp-missing-and-key.pem
index a7b5a749..b34639e5 100644
--- a/tls/tests/files/server-ocsp-missing-and-key.pem
+++ b/tls/tests/files/server-ocsp-missing-and-key.pem
@@ -2,48 +2,48 @@
MIIDlDCCAnygAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
-NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyMjYwN1oXDTQ2MTIw
+OTIyMjYwN1owSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
-Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
-DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
-2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
-tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
-/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBAMiRO33lgOzllkjcrqfh60qxIgrziw07tVWW
+soq0tm5IyCod/4E5jRXuTINkU3ycsMK7QRRZNikmqg+Y14wuGIxLkUB2XUxhlRwg
+Y1Y6BOPRs3Vag8RVzmlDPHNNLZ4sppW2rrLDv0XJ+gnoJaGTASO06NtRxotR5taU
+uRjp0RJxEpzj8MgwzM176mC+6jJNvP9k2Eab/t0Ayp8kWtcxVgp58FCH91PeGU1n
+kxsZA0AZovkOUukyAZiu/AgdXEQ9wsOT90U+LWsLYgAPvFVh73iTyrFTt7nBqqRT
+QlCDmd4EtD1yTh0Qk6vc+3W2NRDI/c0mjz3yvpLdfmnVGrSV81ECAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAFQb1qQMC3ZI
-iJPlUjx98YZRC0cmqzFcXAIgJ2grnGmdykpLRuLnwhCSa3nUCaRyptjMD1o0LzbL
-0cULniGDOUoEOjWxHMpJ8oLojisRSssQgbjqoH5xkZEQg7BwtnOX6JCcLuVFu34H
-lnuf/r7aF5Cz3kxF1+86BQW2BICw2Moern8Jnx768Nv/3ocrYfl0Hz4dbrTxyQq8
-rrt0Y16267IqMNq+yyEx7yG+yzwGWzcQGFgNe4q4KwxOlzpLFMGxrL0FjGACe0fg
-rBlSghDBX7bfbwN7CfN2KPE/bWk0rhR/N3dicN2qbpW0qPInUzLzY1Te+vdwnIcv
-4UQidMpxipk=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAJeeywig8VEp
+wDENKYXS0pbMfiVVueTxYM9XM8Gb4rabVSslQ5SdWEIosMHtaQGZZxrzLsSDttJD
+aTZODiPErLMCoqS9J59VVtEfukxs/kC7vOJxC9O4eyZornSFX9oIjpXgluytMtH+
+G8m3SBPaGXMx5Hupye9SG6LNvcCsHkPc6rZjauqeAbJEuTyZAI8t88gOXky7y4ki
+qpUL+puth/8CZAmpg6OMC9dfvUxt1Z0vzvwGDrrvk2i5sM/3TyaRhuptgL/b9lOs
+JMYfJ4ijJfGYoapcYL08wi76IIIDSQxwNd6+zk9P/NJZCc24GRxaibQxM9/Rbqln
+t26WrvD/niE=
-----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-ocsp-missing-csr.pem b/tls/tests/files/server-ocsp-missing-csr.pem
index 193dfff3..d5b73515 100644
--- a/tls/tests/files/server-ocsp-missing-csr.pem
+++ b/tls/tests/files/server-ocsp-missing-csr.pem
@@ -1,17 +1,18 @@
-----BEGIN CERTIFICATE REQUEST-----
-MIICwTCCAakCAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
+MIIC5TCCAc0CAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OY
-gYIbEit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7
-vUZRDC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEY
-O5Vx2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6m
-qhbWtbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L5
-3Igw/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaAx
-MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
-ATANBgkqhkiG9w0BAQsFAAOCAQEAadheCKyi4LjlDjgFf6TM0urbVbsXfsPkFM3R
-G1p+eOWtjFMZLeNdKOdRHwmYPMiMcshmf0Yw7cEVQxZBj4P0wBveKcvPVdonk2Bh
-Z5aST4LnMfLbsvxntb8DE/wrrFNWnJ1G9+ZD44xJ8TZYMV1vPsjYL6mk7iMJnm1r
-8kwy/RP1m5MSUhcxU1yiPQ2ed7bAbHCw28CwQRuAYazsD5v5fjfWVQfW9CfnEV3R
-T30kEiG1IWAeu7KasxEjcujQ+oGVm7ANhTeJmgkd47DlUt9oNvcUF1wJauJ/EA3z
-BwaXqWtsQ27kSGM8xlLlz7e0DQi5t29YlemiOF8qIjpzAgrbqQ==
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMiRO33lgOzllkjcrqfh60qxIgrziw07
+tVWWsoq0tm5IyCod/4E5jRXuTINkU3ycsMK7QRRZNikmqg+Y14wuGIxLkUB2XUxh
+lRwgY1Y6BOPRs3Vag8RVzmlDPHNNLZ4sppW2rrLDv0XJ+gnoJaGTASO06NtRxotR
+5taUuRjp0RJxEpzj8MgwzM176mC+6jJNvP9k2Eab/t0Ayp8kWtcxVgp58FCH91Pe
+GU1nkxsZA0AZovkOUukyAZiu/AgdXEQ9wsOT90U+LWsLYgAPvFVh73iTyrFTt7nB
+qqRTQlCDmd4EtD1yTh0Qk6vc+3W2NRDI/c0mjz3yvpLdfmnVGrSV81ECAwEAAaBV
+MCIGCSqGSIb3DQEJDjEVMBMwEQYIKwYBBQUHARgEBTADAgEFMC8GCSqGSIb3DQEJ
+DjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0B
+AQsFAAOCAQEAsbXmSMa/hEIKE5jwv3+LIuvvrYxTM76+GczRzC/zybIPraR8kWCZ
+Lqp1H7ALbNaaFqF8nbhyFwa+Irn4cYAhXJ34Bk2+p4HkThuAw9FWlZhSV64n6wV5
+l12a1qQqpWSaW6q/Kg/wCb3hvAliokHCz9OBe85PR1HOtEwLjoiRpBOvZ3WCINwf
+j+c+SwgOuAg291FvsaSW9CUY1N107O7ZFsxuiyUgdw8ik0aVORQKfrbosuvM5OnT
+/3lWTxDYEqPG7brqZQhmDw0yFCb+heWwCOLyInlusj7a3IOGHXJjMGftNPZr49bu
+dOPMeJMIT83/8PXVCKBn87xNuE/PdCEkFQ==
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-ocsp-missing.pem b/tls/tests/files/server-ocsp-missing.pem
index 2e72320d..45b7ef0d 100644
--- a/tls/tests/files/server-ocsp-missing.pem
+++ b/tls/tests/files/server-ocsp-missing.pem
@@ -2,21 +2,21 @@
MIIDlDCCAnygAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
-NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyMzMxN1oXDTQ2MTIw
+OTIyMzMxN1owSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
-Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
-DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
-2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
-tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
-/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBAMcR6lVfGGSVyTULQsXXhX4NNqNHlGSis/DT
+ShfyJn8A7dLybdfZD2hR7DzHrO0O79ZwduIrP4toJvErVRZuOHOdOd2ahI4qcHah
+qS7W9AKX3/YLSFkdRXbxH7xA9gczLKODSdiSwQDAP+O8a0RSxZNRqHMbay2yroG5
+fuDeG1KRN/QT9HTR3s6gkAMLUNfnzsxzEI2EN0E2QxYIUqQalPZDExNGR17hk84L
+DXon0aTTv/ubb9mwSyngX841Lj/XE5hamTrvMUd4Ho1qs60l/wCQOLmFRd8iT6dn
+HGpckdspd0FTR5TkEISDMO67JJgaVT0NKivSig1fR60qjbx/KrsCAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAFQb1qQMC3ZI
-iJPlUjx98YZRC0cmqzFcXAIgJ2grnGmdykpLRuLnwhCSa3nUCaRyptjMD1o0LzbL
-0cULniGDOUoEOjWxHMpJ8oLojisRSssQgbjqoH5xkZEQg7BwtnOX6JCcLuVFu34H
-lnuf/r7aF5Cz3kxF1+86BQW2BICw2Moern8Jnx768Nv/3ocrYfl0Hz4dbrTxyQq8
-rrt0Y16267IqMNq+yyEx7yG+yzwGWzcQGFgNe4q4KwxOlzpLFMGxrL0FjGACe0fg
-rBlSghDBX7bfbwN7CfN2KPE/bWk0rhR/N3dicN2qbpW0qPInUzLzY1Te+vdwnIcv
-4UQidMpxipk=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAFNB+a7Ntqo2
+y3qvguwnDP1CwK0qsSq6HzrtKwlmY7a/h5p8hIUYUZCirRq2eZfiC9sScjxzihG0
+g6M8gVT1DXPqkkKx/9fxeqyvBRuArETWN2DpFz8tGo81yPGXHCBYbpbcd5m8adNv
+zDr3yhelrnNKFYb0Pje/nd1IhikYGeTdWPC0K0mM6EHKd5Pol/BkFyThJURzBobm
+lhO3blOyTdzmMuEWKHvjy0GBptnW2UTHMErG0il3BIGvKtLt/si8J1mBh95C9oM2
+DZ4NUosxQRvGGqSey0j+uRMJkrrQASe6564g1tLRcifMkVJNWcbSXdQncJAm+TQj
+BbvMM6ujcUk=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/server-ocsp-required-by-ca-and-key.pem
b/tls/tests/files/server-ocsp-required-by-ca-and-key.pem
new file mode 100644
index 00000000..5f9f924d
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-ca-and-key.pem
@@ -0,0 +1,49 @@
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNFoXDTQ2MTIw
+OTIzMjAwNFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALHpg/Tl52dVofqqwEtQhuFq9+Jd+/XW3Svd
+RvqZNVrnjL7UzqZ2r/bQ3peoVxeo1eKbv07EuHsL6MNR1elhhlfs70EgaGjATOiX
+lIzrqOaGV+nVehvWVGnKDobj1i8vZ6IHuf4Zf7pfLTOZpwKAwaxrnbRM501g7WNz
+JKutkoGvXRm0y1jvVWfnEO6CQ0OSxrFQc4MAaSlBfASUHZfC2XwWfZnUT/q9PVp3
+1OjeSlFPGvkyKxd74faOyhFQFRPK8sGNEy4MRuAFaPn8PyFVdU1FrDdJhexLmX9+
+JzO+nUYtsYq1+DDLZugKWYaMwH3Ku4fAMwPzkuL8WoJAcWrQQEUCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAMXwbKySl6t0
+XTugRa186C97v8SmX8Zq8zk5IrulMENqluCyCw33HWgFEMrjYfXA+EAxLc/VwxPO
+jI5vdlDMOt3tr9be2Bz2adfC0cSfJdgOpRWaxDjXpKio7HTVDEkMGFrOODph1k+n
+PwQwQV73FsnqsBUJYwq1VKcy+Eoh5t6nrj1+RnjV2HeCHoKqi/ZT0m8bWLix0FTR
+s+IrNaeI9t95umEtmzSqexdH1cPJGIHxZi7v8P/6XreTi9MpatE9GNAUEcpkSICt
+bkycUqD3Jn5PDfuKbHGUaeEueazLg9zIhlGIQSl8vk3Zzn88fwbn8i96/ZTDOyfm
+wjjxwSl+uSU=
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAsemD9OXnZ1Wh+qrAS1CG4Wr34l379dbdK91G+pk1WueMvtTO
+pnav9tDel6hXF6jV4pu/TsS4ewvow1HV6WGGV+zvQSBoaMBM6JeUjOuo5oZX6dV6
+G9ZUacoOhuPWLy9noge5/hl/ul8tM5mnAoDBrGudtEznTWDtY3Mkq62Sga9dGbTL
+WO9VZ+cQ7oJDQ5LGsVBzgwBpKUF8BJQdl8LZfBZ9mdRP+r09WnfU6N5KUU8a+TIr
+F3vh9o7KEVAVE8rywY0TLgxG4AVo+fw/IVV1TUWsN0mF7EuZf34nM76dRi2xirX4
+MMtm6ApZhozAfcq7h8AzA/OS4vxagkBxatBARQIDAQABAoIBAQCHz2Y30DhxHWFk
+5GueEn6kHO/VEUGBTN/Q2D2Sltmv5wn9sp19XSS+GHuS8aJqISwErDfBfVIGO/UX
+BKVyXkwbWnbZFFAfhowvEWcIm+x27R63FYr9LQOLLf8g4VNi+aD2g0drvTNPpc/v
+j995fahaYlwkgoAfBVqxi/f2Ra2M6HaeRzH+56scycBRGpyUdNqueaBHh2R3dayu
+VZdwidl5oJDJRVEO8jxAs1rzYnkPvKeIVhvYVzdUEnYJ+4FWGwvbk00WG+K1OOju
+FkRH3jzT5sfiLQ440zeHcYNlT81YaZrdoNbR9H328zal5VTEcESHeXVcCBdh4fMa
+ghtKgLKBAoGBAOIfryjVa7AM5gf4UwQzStI7wIAg61FAT416pKQTH8vdShIjmcqE
+isMzyTNc3MY+ToVgeH0J3Epswt6tYbPjKF5Y2kDjUDDfsDClMxtS0c+6civv4UBn
+x3K2yjuaYJscmlw8LviqXuAIui4hBaLHysD9S3LgPnaAB0lF91PO3sQdAoGBAMlr
+JHBF77WgKa4L2IM1R+XeXBHAphJzYh5/Hc5uYYsoEg/V04176Vjf7KcJ9kbCeGP0
+jypyzd99I0nz5iJiXyV0wkBYE0HcFcbrj6Gyn4q1Nx9gQFXcxOmCD4Ci81qQnpg4
+6gCOADUva8X9YkzMy+wXZGmSBoRrA9xsoEguO2RJAoGBANIkUdrn5AkbI5eajkPk
+Cw+vmek5Lpc25fd8V49nenAx+ck7rovHe1GHSd9i2IWfl8dZ7P9+72t3Ae6BQMA1
+RenQNxyAY6DX8Nx0Wjd1Uyjyg3ITnskE6RTRjMWxZUAhZ85528kaQ8t+MM/3vk4V
+0HZjrv9WKJZlyt+slvoa0Wl9AoGAby279Fk2QswAlbimL26mnCTML2RmhwK3o1vJ
+SRw2rYhVx/Xgi1VdbZhU2bMvBMntiEcDC4xJRVaetwBxBIPGPzeezcOQBaeFQcLf
+CoM9e2Qh5CjN+lcdPkNzaS8JIvF3CVFJITtAtBrT43rE2t2kplIXNArNnCQyAmbX
+ZmBWmjkCgYEA1B72Ec7Kip7kEHSlS/Np2vr2UrWBUdYA8Nh0/y9II1KNpc7oCRUI
+eI/81eFipGMLS0cZnpxg9ip56awoZsYI/Dy6zw8b3lyqwicYDAgGabRhonk+/wDF
+nuZFSlg2i0I2oiI3uiqd2k7SVEZ4v+cAtkEv49ZLdQr0wo7WgyxTKcE=
+-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-ocsp-required-by-ca-csr.pem
b/tls/tests/files/server-ocsp-required-by-ca-csr.pem
new file mode 100644
index 00000000..bd05a8f8
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-ca-csr.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICwTCCAakCAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
+ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxFeXansIVcMJs4tFkJ/05XA3bipZRg
+VRPrpK8+XAh+EJLxFQRxJUPXDGuwNKrO2ZX336BHJ+NHq9eIozEI4g+Ec/l2HEZz
+jae3qd0ZsE96pCCpI5bMx/tg8QVpNCcTXTviXVzAhxZt+PRqylqGMuWUgrWQpl0B
+7FOCnluXjU2qlkHHNmWurBdJzEbCmE11KKew2R9j4GsxXJu4XcNzN06v9xbvZIC2
+I/6KI+wR6KWTXOjmJtLX5SD6h0Qoj3F5tWH0mJSKMPwhOJCn4ojLnM/TQ0OVNHm3
+an6XbaFOBVlhs/x6EPJRYX1TThxrn/Tgh81RabiadF3+ptQ+sQVT9uMCAwEAAaAx
+MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
+ATANBgkqhkiG9w0BAQsFAAOCAQEAL86Y+uN1xGiFLdWp9taWVLKo/0mDeljfSHGw
+DAgZvUsGcT85cmlcnOQg878HZ/YgDbNzNXhv63tnOUSAJXDmGe7eN9vU6TXuPqPM
+3kVNQFjYlxCbgcItIhyxV4P8gQzwgAwPSVS6uywdQ4Ipc8mp5YHDdxpSU2KVUlb8
+SNy4NDD3FEX6kiFtd2iVcgfTz38sIQPNiAOXb4kskS9iJApxJUwE3DPLSmZy+xLe
+G3sh9aQRobZlRmwa/UrRIx2o02HrtNplO+DFiDk6wIEje+TMeT4nfN/JlE0kTHVA
+fhDWl+zYOxxAwIElUuXUpobU/+8QyKIvjT2GOfDpTL6FYRiEcQ==
+-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-ocsp-required-by-ca.pem b/tls/tests/files/server-ocsp-required-by-ca.pem
new file mode 100644
index 00000000..ae12de96
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-ca.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNFoXDTQ2MTIw
+OTIzMjAwNFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALHpg/Tl52dVofqqwEtQhuFq9+Jd+/XW3Svd
+RvqZNVrnjL7UzqZ2r/bQ3peoVxeo1eKbv07EuHsL6MNR1elhhlfs70EgaGjATOiX
+lIzrqOaGV+nVehvWVGnKDobj1i8vZ6IHuf4Zf7pfLTOZpwKAwaxrnbRM501g7WNz
+JKutkoGvXRm0y1jvVWfnEO6CQ0OSxrFQc4MAaSlBfASUHZfC2XwWfZnUT/q9PVp3
+1OjeSlFPGvkyKxd74faOyhFQFRPK8sGNEy4MRuAFaPn8PyFVdU1FrDdJhexLmX9+
+JzO+nUYtsYq1+DDLZugKWYaMwH3Ku4fAMwPzkuL8WoJAcWrQQEUCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAMXwbKySl6t0
+XTugRa186C97v8SmX8Zq8zk5IrulMENqluCyCw33HWgFEMrjYfXA+EAxLc/VwxPO
+jI5vdlDMOt3tr9be2Bz2adfC0cSfJdgOpRWaxDjXpKio7HTVDEkMGFrOODph1k+n
+PwQwQV73FsnqsBUJYwq1VKcy+Eoh5t6nrj1+RnjV2HeCHoKqi/ZT0m8bWLix0FTR
+s+IrNaeI9t95umEtmzSqexdH1cPJGIHxZi7v8P/6XreTi9MpatE9GNAUEcpkSICt
+bkycUqD3Jn5PDfuKbHGUaeEueazLg9zIhlGIQSl8vk3Zzn88fwbn8i96/ZTDOyfm
+wjjxwSl+uSU=
+-----END CERTIFICATE-----
diff --git a/tls/tests/files/server-ocsp-required-by-server-and-key.pem
b/tls/tests/files/server-ocsp-required-by-server-and-key.pem
new file mode 100644
index 00000000..322eabfd
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-server-and-key.pem
@@ -0,0 +1,49 @@
+-----BEGIN CERTIFICATE-----
+MIIDpzCCAo+gAwIBAgIBBDANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNFoXDTQ2MTIw
+OTIzMjAwNFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALHpg/Tl52dVofqqwEtQhuFq9+Jd+/XW3Svd
+RvqZNVrnjL7UzqZ2r/bQ3peoVxeo1eKbv07EuHsL6MNR1elhhlfs70EgaGjATOiX
+lIzrqOaGV+nVehvWVGnKDobj1i8vZ6IHuf4Zf7pfLTOZpwKAwaxrnbRM501g7WNz
+JKutkoGvXRm0y1jvVWfnEO6CQ0OSxrFQc4MAaSlBfASUHZfC2XwWfZnUT/q9PVp3
+1OjeSlFPGvkyKxd74faOyhFQFRPK8sGNEy4MRuAFaPn8PyFVdU1FrDdJhexLmX9+
+JzO+nUYtsYq1+DDLZugKWYaMwH3Ku4fAMwPzkuL8WoJAcWrQQEUCAwEAAaNaMFgw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wEQYIKwYBBQUHARgEBTADAgEFMA0GCSqGSIb3
+DQEBCwUAA4IBAQBcyWjPOKa1VdahekAxzRxvEayWUXr6ZIgkYUvOHQgRVJE2aV4k
+2f4AP+/2d5G6BOxAoszY4ILCwKoirzU6XSvW2eJEVWS5bcPmrGNkQudsPlDeVrjU
+4d2iJVMziD1/DM774y4b3V1NpRnqo4hwrAoiqxsodyBrGt0TlK3T3Va8BnRyIpcu
+zQcGGlgjP9gyDdbPpUHdMi0nQmI04wKURJysIQBgGehxirIWqqlFGlIe6f4Gx2pt
+ft2gjcvY+1OSX/ImAgxgljrSrgLOSpRpWcFp2foYh7jD6739qLlmWNmgEpsF7Kaf
+QjYphycCx4IAXXDmTbxQ+YjALK14WCyN65Yk
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAsemD9OXnZ1Wh+qrAS1CG4Wr34l379dbdK91G+pk1WueMvtTO
+pnav9tDel6hXF6jV4pu/TsS4ewvow1HV6WGGV+zvQSBoaMBM6JeUjOuo5oZX6dV6
+G9ZUacoOhuPWLy9noge5/hl/ul8tM5mnAoDBrGudtEznTWDtY3Mkq62Sga9dGbTL
+WO9VZ+cQ7oJDQ5LGsVBzgwBpKUF8BJQdl8LZfBZ9mdRP+r09WnfU6N5KUU8a+TIr
+F3vh9o7KEVAVE8rywY0TLgxG4AVo+fw/IVV1TUWsN0mF7EuZf34nM76dRi2xirX4
+MMtm6ApZhozAfcq7h8AzA/OS4vxagkBxatBARQIDAQABAoIBAQCHz2Y30DhxHWFk
+5GueEn6kHO/VEUGBTN/Q2D2Sltmv5wn9sp19XSS+GHuS8aJqISwErDfBfVIGO/UX
+BKVyXkwbWnbZFFAfhowvEWcIm+x27R63FYr9LQOLLf8g4VNi+aD2g0drvTNPpc/v
+j995fahaYlwkgoAfBVqxi/f2Ra2M6HaeRzH+56scycBRGpyUdNqueaBHh2R3dayu
+VZdwidl5oJDJRVEO8jxAs1rzYnkPvKeIVhvYVzdUEnYJ+4FWGwvbk00WG+K1OOju
+FkRH3jzT5sfiLQ440zeHcYNlT81YaZrdoNbR9H328zal5VTEcESHeXVcCBdh4fMa
+ghtKgLKBAoGBAOIfryjVa7AM5gf4UwQzStI7wIAg61FAT416pKQTH8vdShIjmcqE
+isMzyTNc3MY+ToVgeH0J3Epswt6tYbPjKF5Y2kDjUDDfsDClMxtS0c+6civv4UBn
+x3K2yjuaYJscmlw8LviqXuAIui4hBaLHysD9S3LgPnaAB0lF91PO3sQdAoGBAMlr
+JHBF77WgKa4L2IM1R+XeXBHAphJzYh5/Hc5uYYsoEg/V04176Vjf7KcJ9kbCeGP0
+jypyzd99I0nz5iJiXyV0wkBYE0HcFcbrj6Gyn4q1Nx9gQFXcxOmCD4Ci81qQnpg4
+6gCOADUva8X9YkzMy+wXZGmSBoRrA9xsoEguO2RJAoGBANIkUdrn5AkbI5eajkPk
+Cw+vmek5Lpc25fd8V49nenAx+ck7rovHe1GHSd9i2IWfl8dZ7P9+72t3Ae6BQMA1
+RenQNxyAY6DX8Nx0Wjd1Uyjyg3ITnskE6RTRjMWxZUAhZ85528kaQ8t+MM/3vk4V
+0HZjrv9WKJZlyt+slvoa0Wl9AoGAby279Fk2QswAlbimL26mnCTML2RmhwK3o1vJ
+SRw2rYhVx/Xgi1VdbZhU2bMvBMntiEcDC4xJRVaetwBxBIPGPzeezcOQBaeFQcLf
+CoM9e2Qh5CjN+lcdPkNzaS8JIvF3CVFJITtAtBrT43rE2t2kplIXNArNnCQyAmbX
+ZmBWmjkCgYEA1B72Ec7Kip7kEHSlS/Np2vr2UrWBUdYA8Nh0/y9II1KNpc7oCRUI
+eI/81eFipGMLS0cZnpxg9ip56awoZsYI/Dy6zw8b3lyqwicYDAgGabRhonk+/wDF
+nuZFSlg2i0I2oiI3uiqd2k7SVEZ4v+cAtkEv49ZLdQr0wo7WgyxTKcE=
+-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-ocsp-required-by-server-csr.pem
b/tls/tests/files/server-ocsp-required-by-server-csr.pem
new file mode 100644
index 00000000..24d2c40a
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-server-csr.pem
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIC5TCCAc0CAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
+ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxFeXansIVcMJs4tFkJ/05XA3bipZRg
+VRPrpK8+XAh+EJLxFQRxJUPXDGuwNKrO2ZX336BHJ+NHq9eIozEI4g+Ec/l2HEZz
+jae3qd0ZsE96pCCpI5bMx/tg8QVpNCcTXTviXVzAhxZt+PRqylqGMuWUgrWQpl0B
+7FOCnluXjU2qlkHHNmWurBdJzEbCmE11KKew2R9j4GsxXJu4XcNzN06v9xbvZIC2
+I/6KI+wR6KWTXOjmJtLX5SD6h0Qoj3F5tWH0mJSKMPwhOJCn4ojLnM/TQ0OVNHm3
+an6XbaFOBVlhs/x6EPJRYX1TThxrn/Tgh81RabiadF3+ptQ+sQVT9uMCAwEAAaBV
+MCIGCSqGSIb3DQEJDjEVMBMwEQYIKwYBBQUHARgEBTADAgEFMC8GCSqGSIb3DQEJ
+DjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0B
+AQsFAAOCAQEAWoNGUhOcglk7ry1mIpaDpTDXIN6EQZF8PwZYDp84/M23yucJW5xW
+X8f2xLXUwlDQieQgd1YV/PCe0R4VS9BF+8u5oM9Y4Odm97RqyQ+hvBRGEJZeMZL6
++c2JJ7nRPlL4dkVDlzZcf/GK4Tvsi9IEB8NjzDfyotpqj4tB9U4xgVgKCviAN3ne
+dXPbPOEkNAhv/ZMBc/Vlrfy81OvEVoRai2ET0lkTnba67bGaB6cTgc393x52CNqH
+3sJfswWGJnU35ZXtXwb4kgvgBx+jb1/2QFkEXeJmFjboWCqNMEBjB3PtN8JhU/Rk
+xxkl+oJHgMs8CnnsEWunSi//dbjqqzygvg==
+-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-ocsp-required-by-server.pem
b/tls/tests/files/server-ocsp-required-by-server.pem
new file mode 100644
index 00000000..c3c7f42e
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-server.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDpzCCAo+gAwIBAgIBBDANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNFoXDTQ2MTIw
+OTIzMjAwNFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALHpg/Tl52dVofqqwEtQhuFq9+Jd+/XW3Svd
+RvqZNVrnjL7UzqZ2r/bQ3peoVxeo1eKbv07EuHsL6MNR1elhhlfs70EgaGjATOiX
+lIzrqOaGV+nVehvWVGnKDobj1i8vZ6IHuf4Zf7pfLTOZpwKAwaxrnbRM501g7WNz
+JKutkoGvXRm0y1jvVWfnEO6CQ0OSxrFQc4MAaSlBfASUHZfC2XwWfZnUT/q9PVp3
+1OjeSlFPGvkyKxd74faOyhFQFRPK8sGNEy4MRuAFaPn8PyFVdU1FrDdJhexLmX9+
+JzO+nUYtsYq1+DDLZugKWYaMwH3Ku4fAMwPzkuL8WoJAcWrQQEUCAwEAAaNaMFgw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wEQYIKwYBBQUHARgEBTADAgEFMA0GCSqGSIb3
+DQEBCwUAA4IBAQBcyWjPOKa1VdahekAxzRxvEayWUXr6ZIgkYUvOHQgRVJE2aV4k
+2f4AP+/2d5G6BOxAoszY4ILCwKoirzU6XSvW2eJEVWS5bcPmrGNkQudsPlDeVrjU
+4d2iJVMziD1/DM774y4b3V1NpRnqo4hwrAoiqxsodyBrGt0TlK3T3Va8BnRyIpcu
+zQcGGlgjP9gyDdbPpUHdMi0nQmI04wKURJysIQBgGehxirIWqqlFGlIe6f4Gx2pt
+ft2gjcvY+1OSX/ImAgxgljrSrgLOSpRpWcFp2foYh7jD6739qLlmWNmgEpsF7Kaf
+QjYphycCx4IAXXDmTbxQ+YjALK14WCyN65Yk
+-----END CERTIFICATE-----
diff --git a/tls/tests/files/server-ocsp-required-csr.pem b/tls/tests/files/server-ocsp-required-csr.pem
new file mode 100644
index 00000000..dbc881d8
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-csr.pem
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIC5TCCAc0CAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
+ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKldmDSUw+D/RExMhsgjlKJqQNdN/Ccx
+5NOhKVNpAdBEEr08cvGRzLwpAGSEDrLIuvLtCHtiFg6lQlZUUlpBNn4Ij71ggmkD
+wkWLhRX8mDqxlt7S2/xy9aMKQ1Ok547qeF97WG4Zq8ZTOzQGI4bzI/U7jA+siNGv
+I+UexsBH8fWsFpx2lA24nH3gnFXW3DU7rYDQ9/z8gBNyt7b8RuHajHrJilEy5vfz
+hCYJJhOMJ4rSozoC7HeaXUq692W/EEcq5XZGfUHHHYHjFB4fxXKerccl2waGxWk8
+MooGjuIrg0QeHENvLFR8dW6YUf6xdOgQwXmclD1lpfXrY5Y+LDAatDsCAwEAAaBV
+MCIGCSqGSIb3DQEJDjEVMBMwEQYIKwYBBQUHARgEBTADAgEFMC8GCSqGSIb3DQEJ
+DjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0B
+AQsFAAOCAQEAb0zyclEwo2AvcEvlCdAatvSptlqUYzqs7M8CTgr19N+i1vLM/sBv
+3sXIgjaqY0vaAbOP4swHOT1hn43feco3RK13wXxih1wuQH8S9c8DPwSy19F8GIvL
+lX63/uej4IVMofWW9hhadtX1JxhCwwWgj0ponv3inssrmIc+dZnRClQQjWlljIMU
+mcxoUvZLNBMh9pXc7F7V5XIJhs07SGmw+uHgQkxs2K6fvWNJupm8ndN/eSAcFUp6
+V53WxLrxi0oy0qVtvc+mMPWX3/ooe64gfio1JnxogZaBAWag/RlnnOV5p6YE3ZMY
+ECiMZjYl4FsNjFF5g2/krZg8gf5v2bhN8g==
+-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-self.pem b/tls/tests/files/server-self.pem
index d59ab968..c5a5c544 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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
+GQYDVQQDDBJzZXJ2ZXIuZXhhbXBsZS5jb20wHhcNMjExMjE1MjMyMDA1WhcNNDYx
+MjA5MjMyMDA1WjBLMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQB
GRYHRVhBTVBMRTEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUuY29tMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyqK1nfFj8dEXmKsSuSWblv+6kLl745iB
-ghsSK3bxQZvhUwqZQLSju1mKULZAtuNrERTNExbVwrJTzGs1aGCsWmHgNeOK4fu9
-RlEMLWHX8zqMSXMMoIDX5XzLc1rM/oVLV/93tThxOkEvtt0/UFg448DpacFQ8Rg7
-lXHb6MPvdzLVdfnorremtsMsOPngKtpJBSXfQU+B9yWnCnkErNp0DApaBWEcjqaq
-Fta1t6c2q0MDdByDu8NhQjkeuFE9m3rb/uHiYhUY1YVEv4d5ex+dibPCTqRrQvnc
-iDD92UfxnAxLURoYHQRNvFQ/nqvU27NRUntw0YnZ12Wytg6jGHQIJQIDAQABMA0G
-CSqGSIb3DQEBCwUAA4IBAQCzIuhLcAm8fExTPGibomrWY+WJKwXI0d2knIyAP8Vs
-QjMx+24aKQC+dnyYBL72R3393FvZZwnq3qsTIAHcm1n/v10pYno5F58iHxCfYhNm
-lHNCDI/pntVAmPVppgf8wJmqsgG53PVXAVF5Z0L2Nnp0KR0RGAIK1YEGDq6fa4E1
-aW9X37gLDXbXHzgTr9iNuXjbMQjZlS67mNIHEFZp9gCCQuTmqRe+H8L469iJmMuR
-yeJKaMEW5guGqpf2rmhlV2DIg66wjceSSVCoKxUIk03Gw3Nhdhg4A1oDNtywt+1J
-Jc7s0HgwfhEsQS856oNZD0J1Ry5m8OKfJxPE3jnOafIh
+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
-----END CERTIFICATE-----
diff --git a/tls/tests/files/server.der b/tls/tests/files/server.der
index cd9c10c2..c525e204 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 20055f7e..300e065e 100644
--- a/tls/tests/files/server.pem
+++ b/tls/tests/files/server.pem
@@ -2,21 +2,21 @@
MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
-NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIzMjAwNFoXDTQ2MTIw
+OTIzMjAwNFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
-Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
-DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
-2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
-tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
-/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBALHpg/Tl52dVofqqwEtQhuFq9+Jd+/XW3Svd
+RvqZNVrnjL7UzqZ2r/bQ3peoVxeo1eKbv07EuHsL6MNR1elhhlfs70EgaGjATOiX
+lIzrqOaGV+nVehvWVGnKDobj1i8vZ6IHuf4Zf7pfLTOZpwKAwaxrnbRM501g7WNz
+JKutkoGvXRm0y1jvVWfnEO6CQ0OSxrFQc4MAaSlBfASUHZfC2XwWfZnUT/q9PVp3
+1OjeSlFPGvkyKxd74faOyhFQFRPK8sGNEy4MRuAFaPn8PyFVdU1FrDdJhexLmX9+
+JzO+nUYtsYq1+DDLZugKWYaMwH3Ku4fAMwPzkuL8WoJAcWrQQEUCAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEjEBhx+ib3+
-u7O2OYD6z6pVLLTiQpXjESRfFF8sf/epSmmNtE/PpiUhWAXG2dOinup/40rjimAF
-j/8okMGvtTHst16vcV+LYu8AthBq4F41WVlC8/aLmIbkofbBulEUlD02HEBNszHJ
-rCkFBupwDTnbKStdLRPtjchuGLDobePDF7NEBDT4rWxoaQH7ZM3LOHnWoDjgF4ar
-3J6w2YpTl4vFf/e31Ikc+ctVy7tU1/X/II58fbxKqWjtKL67VESRBpHhCGNRlXfF
-ejxfiyHBKPzZbh6jqmyI4GqfotBq/vvbpt2XocKFHB6UDvW7M+oCrEgf/gL1uMLy
-/vq3kChJRdM=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAApNqCn6XQjg
+N2/HN8H+6JaWePIg0WiXoMTVB+wGxGO2FNMxHJNkpRHdqGxyl79dGMpSiwEdt2T+
+TfLyEYixxHxH0Wf74lVZ1/NEy/WNHHV+/kylo9b5P1odvvzwyipgi/+wYGHl1LrI
+X2V3sIFjF3WKoVNpdSpPux4IWO4ssUp/dQTE7qHkAJKR5rz6eJheoJDKarhHDodo
+Q4snW8JO9oHAz4l02TuEsHUtttdH9L5fbwaQQkxpBO1UXKTD/0H/H+Ta21y8Uxh4
+8no49oumb2FPcPvJUHDSYXybgq16p0H/mNXBXWyrgxIA4MFNqJfW+3qryTxYnHRZ
+GF6jub4BTMc=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/ssl/server-muststaple.conf b/tls/tests/files/ssl/server-muststaple.conf
new file mode 100644
index 00000000..20674308
--- /dev/null
+++ b/tls/tests/files/ssl/server-muststaple.conf
@@ -0,0 +1,29 @@
+# Server
+
+[ req ]
+default_md = sha256
+utf8 = yes
+string_mask = utf8only
+prompt = no
+distinguished_name = req_dn
+req_extensions = req_ext
+x509_extensions = v3_req_ext
+
+[ req_dn ]
+0.domainComponent = "COM"
+1.domainComponent = "EXAMPLE"
+commonName = "server.example.com"
+
+[ req_ext ]
+basicConstraints = CA:false
+extendedKeyUsage = serverAuth
+
+[ v3_req_ext ]
+basicConstraints = CA:false
+extendedKeyUsage = serverAuth
+subjectAltName = @alt_names
+tlsfeature = status_request
+
+[ alt_names ]
+IP.0 = 192.168.1.10
+DNS.0 = "server.example.com"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
