[glib-networking/mcatanzaro/openssl-ocsp: 2/2] Update tests for OCSP stapling
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking/mcatanzaro/openssl-ocsp: 2/2] Update tests for OCSP stapling
- Date: Wed, 15 Dec 2021 22:56:00 +0000 (UTC)
commit be47b42e2caa54edea26625ff3c7a4eabac132c6
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, 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.
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 | 30 +++--
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 -> 1218 bytes
tls/tests/files/server-key-pkcs8.pem | 52 ++++----
tls/tests/files/server-key.der | Bin 1190 -> 1192 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 ++---
49 files changed, 1091 insertions(+), 832 deletions(-)
---
diff --git a/tls/tests/certificate.h b/tls/tests/certificate.h
index 63c341b1..2ce686fa 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-15T22:50:21Z"
+#define EXPECTED_NOT_VALID_AFTER "2046-12-09T22:50:21Z"
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 2127cbfe..0a41b2f1 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 "dR4Sd3sRyXBnaHfpNNhA1W6GKDa0ik31htJUYreos38="
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..54d4de96 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
+bTAgFw0yMTEyMTUyMjUwMjFaGA8yMDUxMTIwODIyNTAyMVowgYYxEzARBgoJkiaJ
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
+ggEPADCCAQoCggEBANfwKyeiwkope+JCW3VaIbMBP8uMHjHpLo6KDsJCQKbob5vD
+Ypn2LTn++zlgOcTGfpdDN2nkgK9GaKXO8fVZV6HpG7jHFzL4ZtG70ie8yIxyWHxz
+JyFSIBkG5KZ3wtFct3cJW0Mf3WKohvziuDKXBfGXzkmMgj2fyA6ZQaabyx9Eaogv
+bF0pfMGWvDAWXRObuGCVVE11xs48NoGUY8/ckrCRDgXZ+jSNnni4yK7Pny2dkhF9
+R1Kl2g6e0GCa0jC58nv7QibUs0W7Ao/6YlBmlISl2GqZoUh2fUdRoatjT5G/ItxU
+t/ar2QpgD48decy85dNM4QhvRzpt8Z+dzGKX56kCAwEAAaOCAVwwggFYMB0GA1Ud
+DgQWBBQssKfpp4ZsAKGCOno+dh0Se5scszCB3wYDVR0jBIHXMIHUgBR0DOrLHain
+Tol4thojRjw2EuVHkqGBpaSBojCBnzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUG
CgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBVbnRydXN0ZWQgQ2Vy
dGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndhcy5hLmNhLmV4YW1w
-bGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbYIUGx5sD75kSqNK
-hP/0OQ7QuzKrM70wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwGQYD
+bGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbYIUYgpDrOQ5fbQ3
+1MOwX2JyffT9UHswDwYDVR0TAQH/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=
+b20wDQYJKoZIhvcNAQELBQADggEBANCBzTo6aZZih/FS1Xkbxxw/WaHb09FeGw2S
+bSNsLVrMbqwaWXP9zbdSPH8ZrW967tdnFsjBuehp0J7iaEMfPZbwTrKWz3IrDtPL
+6mNOpkhVdKYFNRZ/OCeu4wul3vGKUfjVkYX/ugjZkDv1bHz1fALEmq254P08Lgra
+6Y/5hhv33uyIJLhjZJTHL0SnHsi5+6c6KGjeUBCLQSlzxPv/wG0Z2xJM7Smr1ok3
+TFvJLjBAM2sSIHnjwDu3bYCRrRiUUvpT3kmfmbLoMdohPyTcWL+K3tfzxR7zVgTX
+r1jmHA7uDqQuRZkELd9sC4E/tepqgJZhHh/fgCeLyMhWuoCZqHI=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/ca-key.pem b/tls/tests/files/ca-key.pem
index 750ec21d..a7232472 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..43463418 100644
--- a/tls/tests/files/ca-ocsp.pem
+++ b/tls/tests/files/ca-ocsp.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE9jCCA96gAwIBAgIUUnrK8xF95zauX9lNEPBSQqx/z4UwDQYJKoZIhvcNAQEL
+MIIE9jCCA96gAwIBAgIUM3TroE7SXHVVuaaxSpuzjI5I3c4wDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/IsZAEZ
+MTEyMTUyMjUwMjFaGA8yMDUxMTIwODIyNTAyMVowgYYxEzARBgoJkiaJk/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
+AQoCggEBANfwKyeiwkope+JCW3VaIbMBP8uMHjHpLo6KDsJCQKbob5vDYpn2LTn+
++zlgOcTGfpdDN2nkgK9GaKXO8fVZV6HpG7jHFzL4ZtG70ie8yIxyWHxzJyFSIBkG
+5KZ3wtFct3cJW0Mf3WKohvziuDKXBfGXzkmMgj2fyA6ZQaabyx9EaogvbF0pfMGW
+vDAWXRObuGCVVE11xs48NoGUY8/ckrCRDgXZ+jSNnni4yK7Pny2dkhF9R1Kl2g6e
+0GCa0jC58nv7QibUs0W7Ao/6YlBmlISl2GqZoUh2fUdRoatjT5G/ItxUt/ar2Qpg
+D48decy85dNM4QhvRzpt8Z+dzGKX56kCAwEAAaOCAVYwggFSMB0GA1UdDgQWBBQs
+sKfpp4ZsAKGCOno+dh0Se5scszCBxgYDVR0jBIG+MIG7gBQssKfpp4ZsAKGCOno+
+dh0Se5scs6GBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-bGUuY29tghRSesrzEX3nNq5f2U0Q8FJCrH/PhTAPBgNVHRMBAf8EBTADAQH/MA4G
+bGUuY29tghQzdOugTtJcdVW5prFKm7OMjkjdzjAPBgNVHRMBAf8EBTADAQH/MA4G
A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
EjAQgQ5jYUBleGFtcGxlLmNvbTARBggrBgEFBQcBGAQFMAMCAQUwDQYJKoZIhvcN
-AQELBQADggEBAC6beOO8UJu7kQsicLZuHkbQv1tcymAHBQ4KG3e6DuPS7Cpiv48j
-nYZWIeApxyYX0WC9USS1Hxibjg1nGYUNg00MN1QcSpr5ivEmm697wYAF37Yc+sv+
-h62oLltkVENPRC9UcoOMDRW4E39Ag1nOxptLEfz7WlOUTjgBmfyy1i9G78M8YF4O
-Cpi38qbUC8PRSz9n8XCIcheb9umPcZkxLeQ4+W5zosg8W4FpjHrQ2j5EVtWu1oaZ
-eAyxghHym6J6z5p2Le9K4sZ2pFVppJXvOPw58QZBZnP8h/v8vidr4fr/CPAh9gmp
-IwnAKK2sIsc1wqcltHWwGgLYp1WPs4Pa9FI=
+AQELBQADggEBAF5agl+PYDy0L6a2aqRQM+F0V7dSzE2um+6OWWXdcG4FoWUtnqIp
+g6extbMAE2A23N5CTCP0uZJ+pO8wTl02PwnlISFa4CEciJw/+YB32tG4RHwaFNQ6
+L4/StvsvjPxXpApqm7HVQIYfEmWMjN5VmX+EGHFmQzg95SM+LLij+BE2aj6NM1D0
+GhiGebYhQ++l1wzegp4cKzHk5aALbf9HfEd+licCDNdLZBLAuT7zpqEzpnM0q23r
+q2j/0utNGhO0csN6dFx3EI09aaOlZHiK6KC4wGhpWfw+cjWW6PDUSxP+VbjxT+GO
+IHXGS4y8gWWjeeB9Ov+ueVyAF4/EHBQgjzM=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/ca-roots-bad.pem b/tls/tests/files/ca-roots-bad.pem
index a1648bcf..1188f8d5 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
+MIIE4zCCA8ugAwIBAgIUM8q6fCtGHAVVVGTVSWYjzuMDDB8wDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/IsZAEZ
+MTEyMTUyMjUwMjFaGA8yMDUxMTIwODIyNTAyMVowgYYxEzARBgoJkiaJk/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
+AQoCggEBANfwKyeiwkope+JCW3VaIbMBP8uMHjHpLo6KDsJCQKbob5vDYpn2LTn+
++zlgOcTGfpdDN2nkgK9GaKXO8fVZV6HpG7jHFzL4ZtG70ie8yIxyWHxzJyFSIBkG
+5KZ3wtFct3cJW0Mf3WKohvziuDKXBfGXzkmMgj2fyA6ZQaabyx9EaogvbF0pfMGW
+vDAWXRObuGCVVE11xs48NoGUY8/ckrCRDgXZ+jSNnni4yK7Pny2dkhF9R1Kl2g6e
+0GCa0jC58nv7QibUs0W7Ao/6YlBmlISl2GqZoUh2fUdRoatjT5G/ItxUt/ar2Qpg
+D48decy85dNM4QhvRzpt8Z+dzGKX56kCAwEAAaOCAUMwggE/MB0GA1UdDgQWBBQs
+sKfpp4ZsAKGCOno+dh0Se5scszCBxgYDVR0jBIG+MIG7gBQssKfpp4ZsAKGCOno+
+dh0Se5scs6GBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-bGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAPBgNVHRMBAf8EBTADAQH/MA4G
+bGUuY29tghQzyrp8K0YcBVVUZNVJZiPO4wMMHzAPBgNVHRMBAf8EBTADAQH/MA4G
A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
-EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
-Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
-H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
-Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
-cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
-uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
-QSNhrzqDvA==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHwt6zBVQmDrc
+EBR2Dp/a5CNVTa9KtvB7fVQSfmgLEz3GgcgE21s6Wy82WdG2GhE1skiSxKvT3ov4
+e22F2lfArEF1aDSl4XimAlBMEZyO8CTYzLRJ15a37dTm9vc/RgZ5qGstuIv3JMDw
+FM/2awElNzvfob7jtPxdxEDGm6VfblcjMcPFAsAsJt74QZL1MzUeZzBGBIXpZJjK
+gj56yZDmx5mCcCU35xBhRVCWYKtAo96yuInZpQakKmTG0FPlKQStBdoMJEYqBwF6
+2yyWraJPJjqEtFwMaelgTgrxhWhR1D4U4yOoXfhZlqv1KjdFicUsg2EXFHdy3kFD
+BN+T/SWxuA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
diff --git a/tls/tests/files/ca-roots.pem b/tls/tests/files/ca-roots.pem
index cb431a62..3b5b72eb 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
+MIIE4zCCA8ugAwIBAgIUM8q6fCtGHAVVVGTVSWYjzuMDDB8wDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/IsZAEZ
+MTEyMTUyMjUwMjFaGA8yMDUxMTIwODIyNTAyMVowgYYxEzARBgoJkiaJk/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
+AQoCggEBANfwKyeiwkope+JCW3VaIbMBP8uMHjHpLo6KDsJCQKbob5vDYpn2LTn+
++zlgOcTGfpdDN2nkgK9GaKXO8fVZV6HpG7jHFzL4ZtG70ie8yIxyWHxzJyFSIBkG
+5KZ3wtFct3cJW0Mf3WKohvziuDKXBfGXzkmMgj2fyA6ZQaabyx9EaogvbF0pfMGW
+vDAWXRObuGCVVE11xs48NoGUY8/ckrCRDgXZ+jSNnni4yK7Pny2dkhF9R1Kl2g6e
+0GCa0jC58nv7QibUs0W7Ao/6YlBmlISl2GqZoUh2fUdRoatjT5G/ItxUt/ar2Qpg
+D48decy85dNM4QhvRzpt8Z+dzGKX56kCAwEAAaOCAUMwggE/MB0GA1UdDgQWBBQs
+sKfpp4ZsAKGCOno+dh0Se5scszCBxgYDVR0jBIG+MIG7gBQssKfpp4ZsAKGCOno+
+dh0Se5scs6GBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-bGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAPBgNVHRMBAf8EBTADAQH/MA4G
+bGUuY29tghQzyrp8K0YcBVVUZNVJZiPO4wMMHzAPBgNVHRMBAf8EBTADAQH/MA4G
A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
-EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
-Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
-H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
-Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
-cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
-uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
-QSNhrzqDvA==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHwt6zBVQmDrc
+EBR2Dp/a5CNVTa9KtvB7fVQSfmgLEz3GgcgE21s6Wy82WdG2GhE1skiSxKvT3ov4
+e22F2lfArEF1aDSl4XimAlBMEZyO8CTYzLRJ15a37dTm9vc/RgZ5qGstuIv3JMDw
+FM/2awElNzvfob7jtPxdxEDGm6VfblcjMcPFAsAsJt74QZL1MzUeZzBGBIXpZJjK
+gj56yZDmx5mCcCU35xBhRVCWYKtAo96yuInZpQakKmTG0FPlKQStBdoMJEYqBwF6
+2yyWraJPJjqEtFwMaelgTgrxhWhR1D4U4yOoXfhZlqv1KjdFicUsg2EXFHdy3kFD
+BN+T/SWxuA==
-----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..ca2dc9e5 100644
--- a/tls/tests/files/ca.pem
+++ b/tls/tests/files/ca.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIE4zCCA8ugAwIBAgIUQL/y3nsri2som8J5/D+Hm8ljMwcwDQYJKoZIhvcNAQEL
+MIIE4zCCA8ugAwIBAgIUM8q6fCtGHAVVVGTVSWYjzuMDDB8wDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/IsZAEZ
+MTEyMTUyMjUwMjFaGA8yMDUxMTIwODIyNTAyMVowgYYxEzARBgoJkiaJk/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
+AQoCggEBANfwKyeiwkope+JCW3VaIbMBP8uMHjHpLo6KDsJCQKbob5vDYpn2LTn+
++zlgOcTGfpdDN2nkgK9GaKXO8fVZV6HpG7jHFzL4ZtG70ie8yIxyWHxzJyFSIBkG
+5KZ3wtFct3cJW0Mf3WKohvziuDKXBfGXzkmMgj2fyA6ZQaabyx9EaogvbF0pfMGW
+vDAWXRObuGCVVE11xs48NoGUY8/ckrCRDgXZ+jSNnni4yK7Pny2dkhF9R1Kl2g6e
+0GCa0jC58nv7QibUs0W7Ao/6YlBmlISl2GqZoUh2fUdRoatjT5G/ItxUt/ar2Qpg
+D48decy85dNM4QhvRzpt8Z+dzGKX56kCAwEAAaOCAUMwggE/MB0GA1UdDgQWBBQs
+sKfpp4ZsAKGCOno+dh0Se5scszCBxgYDVR0jBIG+MIG7gBQssKfpp4ZsAKGCOno+
+dh0Se5scs6GBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-bGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAPBgNVHRMBAf8EBTADAQH/MA4G
+bGUuY29tghQzyrp8K0YcBVVUZNVJZiPO4wMMHzAPBgNVHRMBAf8EBTADAQH/MA4G
A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
-EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
-Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
-H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
-Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
-cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
-uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
-QSNhrzqDvA==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHwt6zBVQmDrc
+EBR2Dp/a5CNVTa9KtvB7fVQSfmgLEz3GgcgE21s6Wy82WdG2GhE1skiSxKvT3ov4
+e22F2lfArEF1aDSl4XimAlBMEZyO8CTYzLRJ15a37dTm9vc/RgZ5qGstuIv3JMDw
+FM/2awElNzvfob7jtPxdxEDGm6VfblcjMcPFAsAsJt74QZL1MzUeZzBGBIXpZJjK
+gj56yZDmx5mCcCU35xBhRVCWYKtAo96yuInZpQakKmTG0FPlKQStBdoMJEYqBwF6
+2yyWraJPJjqEtFwMaelgTgrxhWhR1D4U4yOoXfhZlqv1KjdFicUsg2EXFHdy3kFD
+BN+T/SWxuA==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/chain.pem b/tls/tests/files/chain.pem
index f5302357..74bee920 100644
--- a/tls/tests/files/chain.pem
+++ b/tls/tests/files/chain.pem
@@ -3,78 +3,78 @@ MIIDuzCCAqOgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcyNTE4MTMxMFow
+LWNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMloXDTQ2MTIwOTIyNTAyMlow
SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKdl434MfWmQOdgVOK52liMyCIrv8pDdrFTIwhk3aj59dpB/
-Rx8C7FbOHA8tyIBWpKaNNNT3S/y4buWHcJywr+3oqy31+KFf/hKnDDgR86j822PK
-azfwcjrR05GBfKN3oKo6HEtsJ9jiicGFVp5gZkr18OsSbJiVuWbjEhOgUe4etHU+
-oWwnvKfpwwc3R9mDkqEtP+58lrGXmvUmVICfDW8Hymm4SXGMH05p02+an6rqciFk
-0GNMbeUeYK8fyVprqZIO8aTRAr6+Lb5PpBm6BTKI3KVGpRsevCJTVH867phwp7Qj
-ImbsEpxbUo9sJsIHshhNsLwi0bl7w4QhFrGlKO0CAwEAAaNHMEUwCQYDVR0TBAIw
+ggEPADCCAQoCggEBANEvj69lLUh4yKmymKWlcAYdcMFtISBGZc/Gth2AB0i174N1
+1jBGaF4BBrj8G68Pg2VJvUh8ZCg3E92/2jeX0liu3STLi3paW6FL4rI2R8K0fG/t
+bXpQ4R8KFKGEf8oe7T3ng9VaIjSjsefLClKmv4V3G5ZBIiGWvGm51scO0eKJ8l6J
+OpjNp9u1Fx3yKPA7p39lhapkjmp4mivZ1FA3uzhG5GB6kG7IQhFnZ23wKXfILgLW
+LFMLPnAY4vHkqjkxc/pEIQx2fhaTnHQXfQ2JEKlvVr4IPJahtZDf+oi9sFHiqSCc
+q8qjvuzcxWlXAr2RBuIFheJO3Y19dw8j7Phpg78CAwEAAaNHMEUwCQYDVR0TBAIw
ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
-ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAH44AdGFIuKyXGruD3XnuNZF
-eGOxLd3epXbWBsuY5tfol7ACO/hV6301VIrCHDGf4uovfyasLhu26kI6gCNZkROf
-NzODOhNOdNy6rSDApFn3TVIgEsmQ9Zm1MHfXc7Xz18L/1Cb1mjmXGRa+fMetNwSD
-jQLgxIKbA1LN4QPGQ9FnGeq/1KvXNHykAbV7dA8uRCkZnkgmXKVH5bjMZIi51Uo1
-Ls49sFAsrxL49rz4yvTVZe/13Gu7KCIVl1echy0nDk6J4C2qLrS5+WV/vyGdV6nk
-WZm6baVMEaGu/ygmJ8H6rUmrZy/rdIFv4yyQgOME8K6ZDW0/lYFqozDMxB5NucY=
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAAvGicZxxydN5DNYMEY6srw+
+3qgxcY9PazUwY9P5kQX6YKh3ixCQS1XX9FZegSM2jCHVnutqifgA0Sj3U902I3jQ
+VSjQ/iPs1WE2r4dsfPzmPNYtC8p8g6q/q6/27870X4ZHfyZdVs5IaJmaDIl2w6Uz
+dkfSAwhCGzTyIEuMkwLFPY6uyQox913XnHkmMPvWhPq5StASjHgUxOCml3EiBIb1
+H6HNBhqdBLYxnJGr+GHXlipSHqrVPe+wPPsBd83x6Lnpet7h3y/uMeY2/Iih0uhY
+/NDdwMBQgksOx5xcc1JsTZSQ2O/bMFSumf4gG28d0aL+foX3l8CGsrC2A58BxXU=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIFAjCCA+qgAwIBAgIBCDANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIFAjCCA+qgAwIBAgIBCTANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
-NTE4MTMxMFowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMloXDTQ2MTIw
+OTIyNTAyMlowga0xEzARBgoJkiaJk/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
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALwwHH8eY4UwG0lcmWbVdpJGI5EJrKVy
+x8fafo2vnsyiH500Y8CVxqbqbIBje4IiE9kOz42+0YaONVwO3gNCCVx2xPKEo1HV
+wrsLBCJYB8QEWRJ9DJbHhbCN+cWyJZ7947ixY99k7rCwfjIazJIlsyXoFYQvwq7h
+TWGrelEgjqY7amQMJHccKUiIGDe3eBmpyZzZLGxkagWotWm4IbcEzL03XLQsT67d
++zdjqHAloFPcx70k0JJNLP0q6+GSgqI4EhFQ0emhr1eROdeG//GfgFAiuNzXK+5F
+qmlhB5uKBqtvP38UWYaz1/o65BIw58Olr97G0GjrGkq6vnL9nrco+QkCAwEAAaOC
+AVAwggFMMB0GA1UdDgQWBBQt39ZXMnYbbQhX97nrBtkS+W0DBTCBxgYDVR0jBIG+
+MIG7gBQssKfpp4ZsAKGCOno+dh0Se5scs6GBjKSBiTCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAP
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQzyrp8K0YcBVVUZNVJZiPO4wMMHzAP
BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAJArQW4HGrmrCNYdA3C6LwwqhuzJzwR87HPg
-jmK+1f/E4qPlaT8PhgoxmU2bOCoI/eNHPSfXk5sOl8k6HUZyF/hRdFBUgUtUEO81
-udRrFXRwUeRY30p8BXm8sbxNGk9FMCO/czdS2MD6T7fdLI8Z6g9hz+eOOyEHVy6D
-Z/LkUgIMQwVibdMuNs2fxgpmReZgraqQOeHAyCCo0SkZXGkN2rHV3kYJkuc522kq
-K11ldkrxKhHU77ebxrHvgYtv0D90rspFEcY16/0iYAFdthZX1gJOgpMivD7lXykX
-IHU1jn7fIdjT+uaoB+5ScQKYrlngZcaij16rX0nj7GMwrls/Awc=
+b20wDQYJKoZIhvcNAQELBQADggEBAFctWN1xJ3fLGWcSgMiCTgzQFU3vydWILInW
+rJMyjDaEC7yciiJbRbAhPo0ouMlkNVGFwltzYMdtNWd8ifZ3S36A4RAKRi8FFXz0
+hX2w7OiMoMj4R8TWfNx7aOdPAzfdqRd5Op3fdZugC+WxtIdSU2e7sXn00ig0Y/8o
+/yjJhbw5vCrLTnsdXJ+n4E32Bh9nCzB7Tj0/ABAwR16B0CAgcuXgdVJAF/X1nMEW
+/ePG8c80TU35HkkD9mX4jr6/IDOWaeGnEr10pY4GNA+Jpm1S4y20dp5wZZ9wP+aP
+w32ZXeBBFsifqW6q9hu9q5sMDq/ATKLpQDPEcjR6hh7tmb19kUM=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIE4zCCA8ugAwIBAgIUQL/y3nsri2som8J5/D+Hm8ljMwcwDQYJKoZIhvcNAQEL
+MIIE4zCCA8ugAwIBAgIUM8q6fCtGHAVVVGTVSWYjzuMDDB8wDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/IsZAEZ
+MTEyMTUyMjUwMjFaGA8yMDUxMTIwODIyNTAyMVowgYYxEzARBgoJkiaJk/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
+AQoCggEBANfwKyeiwkope+JCW3VaIbMBP8uMHjHpLo6KDsJCQKbob5vDYpn2LTn+
++zlgOcTGfpdDN2nkgK9GaKXO8fVZV6HpG7jHFzL4ZtG70ie8yIxyWHxzJyFSIBkG
+5KZ3wtFct3cJW0Mf3WKohvziuDKXBfGXzkmMgj2fyA6ZQaabyx9EaogvbF0pfMGW
+vDAWXRObuGCVVE11xs48NoGUY8/ckrCRDgXZ+jSNnni4yK7Pny2dkhF9R1Kl2g6e
+0GCa0jC58nv7QibUs0W7Ao/6YlBmlISl2GqZoUh2fUdRoatjT5G/ItxUt/ar2Qpg
+D48decy85dNM4QhvRzpt8Z+dzGKX56kCAwEAAaOCAUMwggE/MB0GA1UdDgQWBBQs
+sKfpp4ZsAKGCOno+dh0Se5scszCBxgYDVR0jBIG+MIG7gBQssKfpp4ZsAKGCOno+
+dh0Se5scs6GBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-bGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAPBgNVHRMBAf8EBTADAQH/MA4G
+bGUuY29tghQzyrp8K0YcBVVUZNVJZiPO4wMMHzAPBgNVHRMBAf8EBTADAQH/MA4G
A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
-EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
-Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
-H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
-Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
-cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
-uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
-QSNhrzqDvA==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAHwt6zBVQmDrc
+EBR2Dp/a5CNVTa9KtvB7fVQSfmgLEz3GgcgE21s6Wy82WdG2GhE1skiSxKvT3ov4
+e22F2lfArEF1aDSl4XimAlBMEZyO8CTYzLRJ15a37dTm9vc/RgZ5qGstuIv3JMDw
+FM/2awElNzvfob7jtPxdxEDGm6VfblcjMcPFAsAsJt74QZL1MzUeZzBGBIXpZJjK
+gj56yZDmx5mCcCU35xBhRVCWYKtAo96yuInZpQakKmTG0FPlKQStBdoMJEYqBwF6
+2yyWraJPJjqEtFwMaelgTgrxhWhR1D4U4yOoXfhZlqv1KjdFicUsg2EXFHdy3kFD
+BN+T/SWxuA==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client-and-key.pem b/tls/tests/files/client-and-key.pem
index 4f35914c..fc803a13 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
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTEyMTUyMjUwMjJaFw00NjEyMDkyMjUw
+MjJaMGIxEzARBgoJkiaJk/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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCK7/sF1RVJ
+4jS+lLWciJMKeSGfI6bomevFZ0ctTcpa0Um2/jk9YZldtNPcIf6V9RripxQ1FY5I
+xkH7hUZVWLpyep74gA4i1NFhOluxtf8H4l2topRNnJ+ekJjyFdymn7c13YTyfQs9
++ALSFCmosSBcTw3LAlkunq8Xg5l7dAkBhLx5Fw8v0BY7DZtYzDHrmHEnNiI5BRkU
+uZ6rN4bb0/Uu5cE4Zk70b0J/7Npr3aA/p3wYQLv6w/ZeVbgFy5j0MAvy5uC414/8
+2TTI/3sip1NDFS0R6jbkurga8436bHgZ44616ho6oxzLLgcIT4FtdoAeOMai9/hD
+y1jPMNEuqVcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQVuLr9X1egKlCvObnkvC
+wdziakK8sm3iQ6E4ieYP5eOAo8WmQB8n/fpEzkbnxVBbSWtEofpulqINzuEtcByc
+dV7BPAvOxBgiSUGp1mQDiOQOnsZVfbpT6K+oz/mr6cH5mUyvzSN7FwQYZezypPgT
+W+OIvQquhBMLg+VGTkGL9PkKT6bPOZHWW8XXHASqeEKvKK3jEJCOVrDr+4Re+FJT
+59bWr+1jA84iJcZsD12qSO2CDGHWsuPdMg9AzAq+rYw3w+sA/V0ZZUtC5r8OnKyj
+DkD9hqN6gRwCVZNmHmEdTM2kc8UkhJFHD9U7HnRi7HoRF7bEpGaXzOQj/o22FYUT
+dQ==
-----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..284d01b7 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=
+wIrv+wXVFUniNL6UtZyIkwp5IZ8jpuiZ68VnRy1NylrRSbb+OT1hmV2009wh/pX1
+GuKnFDUVjkjGQfuFRlVYunJ6nviADiLU0WE6W7G1/wfiXa2ilE2cn56QmPIV3Kaf
+tzXdhPJ9Cz34AtIUKaixIFxPDcsCWS6erxeDmXt0CQGEvHkXDy/QFjsNm1jMMeuY
+cSc2IjkFGRS5nqs3htvT9S7lwThmTvRvQn/s2mvdoD+nfBhAu/rD9l5VuAXLmPQw
+C/Lm4LjXj/zZNMj/eyKnU0MVLRHqNuS6uBrzjfpseBnjjrXqGjqjHMsuBwhPgW12
+gB44xqL3+EPLWM8w0S6pVwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAIlurekS
+MudOVnIfl37k2vwif0lMJvGw7yLfiBf5Ge800qGJ9/JKPGboSQA8g1yDDCUTXUVa
+Nn3L4dqfjBmJkiSL1wzUR9NDXUiYZJYcqc53NpiliheFXIpyrUoBfNi/iSkJUbPR
+dPpQ6Hjxjh6MtGFK1zJDBZAxzvwBywynlk70roiecVEsb2DqsrDtW3oCRgH3OfQn
+JIyUJwJ+sn0SBKwkE2m1g0MPrmaUebpn9l9iMINv/+dSCcqvVWgSBnCZVcQBgmTl
+N43ceaoC6ELiUjP+Hm2pol+aBePlMnYhVWABC+abTSI84pYpTY4YfSFGH+Oy+Fda
+pnARg/oXRAuxhgU=
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/client-future.pem b/tls/tests/files/client-future.pem
index e4a1f960..a453631a 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=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAiu/7
+BdUVSeI0vpS1nIiTCnkhnyOm6JnrxWdHLU3KWtFJtv45PWGZXbTT3CH+lfUa4qcU
+NRWOSMZB+4VGVVi6cnqe+IAOItTRYTpbsbX/B+JdraKUTZyfnpCY8hXcpp+3Nd2E
+8n0LPfgC0hQpqLEgXE8NywJZLp6vF4OZe3QJAYS8eRcPL9AWOw2bWMwx65hxJzYi
+OQUZFLmeqzeG29P1LuXBOGZO9G9Cf+zaa92gP6d8GEC7+sP2XlW4BcuY9DAL8ubg
+uNeP/Nk0yP97IqdTQxUtEeo25Lq4GvON+mx4GeOOteoaOqMcyy4HCE+BbXaAHjjG
+ovf4Q8tYzzDRLqlXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMRiTmPiC4oh9eqv
+AWVXieDP08IQ/x56p6vL61k1MrCHP5XWCpPZ3HGEy+SC6BuHC0O3vMGiFnRxtm9Y
+YhCJZ+FUqqQD6dYWNW5vuhvx2SbiH6zUBxby2uj5LWXmAHb3zq601e0l5j74rGsm
+BQxQRfhyShvLhl7efBPl2P7jFYC/5orEPwjIZTg11Gb2oILF5j5VcG33aJzYvflg
+JZc8SL7tUATaw8DR29t/B2g96+IPDNM0bxFkXUY+eW6S5EvWLbqNxX9ofwvgyw3c
+oV2cWyDhqk839+X1Q9ruJdjlMuUN4y/Z9gk/3n012bVWuCDKnhYJ7LqPRvfVRV6i
++l0amkk=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client-key.pem b/tls/tests/files/client-key.pem
index c3d0a958..de4f6cb0 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..4fec3d97 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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCK7/sF1RVJ
+4jS+lLWciJMKeSGfI6bomevFZ0ctTcpa0Um2/jk9YZldtNPcIf6V9RripxQ1FY5I
+xkH7hUZVWLpyep74gA4i1NFhOluxtf8H4l2topRNnJ+ekJjyFdymn7c13YTyfQs9
++ALSFCmosSBcTw3LAlkunq8Xg5l7dAkBhLx5Fw8v0BY7DZtYzDHrmHEnNiI5BRkU
+uZ6rN4bb0/Uu5cE4Zk70b0J/7Npr3aA/p3wYQLv6w/ZeVbgFy5j0MAvy5uC414/8
+2TTI/3sip1NDFS0R6jbkurga8436bHgZ44616ho6oxzLLgcIT4FtdoAeOMai9/hD
+y1jPMNEuqVcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEALGNMMQaGcCAYWOpW967Z
+K28yuHljz2A1d3xC8V4Wus7r+33nuSnwlBgRBpRpRsAOaDaZ0AiC35cqaHfDjDQT
+jDgNRMScRPyKT6kkxwM5sj1aJPlLgUxSLgFJjSasG96NiLZhCh7osikRoF2YUEWb
+pWTYP1m1+8j+ApB96S5kZhBBrvCp32M1QZg53FFOnOY0CuDEYevQlnuGf7BapDMh
+Kwubxg/pV8rImr3fBns3RRcuM/TTSsFagibV2fga4nUuZ6cmP0AM2FFBsRKLmAW0
+GeSZ3jgViYcwIPOCY0yjWuYrdvwIBxqOeIWAavY+/zkpQUxmww586cSxsnz26MUy
+ig==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client.pem b/tls/tests/files/client.pem
index e2646c8d..ea216d6f 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
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTEyMTUyMjUwMjJaFw00NjEyMDkyMjUw
+MjJaMGIxEzARBgoJkiaJk/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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCK7/sF1RVJ
+4jS+lLWciJMKeSGfI6bomevFZ0ctTcpa0Um2/jk9YZldtNPcIf6V9RripxQ1FY5I
+xkH7hUZVWLpyep74gA4i1NFhOluxtf8H4l2topRNnJ+ekJjyFdymn7c13YTyfQs9
++ALSFCmosSBcTw3LAlkunq8Xg5l7dAkBhLx5Fw8v0BY7DZtYzDHrmHEnNiI5BRkU
+uZ6rN4bb0/Uu5cE4Zk70b0J/7Npr3aA/p3wYQLv6w/ZeVbgFy5j0MAvy5uC414/8
+2TTI/3sip1NDFS0R6jbkurga8436bHgZ44616ho6oxzLLgcIT4FtdoAeOMai9/hD
+y1jPMNEuqVcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQVuLr9X1egKlCvObnkvC
+wdziakK8sm3iQ6E4ieYP5eOAo8WmQB8n/fpEzkbnxVBbSWtEofpulqINzuEtcByc
+dV7BPAvOxBgiSUGp1mQDiOQOnsZVfbpT6K+oz/mr6cH5mUyvzSN7FwQYZezypPgT
+W+OIvQquhBMLg+VGTkGL9PkKT6bPOZHWW8XXHASqeEKvKK3jEJCOVrDr+4Re+FJT
+59bWr+1jA84iJcZsD12qSO2CDGHWsuPdMg9AzAq+rYw3w+sA/V0ZZUtC5r8OnKyj
+DkD9hqN6gRwCVZNmHmEdTM2kc8UkhJFHD9U7HnRi7HoRF7bEpGaXzOQj/o22FYUT
+dQ==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client2-and-key.pem b/tls/tests/files/client2-and-key.pem
index c77a0313..865625b5 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
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTEyMTUyMjUwMjJaFw00NjEyMDkyMjUw
+MjJaMGIxEzARBgoJkiaJk/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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyqN23H7cOb
+QfZsjziTQOAZAD5iH17AeazyGGmd/btDZtnQQE41WOPehfdSHe/TUMQQINXgJal6
+edu+RMzaN9oo5smYoVKhBPxkSUFiJHL570piCovCbjN+YxRzclIboFaHc3JfoZEt
+lTdyKQayQOxajMBz4pu3TgG4A8hGpjmf+/j2Q+RziX/H8JuVnFnZ8iskHf9oPpC+
+wyR//ysKWpsmeA8+oDoj5wxv3QKqjpsbPNtWXjURdrY1oKlaDVJpUoSAfU1fDpC/
+v0FjcdapmJophk9KelKqujky+NdTzH2YDibeFTdTNOgSFpAjwU0BPkMfpqlbCqNC
+ny6eGU3UxisCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAkIkL3gG8B9GTVDOxX/t6
+cC9+Jdddo5oMUQrE2A5Cbg4hCJHUdxClz7KBsiCTEbX38K0MO5kRNu8zE2pGYxxJ
+SocOwZ74TQNb24wdCBSh8ZmiNeKmdQvNfuwLoNrWZhit8iVCXaPFtaR0V2Dkc+1T
+VYxVV2IIXaX1huyxwnR6OslA+JgbjNYJNrSnyvwfSur/yw2bwtNnBxYbm8oeQiDl
+ZXJKYzWUmyBw3ezYRANTtx05n21vWfBGiBYPPCwgRyqsdtujlcMPUSvWJ1GYq8eC
+uVKdcxuODaz8aULh36AOG5Qq4eucd5+oFQSIqIXmdDCDL51HNLosqMt/QP8NxFlc
++Q==
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
-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
+MIIEpAIBAAKCAQEAvKo3bcftw5tB9myPOJNA4BkAPmIfXsB5rPIYaZ39u0Nm2dBA
+TjVY496F91Id79NQxBAg1eAlqXp5275EzNo32ijmyZihUqEE/GRJQWIkcvnvSmIK
+i8JuM35jFHNyUhugVodzcl+hkS2VN3IpBrJA7FqMwHPim7dOAbgDyEamOZ/7+PZD
+5HOJf8fwm5WcWdnyKyQd/2g+kL7DJH//KwpamyZ4Dz6gOiPnDG/dAqqOmxs821Ze
+NRF2tjWgqVoNUmlShIB9TV8OkL+/QWNx1qmYmimGT0p6Uqq6OTL411PMfZgOJt4V
+N1M06BIWkCPBTQE+Qx+mqVsKo0KfLp4ZTdTGKwIDAQABAoIBAC/y0sOD3FmqS8ll
+LcEjK4nI0NcJ+Q8Lu+DIZovxK1s8dhdFZhJ6XG0NUN7ab+FTw2MQ9kdlAC1igzXl
+1XZ6v1cirgTuVZG6epnqovOLDdhqzPYKlMOQVpGfvW6lKJjVjJpxMlYPF/DdtN6y
+lNqu0vE+0ibXTPBmVdz593we+IAMSTO6vC1JE+8sIb4UuvjQInsr8A4BwYsON6pI
+DD1lmixwGRHW8nUf19f6WCeZJgaa5DwZTMjDm+aXUhIpVKdhRKWR4Bvch7EFjcj0
+xk2RFhTcVIOx7mwCh2z48ISIdCGojn1nh2IP+FzLLWHlLgVC5DLBXxqcn7NOax5t
+HIPfLIECgYEA37rPiF+RXO+bVXPjGRe0x7xgoabrKwM6iwIA6vKp3PnawdDVJQaS
+Ft4YRfzUywxlpYHrKnXEQfoUTzhMfkALJIHWEgeR0aRE/GA0dNcKPj/4aUTnw1x6
+28Pf8VvW+CeeRl5e/se6/dprZIf23JPIRe6CEQOKQN9a7zz4ap62UDcCgYEA1+Ck
+ZdEJgIpFbf7Gie+XlvRSMPEs6gqxLircrFwBsjmbTfHudN4zbXKsbey7Pcg9arsV
++mqzMKS37q7ZUdPQWLHnkK/YAPUhBQ3msy/0YmBNfupRONZy851nO6fcW65PmnFZ
+Y4Gt8QRAe7qsCLaA4OGvwP2setOsMxD/hRvhd60CgYEApT+ABgRAg9peaxF7jY8a
+8eRLo1p8nHp4BTBnqSGvIQ5S65Dpvb1KriVA3IDQU2FGuqZpIiV13h1uXs0Agsee
+80oK6ao5pBSm95m/ZQVoBW6OdoJ0hLGL9UKJ5+WjtArfNq6Bj8HKdbGcXNaoGWf2
+JuDxpMtulFfk/IuWGHo9wqUCgYEAvEVKmxGHu/bbPmboN/wgtKI33D858JOKmrz+
+38MOJ6Vd8MiCMqJnL5jHEMdZNTShe6fWLyNHS7EcSKltFpQoLHJbhjAVriAawBGz
+larI89MRQxKP64X7ksM/+SMYZ0zKV+NrFgFO9dfDdSUETET+eSHa6fFSr3xTveWh
+MzFxnbECgYBIjpoWiwes7Cokvv/UKf43wWEkCKBZhnoFYnO1rOkQKLKDKFYsTuJm
+wqpRddc8SI4D+M6IaZBOBtuF7ZZfPD+AUjZPGUEgPWexbgvHbUEjSSyQlLPT35dA
+iLyVAIJ7btTbGy6mPfO4VUtKe6bKPb8E5L+aMzQTk4zUjWUXFNRvRw==
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client2-csr.pem b/tls/tests/files/client2-csr.pem
index 341c6174..da5e1dcf 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=
+vKo3bcftw5tB9myPOJNA4BkAPmIfXsB5rPIYaZ39u0Nm2dBATjVY496F91Id79NQ
+xBAg1eAlqXp5275EzNo32ijmyZihUqEE/GRJQWIkcvnvSmIKi8JuM35jFHNyUhug
+Vodzcl+hkS2VN3IpBrJA7FqMwHPim7dOAbgDyEamOZ/7+PZD5HOJf8fwm5WcWdny
+KyQd/2g+kL7DJH//KwpamyZ4Dz6gOiPnDG/dAqqOmxs821ZeNRF2tjWgqVoNUmlS
+hIB9TV8OkL+/QWNx1qmYmimGT0p6Uqq6OTL411PMfZgOJt4VN1M06BIWkCPBTQE+
+Qx+mqVsKo0KfLp4ZTdTGKwIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAJlQbaMF
+wIlsooL/cgxDijKZYnSOjCpM8iQorUC8jR7QO4X9mRR11IVRRtGBlzkuBvOxSgEU
+wWv7sq0xZNzHU9GEfGVMFbAFlUCLGLRUy7XBmAHHIp8cFzWaEZUFOTQ3rmhhh+DE
+Il0zL/a8dTol0ulDlbOD/XlrZbg96dwtDG6AR+47dawb3V7H7eHWBsJFObQ0LTxX
+qkTiqpya9oQjo8gvUHiv+BS6YGMeHRAFtrdmc3NTG3/nxH6gz7X6+uosxCjcsDi2
+AXn4+/8aWfXYl0oPCm0Yxx1MXH2MBRUtsP1g3a6IewOOc5+xwj2vCPWlfM806xDv
+jEqreYhUE1mVwWE=
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/client2-key.pem b/tls/tests/files/client2-key.pem
index c48c3ba2..543bbd26 100644
--- a/tls/tests/files/client2-key.pem
+++ b/tls/tests/files/client2-key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client2.pem b/tls/tests/files/client2.pem
index 720bc188..18c8e2c8 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
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTEyMTUyMjUwMjJaFw00NjEyMDkyMjUw
+MjJaMGIxEzARBgoJkiaJk/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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyqN23H7cOb
+QfZsjziTQOAZAD5iH17AeazyGGmd/btDZtnQQE41WOPehfdSHe/TUMQQINXgJal6
+edu+RMzaN9oo5smYoVKhBPxkSUFiJHL570piCovCbjN+YxRzclIboFaHc3JfoZEt
+lTdyKQayQOxajMBz4pu3TgG4A8hGpjmf+/j2Q+RziX/H8JuVnFnZ8iskHf9oPpC+
+wyR//ysKWpsmeA8+oDoj5wxv3QKqjpsbPNtWXjURdrY1oKlaDVJpUoSAfU1fDpC/
+v0FjcdapmJophk9KelKqujky+NdTzH2YDibeFTdTNOgSFpAjwU0BPkMfpqlbCqNC
+ny6eGU3UxisCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAkIkL3gG8B9GTVDOxX/t6
+cC9+Jdddo5oMUQrE2A5Cbg4hCJHUdxClz7KBsiCTEbX38K0MO5kRNu8zE2pGYxxJ
+SocOwZ74TQNb24wdCBSh8ZmiNeKmdQvNfuwLoNrWZhit8iVCXaPFtaR0V2Dkc+1T
+VYxVV2IIXaX1huyxwnR6OslA+JgbjNYJNrSnyvwfSur/yw2bwtNnBxYbm8oeQiDl
+ZXJKYzWUmyBw3ezYRANTtx05n21vWfBGiBYPPCwgRyqsdtujlcMPUSvWJ1GYq8eC
+uVKdcxuODaz8aULh36AOG5Qq4eucd5+oFQSIqIXmdDCDL51HNLosqMt/QP8NxFlc
++Q==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/create-files.sh b/tls/tests/files/create-files.sh
index b699e7c8..3055e882 100755
--- a/tls/tests/files/create-files.sh
+++ b/tls/tests/files/create-files.sh
@@ -88,18 +88,32 @@ 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 request"
+openssl req -config ssl/server.conf -key server-key.pem -new -out server-ocsp-required-by-ca-csr.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 "Creating server (OCSP required by CA) certificate"
+openssl x509 -req -in server-ocsp-required-by-ca-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 "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
+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
+
+#######################################################################
+### Server (OCSP required by server)
+#######################################################################
+
+msg "Creating server (OCSP required by server) certificate request"
+openssl req -config ssl/server.conf -addext tlsfeature=status_request -key server-key.pem -new -out
server-ocsp-required-by-server-csr.pem
+
+msg "Creating server (OCSP required by server) certificate"
+openssl x509 -req -in server-ocsp-required-by-server-csr.pem -days 9125 -CA ca.pem -CAkey ca-key.pem
-CAserial serial -extfile ssl/server.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..0da8f0eb 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
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALwwHH8eY4UwG0lcmWbVdpJGI5EJ
+rKVyx8fafo2vnsyiH500Y8CVxqbqbIBje4IiE9kOz42+0YaONVwO3gNCCVx2xPKE
+o1HVwrsLBCJYB8QEWRJ9DJbHhbCN+cWyJZ7947ixY99k7rCwfjIazJIlsyXoFYQv
+wq7hTWGrelEgjqY7amQMJHccKUiIGDe3eBmpyZzZLGxkagWotWm4IbcEzL03XLQs
+T67d+zdjqHAloFPcx70k0JJNLP0q6+GSgqI4EhFQ0emhr1eROdeG//GfgFAiuNzX
+K+5FqmlhB5uKBqtvP38UWYaz1/o65BIw58Olr97G0GjrGkq6vnL9nrco+QkCAwEA
+AaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFC3f1lcydhttCFf3uesG2RL5
+bQMFMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+CwUAA4IBAQC5frEL3407E2y0gN23uoDehQdBrFqphCHotUFpC+ClwCRrd92SsKVS
+yAbLQFYsueiaYgUNZDEhOS2A/S17bQbB6f/2M98HzC++sve5fRFaQ86RdBquCR7o
+60uA73UbqK9gx3+w5YnZU8x/vAH1i0xVuJkgFPT8Ny8W1UMoTp5c8SL/dPK86GLH
+jWeEwMxTJIUMY1tc7GkqLziaIO6NgJaBJzPCgSqLCzKE5ecli34jhJJDLavDtIjD
+uUNSk2C3k9y9Pqv5htVbOJoQBdaE6lr7PE/vvu5Tz9ek95xj2uV7/X6s7xV7unjZ
+EZbnZlqsZXbEp3ka5sV2/+zO08x7FSBn
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/intermediate-ca-key.pem b/tls/tests/files/intermediate-ca-key.pem
index e72c90c2..0afdc5c6 100644
--- a/tls/tests/files/intermediate-ca-key.pem
+++ b/tls/tests/files/intermediate-ca-key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/intermediate-ca.pem b/tls/tests/files/intermediate-ca.pem
index deb1b892..70f3755f 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
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMloXDTQ2MTIw
+OTIyNTAyMlowga0xEzARBgoJkiaJk/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
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALwwHH8eY4UwG0lcmWbVdpJGI5EJrKVy
+x8fafo2vnsyiH500Y8CVxqbqbIBje4IiE9kOz42+0YaONVwO3gNCCVx2xPKEo1HV
+wrsLBCJYB8QEWRJ9DJbHhbCN+cWyJZ7947ixY99k7rCwfjIazJIlsyXoFYQvwq7h
+TWGrelEgjqY7amQMJHccKUiIGDe3eBmpyZzZLGxkagWotWm4IbcEzL03XLQsT67d
++zdjqHAloFPcx70k0JJNLP0q6+GSgqI4EhFQ0emhr1eROdeG//GfgFAiuNzXK+5F
+qmlhB5uKBqtvP38UWYaz1/o65BIw58Olr97G0GjrGkq6vnL9nrco+QkCAwEAAaOC
+AVAwggFMMB0GA1UdDgQWBBQt39ZXMnYbbQhX97nrBtkS+W0DBTCBxgYDVR0jBIG+
+MIG7gBQssKfpp4ZsAKGCOno+dh0Se5scs6GBjKSBiTCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAP
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQzyrp8K0YcBVVUZNVJZiPO4wMMHzAP
BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAJArQW4HGrmrCNYdA3C6LwwqhuzJzwR87HPg
-jmK+1f/E4qPlaT8PhgoxmU2bOCoI/eNHPSfXk5sOl8k6HUZyF/hRdFBUgUtUEO81
-udRrFXRwUeRY30p8BXm8sbxNGk9FMCO/czdS2MD6T7fdLI8Z6g9hz+eOOyEHVy6D
-Z/LkUgIMQwVibdMuNs2fxgpmReZgraqQOeHAyCCo0SkZXGkN2rHV3kYJkuc522kq
-K11ldkrxKhHU77ebxrHvgYtv0D90rspFEcY16/0iYAFdthZX1gJOgpMivD7lXykX
-IHU1jn7fIdjT+uaoB+5ScQKYrlngZcaij16rX0nj7GMwrls/Awc=
+b20wDQYJKoZIhvcNAQELBQADggEBAFctWN1xJ3fLGWcSgMiCTgzQFU3vydWILInW
+rJMyjDaEC7yciiJbRbAhPo0ouMlkNVGFwltzYMdtNWd8ifZ3S36A4RAKRi8FFXz0
+hX2w7OiMoMj4R8TWfNx7aOdPAzfdqRd5Op3fdZugC+WxtIdSU2e7sXn00ig0Y/8o
+/yjJhbw5vCrLTnsdXJ+n4E32Bh9nCzB7Tj0/ABAwR16B0CAgcuXgdVJAF/X1nMEW
+/ePG8c80TU35HkkD9mX4jr6/IDOWaeGnEr10pY4GNA+Jpm1S4y20dp5wZZ9wP+aP
+w32ZXeBBFsifqW6q9hu9q5sMDq/ATKLpQDPEcjR6hh7tmb19kUM=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/non-ca.pem b/tls/tests/files/non-ca.pem
index 4a0f253f..bad80042 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
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTEyMTUyMjUwMjJaFw00NjEyMDkyMjUw
+MjJaMGIxEzARBgoJkiaJk/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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCK7/sF1RVJ
+4jS+lLWciJMKeSGfI6bomevFZ0ctTcpa0Um2/jk9YZldtNPcIf6V9RripxQ1FY5I
+xkH7hUZVWLpyep74gA4i1NFhOluxtf8H4l2topRNnJ+ekJjyFdymn7c13YTyfQs9
++ALSFCmosSBcTw3LAlkunq8Xg5l7dAkBhLx5Fw8v0BY7DZtYzDHrmHEnNiI5BRkU
+uZ6rN4bb0/Uu5cE4Zk70b0J/7Npr3aA/p3wYQLv6w/ZeVbgFy5j0MAvy5uC414/8
+2TTI/3sip1NDFS0R6jbkurga8436bHgZ44616ho6oxzLLgcIT4FtdoAeOMai9/hD
+y1jPMNEuqVcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAQVuLr9X1egKlCvObnkvC
+wdziakK8sm3iQ6E4ieYP5eOAo8WmQB8n/fpEzkbnxVBbSWtEofpulqINzuEtcByc
+dV7BPAvOxBgiSUGp1mQDiOQOnsZVfbpT6K+oz/mr6cH5mUyvzSN7FwQYZezypPgT
+W+OIvQquhBMLg+VGTkGL9PkKT6bPOZHWW8XXHASqeEKvKK3jEJCOVrDr+4Re+FJT
+59bWr+1jA84iJcZsD12qSO2CDGHWsuPdMg9AzAq+rYw3w+sA/V0ZZUtC5r8OnKyj
+DkD9hqN6gRwCVZNmHmEdTM2kc8UkhJFHD9U7HnRi7HoRF7bEpGaXzOQj/o22FYUT
+dQ==
-----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=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAiu/7
+BdUVSeI0vpS1nIiTCnkhnyOm6JnrxWdHLU3KWtFJtv45PWGZXbTT3CH+lfUa4qcU
+NRWOSMZB+4VGVVi6cnqe+IAOItTRYTpbsbX/B+JdraKUTZyfnpCY8hXcpp+3Nd2E
+8n0LPfgC0hQpqLEgXE8NywJZLp6vF4OZe3QJAYS8eRcPL9AWOw2bWMwx65hxJzYi
+OQUZFLmeqzeG29P1LuXBOGZO9G9Cf+zaa92gP6d8GEC7+sP2XlW4BcuY9DAL8ubg
+uNeP/Nk0yP97IqdTQxUtEeo25Lq4GvON+mx4GeOOteoaOqMcyy4HCE+BbXaAHjjG
+ovf4Q8tYzzDRLqlXAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMRiTmPiC4oh9eqv
+AWVXieDP08IQ/x56p6vL61k1MrCHP5XWCpPZ3HGEy+SC6BuHC0O3vMGiFnRxtm9Y
+YhCJZ+FUqqQD6dYWNW5vuhvx2SbiH6zUBxby2uj5LWXmAHb3zq601e0l5j74rGsm
+BQxQRfhyShvLhl7efBPl2P7jFYC/5orEPwjIZTg11Gb2oILF5j5VcG33aJzYvflg
+JZc8SL7tUATaw8DR29t/B2g96+IPDNM0bxFkXUY+eW6S5EvWLbqNxX9ofwvgyw3c
+oV2cWyDhqk839+X1Q9ruJdjlMuUN4y/Z9gk/3n012bVWuCDKnhYJ7LqPRvfVRV6i
++l0amkk=
-----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==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCK7/sF1RVJ
+4jS+lLWciJMKeSGfI6bomevFZ0ctTcpa0Um2/jk9YZldtNPcIf6V9RripxQ1FY5I
+xkH7hUZVWLpyep74gA4i1NFhOluxtf8H4l2topRNnJ+ekJjyFdymn7c13YTyfQs9
++ALSFCmosSBcTw3LAlkunq8Xg5l7dAkBhLx5Fw8v0BY7DZtYzDHrmHEnNiI5BRkU
+uZ6rN4bb0/Uu5cE4Zk70b0J/7Npr3aA/p3wYQLv6w/ZeVbgFy5j0MAvy5uC414/8
+2TTI/3sip1NDFS0R6jbkurga8436bHgZ44616ho6oxzLLgcIT4FtdoAeOMai9/hD
+y1jPMNEuqVcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEALGNMMQaGcCAYWOpW967Z
+K28yuHljz2A1d3xC8V4Wus7r+33nuSnwlBgRBpRpRsAOaDaZ0AiC35cqaHfDjDQT
+jDgNRMScRPyKT6kkxwM5sj1aJPlLgUxSLgFJjSasG96NiLZhCh7osikRoF2YUEWb
+pWTYP1m1+8j+ApB96S5kZhBBrvCp32M1QZg53FFOnOY0CuDEYevQlnuGf7BapDMh
+Kwubxg/pV8rImr3fBns3RRcuM/TTSsFagibV2fga4nUuZ6cmP0AM2FFBsRKLmAW0
+GeSZ3jgViYcwIPOCY0yjWuYrdvwIBxqOeIWAavY+/zkpQUxmww586cSxsnz26MUy
+ig==
-----END CERTIFICATE-----
server.pem:
@@ -76,42 +76,42 @@ server.pem:
MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
-NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMVoXDTQ2MTIw
+OTIyNTAyMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
-Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
-DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
-2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
-tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
-/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBALZYhMq8HdyU4270P/4i57uUTXxkp7c2D9UU
+F+DZ88iTa6GQfDhInxwLg8ck1iBRziZjgXBFrFNLRoPOiUnQN0ycjkvtViJjY+Se
+DXn6iIbMowADG14CmhvtEKHZLXzkHnYRWixIGEWTg3hbm6KPenK6bzPtmjpGWJw2
+P2QhMs5RKFte/8glPGkePTpn/C0vcAPHeU6eV3k1DOUKAET91GrGJDk6emWvaUkW
+d66ehx/ZBvun9/Wu4CF3zKeLmD5fNs4S3rTjTFvPWjK57gLxowEwlx0/a6A5jRyr
+jtuJit4WK6XtPja5z6RUftKkpkf2Ew2/pRbpYhYSpHBNA5eRyfcCAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEjEBhx+ib3+
-u7O2OYD6z6pVLLTiQpXjESRfFF8sf/epSmmNtE/PpiUhWAXG2dOinup/40rjimAF
-j/8okMGvtTHst16vcV+LYu8AthBq4F41WVlC8/aLmIbkofbBulEUlD02HEBNszHJ
-rCkFBupwDTnbKStdLRPtjchuGLDobePDF7NEBDT4rWxoaQH7ZM3LOHnWoDjgF4ar
-3J6w2YpTl4vFf/e31Ikc+ctVy7tU1/X/II58fbxKqWjtKL67VESRBpHhCGNRlXfF
-ejxfiyHBKPzZbh6jqmyI4GqfotBq/vvbpt2XocKFHB6UDvW7M+oCrEgf/gL1uMLy
-/vq3kChJRdM=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAIFGWWV7VM7D
+gJRywIoW6P46zaqRlD1wK6ZZ9+Zwdx2IDuLMzdn5OlSBU1C/XyRr8Q1B95tXTYjD
+LOXI03tJa6DqEUIJvrWfvAGYgixVo2P8wMUfNZd24YbvARsQ0BMUN42LU0sXng1Q
+R4qKBeqvpF7ngOpytedpfMG+Go+GqkOmgRUVUrxhdm1i1HlbVK3FruXGZ4Gkw4pp
+gZ2/p4AsT4yMw6OCypRZzfShRpk8liPKUwupDmUMhGvDNHPrhAqzDYQWCZx8FLzS
+K9sm82tqc8WMjWd5GYUgj1UNhn8ND8zNJ3ULtNQTDjix8AFTAk1gU7dLB3Nm+ZLx
+BAUv1ODOisk=
-----END CERTIFICATE-----
server-self.pem:
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-----END CERTIFICATE-----
diff --git a/tls/tests/files/old-ca-key.pem b/tls/tests/files/old-ca-key.pem
index e3fdec1a..b3e745eb 100644
--- a/tls/tests/files/old-ca-key.pem
+++ b/tls/tests/files/old-ca-key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/old-ca.pem b/tls/tests/files/old-ca.pem
index 49eafe53..fc82a39d 100644
--- a/tls/tests/files/old-ca.pem
+++ b/tls/tests/files/old-ca.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-MIIFLjCCBBagAwIBAgIUGx5sD75kSqNKhP/0OQ7QuzKrM70wDQYJKoZIhvcNAQEL
+MIIFLjCCBBagAwIBAgIUYgpDrOQ5fbQ31MOwX2JyffT9UHswDQYJKoZIhvcNAQEL
BQAwgZ8xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMSwwKgYDVQQLDCNPbGQgVW50cnVzdGVkIENlcnRpZmljYXRlIEF1dGhvcml0
eTEiMCAGA1UEAwwZb25jZS53YXMuYS5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3
-DQEJARYOY2FAZXhhbXBsZS5jb20wIBcNMjEwNzMxMTgxMzEwWhgPMjA1MTA3MjQx
-ODEzMTBaMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
+DQEJARYOY2FAZXhhbXBsZS5jb20wIBcNMjExMjE1MjI1MDIxWhgPMjA1MTEyMDgy
+MjUwMjFaMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
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
+MIIBCgKCAQEA3hNpve9BcGhjr4GYDA7s8W2O++/sqzTYzRlOwgQWI1ker7UhT8vU
+alUvgUhsjWRTXlUCC8RKK6Yo/avyqZChXNXtBhockDXqVRbIyaccxavKwQBGNb4u
+nTYSxvFKhF660BfO092D6Dt05uSFAgF9a+d3xEqNFmqpj5Vi7uzGzL8EewfV0ihG
+8nY3bbApJTnTdhChrgGnzBIZK/hVe7nQ6Idx/PvAG8jahrOxv3LLOTghKN5l/CXC
+3LXOVlBPUgz5dOQAmjQDNKQXxu8d2qiddAH0P7kHKEcRNB9Yiso1HwWbW1+qh+KU
+csnymrizWXikjXDGha0O6Spv2IphRhLrDQIDAQABo4IBXDCCAVgwHQYDVR0OBBYE
+FHQM6ssdqKdOiXi2GiNGPDYS5UeSMIHfBgNVHSMEgdcwgdSAFHQM6ssdqKdOiXi2
+GiNGPDYS5UeSoYGlpIGiMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZIm
iZPyLGQBGRYHRVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZp
Y2F0ZSBBdXRob3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5j
-b20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQbHmwPvmRKo0qE//Q5
-DtC7MqszvTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREE
+b20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRiCkOs5Dl9tDfUw7Bf
+YnJ99P1QezAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREE
EjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTAN
-BgkqhkiG9w0BAQsFAAOCAQEAEgsx0U8ZVbj2+Y6aYEyTeKocfUfdtz3TtK7fRbPr
-8NlBD75y4f0MuIBYfXa/GvxZaCVruPEQdOtqH35PhPTED9rCoVFKXCEY/yQvDas9
-bGk5Fu5Sjjp0qJhnnlUYNNpGkw4VoGf9e/jtNlaXnr/7qz4GGVN3n9rp8GLrIsjY
-O8wXC1aikT+/UK1AofAUtlK/9ejdBvXCFCoSLEK/fnWzXP5G0cGFP0Ai+ezwvHTW
-QaSaPiLKNC4+DE677zujQkbdXSiRHCt6o6SD2N0fPFmnF3bwHdva3EER3JGirZhX
-d3xmaHSx/LoybaEk1/f8G7t116WvOXpDSz4vgISIt2HPag==
+BgkqhkiG9w0BAQsFAAOCAQEAiHicR28OHc7kk0Tctvgd2xHUorNliSKNhYoXhAPy
+OVraJ05JkjmXep5t032t+19aUmp0QWRH7SV7q7dqLivW932/AsCd/FTZT4bT1CWI
+jI6bA3wjjG0/j5xlbyX4HdCaujfcLMiz89LnweUKCIoj3KeuIRgsblxWf3MlDVE5
+d6QFMxAefajmlQCaPQCRDNsOAMYg+S4C6VGKuVjyR0Wpm1KLLaTIEBoNKGQMUAZM
+fzbiN1P5NVL8+5WRu0OBWVNW73KjQTHqMNEW2bWH/AEbya9LcSZlrpptVLv6BpJ4
+c3BzbNQnuHQq1KS0mWYWhiyYcGhYAddKenwwuEgIsYj6CQ==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/root-ca-csr.pem b/tls/tests/files/root-ca-csr.pem
index 4f558906..ab781bbe 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..49d25971 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
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMVoXDTQ2MTIw
+OTIyNTAyMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
-Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
-DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
-2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
-tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
-/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBALZYhMq8HdyU4270P/4i57uUTXxkp7c2D9UU
+F+DZ88iTa6GQfDhInxwLg8ck1iBRziZjgXBFrFNLRoPOiUnQN0ycjkvtViJjY+Se
+DXn6iIbMowADG14CmhvtEKHZLXzkHnYRWixIGEWTg3hbm6KPenK6bzPtmjpGWJw2
+P2QhMs5RKFte/8glPGkePTpn/C0vcAPHeU6eV3k1DOUKAET91GrGJDk6emWvaUkW
+d66ehx/ZBvun9/Wu4CF3zKeLmD5fNs4S3rTjTFvPWjK57gLxowEwlx0/a6A5jRyr
+jtuJit4WK6XtPja5z6RUftKkpkf2Ew2/pRbpYhYSpHBNA5eRyfcCAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEjEBhx+ib3+
-u7O2OYD6z6pVLLTiQpXjESRfFF8sf/epSmmNtE/PpiUhWAXG2dOinup/40rjimAF
-j/8okMGvtTHst16vcV+LYu8AthBq4F41WVlC8/aLmIbkofbBulEUlD02HEBNszHJ
-rCkFBupwDTnbKStdLRPtjchuGLDobePDF7NEBDT4rWxoaQH7ZM3LOHnWoDjgF4ar
-3J6w2YpTl4vFf/e31Ikc+ctVy7tU1/X/II58fbxKqWjtKL67VESRBpHhCGNRlXfF
-ejxfiyHBKPzZbh6jqmyI4GqfotBq/vvbpt2XocKFHB6UDvW7M+oCrEgf/gL1uMLy
-/vq3kChJRdM=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAIFGWWV7VM7D
+gJRywIoW6P46zaqRlD1wK6ZZ9+Zwdx2IDuLMzdn5OlSBU1C/XyRr8Q1B95tXTYjD
+LOXI03tJa6DqEUIJvrWfvAGYgixVo2P8wMUfNZd24YbvARsQ0BMUN42LU0sXng1Q
+R4qKBeqvpF7ngOpytedpfMG+Go+GqkOmgRUVUrxhdm1i1HlbVK3FruXGZ4Gkw4pp
+gZ2/p4AsT4yMw6OCypRZzfShRpk8liPKUwupDmUMhGvDNHPrhAqzDYQWCZx8FLzS
+K9sm82tqc8WMjWd5GYUgj1UNhn8ND8zNJ3ULtNQTDjix8AFTAk1gU7dLB3Nm+ZLx
+BAUv1ODOisk=
-----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..1a9bc39a 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
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALZYhMq8HdyU4270P/4i57uUTXxkp7c2
+D9UUF+DZ88iTa6GQfDhInxwLg8ck1iBRziZjgXBFrFNLRoPOiUnQN0ycjkvtViJj
+Y+SeDXn6iIbMowADG14CmhvtEKHZLXzkHnYRWixIGEWTg3hbm6KPenK6bzPtmjpG
+WJw2P2QhMs5RKFte/8glPGkePTpn/C0vcAPHeU6eV3k1DOUKAET91GrGJDk6emWv
+aUkWd66ehx/ZBvun9/Wu4CF3zKeLmD5fNs4S3rTjTFvPWjK57gLxowEwlx0/a6A5
+jRyrjtuJit4WK6XtPja5z6RUftKkpkf2Ew2/pRbpYhYSpHBNA5eRyfcCAwEAAaAx
MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
-ATANBgkqhkiG9w0BAQsFAAOCAQEAadheCKyi4LjlDjgFf6TM0urbVbsXfsPkFM3R
-G1p+eOWtjFMZLeNdKOdRHwmYPMiMcshmf0Yw7cEVQxZBj4P0wBveKcvPVdonk2Bh
-Z5aST4LnMfLbsvxntb8DE/wrrFNWnJ1G9+ZD44xJ8TZYMV1vPsjYL6mk7iMJnm1r
-8kwy/RP1m5MSUhcxU1yiPQ2ed7bAbHCw28CwQRuAYazsD5v5fjfWVQfW9CfnEV3R
-T30kEiG1IWAeu7KasxEjcujQ+oGVm7ANhTeJmgkd47DlUt9oNvcUF1wJauJ/EA3z
-BwaXqWtsQ27kSGM8xlLlz7e0DQi5t29YlemiOF8qIjpzAgrbqQ==
+ATANBgkqhkiG9w0BAQsFAAOCAQEAlXg5KHUPK//3ZyOcD8Eoq1C93zbbGpbIVqIF
+paXwoMH8SfsCy9xxaEXDNkUOhzzQTL74EuH8wCMH36AT03vZGXXOI5T9zbLJxjpw
+RGGK0TSyHExA5pdyiIRnufZ1DpoNygK6LfoPwOfHK5YRRXtNXwMvEjfNTWe8Kzkg
+VEwTbJRtloH20GrsXfrEWaO9bVByiuP/A6Mju2nOvLKQxwB8X5MZIwtzv30iLcIE
+rf2r8f2NtVNnPEiJHSc843qlVV2ZWot1ymSRqNsF6kh1gTqvYZo0OSVUYozydb/T
+sfdie6P2VLRwYFQdIOvjVlwe3gl63uS8PL+Yin5r4mP6sXtGYQ==
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-intermediate-csr.pem b/tls/tests/files/server-intermediate-csr.pem
index 9cfcaabc..a585e50b 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
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBANEvj69lLUh4yKmymKWlcAYdcMFtISBG
+Zc/Gth2AB0i174N11jBGaF4BBrj8G68Pg2VJvUh8ZCg3E92/2jeX0liu3STLi3pa
+W6FL4rI2R8K0fG/tbXpQ4R8KFKGEf8oe7T3ng9VaIjSjsefLClKmv4V3G5ZBIiGW
+vGm51scO0eKJ8l6JOpjNp9u1Fx3yKPA7p39lhapkjmp4mivZ1FA3uzhG5GB6kG7I
+QhFnZ23wKXfILgLWLFMLPnAY4vHkqjkxc/pEIQx2fhaTnHQXfQ2JEKlvVr4IPJah
+tZDf+oi9sFHiqSCcq8qjvuzcxWlXAr2RBuIFheJO3Y19dw8j7Phpg78CAwEAAaAx
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==
+ATANBgkqhkiG9w0BAQsFAAOCAQEARF1RrQfA3ZuEdGSveGFjyUkCuEbxzdM64zqh
+b26Q5icLfuZKoRklJQkUtGwkHm00oq9TNH7gqSrsBWufMyNmy3T94YCyTc1RM+uC
+OwJNLuwm3uJz5En+rIF7yo8HBZcau7jhcXEhoWI5lCjswMVeGTUP5h+Ru21010Zn
+eC3SA7DdGe2/gXVX47/34eUmqVm/9nrNVXZvdiAxeyGwjGsM/MM3MClGbSccmbWm
+JBLeejdaGdQFeu1/+wjFxdiZoxiDg6m8+7q1xnNYn+ruRB0y2bKcYb1A4b9q2vqb
+IAOoIJ8YAaPfqTGv2X2jE7pfgVCnyx32djYRJBwKuSIXFF2+tw==
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-intermediate-key.pem b/tls/tests/files/server-intermediate-key.pem
index cb4bfa7e..e7f40d2f 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..efce124d 100644
--- a/tls/tests/files/server-intermediate.pem
+++ b/tls/tests/files/server-intermediate.pem
@@ -3,20 +3,20 @@ MIIDuzCCAqOgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcyNTE4MTMxMFow
+LWNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMloXDTQ2MTIwOTIyNTAyMlow
SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKdl434MfWmQOdgVOK52liMyCIrv8pDdrFTIwhk3aj59dpB/
-Rx8C7FbOHA8tyIBWpKaNNNT3S/y4buWHcJywr+3oqy31+KFf/hKnDDgR86j822PK
-azfwcjrR05GBfKN3oKo6HEtsJ9jiicGFVp5gZkr18OsSbJiVuWbjEhOgUe4etHU+
-oWwnvKfpwwc3R9mDkqEtP+58lrGXmvUmVICfDW8Hymm4SXGMH05p02+an6rqciFk
-0GNMbeUeYK8fyVprqZIO8aTRAr6+Lb5PpBm6BTKI3KVGpRsevCJTVH867phwp7Qj
-ImbsEpxbUo9sJsIHshhNsLwi0bl7w4QhFrGlKO0CAwEAAaNHMEUwCQYDVR0TBAIw
+ggEPADCCAQoCggEBANEvj69lLUh4yKmymKWlcAYdcMFtISBGZc/Gth2AB0i174N1
+1jBGaF4BBrj8G68Pg2VJvUh8ZCg3E92/2jeX0liu3STLi3paW6FL4rI2R8K0fG/t
+bXpQ4R8KFKGEf8oe7T3ng9VaIjSjsefLClKmv4V3G5ZBIiGWvGm51scO0eKJ8l6J
+OpjNp9u1Fx3yKPA7p39lhapkjmp4mivZ1FA3uzhG5GB6kG7IQhFnZ23wKXfILgLW
+LFMLPnAY4vHkqjkxc/pEIQx2fhaTnHQXfQ2JEKlvVr4IPJahtZDf+oi9sFHiqSCc
+q8qjvuzcxWlXAr2RBuIFheJO3Y19dw8j7Phpg78CAwEAAaNHMEUwCQYDVR0TBAIw
ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
-ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAH44AdGFIuKyXGruD3XnuNZF
-eGOxLd3epXbWBsuY5tfol7ACO/hV6301VIrCHDGf4uovfyasLhu26kI6gCNZkROf
-NzODOhNOdNy6rSDApFn3TVIgEsmQ9Zm1MHfXc7Xz18L/1Cb1mjmXGRa+fMetNwSD
-jQLgxIKbA1LN4QPGQ9FnGeq/1KvXNHykAbV7dA8uRCkZnkgmXKVH5bjMZIi51Uo1
-Ls49sFAsrxL49rz4yvTVZe/13Gu7KCIVl1echy0nDk6J4C2qLrS5+WV/vyGdV6nk
-WZm6baVMEaGu/ygmJ8H6rUmrZy/rdIFv4yyQgOME8K6ZDW0/lYFqozDMxB5NucY=
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAAvGicZxxydN5DNYMEY6srw+
+3qgxcY9PazUwY9P5kQX6YKh3ixCQS1XX9FZegSM2jCHVnutqifgA0Sj3U902I3jQ
+VSjQ/iPs1WE2r4dsfPzmPNYtC8p8g6q/q6/27870X4ZHfyZdVs5IaJmaDIl2w6Uz
+dkfSAwhCGzTyIEuMkwLFPY6uyQox913XnHkmMPvWhPq5StASjHgUxOCml3EiBIb1
+H6HNBhqdBLYxnJGr+GHXlipSHqrVPe+wPPsBd83x6Lnpet7h3y/uMeY2/Iih0uhY
+/NDdwMBQgksOx5xcc1JsTZSQ2O/bMFSumf4gG28d0aL+foX3l8CGsrC2A58BxXU=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/server-key-pkcs8.der b/tls/tests/files/server-key-pkcs8.der
index b901ee38..5f88c5d2 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..3905881b 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==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC2WITKvB3clONu
+9D/+Iue7lE18ZKe3Ng/VFBfg2fPIk2uhkHw4SJ8cC4PHJNYgUc4mY4FwRaxTS0aD
+zolJ0DdMnI5L7VYiY2Pkng15+oiGzKMAAxteApob7RCh2S185B52EVosSBhFk4N4
+W5uij3pyum8z7Zo6RlicNj9kITLOUShbXv/IJTxpHj06Z/wtL3ADx3lOnld5NQzl
+CgBE/dRqxiQ5Onplr2lJFneunocf2Qb7p/f1ruAhd8yni5g+XzbOEt6040xbz1oy
+ue4C8aMBMJcdP2ugOY0cq47biYreFiul7T42uc+kVH7SpKZH9hMNv6UW6WIWEqRw
+TQOXkcn3AgMBAAECggEBAKqwE6W/D+jiij7bbmeS/v6s5ReTFRfACHP5+hwliTjx
+Hmg/WrhI6n+TG8i3Z6UbTnDK5mhVH+lcZmaNWB/7Qzh4uA7E3MMV7HUdqhnLdi9Q
+sSgawGxw3RdVAyOtqxHka8szlQgseGPwoLlyby5tRj7M27ltKdhw7xNTCGXPWcKb
+yzgEP+Th9+xH0LEf0mjkqByBVi6R3P6D+94/LviPIGcSJliO48JrCVVGULu2i4um
+YuzhYVnfRAsLgdbSxeGV4EwT7JPHrsb1RDAvK5yv4h+YXW931+nNODfBwpKqMd3Q
+5/98vPDWRTerF/LZ65DV8YqATJ0VQYvJiijQiV4yS2kCgYEA2r84hxtetozxXBVq
+FM8AzgFHTW1LhWDLaPV6fBMjIspMxvs67erCruhmT9tvPIBezC6KPpTVldX12MEL
+/ru019Fjst1blqKjnf05xfF2CNMU2OsCfQTW9qKGk0Xncu0xY6MZmOKax79YspzG
+FhWMUpf/43hB02KUDdrzQdt590MCgYEA1WZN6A0gRaUo6Cr6V40oO0H6bKdSsoM8
+qH7yweKRMw4meXpRVoBYpYc126BLRkHYJx28o4LFxxdElumUaEngW3+l802rnKQZ
+7J4tq4Wj0W693g2xrIEVDb7JNHgFzPGv/3089jceO8tLHGtoyIMpkMkzdt4UimT6
+vSYM0ZfbNT0CgYAbEOAAr51Hfyb6Gtg2XOqfkr7s0KIwjap9gSo3ofKOAnP/huRi
+vdJ669yE8wTPep7AKt4GIkpPMNsrh69hRH562bi5T/ReLh+Kk+OLH3ZYXy3MLT/w
+kiG7AJ8gJ90cdkbPKkYniZpXLtDdwNItt1rWeWI7Fg0nB6KEGFxTAMIVmwKBgQDF
+ML7GsfJjSMWvG5+u7VoCv+n3IvqQyCJyFLSfoovHoMi+sd+dTgYcFwAWjV1hc5CY
+PKtGcJ3vZbnUtcyUPcfa5O5lEB2HJkBqXJQZDemdqnY6TW8j1zesNuLX4ByED8Ux
+EfoWDkKawDUM8teliUYMa09qBLb4V203AYUQ3AEMhQKBgAizuShQqpNEDCPRmRrP
+n0CofYCL9cLNb3h4OqwGjpxMTcGIF3UzSqGBOGz2wEdKXnCSiZrcPxW1keXHP+o2
+Qb0r4QGzJsB01m0cF7ynIaOnMWyALsZtG73FsOUpdNsz1/rAKLg5Fl/cYfu/mf1J
+QDEjXL3NV7R43ga6Jl+Vxn6B
-----END PRIVATE KEY-----
diff --git a/tls/tests/files/server-key.der b/tls/tests/files/server-key.der
index a6017543..b113c98b 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..466f20a4 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..1414105a
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-ca-and-key.pem
@@ -0,0 +1,49 @@
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMloXDTQ2MTIw
+OTIyNTAyMlowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALZYhMq8HdyU4270P/4i57uUTXxkp7c2D9UU
+F+DZ88iTa6GQfDhInxwLg8ck1iBRziZjgXBFrFNLRoPOiUnQN0ycjkvtViJjY+Se
+DXn6iIbMowADG14CmhvtEKHZLXzkHnYRWixIGEWTg3hbm6KPenK6bzPtmjpGWJw2
+P2QhMs5RKFte/8glPGkePTpn/C0vcAPHeU6eV3k1DOUKAET91GrGJDk6emWvaUkW
+d66ehx/ZBvun9/Wu4CF3zKeLmD5fNs4S3rTjTFvPWjK57gLxowEwlx0/a6A5jRyr
+jtuJit4WK6XtPja5z6RUftKkpkf2Ew2/pRbpYhYSpHBNA5eRyfcCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAJ1NSHWX/Jfw
+PCNNQeT9DqQtyBBqhY+lF0IkYwDxpdIfDYiHPRIR9ZbWQO2X/z0hg19HTVz1c78s
+aKb/nSjcb8aVlodNjkAkuJtUxEE9vRYp6Nn3Zt0h9eW8UCYHkGQf3ECLAKoTmXx3
+mN9D/mUjsjk61Y9+4Zr/qCtgNpYjr+qheBb41z1aFe+MDDWH3iu7hPd4Jzq2GIji
+/LGPeVFC2A2TTA5QfCu35QQGUwb8/dDa/Mhqm6OgU2fR+DrGI1cjPtDTeVdjQUww
+7A+eNa66M9mAwKX6o/CEXaJHqoQpUwhaUSTbVLTHohmezCfAGbvTSNjo82gw8pIf
+4NQMmCEskbA=
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAtliEyrwd3JTjbvQ//iLnu5RNfGSntzYP1RQX4NnzyJNroZB8
+OEifHAuDxyTWIFHOJmOBcEWsU0tGg86JSdA3TJyOS+1WImNj5J4NefqIhsyjAAMb
+XgKaG+0QodktfOQedhFaLEgYRZODeFuboo96crpvM+2aOkZYnDY/ZCEyzlEoW17/
+yCU8aR49Omf8LS9wA8d5Tp5XeTUM5QoARP3UasYkOTp6Za9pSRZ3rp6HH9kG+6f3
+9a7gIXfMp4uYPl82zhLetONMW89aMrnuAvGjATCXHT9roDmNHKuO24mK3hYrpe0+
+NrnPpFR+0qSmR/YTDb+lFuliFhKkcE0Dl5HJ9wIDAQABAoIBAQCqsBOlvw/o4oo+
+225nkv7+rOUXkxUXwAhz+focJYk48R5oP1q4SOp/kxvIt2elG05wyuZoVR/pXGZm
+jVgf+0M4eLgOxNzDFex1HaoZy3YvULEoGsBscN0XVQMjrasR5GvLM5UILHhj8KC5
+cm8ubUY+zNu5bSnYcO8TUwhlz1nCm8s4BD/k4ffsR9CxH9Jo5KgcgVYukdz+g/ve
+Py74jyBnEiZYjuPCawlVRlC7touLpmLs4WFZ30QLC4HW0sXhleBME+yTx67G9UQw
+Lyucr+IfmF1vd9fpzTg3wcKSqjHd0Of/fLzw1kU3qxfy2euQ1fGKgEydFUGLyYoo
+0IleMktpAoGBANq/OIcbXraM8VwVahTPAM4BR01tS4Vgy2j1enwTIyLKTMb7Ou3q
+wq7oZk/bbzyAXswuij6U1ZXV9djBC/67tNfRY7LdW5aio539OcXxdgjTFNjrAn0E
+1vaihpNF53LtMWOjGZjimse/WLKcxhYVjFKX/+N4QdNilA3a80HbefdDAoGBANVm
+TegNIEWlKOgq+leNKDtB+mynUrKDPKh+8sHikTMOJnl6UVaAWKWHNdugS0ZB2Ccd
+vKOCxccXRJbplGhJ4Ft/pfNNq5ykGeyeLauFo9Fuvd4NsayBFQ2+yTR4Bczxr/99
+PPY3HjvLSxxraMiDKZDJM3beFIpk+r0mDNGX2zU9AoGAGxDgAK+dR38m+hrYNlzq
+n5K+7NCiMI2qfYEqN6HyjgJz/4bkYr3SeuvchPMEz3qewCreBiJKTzDbK4evYUR+
+etm4uU/0Xi4fipPjix92WF8tzC0/8JIhuwCfICfdHHZGzypGJ4maVy7Q3cDSLbda
+1nliOxYNJweihBhcUwDCFZsCgYEAxTC+xrHyY0jFrxufru1aAr/p9yL6kMgichS0
+n6KLx6DIvrHfnU4GHBcAFo1dYXOQmDyrRnCd72W51LXMlD3H2uTuZRAdhyZAalyU
+GQ3pnap2Ok1vI9c3rDbi1+AchA/FMRH6Fg5CmsA1DPLXpYlGDGtPagS2+FdtNwGF
+ENwBDIUCgYAIs7koUKqTRAwj0Zkaz59AqH2Ai/XCzW94eDqsBo6cTE3BiBd1M0qh
+gThs9sBHSl5wkoma3D8VtZHlxz/qNkG9K+EBsybAdNZtHBe8pyGjpzFsgC7GbRu9
+xbDlKXTbM9f6wCi4ORZf3GH7v5n9SUAxI1y9zVe0eN4GuiZflcZ+gQ==
+-----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..1a9bc39a
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-ca-csr.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICwTCCAakCAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
+ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALZYhMq8HdyU4270P/4i57uUTXxkp7c2
+D9UUF+DZ88iTa6GQfDhInxwLg8ck1iBRziZjgXBFrFNLRoPOiUnQN0ycjkvtViJj
+Y+SeDXn6iIbMowADG14CmhvtEKHZLXzkHnYRWixIGEWTg3hbm6KPenK6bzPtmjpG
+WJw2P2QhMs5RKFte/8glPGkePTpn/C0vcAPHeU6eV3k1DOUKAET91GrGJDk6emWv
+aUkWd66ehx/ZBvun9/Wu4CF3zKeLmD5fNs4S3rTjTFvPWjK57gLxowEwlx0/a6A5
+jRyrjtuJit4WK6XtPja5z6RUftKkpkf2Ew2/pRbpYhYSpHBNA5eRyfcCAwEAAaAx
+MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
+ATANBgkqhkiG9w0BAQsFAAOCAQEAlXg5KHUPK//3ZyOcD8Eoq1C93zbbGpbIVqIF
+paXwoMH8SfsCy9xxaEXDNkUOhzzQTL74EuH8wCMH36AT03vZGXXOI5T9zbLJxjpw
+RGGK0TSyHExA5pdyiIRnufZ1DpoNygK6LfoPwOfHK5YRRXtNXwMvEjfNTWe8Kzkg
+VEwTbJRtloH20GrsXfrEWaO9bVByiuP/A6Mju2nOvLKQxwB8X5MZIwtzv30iLcIE
+rf2r8f2NtVNnPEiJHSc843qlVV2ZWot1ymSRqNsF6kh1gTqvYZo0OSVUYozydb/T
+sfdie6P2VLRwYFQdIOvjVlwe3gl63uS8PL+Yin5r4mP6sXtGYQ==
+-----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..aa380020
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-ca.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMloXDTQ2MTIw
+OTIyNTAyMlowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALZYhMq8HdyU4270P/4i57uUTXxkp7c2D9UU
+F+DZ88iTa6GQfDhInxwLg8ck1iBRziZjgXBFrFNLRoPOiUnQN0ycjkvtViJjY+Se
+DXn6iIbMowADG14CmhvtEKHZLXzkHnYRWixIGEWTg3hbm6KPenK6bzPtmjpGWJw2
+P2QhMs5RKFte/8glPGkePTpn/C0vcAPHeU6eV3k1DOUKAET91GrGJDk6emWvaUkW
+d66ehx/ZBvun9/Wu4CF3zKeLmD5fNs4S3rTjTFvPWjK57gLxowEwlx0/a6A5jRyr
+jtuJit4WK6XtPja5z6RUftKkpkf2Ew2/pRbpYhYSpHBNA5eRyfcCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAJ1NSHWX/Jfw
+PCNNQeT9DqQtyBBqhY+lF0IkYwDxpdIfDYiHPRIR9ZbWQO2X/z0hg19HTVz1c78s
+aKb/nSjcb8aVlodNjkAkuJtUxEE9vRYp6Nn3Zt0h9eW8UCYHkGQf3ECLAKoTmXx3
+mN9D/mUjsjk61Y9+4Zr/qCtgNpYjr+qheBb41z1aFe+MDDWH3iu7hPd4Jzq2GIji
+/LGPeVFC2A2TTA5QfCu35QQGUwb8/dDa/Mhqm6OgU2fR+DrGI1cjPtDTeVdjQUww
+7A+eNa66M9mAwKX6o/CEXaJHqoQpUwhaUSTbVLTHohmezCfAGbvTSNjo82gw8pIf
+4NQMmCEskbA=
+-----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..5e5bbcf4
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-server-and-key.pem
@@ -0,0 +1,49 @@
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIBBDANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMloXDTQ2MTIw
+OTIyNTAyMlowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALZYhMq8HdyU4270P/4i57uUTXxkp7c2D9UU
+F+DZ88iTa6GQfDhInxwLg8ck1iBRziZjgXBFrFNLRoPOiUnQN0ycjkvtViJjY+Se
+DXn6iIbMowADG14CmhvtEKHZLXzkHnYRWixIGEWTg3hbm6KPenK6bzPtmjpGWJw2
+P2QhMs5RKFte/8glPGkePTpn/C0vcAPHeU6eV3k1DOUKAET91GrGJDk6emWvaUkW
+d66ehx/ZBvun9/Wu4CF3zKeLmD5fNs4S3rTjTFvPWjK57gLxowEwlx0/a6A5jRyr
+jtuJit4WK6XtPja5z6RUftKkpkf2Ew2/pRbpYhYSpHBNA5eRyfcCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAJwqLtAc+Vdw
+4IQSrnT+J0hG386fIqeC6q0h64apTKYJ8lmhCHyJbmevDUIicnxhJinul2kw4R+O
+WpX6dPlbhqVessF1RydHb8d7Ey/ydPa3wXqeYaWuvg1TZe5SXjuVHCjGq39YaX2m
+gROuyOHQSlraLZ5+0jHaIo7ZDjee7FX6WDuSXNk0QHeKXaHlXxhvnfHgiIeYT2Q1
+9kkrZTbHOA5hKjAsz1TWkQNw5TU+nYFVPVUAgA0ZYRleBLcOl5OuvyHwjoQzi/dA
+vYD5nXLi8azXizwA8/wpQmwr4vz1m8b7wB6zxtGwJleQ49YOzv2FwCjt1Cj34eq1
+Nrpat17nZDY=
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAtliEyrwd3JTjbvQ//iLnu5RNfGSntzYP1RQX4NnzyJNroZB8
+OEifHAuDxyTWIFHOJmOBcEWsU0tGg86JSdA3TJyOS+1WImNj5J4NefqIhsyjAAMb
+XgKaG+0QodktfOQedhFaLEgYRZODeFuboo96crpvM+2aOkZYnDY/ZCEyzlEoW17/
+yCU8aR49Omf8LS9wA8d5Tp5XeTUM5QoARP3UasYkOTp6Za9pSRZ3rp6HH9kG+6f3
+9a7gIXfMp4uYPl82zhLetONMW89aMrnuAvGjATCXHT9roDmNHKuO24mK3hYrpe0+
+NrnPpFR+0qSmR/YTDb+lFuliFhKkcE0Dl5HJ9wIDAQABAoIBAQCqsBOlvw/o4oo+
+225nkv7+rOUXkxUXwAhz+focJYk48R5oP1q4SOp/kxvIt2elG05wyuZoVR/pXGZm
+jVgf+0M4eLgOxNzDFex1HaoZy3YvULEoGsBscN0XVQMjrasR5GvLM5UILHhj8KC5
+cm8ubUY+zNu5bSnYcO8TUwhlz1nCm8s4BD/k4ffsR9CxH9Jo5KgcgVYukdz+g/ve
+Py74jyBnEiZYjuPCawlVRlC7touLpmLs4WFZ30QLC4HW0sXhleBME+yTx67G9UQw
+Lyucr+IfmF1vd9fpzTg3wcKSqjHd0Of/fLzw1kU3qxfy2euQ1fGKgEydFUGLyYoo
+0IleMktpAoGBANq/OIcbXraM8VwVahTPAM4BR01tS4Vgy2j1enwTIyLKTMb7Ou3q
+wq7oZk/bbzyAXswuij6U1ZXV9djBC/67tNfRY7LdW5aio539OcXxdgjTFNjrAn0E
+1vaihpNF53LtMWOjGZjimse/WLKcxhYVjFKX/+N4QdNilA3a80HbefdDAoGBANVm
+TegNIEWlKOgq+leNKDtB+mynUrKDPKh+8sHikTMOJnl6UVaAWKWHNdugS0ZB2Ccd
+vKOCxccXRJbplGhJ4Ft/pfNNq5ykGeyeLauFo9Fuvd4NsayBFQ2+yTR4Bczxr/99
+PPY3HjvLSxxraMiDKZDJM3beFIpk+r0mDNGX2zU9AoGAGxDgAK+dR38m+hrYNlzq
+n5K+7NCiMI2qfYEqN6HyjgJz/4bkYr3SeuvchPMEz3qewCreBiJKTzDbK4evYUR+
+etm4uU/0Xi4fipPjix92WF8tzC0/8JIhuwCfICfdHHZGzypGJ4maVy7Q3cDSLbda
+1nliOxYNJweihBhcUwDCFZsCgYEAxTC+xrHyY0jFrxufru1aAr/p9yL6kMgichS0
+n6KLx6DIvrHfnU4GHBcAFo1dYXOQmDyrRnCd72W51LXMlD3H2uTuZRAdhyZAalyU
+GQ3pnap2Ok1vI9c3rDbi1+AchA/FMRH6Fg5CmsA1DPLXpYlGDGtPagS2+FdtNwGF
+ENwBDIUCgYAIs7koUKqTRAwj0Zkaz59AqH2Ai/XCzW94eDqsBo6cTE3BiBd1M0qh
+gThs9sBHSl5wkoma3D8VtZHlxz/qNkG9K+EBsybAdNZtHBe8pyGjpzFsgC7GbRu9
+xbDlKXTbM9f6wCi4ORZf3GH7v5n9SUAxI1y9zVe0eN4GuiZflcZ+gQ==
+-----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..392f318d
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-server-csr.pem
@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIC5TCCAc0CAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
+ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALZYhMq8HdyU4270P/4i57uUTXxkp7c2
+D9UUF+DZ88iTa6GQfDhInxwLg8ck1iBRziZjgXBFrFNLRoPOiUnQN0ycjkvtViJj
+Y+SeDXn6iIbMowADG14CmhvtEKHZLXzkHnYRWixIGEWTg3hbm6KPenK6bzPtmjpG
+WJw2P2QhMs5RKFte/8glPGkePTpn/C0vcAPHeU6eV3k1DOUKAET91GrGJDk6emWv
+aUkWd66ehx/ZBvun9/Wu4CF3zKeLmD5fNs4S3rTjTFvPWjK57gLxowEwlx0/a6A5
+jRyrjtuJit4WK6XtPja5z6RUftKkpkf2Ew2/pRbpYhYSpHBNA5eRyfcCAwEAAaBV
+MCIGCSqGSIb3DQEJDjEVMBMwEQYIKwYBBQUHARgEBTADAgEFMC8GCSqGSIb3DQEJ
+DjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG9w0B
+AQsFAAOCAQEAFNIKvEW2DTTnDIdiOxpEjH6LhIh0l/+OzTLuzgWX2QYZ+AJIOfxs
+5KpS9/cZY5UFjbQSl55hgRgUzgYThwOAfkOIIH4/Ui2ccS+abjb6+h334w/Oo98T
+sT0DhCuI7J+cPMbCNhG+6q3jJn2KjEQg/LzEeIXmNofB6qV55xlTuxKJGD2jfq8K
+aBPHsnDKjcTjFWc9SiDjLYvUyGaPZp0tg5Kr6AuyjdyVQEsztw8VQjPc2a6S/ym1
+2ZLp2wRIfAXjlbzVRJb64BHG4B0c1yyxcvqg5mOIsPEyzYVMLyVLxLHQMWW49YkB
+X02vZNjf2ppafO8owzMazQSM/+aCa8tyqw==
+-----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..c11d7ddc
--- /dev/null
+++ b/tls/tests/files/server-ocsp-required-by-server.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIBBDANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMloXDTQ2MTIw
+OTIyNTAyMlowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALZYhMq8HdyU4270P/4i57uUTXxkp7c2D9UU
+F+DZ88iTa6GQfDhInxwLg8ck1iBRziZjgXBFrFNLRoPOiUnQN0ycjkvtViJjY+Se
+DXn6iIbMowADG14CmhvtEKHZLXzkHnYRWixIGEWTg3hbm6KPenK6bzPtmjpGWJw2
+P2QhMs5RKFte/8glPGkePTpn/C0vcAPHeU6eV3k1DOUKAET91GrGJDk6emWvaUkW
+d66ehx/ZBvun9/Wu4CF3zKeLmD5fNs4S3rTjTFvPWjK57gLxowEwlx0/a6A5jRyr
+jtuJit4WK6XtPja5z6RUftKkpkf2Ew2/pRbpYhYSpHBNA5eRyfcCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAJwqLtAc+Vdw
+4IQSrnT+J0hG386fIqeC6q0h64apTKYJ8lmhCHyJbmevDUIicnxhJinul2kw4R+O
+WpX6dPlbhqVessF1RydHb8d7Ey/ydPa3wXqeYaWuvg1TZe5SXjuVHCjGq39YaX2m
+gROuyOHQSlraLZ5+0jHaIo7ZDjee7FX6WDuSXNk0QHeKXaHlXxhvnfHgiIeYT2Q1
+9kkrZTbHOA5hKjAsz1TWkQNw5TU+nYFVPVUAgA0ZYRleBLcOl5OuvyHwjoQzi/dA
+vYD5nXLi8azXizwA8/wpQmwr4vz1m8b7wB6zxtGwJleQ49YOzv2FwCjt1Cj34eq1
+Nrpat17nZDY=
+-----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..28022160 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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
+GQYDVQQDDBJzZXJ2ZXIuZXhhbXBsZS5jb20wHhcNMjExMjE1MjI1MDIyWhcNNDYx
+MjA5MjI1MDIyWjBLMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQB
GRYHRVhBTVBMRTEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUuY29tMIIBIjANBgkq
-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
+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
-----END CERTIFICATE-----
diff --git a/tls/tests/files/server.der b/tls/tests/files/server.der
index cd9c10c2..31bcc293 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..2e06b050 100644
--- a/tls/tests/files/server.pem
+++ b/tls/tests/files/server.pem
@@ -2,21 +2,21 @@
MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
-NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMTIxNTIyNTAyMVoXDTQ2MTIw
+OTIyNTAyMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
-Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
-DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
-2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
-tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
-/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBALZYhMq8HdyU4270P/4i57uUTXxkp7c2D9UU
+F+DZ88iTa6GQfDhInxwLg8ck1iBRziZjgXBFrFNLRoPOiUnQN0ycjkvtViJjY+Se
+DXn6iIbMowADG14CmhvtEKHZLXzkHnYRWixIGEWTg3hbm6KPenK6bzPtmjpGWJw2
+P2QhMs5RKFte/8glPGkePTpn/C0vcAPHeU6eV3k1DOUKAET91GrGJDk6emWvaUkW
+d66ehx/ZBvun9/Wu4CF3zKeLmD5fNs4S3rTjTFvPWjK57gLxowEwlx0/a6A5jRyr
+jtuJit4WK6XtPja5z6RUftKkpkf2Ew2/pRbpYhYSpHBNA5eRyfcCAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEjEBhx+ib3+
-u7O2OYD6z6pVLLTiQpXjESRfFF8sf/epSmmNtE/PpiUhWAXG2dOinup/40rjimAF
-j/8okMGvtTHst16vcV+LYu8AthBq4F41WVlC8/aLmIbkofbBulEUlD02HEBNszHJ
-rCkFBupwDTnbKStdLRPtjchuGLDobePDF7NEBDT4rWxoaQH7ZM3LOHnWoDjgF4ar
-3J6w2YpTl4vFf/e31Ikc+ctVy7tU1/X/II58fbxKqWjtKL67VESRBpHhCGNRlXfF
-ejxfiyHBKPzZbh6jqmyI4GqfotBq/vvbpt2XocKFHB6UDvW7M+oCrEgf/gL1uMLy
-/vq3kChJRdM=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAIFGWWV7VM7D
+gJRywIoW6P46zaqRlD1wK6ZZ9+Zwdx2IDuLMzdn5OlSBU1C/XyRr8Q1B95tXTYjD
+LOXI03tJa6DqEUIJvrWfvAGYgixVo2P8wMUfNZd24YbvARsQ0BMUN42LU0sXng1Q
+R4qKBeqvpF7ngOpytedpfMG+Go+GqkOmgRUVUrxhdm1i1HlbVK3FruXGZ4Gkw4pp
+gZ2/p4AsT4yMw6OCypRZzfShRpk8liPKUwupDmUMhGvDNHPrhAqzDYQWCZx8FLzS
+K9sm82tqc8WMjWd5GYUgj1UNhn8ND8zNJ3ULtNQTDjix8AFTAk1gU7dLB3Nm+ZLx
+BAUv1ODOisk=
-----END CERTIFICATE-----
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
