[glib-networking/pgriffis/ocsp-must-staple-test: 2/2] Regenerate certificates
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking/pgriffis/ocsp-must-staple-test: 2/2] Regenerate certificates
- Date: Sat, 31 Jul 2021 18:13:41 +0000 (UTC)
commit fe473d62b5804c7444acf8c2cb7659681400ff7f
Author: Patrick Griffis <pgriffis igalia com>
Date: Sat Jul 31 13:13:24 2021 -0500
Regenerate certificates
tls/tests/certificate.h | 4 +-
tls/tests/connection.c | 2 +-
tls/tests/files/ca-alternative.pem | 34 +++---
tls/tests/files/ca-key.pem | 50 ++++----
tls/tests/files/ca-ocsp.pem | 29 +++++
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/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 1219 -> 1216 bytes
tls/tests/files/server-key-pkcs8.pem | 52 ++++-----
tls/tests/files/server-key.der | Bin 1193 -> 1190 bytes
tls/tests/files/server-key.pem | 50 ++++----
tls/tests/files/server-ocsp-missing-and-key.pem | 49 ++++++++
tls/tests/files/server-ocsp-missing-csr.pem | 17 +++
tls/tests/files/server-ocsp-missing.pem | 22 ++++
tls/tests/files/server-oscp-req.der | Bin 0 -> 105 bytes
tls/tests/files/server-self.pem | 30 ++---
tls/tests/files/server.csr.pem | 19 +++
tls/tests/files/server.der | Bin 920 -> 920 bytes
tls/tests/files/server.pem | 30 ++---
43 files changed, 872 insertions(+), 736 deletions(-)
---
diff --git a/tls/tests/certificate.h b/tls/tests/certificate.h
index c306e67f..63c341b1 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-06-23T20:16:15Z"
-#define EXPECTED_NOT_VALID_AFTER "2046-06-17T20:16:15Z"
+#define EXPECTED_NOT_VALID_BEFORE "2021-07-31T18:13:10Z"
+#define EXPECTED_NOT_VALID_AFTER "2046-07-25T18:13:10Z"
diff --git a/tls/tests/connection.c b/tls/tests/connection.c
index 2f422ee3..d1cbf521 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 "eHKDtxoT/cw518SETTA2D1jJyBeADm+5kM9nCY5/ono="
+#define SERVER_CERT_DIGEST_B64 "AX+tOuSPoSSzxau7zBGSOxAfrO/E6eLYvCv3O8MYTfE="
static void
test_connection_binding_match_tls_server_end_point (TestConnection *test,
gconstpointer data)
diff --git a/tls/tests/files/ca-alternative.pem b/tls/tests/files/ca-alternative.pem
index aa53dc0a..31cf4df0 100644
--- a/tls/tests/files/ca-alternative.pem
+++ b/tls/tests/files/ca-alternative.pem
@@ -3,27 +3,27 @@ MIIFAjCCA+qgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBnzETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBV
bnRydXN0ZWQgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndh
cy5hLmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNv
-bTAgFw0yMTA2MjMyMDE2MTVaGA8yMDUxMDYxNjIwMTYxNVowgYYxEzARBgoJkiaJ
+bTAgFw0yMTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJ
k/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVD
ZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0w
GwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMDI1oGcdnQkf3rb6tSABVeqsuZzVpoA7NmcbGWZPOC5x7XT
-dBeSeU/Q+Fl6B048CwVlIxXgL3z44CFcDee5Q3oIk3AiQenl4VIofbm8i43wXaPe
-9cf4m3lF88RQZsF6e8oTnuLnaqFOJyOo17cuzY+m9RayaOzS5/04gEZj19J+EbIA
-Jh1uUnWYKtc+pAUKzvTtCMYygwHFq/5IlQ7Ns4O9j/wKaKnMNbC7PL90QUpgjZtW
-fyO5v1beEjAHigt00GUqOEhiVIEN9spFGqOf7sY0MOrluqC6fBnaKC4zKkEYLrib
-4X1ncCMffZ3pB1HoEp+RLq9NgF/PjWNLfVDr3gkCAwEAAaOCAVwwggFYMB0GA1Ud
-DgQWBBQldL0J5/KLcVa6ixbx//cNq2oo3jCB3wYDVR0jBIHXMIHUgBRwWfK4vV/U
-to+eNwpNbSELvacj3aGBpaSBojCBnzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUG
+ggEPADCCAQoCggEBALk97CGeG3O95ZKKTbZ25xkZdeKkXm1fQZRwjK1FwC+XMG1e
+hGtI40zGrb8ayC/olqoMFqz4yUrkb4qpzau8Uml+jZSOx+E3VsLS41lrgMf4k4lg
+YqghgXpu+ErDwL2crJR1IQsKSk/xWeltSZuDkZjUSUqK6SfhC7XZ9PAJmb+Km5Yq
+Z2BnnioxK1lMC25BFtYyXMje0/+15r/Am0+5ek2HMHmD2nCAaHeXEU4mn30lPGEk
+q9l7nNpovH9Rei8mCuZtXkeuzpcO7icRTusI8VBAPXvYB5d3GRmcECnV6jBwWZ0M
+AQ6ib+tdT/PkjEkR4oncAsyO8cRw25gltPo+DpECAwEAAaOCAVwwggFYMB0GA1Ud
+DgQWBBR9MHdtjvb0Yq9WTAKv4wB756MpeTCB3wYDVR0jBIHXMIHUgBTceGApUpyJ
+pj8+VM2B+0qtAGSA3aGBpaSBojCBnzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUG
CgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBVbnRydXN0ZWQgQ2Vy
dGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndhcy5hLmNhLmV4YW1w
-bGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbYIUAT/Zj4jAA7sB
-3BGbnpmsaV1nSwkwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwGQYD
+bGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbYIUGx5sD75kSqNK
+hP/0OQ7QuzKrM70wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwGQYD
VR0RBBIwEIEOY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAAWFZEgeQJ0QG9tn8IHZXOF/aNLow4jk1nQb
-bbO/SWSsRcDvJJlqkQ+w/HZVyULUVvvAe/WAev5WHR5shGSmVsTOxSGcjfppFEXs
-Qq26zBJtDbnIidrKNLsQ+01kufKLMmarQbBnDj+u/bnKv6lvmwZ3FkV1Rra3wW4z
-xG42bhV54YfUGCLgneqE/We78XJ9lZdqliFXHixMB9sh3JON0dOkxuu6ZEk4bq5c
-BxJVDtZvZr///ow4iiFpE9ynJodxbyKLIyqVaYXW5za1cLt7oRzIaYVDtga03pqH
-620f5zDR9iH4OLM1dZyvYgURDEwipyivLlm561iiH8WwMdT3R8s=
+b20wDQYJKoZIhvcNAQELBQADggEBAEKW1WUf/Gv+Dqnc7KYoXtS0CJUPJRUze7i7
+L+hEf83wQ7YMnUPE7y5kBibX8c/1BR4h1ITN8CsSYKnJRVH0NVTrX3FIecAMoltI
+r6kg9FUzic3st2JnzcVC7kKokU9ZjjN+iZmEi6tHRmoofB+FdqjcQTUwyTv6FEgV
+qajlizSRwU4pI+hAwRrC3WCFFdTg1QN06r5Gg0g0lp9dIt0mGbOWxlqSmunKDe+Z
+7UtnsHjOzcqHzqABF/uz1PLT73a8b/OOjQ8U3/mqgWjeE94Dc049MiGN/BYb+50j
+rF8ftm/eCiG+VrojoNYGYt76rFCVQ+3SJdw6q6MH3BpE4KjqDIw=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/ca-key.pem b/tls/tests/files/ca-key.pem
index 9a8d99d4..750ec21d 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
new file mode 100644
index 00000000..9b6ef96d
--- /dev/null
+++ b/tls/tests/files/ca-ocsp.pem
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE9jCCA96gAwIBAgIUUnrK8xF95zauX9lNEPBSQqx/z4UwDQYJKoZIhvcNAQEL
+BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
+LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
+MTA3MzExODEzMTBaGA8yMDUxMDcyNDE4MTMxMFowgYYxEzARBgoJkiaJk/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
+8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
+MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
+bGUuY29tghRSesrzEX3nNq5f2U0Q8FJCrH/PhTAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIE
+EjAQgQ5jYUBleGFtcGxlLmNvbTARBggrBgEFBQcBGAQFMAMCAQUwDQYJKoZIhvcN
+AQELBQADggEBAC6beOO8UJu7kQsicLZuHkbQv1tcymAHBQ4KG3e6DuPS7Cpiv48j
+nYZWIeApxyYX0WC9USS1Hxibjg1nGYUNg00MN1QcSpr5ivEmm697wYAF37Yc+sv+
+h62oLltkVENPRC9UcoOMDRW4E39Ag1nOxptLEfz7WlOUTjgBmfyy1i9G78M8YF4O
+Cpi38qbUC8PRSz9n8XCIcheb9umPcZkxLeQ4+W5zosg8W4FpjHrQ2j5EVtWu1oaZ
+eAyxghHym6J6z5p2Le9K4sZ2pFVppJXvOPw58QZBZnP8h/v8vidr4fr/CPAh9gmp
+IwnAKK2sIsc1wqcltHWwGgLYp1WPs4Pa9FI=
+-----END CERTIFICATE-----
diff --git a/tls/tests/files/ca-roots-bad.pem b/tls/tests/files/ca-roots-bad.pem
index e86d4fec..a1648bcf 100644
--- a/tls/tests/files/ca-roots-bad.pem
+++ b/tls/tests/files/ca-roots-bad.pem
@@ -1,31 +1,31 @@
-----BEGIN CERTIFICATE-----
-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
+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
-MTA2MjMyMDE2MTVaGA8yMDUxMDYxNjIwMTYxNVowgYYxEzARBgoJkiaJk/IsZAEZ
+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
-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
+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
-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
+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
-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
-ixUo8KqSNQ==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
+Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
+H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
+Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
+cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
+uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
+QSNhrzqDvA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
diff --git a/tls/tests/files/ca-roots.pem b/tls/tests/files/ca-roots.pem
index d905311e..cb431a62 100644
--- a/tls/tests/files/ca-roots.pem
+++ b/tls/tests/files/ca-roots.pem
@@ -1,33 +1,33 @@
These are some CA certificates
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+AQoCggEBALk97CGeG3O95ZKKTbZ25xkZdeKkXm1fQZRwjK1FwC+XMG1ehGtI40zG
+rb8ayC/olqoMFqz4yUrkb4qpzau8Uml+jZSOx+E3VsLS41lrgMf4k4lgYqghgXpu
++ErDwL2crJR1IQsKSk/xWeltSZuDkZjUSUqK6SfhC7XZ9PAJmb+Km5YqZ2Bnniox
+K1lMC25BFtYyXMje0/+15r/Am0+5ek2HMHmD2nCAaHeXEU4mn30lPGEkq9l7nNpo
+vH9Rei8mCuZtXkeuzpcO7icRTusI8VBAPXvYB5d3GRmcECnV6jBwWZ0MAQ6ib+td
+T/PkjEkR4oncAsyO8cRw25gltPo+DpECAwEAAaOCAUMwggE/MB0GA1UdDgQWBBR9
+MHdtjvb0Yq9WTAKv4wB756MpeTCBxgYDVR0jBIG+MIG7gBR9MHdtjvb0Yq9WTAKv
+4wB756MpeaGBjKSBiTCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT
8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0eTEX
MBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1w
-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
+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
-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
-ixUo8KqSNQ==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
+Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
+H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
+Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
+cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
+uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
+QSNhrzqDvA==
-----END CERTIFICATE-----
GLib shouldn't care about this comment
diff --git a/tls/tests/files/ca.pem b/tls/tests/files/ca.pem
index e22a68ce..93ec59a2 100644
--- a/tls/tests/files/ca.pem
+++ b/tls/tests/files/ca.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
-ixUo8KqSNQ==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
+Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
+H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
+Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
+cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
+uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
+QSNhrzqDvA==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/chain.pem b/tls/tests/files/chain.pem
index b22a024b..f5302357 100644
--- a/tls/tests/files/chain.pem
+++ b/tls/tests/files/chain.pem
@@ -3,78 +3,78 @@ MIIDuzCCAqOgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTIxMDYyMzIwMTYxNloXDTQ2MDYxNzIwMTYxNlow
+LWNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcyNTE4MTMxMFow
SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAON5fzcX7h1+XmmMFjpbUiJdqIXworEf6ToQru0zxoKxfVzj
-mo6O02jSkIduKZgycUgT5KDHlQx3OrKd2KnFe47NqIsSlzapQto9+VbbUFXFv31a
-+qZlQr1AO5z8UtoPBCXamRoraV0PzlilGp9/TETVgUya2Gsz0C+1F8iJAaha7DEg
-FSnapuRvEstd6iOPh8q2gdAigoGryENr61YL5ke13HU9hU3vwdsUnt7ZuNlKFBjS
-1NneXYtkQpeDgrV0ee3yauS9p0PWKUuN+ExWlUsgCG92mDZ0HqBOEamfu+akxZV6
-/zKGZrd6V4HgeFfBm5LfxtaogVqYsQG5KB1RDmsCAwEAAaNHMEUwCQYDVR0TBAIw
+ggEPADCCAQoCggEBAKdl434MfWmQOdgVOK52liMyCIrv8pDdrFTIwhk3aj59dpB/
+Rx8C7FbOHA8tyIBWpKaNNNT3S/y4buWHcJywr+3oqy31+KFf/hKnDDgR86j822PK
+azfwcjrR05GBfKN3oKo6HEtsJ9jiicGFVp5gZkr18OsSbJiVuWbjEhOgUe4etHU+
+oWwnvKfpwwc3R9mDkqEtP+58lrGXmvUmVICfDW8Hymm4SXGMH05p02+an6rqciFk
+0GNMbeUeYK8fyVprqZIO8aTRAr6+Lb5PpBm6BTKI3KVGpRsevCJTVH867phwp7Qj
+ImbsEpxbUo9sJsIHshhNsLwi0bl7w4QhFrGlKO0CAwEAAaNHMEUwCQYDVR0TBAIw
ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
-ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAIX8YaD7oV+ULhX4yrXRjZwz
-Rn1IiktJVxdCo3s8wx3LVHtyywWud4N5H0FtAbM3LMBWp9A4k+NUvVTVdPgfLkzS
-jYRn6hHBafSbp0tevXFBer1QH1m1K72B7RDUfP7L8tGz94zY6j/9adSj9pygr4qC
-V5BO/6Qh7gG1UTaAXsFWHntY0UWAc92r8Th3MhpKwOFeNGwNYb/N+BlgtfvMKRgT
-/v8FYyIWqB/DNymhyVQg3GgeDEeDWxX4qgeZoNSZu9fVHLUfPh143njBqd1BG0AE
-Sinzts1+adYA2qFua6ZaWizf6UlJjDdhk89sCUhlsRjJbTMfaLnwT60aoFSESNM=
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAH44AdGFIuKyXGruD3XnuNZF
+eGOxLd3epXbWBsuY5tfol7ACO/hV6301VIrCHDGf4uovfyasLhu26kI6gCNZkROf
+NzODOhNOdNy6rSDApFn3TVIgEsmQ9Zm1MHfXc7Xz18L/1Cb1mjmXGRa+fMetNwSD
+jQLgxIKbA1LN4QPGQ9FnGeq/1KvXNHykAbV7dA8uRCkZnkgmXKVH5bjMZIi51Uo1
+Ls49sFAsrxL49rz4yvTVZe/13Gu7KCIVl1echy0nDk6J4C2qLrS5+WV/vyGdV6nk
+WZm6baVMEaGu/ygmJ8H6rUmrZy/rdIFv4yyQgOME8K6ZDW0/lYFqozDMxB5NucY=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-MIIFAjCCA+qgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIFAjCCA+qgAwIBAgIBCDANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDYyMzIwMTYxNloXDTQ2MDYx
-NzIwMTYxNlowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
+NTE4MTMxMFowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALY5OFxJqyqgUogBiy2MqYFv3Z4vy8pU
-syAKqCTdb6gJfbHxt3mVh4mLvXV+IUxAqDj2v+0zoEPDXepU7/+MZ+I/ETpp2U2W
-fJDZBp3poTMoaunia7b5+yVsVEZaIh29WY17yeNvUbY8daR7eCDkB5KT3iQX0fGo
-ilZISyKJHciDtRpo1xJJ+MoZnkRZW8NfPyWQ2/Nv1iPMHBG35CizRStdVOZIVGP5
-zcqqZSorcZG1k6k7jxoY0pd/MFqr69F5+oay+QrPRMe9U+5GK9OtyT/2FphzC9Kx
-wWXdg0XXewaoNqoDPqcWBN3PghR/uVBNG/FG4QqG/FaFvl6igZIB42kCAwEAAaOC
-AVAwggFMMB0GA1UdDgQWBBQXwmXb5SAK/5utoWBPlo77W+Av5DCBxgYDVR0jBIG+
-MIG7gBQldL0J5/KLcVa6ixbx//cNq2oo3qGBjKSBiTCBhjETMBEGCgmSJomT8ixk
+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
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQ2s6OXj82ZwGEmP/x0jQhjVrfcQTAP
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAP
BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAF6HrnyG1z3U5XLiX8u9zzrX81mcSyrHWotm
-vaAEyi0D3EpyuXcxLEMmsriJROshPIb7Xg8jvf/heX96rgXOQ9AyTR0vGKiXeiax
-F8tpsFXRhKISlHFj6ejbUezx0Q5eXynfcqWob/mtMO/KRfueBjlvCcrgkOJRddY8
-827NOO4ileYp270GgLbEE78eUzf/XhqCyV+krrlz/kvJCAbDBP/ugjxFbZGtY/ti
-7zOpSV7B/zaUtpyVbVHClBMC7+XpqGYgwL0QPhoaSOOPv4NMQrpQTvciZM4UU155
-/BN62aYhtIdGtO7dJzoTrtsVssyvPN007cdO3muHL0uLe7DdkVA=
+b20wDQYJKoZIhvcNAQELBQADggEBAJArQW4HGrmrCNYdA3C6LwwqhuzJzwR87HPg
+jmK+1f/E4qPlaT8PhgoxmU2bOCoI/eNHPSfXk5sOl8k6HUZyF/hRdFBUgUtUEO81
+udRrFXRwUeRY30p8BXm8sbxNGk9FMCO/czdS2MD6T7fdLI8Z6g9hz+eOOyEHVy6D
+Z/LkUgIMQwVibdMuNs2fxgpmReZgraqQOeHAyCCo0SkZXGkN2rHV3kYJkuc522kq
+K11ldkrxKhHU77ebxrHvgYtv0D90rspFEcY16/0iYAFdthZX1gJOgpMivD7lXykX
+IHU1jn7fIdjT+uaoB+5ScQKYrlngZcaij16rX0nj7GMwrls/Awc=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
-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
+MIIE4zCCA8ugAwIBAgIUQL/y3nsri2som8J5/D+Hm8ljMwcwDQYJKoZIhvcNAQEL
BQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNh
LmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNvbTAgFw0y
-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
+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
-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
+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
-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
+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
-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
-ixUo8KqSNQ==
+EjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAVn5Zp/2oUFAO
+Ork8QU7IJo9a/NEfBMOJfFQBXyN8l7AKux/wDICDqd+Hmeb3yoPx/Yy+5Z/BoEdY
+H+sG5gAGK8Kd5KsQxfcPW6uQMQ8K+WEmtdeT2OjDkKzkLhMfAXbaSOrGf/95rMk8
+Tq/Cx7csH+M21m8ZvrvJCHFr673d4GvWKN7nfa7xcd2ErvKWLEIiyp607AfD5wHg
+cKm0LtC9RCVABGrS7tvW6DfR2V0QNKk/+OlWAqPXzElJwZPwI4CdGjAVfYkEfE86
+uTWT08HDZM5gD1ohhUPEnNxma1HkMOnBhhxmnA3HfFB7l6BPPAj4xmv/tQv5BtfT
+QSNhrzqDvA==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client-and-key.pem b/tls/tests/files/client-and-key.pem
index 347ef15c..4f35914c 100644
--- a/tls/tests/files/client-and-key.pem
+++ b/tls/tests/files/client-and-key.pem
@@ -1,48 +1,48 @@
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA2MjMyMDE2MTVaFw00NjA2MTcyMDE2
-MTVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA3MzExODEzMTBaFw00NjA3MjUxODEz
+MTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfxzQKwthl+
-nS2FR6C07d/WHpMBgM0INwlfP1X6lwrIWRDfSqLikgOfJaVHXiSOqljl95VZSh7f
-LyStULZJh37uUmdmf/RBShjMJ4Gby/TmaK/gmRTrAo1YjW9ZDH7FJa//Ea8CPURg
-4uQt3bW6nf/U1kDPIhGSQHM+6Yi+vQS9F9TOeduJcL9v+aqlRJ/rFDLaS2TmvhkK
-CDoXTzTBlVNed4wv68EnHS1BRmEDJ2PNWhoTXt0vzBxkaiaa4e7ZD1SJqGgE3dIV
-ktIRTvOg8WAr9Y7gfQzPOlb5jMIVuVzv4zuhew2LUNpv0MUR0qLpj6gk4rv7vqdf
-irx8whj7xz0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEALjdAUd1Kz9aZbcBJhcu+
-M/WmfAenaHObivjNWNtezYXmk0kBXbfnf2bvrb5FT1mPF2bQ0P/yC2DiTCRguDKE
-aAPV95yVvk0SkMkXSdKIPoc3mv9v+0mRoQAtcYoRenyj6hZgPNub1DjxQJW0LLcO
-tSqe7Y4UYJNa7Q5zsWfz0oWeQdE2ctEWOKCUJhIzhSsZy+zvDDH9t15a5cVBE6+e
-PhTboNFByl+URVPjgdP/FlhE2IWtrZ/t8ZwSZ7KPTcnzh3gMWRZDXms8g+IG9ubF
-u7KPjRwL1yBtdqgIKhv/IBTbDyWC/U4VglLAQ93cHLIoOPXfptNtNnQLVmsaZzeL
-MQ==
+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==
-----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 54796dc5..7197ec74 100644
--- a/tls/tests/files/client-csr.pem
+++ b/tls/tests/files/client-csr.pem
@@ -2,16 +2,16 @@
MIICpzCCAY8CAQAwYjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
ARkWB0VYQU1QTEUxDzANBgNVBAMMBkNsaWVudDEhMB8GCSqGSIb3DQEJARYSY2xp
ZW50QGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-x/HNArC2GX6dLYVHoLTt39YekwGAzQg3CV8/VfqXCshZEN9KouKSA58lpUdeJI6q
-WOX3lVlKHt8vJK1QtkmHfu5SZ2Z/9EFKGMwngZvL9OZor+CZFOsCjViNb1kMfsUl
-r/8RrwI9RGDi5C3dtbqd/9TWQM8iEZJAcz7piL69BL0X1M5524lwv2/5qqVEn+sU
-MtpLZOa+GQoIOhdPNMGVU153jC/rwScdLUFGYQMnY81aGhNe3S/MHGRqJprh7tkP
-VImoaATd0hWS0hFO86DxYCv1juB9DM86VvmMwhW5XO/jO6F7DYtQ2m/QxRHSoumP
-qCTiu/u+p1+KvHzCGPvHPQIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBAD6mEs60
-jns1fZqZLJHPQEq6tmLYdosbpqyLgC1Kx4BsUsz5g1xfiYBUWhxjXdGbbCBxb6Lb
-c+/mIszSwUI9uDIlKLfRZXdbZZBM7CVOeGuLq7Rp4nI4R1lLkkuxOQLCchlI/onW
-ZoYRFNRy1+as1FYJZOJAVDCdZX0q+YDOxh6MeKdg1nIMDW5bMHCCl/vXGS/SYfnT
-48QI2rpEJk8G1PkrDf3Hg1Ibf6VNALYZ70j3/P4j2zN/mufleZH0EHGodmxf0ldx
-G/jvfhK7nVeIQf7PHBtwIgdSfYaIj9kwGe1Bg1gdYmXDP7zVeTOw1mgPYRkDCGdS
-rpyHn9vaVt2YlLE=
+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=
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/client-future.pem b/tls/tests/files/client-future.pem
index 72c055dd..e4a1f960 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-----
-MIIDYTCCAkkCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDYTCCAkkCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzIzMDAwMFoYDzIwNjEwNzE3
MjMwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH8c0C
-sLYZfp0thUegtO3f1h6TAYDNCDcJXz9V+pcKyFkQ30qi4pIDnyWlR14kjqpY5feV
-WUoe3y8krVC2SYd+7lJnZn/0QUoYzCeBm8v05miv4JkU6wKNWI1vWQx+xSWv/xGv
-Aj1EYOLkLd21up3/1NZAzyIRkkBzPumIvr0EvRfUznnbiXC/b/mqpUSf6xQy2ktk
-5r4ZCgg6F080wZVTXneML+vBJx0tQUZhAydjzVoaE17dL8wcZGommuHu2Q9Uiaho
-BN3SFZLSEU7zoPFgK/WO4H0MzzpW+YzCFblc7+M7oXsNi1Dab9DFEdKi6Y+oJOK7
-+76nX4q8fMIY+8c9AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHi091Bd7K41SLdT
-0D+aFJztRwA8EOLuhIqyx6DMAoT50xMSovR9aSob2A/jA+TslmWpIz4/gJxmDLbW
-wQuRs1tRcwpq6wedJqlhYyNyQnBE6v9Yc+tM+DsulsdC3R80AuudIVi3wACiRCqI
-BTtPYzUj56YV4YqIo+CTRBhpxcB2C2GtQMHX44q5o3Od7l/sV5f/dIR7LKCKTHnT
-lvAVEKgBIuHNJljTpiqI6oK7X5F9RFGIA0/0drfrrrI9s7v9sxQZ+lXetgY6oI18
-nBI/4XlgNtf+YNtat2Oruih35F7CDvoUdTACdUptPAJFB00Yy1IUY9/xi8T13+O6
-W6Hsy1A=
+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=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client-key.pem b/tls/tests/files/client-key.pem
index 390abe9c..c3d0a958 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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
+MIIEowIBAAKCAQEA49u5kwy4Bg0cd872he4Mkba81ymELicSiV0mtLhavtflFReV
+VQfIeLBjZLupey1k/bmbof05uXjYDKwYNhxwpKbT8173sIaRO4xKgkV+bwQ/VbmG
+fYXKICZwkkMQDiz0Abtk25m1uLssynkzQntDKP/sAqu5ophd8HUJYcBHkH2YCoTX
+WEZklxQA3iDFXshU09iTpueFSCMQfx6IJ+zrJQHcKpnVLssgK8L2PCDYn/5CR+bS
+18du+2jIARvu0VVZtncZyBR+e02LF77VSbezynIH7BXOe/rlwSMI++CowwlV9L2g
+xXsuDtO42qOKvNpJIZJVYa5HcjJWaO1+kaT1HwIDAQABAoIBAFr6JStQfb10yLQR
+f57UAFLByr6CBhPDaAROnCC2Jw1h+EampupPdDyz+MuEnlPfOR6RWFGiYMTsOh89
+K2GXk2Y6chAPEAh8gkprZmiDRMsgwAUDUW6W17BkiLftbOCsFDUI1GlWAxeiLG0f
+XVcjDhq1rE8Yr8L64S8cG8Xa1vgaXI6YpPch8YaBXQrBtZZsKiqmD8OUcE/sj1rc
+jrSuwTYmR9wqNymJH1b21cDhCKcU2UAUAhbLWm6k9rhKGEvbcrFcBVe6cRjY10h3
+RahLV8geyNKtundqg4Fajw5i74SxRHqnGrrK99EAYOyehxI0hjAPlrUmUsx5juwX
+DuThPrECgYEA9jTMikAY7TIZOb2R1Dmy4ob3jGV23YoetSb/RyDuIYI1FhOxk8M7
+Lh61zdcnih4q4AZU4f+tSrLM0faVO+Qm/aPsXcJZSw6voOLX7crWA6RoffrNXpcr
+I8QfBqXoDosUEZhu+ZWTOHU3jaUEZojT3HVii3dnDe8lcg2fURZ8CxcCgYEA7OwV
+Jis3geW4JeqimmKYCcb2eCYX/XhK5s0fIY1TUQc2BcjG5qmsfBK5WM4Y/9kgiqRy
+kGb0KSLcf4EGA2UMfARPXMjGBd7O7ZGw97h52OQ9KntwAlk+M88IkGtgiBB8B8/6
+vOM1NlYm9KNdz7yYJyWKhX5CpYWNKDybBBanizkCgYAfFk2ZSzyafo/m1YPbSynG
+JoqNRKZ8lJsJ/pGPFp5axskTL4tlf+oyCZilE/yfGO4K+WGwY4sq+maYQE1ZkZZG
+wnLu58JEkuckJmBjWxAox5KWDZvuzKGa04GjYkFpzK/NBPVGOFetckeAcAydMbum
+g3/c4ke137NXslaic3dYIwKBgQCEJk7JonNsngCwDYczC+l4EqVpcP4SoKVOxX0m
+zth5KseERHBFOsD918fQc+zX0HlpO763MuXfiBVrfUEoZZWoGxNVUpu5rITJWGlY
+U2qLgwtnBcD9Xl/msAU74NjQLDmyddyKvUTyEO3bqL/r3msT8smoGjv8bVjF58Aj
+cKt1aQKBgF8WJ/5JbhEUvhv9+2tkSGXsoGVRZkHVeMr++NCJH4Ee6U2eKeq2DOYA
+e8ex5fKJPcjoaXeguKYaP3lsFVdT+F9bj7+L1RpJea06ovYbTs7wAyzxURLOjbfy
+0SUZG8hhBhdcqz+RVvqnQeYFe8k/c4RVZQeEgtBGChevJtT4ymY3
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client-past.pem b/tls/tests/files/client-past.pem
index 5d00b0d9..f1e738dc 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-----
-MIIDXTCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcyMzAwMDBaFw0wMTA3MTcyMzAw
MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfxzQKwthl+
-nS2FR6C07d/WHpMBgM0INwlfP1X6lwrIWRDfSqLikgOfJaVHXiSOqljl95VZSh7f
-LyStULZJh37uUmdmf/RBShjMJ4Gby/TmaK/gmRTrAo1YjW9ZDH7FJa//Ea8CPURg
-4uQt3bW6nf/U1kDPIhGSQHM+6Yi+vQS9F9TOeduJcL9v+aqlRJ/rFDLaS2TmvhkK
-CDoXTzTBlVNed4wv68EnHS1BRmEDJ2PNWhoTXt0vzBxkaiaa4e7ZD1SJqGgE3dIV
-ktIRTvOg8WAr9Y7gfQzPOlb5jMIVuVzv4zuhew2LUNpv0MUR0qLpj6gk4rv7vqdf
-irx8whj7xz0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEALL01K6kftU/U7vt9Nf/G
-UsnSi8A8IupTS+dfm3Fa75sQC3AUP4Zs+UQMf0dfKvnVMyT6dVAYQRQ91Pklhp4b
-wnIV0U2a+RuhnxvsrBgYT52LD5ZjC2+MsW7Rd2LZsipLSS28Era6OD2RgOHuSgZP
-hTKNxAGBSQs+M9Oe9Z06sqBiO3sRP10r+vNkPfy5ZEl6X1HtBtzhAxFcDHm4otSE
-ypmuMhMXxQlDOAPdNlCEkYxJYtLcY2buxYz6PAIPU2+k8R1jujXBWIzzoS0MnE1l
-c1UtQwk9lY7FHv5Y7M5r62GVVJbIiqH9FlePXpEKmCBVYCh2b5rJ6x0BHxCCeyta
-6A==
+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==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client.pem b/tls/tests/files/client.pem
index 0979b99e..e2646c8d 100644
--- a/tls/tests/files/client.pem
+++ b/tls/tests/files/client.pem
@@ -1,21 +1,21 @@
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA2MjMyMDE2MTVaFw00NjA2MTcyMDE2
-MTVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA3MzExODEzMTBaFw00NjA3MjUxODEz
+MTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfxzQKwthl+
-nS2FR6C07d/WHpMBgM0INwlfP1X6lwrIWRDfSqLikgOfJaVHXiSOqljl95VZSh7f
-LyStULZJh37uUmdmf/RBShjMJ4Gby/TmaK/gmRTrAo1YjW9ZDH7FJa//Ea8CPURg
-4uQt3bW6nf/U1kDPIhGSQHM+6Yi+vQS9F9TOeduJcL9v+aqlRJ/rFDLaS2TmvhkK
-CDoXTzTBlVNed4wv68EnHS1BRmEDJ2PNWhoTXt0vzBxkaiaa4e7ZD1SJqGgE3dIV
-ktIRTvOg8WAr9Y7gfQzPOlb5jMIVuVzv4zuhew2LUNpv0MUR0qLpj6gk4rv7vqdf
-irx8whj7xz0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEALjdAUd1Kz9aZbcBJhcu+
-M/WmfAenaHObivjNWNtezYXmk0kBXbfnf2bvrb5FT1mPF2bQ0P/yC2DiTCRguDKE
-aAPV95yVvk0SkMkXSdKIPoc3mv9v+0mRoQAtcYoRenyj6hZgPNub1DjxQJW0LLcO
-tSqe7Y4UYJNa7Q5zsWfz0oWeQdE2ctEWOKCUJhIzhSsZy+zvDDH9t15a5cVBE6+e
-PhTboNFByl+URVPjgdP/FlhE2IWtrZ/t8ZwSZ7KPTcnzh3gMWRZDXms8g+IG9ubF
-u7KPjRwL1yBtdqgIKhv/IBTbDyWC/U4VglLAQ93cHLIoOPXfptNtNnQLVmsaZzeL
-MQ==
+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==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/client2-and-key.pem b/tls/tests/files/client2-and-key.pem
index bccff204..c77a0313 100644
--- a/tls/tests/files/client2-and-key.pem
+++ b/tls/tests/files/client2-and-key.pem
@@ -1,48 +1,48 @@
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQcwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA2MjMyMDE2MTVaFw00NjA2MTcyMDE2
-MTVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA3MzExODEzMTBaFw00NjA3MjUxODEz
+MTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJHfgdQQgDX9
-YQbrh64p1NSlS03pSmogec3aW+g/jR71e5aTJB0vlUCkbgzhrRG8ZfB2uuAv+l/o
-uUNWYV4k7Mz6b5IT23tRlbYA1CxGvF29xRsYSAfGBSo06u+jlJhMv4AhjRNo8pH/
-8DdveA2P2U6ugZk8Az88IxrJt/l5d7ae1sct3DtC4aCiiCQYCPvSTJoGB9i/BDlb
-qfEP9UCJ/oDlSl+PQ6LNS6cJO9q41aMJ2wdnazoHPxebyMMO7gsqFOsZjxgmrvRY
-o0kaEf274rrAVhJF22Kna8SYqRRUecxrpVPKlLCEqzEJblorrKdOOmR8rvfxPqXf
-oIg25IlIf+cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH88Nh7A3/sriAgQgrUw0
-fAb6WY9Oh76TeWFOFPpOGKeUNYNRW1tPSCuAK51yiBBx1V/kwzcuGLxPG1ATWPd/
-2IkXgwqHdddWT9ZP5BZUb07xCrMZLH2R8GFWsdQgkFFQ+VKFxg4AZGJTWVgm5zPC
-EGj7tlHebQuCbEsGcGx4FihEmTf9fuI1QXpPwuAOTzNSCGEFZrDSys7CsGUEzPtZ
-3v3RHj9L+DFUdoiuPjXD2SvPH+tQOXBCEIglkFjaLo8AONgLRMYROmCNHQwAdM3g
-AJC065fTtbTMZbMVwhghHg5FFz6WHfo54/gHLkyy6FbQZN3adgVHoqKDFQpGiNF0
-1A==
+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==
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client2-csr.pem b/tls/tests/files/client2-csr.pem
index 25e181a4..341c6174 100644
--- a/tls/tests/files/client2-csr.pem
+++ b/tls/tests/files/client2-csr.pem
@@ -2,16 +2,16 @@
MIICpzCCAY8CAQAwYjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
ARkWB0VYQU1QTEUxDzANBgNVBAMMBkNsaWVudDEhMB8GCSqGSIb3DQEJARYSY2xp
ZW50QGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-kd+B1BCANf1hBuuHrinU1KVLTelKaiB5zdpb6D+NHvV7lpMkHS+VQKRuDOGtEbxl
-8Ha64C/6X+i5Q1ZhXiTszPpvkhPbe1GVtgDULEa8Xb3FGxhIB8YFKjTq76OUmEy/
-gCGNE2jykf/wN294DY/ZTq6BmTwDPzwjGsm3+Xl3tp7Wxy3cO0LhoKKIJBgI+9JM
-mgYH2L8EOVup8Q/1QIn+gOVKX49Dos1Lpwk72rjVownbB2drOgc/F5vIww7uCyoU
-6xmPGCau9FijSRoR/bviusBWEkXbYqdrxJipFFR5zGulU8qUsISrMQluWiusp046
-ZHyu9/E+pd+giDbkiUh/5wIDAQABoAAwDQYJKoZIhvcNAQELBQADggEBACIWBoO5
-4muX0hMZMe6TpzCaWJa2+6O2E5j1VgZgQOJmYbMsu+eqa1EXXrPXq3m1nq2oGQFf
-vI8B9SnH4KKBk1yJj18qNIjQxrt3VTpIhRZPtrAZCy/L4o20qi+xvqw//cwMrR5k
-atUwo0/siYeXDyvYNsRB5kg/xevugSSwWneAOAOM3jAxKppWOKwNP2C+Q5J8wfWg
-z1eXB76maEuJK/Xnsi++75qWtsaHVPjDhyCk0XCXAXRKieY8nybtOXW42wM56ODL
-8LS3GWI877NjHahyR5Gg1FlCFkorUbDTCaWxJTVt/sXGuGccoBkPK5LJTrCaBi0b
-mwbfpxg7oMgrbk0=
+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=
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/client2-key.pem b/tls/tests/files/client2-key.pem
index 69481f5f..c48c3ba2 100644
--- a/tls/tests/files/client2-key.pem
+++ b/tls/tests/files/client2-key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAkd+B1BCANf1hBuuHrinU1KVLTelKaiB5zdpb6D+NHvV7lpMk
-HS+VQKRuDOGtEbxl8Ha64C/6X+i5Q1ZhXiTszPpvkhPbe1GVtgDULEa8Xb3FGxhI
-B8YFKjTq76OUmEy/gCGNE2jykf/wN294DY/ZTq6BmTwDPzwjGsm3+Xl3tp7Wxy3c
-O0LhoKKIJBgI+9JMmgYH2L8EOVup8Q/1QIn+gOVKX49Dos1Lpwk72rjVownbB2dr
-Ogc/F5vIww7uCyoU6xmPGCau9FijSRoR/bviusBWEkXbYqdrxJipFFR5zGulU8qU
-sISrMQluWiusp046ZHyu9/E+pd+giDbkiUh/5wIDAQABAoIBAAwgUGKYnI/gaFhy
-6+yGfbLPqtrnMdBwsq9yH4HHBqw0K/nwcWgbtISTJrLbb8+xoafDtvU8B8xBRGVc
-oOt6llTT3MJ/9BbkSVW/6+NiXfZM+D2wXwyGYZeInp8dMhUXDDRSla+vYbrRU97H
-3WsDMkVgLFXYr0xqa2CmtCyA9HqxyXfj66zkND8UxKDavxW7qwiAQv1ekQq/GkZd
-1ItJO3I+iUo3dPDb922Bkir7CT4DJlYfjtWEFJwPwtTRHZKpd5cltn4f8Yf97b4f
-zxWQOwQai5mv2rs9QYG8t/sLQifEurjhhildYbE9kALN5IlcI8oavCw65L70i/OC
-jwnUGcECgYEAwigZrHqe53BD/jRm7+IEETnBkL/pUBkUj8WfLvEPfdT2UXHgWmw1
-dc/j3x1S2MvSdbI8GF2Uzp8T4OOWrJ2VtUPgyRkJ80Y3xf/04gQZK5qYgMhch3E6
-HGUdOiTdvZeCFscm9PRxqDRksOxQHOFX31owLD+bE3CathlJILQ9310CgYEAwFZG
-BBueSPowgKZqzeUMOOy0s1rsVVVGfYfpTrdWGSGAqZMNTlH+EktB8oRj6N4nBuri
-KaXNT8JhnTnhZndmB6jaJy3MrcY2Ze3pjDLOq6T4GwKzXTIV38XQr5q66Gw5gqHd
-76teDTOQAXP4icsxgjfasEE26/eO1cFTJJzh3BMCgYBXGtp50QFdX7aBY00TLdkZ
-SUoYAKFRuA7LeaOy0Z9bmqFvZKF8r7NESaI3xNYYQUkIWJAxdjp+gEvQxwogIwq5
-Kdy9G6ilJcl74RsiEyifsVnd3QX2Fcw2VP7JySRaHJDWWz6VAt3C0s6huUMv0cE0
-iSe3kkmmbQxbyfhO3c4sWQKBgAj5fZbfewlIs06tdTpaP7HAScY8rd5ldj6RQu+r
-Wlcd2xUOiYZoCQTtggxA5TCOfR+zgg4TcHsSRN/DPaM8WwRsepFtb6mEIDGtYkJq
-dH5J2lHYVGo61g50+oHXJHWH5z8TMnnmcyMGjueic6xqUMsUtB2ZTWjBSmbq+Ggy
-8c8FAoGATjPRdAaVW56lJetBVP3NaB504ej5rw2BH0PURlD7pnxvbA//L+mZkkkd
-0CTRCYVesO2IfID4xBSQin/2XeCv7XpeDemsl3ewP1za3sQiFfYTE5nmhN6NvBhx
-2fZgK+6v0ElDZRPV2W+lwfbLqRoPduNhwe8sIICaj7jhdLphtuM=
+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
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client2.pem b/tls/tests/files/client2.pem
index 2c4a24a6..720bc188 100644
--- a/tls/tests/files/client2.pem
+++ b/tls/tests/files/client2.pem
@@ -1,21 +1,21 @@
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQcwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA2MjMyMDE2MTVaFw00NjA2MTcyMDE2
-MTVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA3MzExODEzMTBaFw00NjA3MjUxODEz
+MTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJHfgdQQgDX9
-YQbrh64p1NSlS03pSmogec3aW+g/jR71e5aTJB0vlUCkbgzhrRG8ZfB2uuAv+l/o
-uUNWYV4k7Mz6b5IT23tRlbYA1CxGvF29xRsYSAfGBSo06u+jlJhMv4AhjRNo8pH/
-8DdveA2P2U6ugZk8Az88IxrJt/l5d7ae1sct3DtC4aCiiCQYCPvSTJoGB9i/BDlb
-qfEP9UCJ/oDlSl+PQ6LNS6cJO9q41aMJ2wdnazoHPxebyMMO7gsqFOsZjxgmrvRY
-o0kaEf274rrAVhJF22Kna8SYqRRUecxrpVPKlLCEqzEJblorrKdOOmR8rvfxPqXf
-oIg25IlIf+cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAH88Nh7A3/sriAgQgrUw0
-fAb6WY9Oh76TeWFOFPpOGKeUNYNRW1tPSCuAK51yiBBx1V/kwzcuGLxPG1ATWPd/
-2IkXgwqHdddWT9ZP5BZUb07xCrMZLH2R8GFWsdQgkFFQ+VKFxg4AZGJTWVgm5zPC
-EGj7tlHebQuCbEsGcGx4FihEmTf9fuI1QXpPwuAOTzNSCGEFZrDSys7CsGUEzPtZ
-3v3RHj9L+DFUdoiuPjXD2SvPH+tQOXBCEIglkFjaLo8AONgLRMYROmCNHQwAdM3g
-AJC065fTtbTMZbMVwhghHg5FFz6WHfo54/gHLkyy6FbQZN3adgVHoqKDFQpGiNF0
-1A==
+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==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/intermediate-ca-csr.pem b/tls/tests/files/intermediate-ca-csr.pem
index ffb13161..2f8bd1da 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
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALY5OFxJqyqgUogBiy2MqYFv3Z4v
-y8pUsyAKqCTdb6gJfbHxt3mVh4mLvXV+IUxAqDj2v+0zoEPDXepU7/+MZ+I/ETpp
-2U2WfJDZBp3poTMoaunia7b5+yVsVEZaIh29WY17yeNvUbY8daR7eCDkB5KT3iQX
-0fGoilZISyKJHciDtRpo1xJJ+MoZnkRZW8NfPyWQ2/Nv1iPMHBG35CizRStdVOZI
-VGP5zcqqZSorcZG1k6k7jxoY0pd/MFqr69F5+oay+QrPRMe9U+5GK9OtyT/2Fphz
-C9KxwWXdg0XXewaoNqoDPqcWBN3PghR/uVBNG/FG4QqG/FaFvl6igZIB42kCAwEA
-AaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFBfCZdvlIAr/m62hYE+Wjvtb
-4C/kMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
-CwUAA4IBAQCZ4onlC/c69LY0JzdLFt6P2K3kTVbUPWrfm21RoCD+VC3EpMU1zbbu
-sxhYXzlQo43aG1y+gUFACc/1fVGo8n3/N5lGJ2mOcX6SY/UbmMFuTfoo379SwKRR
-Q5hHtThamKD6BxT7ON7wRAHyX7iHckjNHLkZr1Z4MYYY6dlZ75MbbFibQcwUY8BP
-RZnB9dYpGswm3ZoYahtjNJQq8ZURFFLDvTzOpJs3q9w3t0OAZCaBIm1yhaFMfGcf
-QVjLHTAp62+ZCtOEKYR6WXAk3hQWisIt9ENIKOgoYpjwjl917cvpzw6oG+DNre0i
-j9rzDx04mKQhF/ur7tEl1cNFe2ZWqG1A
+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
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/intermediate-ca-key.pem b/tls/tests/files/intermediate-ca-key.pem
index 2f1fcb2f..e72c90c2 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 8caddfb9..deb1b892 100644
--- a/tls/tests/files/intermediate-ca.pem
+++ b/tls/tests/files/intermediate-ca.pem
@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE-----
-MIIFAjCCA+qgAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIIFAjCCA+qgAwIBAgIBCDANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDYyMzIwMTYxNloXDTQ2MDYx
-NzIwMTYxNlowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
+NTE4MTMxMFowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALY5OFxJqyqgUogBiy2MqYFv3Z4vy8pU
-syAKqCTdb6gJfbHxt3mVh4mLvXV+IUxAqDj2v+0zoEPDXepU7/+MZ+I/ETpp2U2W
-fJDZBp3poTMoaunia7b5+yVsVEZaIh29WY17yeNvUbY8daR7eCDkB5KT3iQX0fGo
-ilZISyKJHciDtRpo1xJJ+MoZnkRZW8NfPyWQ2/Nv1iPMHBG35CizRStdVOZIVGP5
-zcqqZSorcZG1k6k7jxoY0pd/MFqr69F5+oay+QrPRMe9U+5GK9OtyT/2FphzC9Kx
-wWXdg0XXewaoNqoDPqcWBN3PghR/uVBNG/FG4QqG/FaFvl6igZIB42kCAwEAAaOC
-AVAwggFMMB0GA1UdDgQWBBQXwmXb5SAK/5utoWBPlo77W+Av5DCBxgYDVR0jBIG+
-MIG7gBQldL0J5/KLcVa6ixbx//cNq2oo3qGBjKSBiTCBhjETMBEGCgmSJomT8ixk
+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
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQ2s6OXj82ZwGEmP/x0jQhjVrfcQTAP
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghRAv/LeeyuLayibwnn8P4ebyWMzBzAP
BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAmBgNVHREEHzAdgRtpbnRl
cm1lZGlhdGUtY2FAZXhhbXBsZS5jb20wGQYDVR0SBBIwEIEOY2FAZXhhbXBsZS5j
-b20wDQYJKoZIhvcNAQELBQADggEBAF6HrnyG1z3U5XLiX8u9zzrX81mcSyrHWotm
-vaAEyi0D3EpyuXcxLEMmsriJROshPIb7Xg8jvf/heX96rgXOQ9AyTR0vGKiXeiax
-F8tpsFXRhKISlHFj6ejbUezx0Q5eXynfcqWob/mtMO/KRfueBjlvCcrgkOJRddY8
-827NOO4ileYp270GgLbEE78eUzf/XhqCyV+krrlz/kvJCAbDBP/ugjxFbZGtY/ti
-7zOpSV7B/zaUtpyVbVHClBMC7+XpqGYgwL0QPhoaSOOPv4NMQrpQTvciZM4UU155
-/BN62aYhtIdGtO7dJzoTrtsVssyvPN007cdO3muHL0uLe7DdkVA=
+b20wDQYJKoZIhvcNAQELBQADggEBAJArQW4HGrmrCNYdA3C6LwwqhuzJzwR87HPg
+jmK+1f/E4qPlaT8PhgoxmU2bOCoI/eNHPSfXk5sOl8k6HUZyF/hRdFBUgUtUEO81
+udRrFXRwUeRY30p8BXm8sbxNGk9FMCO/czdS2MD6T7fdLI8Z6g9hz+eOOyEHVy6D
+Z/LkUgIMQwVibdMuNs2fxgpmReZgraqQOeHAyCCo0SkZXGkN2rHV3kYJkuc522kq
+K11ldkrxKhHU77ebxrHvgYtv0D90rspFEcY16/0iYAFdthZX1gJOgpMivD7lXykX
+IHU1jn7fIdjT+uaoB+5ScQKYrlngZcaij16rX0nj7GMwrls/Awc=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/non-ca.pem b/tls/tests/files/non-ca.pem
index e2d3b33f..4a0f253f 100644
--- a/tls/tests/files/non-ca.pem
+++ b/tls/tests/files/non-ca.pem
@@ -1,74 +1,74 @@
client.pem:
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA2MjMyMDE2MTVaFw00NjA2MTcyMDE2
-MTVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0yMTA3MzExODEzMTBaFw00NjA3MjUxODEz
+MTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfxzQKwthl+
-nS2FR6C07d/WHpMBgM0INwlfP1X6lwrIWRDfSqLikgOfJaVHXiSOqljl95VZSh7f
-LyStULZJh37uUmdmf/RBShjMJ4Gby/TmaK/gmRTrAo1YjW9ZDH7FJa//Ea8CPURg
-4uQt3bW6nf/U1kDPIhGSQHM+6Yi+vQS9F9TOeduJcL9v+aqlRJ/rFDLaS2TmvhkK
-CDoXTzTBlVNed4wv68EnHS1BRmEDJ2PNWhoTXt0vzBxkaiaa4e7ZD1SJqGgE3dIV
-ktIRTvOg8WAr9Y7gfQzPOlb5jMIVuVzv4zuhew2LUNpv0MUR0qLpj6gk4rv7vqdf
-irx8whj7xz0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEALjdAUd1Kz9aZbcBJhcu+
-M/WmfAenaHObivjNWNtezYXmk0kBXbfnf2bvrb5FT1mPF2bQ0P/yC2DiTCRguDKE
-aAPV95yVvk0SkMkXSdKIPoc3mv9v+0mRoQAtcYoRenyj6hZgPNub1DjxQJW0LLcO
-tSqe7Y4UYJNa7Q5zsWfz0oWeQdE2ctEWOKCUJhIzhSsZy+zvDDH9t15a5cVBE6+e
-PhTboNFByl+URVPjgdP/FlhE2IWtrZ/t8ZwSZ7KPTcnzh3gMWRZDXms8g+IG9ubF
-u7KPjRwL1yBtdqgIKhv/IBTbDyWC/U4VglLAQ93cHLIoOPXfptNtNnQLVmsaZzeL
-MQ==
+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==
-----END CERTIFICATE-----
client-future.pem:
notBefore=Jul 17 23:00:00 2060 GMT
notAfter=Jul 17 23:00:00 2061 GMT
-----BEGIN CERTIFICATE-----
-MIIDYTCCAkkCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDYTCCAkkCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzIzMDAwMFoYDzIwNjEwNzE3
MjMwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH8c0C
-sLYZfp0thUegtO3f1h6TAYDNCDcJXz9V+pcKyFkQ30qi4pIDnyWlR14kjqpY5feV
-WUoe3y8krVC2SYd+7lJnZn/0QUoYzCeBm8v05miv4JkU6wKNWI1vWQx+xSWv/xGv
-Aj1EYOLkLd21up3/1NZAzyIRkkBzPumIvr0EvRfUznnbiXC/b/mqpUSf6xQy2ktk
-5r4ZCgg6F080wZVTXneML+vBJx0tQUZhAydjzVoaE17dL8wcZGommuHu2Q9Uiaho
-BN3SFZLSEU7zoPFgK/WO4H0MzzpW+YzCFblc7+M7oXsNi1Dab9DFEdKi6Y+oJOK7
-+76nX4q8fMIY+8c9AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHi091Bd7K41SLdT
-0D+aFJztRwA8EOLuhIqyx6DMAoT50xMSovR9aSob2A/jA+TslmWpIz4/gJxmDLbW
-wQuRs1tRcwpq6wedJqlhYyNyQnBE6v9Yc+tM+DsulsdC3R80AuudIVi3wACiRCqI
-BTtPYzUj56YV4YqIo+CTRBhpxcB2C2GtQMHX44q5o3Od7l/sV5f/dIR7LKCKTHnT
-lvAVEKgBIuHNJljTpiqI6oK7X5F9RFGIA0/0drfrrrI9s7v9sxQZ+lXetgY6oI18
-nBI/4XlgNtf+YNtat2Oruih35F7CDvoUdTACdUptPAJFB00Yy1IUY9/xi8T13+O6
-W6Hsy1A=
+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=
-----END CERTIFICATE-----
client-past.pem:
notBefore=Jul 17 23:00:00 2000 GMT
notAfter=Jul 17 23:00:00 2001 GMT
-----BEGIN CERTIFICATE-----
-MIIDXTCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIDXTCCAkUCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcyMzAwMDBaFw0wMTA3MTcyMzAw
MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfxzQKwthl+
-nS2FR6C07d/WHpMBgM0INwlfP1X6lwrIWRDfSqLikgOfJaVHXiSOqljl95VZSh7f
-LyStULZJh37uUmdmf/RBShjMJ4Gby/TmaK/gmRTrAo1YjW9ZDH7FJa//Ea8CPURg
-4uQt3bW6nf/U1kDPIhGSQHM+6Yi+vQS9F9TOeduJcL9v+aqlRJ/rFDLaS2TmvhkK
-CDoXTzTBlVNed4wv68EnHS1BRmEDJ2PNWhoTXt0vzBxkaiaa4e7ZD1SJqGgE3dIV
-ktIRTvOg8WAr9Y7gfQzPOlb5jMIVuVzv4zuhew2LUNpv0MUR0qLpj6gk4rv7vqdf
-irx8whj7xz0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEALL01K6kftU/U7vt9Nf/G
-UsnSi8A8IupTS+dfm3Fa75sQC3AUP4Zs+UQMf0dfKvnVMyT6dVAYQRQ91Pklhp4b
-wnIV0U2a+RuhnxvsrBgYT52LD5ZjC2+MsW7Rd2LZsipLSS28Era6OD2RgOHuSgZP
-hTKNxAGBSQs+M9Oe9Z06sqBiO3sRP10r+vNkPfy5ZEl6X1HtBtzhAxFcDHm4otSE
-ypmuMhMXxQlDOAPdNlCEkYxJYtLcY2buxYz6PAIPU2+k8R1jujXBWIzzoS0MnE1l
-c1UtQwk9lY7FHv5Y7M5r62GVVJbIiqH9FlePXpEKmCBVYCh2b5rJ6x0BHxCCeyta
-6A==
+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==
-----END CERTIFICATE-----
server.pem:
@@ -76,42 +76,42 @@ server.pem:
MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDYyMzIwMTYxNVoXDTQ2MDYx
-NzIwMTYxNVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
+NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMPZbX+Z0KiSwdnp5t2KXMK7Gv9TbkVdsuE4
-C1qfBKDzuEVeqFd5KO5QoCu7txSBxq8Rhrc1sHH4PfVMwXubFCzRaPAn4xb0ncVl
-IvwKB7+jvPxzKqlK6q1Q7Gxc7eG/oUOnEfaZJhpYluTSRd8lk251SMkngY3jfqsf
-avzxbgOAZRvINtg+mnTtj8mE5siG1iNiRemqtjNYP4XIjRdrhMW9C0Qp9axaXGgX
-SljAHqE2AQXmRxypW+Ok2TdrSxQBEK8fnUngj2JONQM6jvZKRwodrqpSvH5RfOrw
-xHu2yUrKgnqOWsAdAPf10rSRmgr0eWVenniv34BQGDPxIgP72vkCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
+Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
+DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
+2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
+tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
+/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEOMZcqWdZw+
-DjI8kcdXoOXS3YlGboq+ulu2qzQic6EzR4tgFe/aEFSsV2K1rGxbl/bhvAd22/lR
-0LmrvgQgEdgtpQQGT/n0QmbXzahKksPxLKt0Bpi1H2a1BO+9gywVIGXpKxKm9XAH
-zhBb3de31311XlQRC5p665TFoc6Aguq5QVlki+LXAW4Kdi1L2r8CDdYneK/yg7qW
-0/I4WhT4Sl0JMHvHiIkEUKD61BIoLF8u0jBgzr9og2acmIacBICy5pOfmiR4lcQf
-mJ3NlbLXwZ96nfQKuStTgAFmONgU1ElQ5tlsF+tIjDCwPOrc1q5U1q0iFkz9hHV1
-ZYegUzlFqbo=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEjEBhx+ib3+
+u7O2OYD6z6pVLLTiQpXjESRfFF8sf/epSmmNtE/PpiUhWAXG2dOinup/40rjimAF
+j/8okMGvtTHst16vcV+LYu8AthBq4F41WVlC8/aLmIbkofbBulEUlD02HEBNszHJ
+rCkFBupwDTnbKStdLRPtjchuGLDobePDF7NEBDT4rWxoaQH7ZM3LOHnWoDjgF4ar
+3J6w2YpTl4vFf/e31Ikc+ctVy7tU1/X/II58fbxKqWjtKL67VESRBpHhCGNRlXfF
+ejxfiyHBKPzZbh6jqmyI4GqfotBq/vvbpt2XocKFHB6UDvW7M+oCrEgf/gL1uMLy
+/vq3kChJRdM=
-----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 2362c785..e3fdec1a 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 5980d043..49eafe53 100644
--- a/tls/tests/files/old-ca.pem
+++ b/tls/tests/files/old-ca.pem
@@ -1,30 +1,30 @@
-----BEGIN CERTIFICATE-----
-MIIFLjCCBBagAwIBAgIUAT/Zj4jAA7sB3BGbnpmsaV1nSwkwDQYJKoZIhvcNAQEL
+MIIFLjCCBBagAwIBAgIUGx5sD75kSqNKhP/0OQ7QuzKrM70wDQYJKoZIhvcNAQEL
BQAwgZ8xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
UExFMSwwKgYDVQQLDCNPbGQgVW50cnVzdGVkIENlcnRpZmljYXRlIEF1dGhvcml0
eTEiMCAGA1UEAwwZb25jZS53YXMuYS5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3
-DQEJARYOY2FAZXhhbXBsZS5jb20wIBcNMjEwNjIzMjAxNjE1WhgPMjA1MTA2MTYy
-MDE2MTVaMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
+DQEJARYOY2FAZXhhbXBsZS5jb20wIBcNMjEwNzMxMTgxMzEwWhgPMjA1MTA3MjQx
+ODEzMTBaMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
RVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZpY2F0ZSBBdXRo
b3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5jb20xHTAbBgkq
hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA1zBOnsRyQg9OvkIYeiRfak7yJDI+84QSu81mgFl32vjzfwj1Dio7
-4/G7cM3KPkAAamjlE9PrZMWaukJrFUBGtKoY/MlA607ORWOqop9kWjYjQJRLiU6r
-m1eQ8Kgb8Aymmmij810u9MmSB+RbM6IrWYnuWu8iO+hWJXoGMZRD29IF/YEproHI
-C1Kx0RGvc+ITF6PWSHnMrKs6vgLnFQ+nNEy9DP3xHy1hmEyEKk5UEvDiL5b/FBFD
-pFqrkoNPljUeNoujBg0xrfyBRGbGJjZaix6KA7o18RrlRNlmpCXtnX8yW5Jj0wJa
-SxjMzEigzF4wcrSq4IuhsCZrLFn6WwTdRQIDAQABo4IBXDCCAVgwHQYDVR0OBBYE
-FHBZ8ri9X9S2j543Ck1tIQu9pyPdMIHfBgNVHSMEgdcwgdSAFHBZ8ri9X9S2j543
-Ck1tIQu9pyPdoYGlpIGiMIGfMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZIm
+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
iZPyLGQBGRYHRVhBTVBMRTEsMCoGA1UECwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZp
Y2F0ZSBBdXRob3JpdHkxIjAgBgNVBAMMGW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5j
-b20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQBP9mPiMADuwHcEZue
-maxpXWdLCTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREE
+b20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tghQbHmwPvmRKo0qE//Q5
+DtC7MqszvTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREE
EjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTAN
-BgkqhkiG9w0BAQsFAAOCAQEAfPYTCU0/pcPGbz2dWZNBduK41o1rGrQLxQFenq11
-HT/s9udS8cCOZyB1XryUtP2eP3Lj3LDuNVXjaEr8pvD258XUnh0Tus9oGaW9t33A
-eWrLQyM1FhZ3A+gqG1hQttLAbXGKwK4eGIO9QKqwuDkJZ9sW9qQWACHKT+ulALfp
-l39oBGIOSTVRPxLWZw6NyYNlhEpqm/aBAlusj/DtXxCz1X7eNF5gjdLsWYpGzM/q
-0bsjGglWAfjWOTu9lzj9//9jx+CTREk66bIPFU5Bc2tITqdBihwKFckn77e84FqF
-wRLqkcjuzS3qOQ5LRk/v5Yvvdc8DsdK8UpLR87KOeF601Q==
+BgkqhkiG9w0BAQsFAAOCAQEAEgsx0U8ZVbj2+Y6aYEyTeKocfUfdtz3TtK7fRbPr
+8NlBD75y4f0MuIBYfXa/GvxZaCVruPEQdOtqH35PhPTED9rCoVFKXCEY/yQvDas9
+bGk5Fu5Sjjp0qJhnnlUYNNpGkw4VoGf9e/jtNlaXnr/7qz4GGVN3n9rp8GLrIsjY
+O8wXC1aikT+/UK1AofAUtlK/9ejdBvXCFCoSLEK/fnWzXP5G0cGFP0Ai+ezwvHTW
+QaSaPiLKNC4+DE677zujQkbdXSiRHCt6o6SD2N0fPFmnF3bwHdva3EER3JGirZhX
+d3xmaHSx/LoybaEk1/f8G7t116WvOXpDSz4vgISIt2HPag==
-----END CERTIFICATE-----
diff --git a/tls/tests/files/root-ca-csr.pem b/tls/tests/files/root-ca-csr.pem
index 0f2833dd..4f558906 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 5a724e45..428ca553 100644
--- a/tls/tests/files/server-and-key.pem
+++ b/tls/tests/files/server-and-key.pem
@@ -2,48 +2,48 @@
MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDYyMzIwMTYxNVoXDTQ2MDYx
-NzIwMTYxNVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
+NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMPZbX+Z0KiSwdnp5t2KXMK7Gv9TbkVdsuE4
-C1qfBKDzuEVeqFd5KO5QoCu7txSBxq8Rhrc1sHH4PfVMwXubFCzRaPAn4xb0ncVl
-IvwKB7+jvPxzKqlK6q1Q7Gxc7eG/oUOnEfaZJhpYluTSRd8lk251SMkngY3jfqsf
-avzxbgOAZRvINtg+mnTtj8mE5siG1iNiRemqtjNYP4XIjRdrhMW9C0Qp9axaXGgX
-SljAHqE2AQXmRxypW+Ok2TdrSxQBEK8fnUngj2JONQM6jvZKRwodrqpSvH5RfOrw
-xHu2yUrKgnqOWsAdAPf10rSRmgr0eWVenniv34BQGDPxIgP72vkCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
+Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
+DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
+2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
+tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
+/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEOMZcqWdZw+
-DjI8kcdXoOXS3YlGboq+ulu2qzQic6EzR4tgFe/aEFSsV2K1rGxbl/bhvAd22/lR
-0LmrvgQgEdgtpQQGT/n0QmbXzahKksPxLKt0Bpi1H2a1BO+9gywVIGXpKxKm9XAH
-zhBb3de31311XlQRC5p665TFoc6Aguq5QVlki+LXAW4Kdi1L2r8CDdYneK/yg7qW
-0/I4WhT4Sl0JMHvHiIkEUKD61BIoLF8u0jBgzr9og2acmIacBICy5pOfmiR4lcQf
-mJ3NlbLXwZ96nfQKuStTgAFmONgU1ElQ5tlsF+tIjDCwPOrc1q5U1q0iFkz9hHV1
-ZYegUzlFqbo=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEjEBhx+ib3+
+u7O2OYD6z6pVLLTiQpXjESRfFF8sf/epSmmNtE/PpiUhWAXG2dOinup/40rjimAF
+j/8okMGvtTHst16vcV+LYu8AthBq4F41WVlC8/aLmIbkofbBulEUlD02HEBNszHJ
+rCkFBupwDTnbKStdLRPtjchuGLDobePDF7NEBDT4rWxoaQH7ZM3LOHnWoDjgF4ar
+3J6w2YpTl4vFf/e31Ikc+ctVy7tU1/X/II58fbxKqWjtKL67VESRBpHhCGNRlXfF
+ejxfiyHBKPzZbh6jqmyI4GqfotBq/vvbpt2XocKFHB6UDvW7M+oCrEgf/gL1uMLy
+/vq3kChJRdM=
-----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 6af87ea9..193dfff3 100644
--- a/tls/tests/files/server-csr.pem
+++ b/tls/tests/files/server-csr.pem
@@ -1,17 +1,17 @@
-----BEGIN CERTIFICATE REQUEST-----
MIICwTCCAakCAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
ARkWB0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMPZbX+Z0KiSwdnp5t2KXMK7Gv9TbkVd
-suE4C1qfBKDzuEVeqFd5KO5QoCu7txSBxq8Rhrc1sHH4PfVMwXubFCzRaPAn4xb0
-ncVlIvwKB7+jvPxzKqlK6q1Q7Gxc7eG/oUOnEfaZJhpYluTSRd8lk251SMkngY3j
-fqsfavzxbgOAZRvINtg+mnTtj8mE5siG1iNiRemqtjNYP4XIjRdrhMW9C0Qp9axa
-XGgXSljAHqE2AQXmRxypW+Ok2TdrSxQBEK8fnUngj2JONQM6jvZKRwodrqpSvH5R
-fOrwxHu2yUrKgnqOWsAdAPf10rSRmgr0eWVenniv34BQGDPxIgP72vkCAwEAAaAx
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OY
+gYIbEit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7
+vUZRDC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEY
+O5Vx2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6m
+qhbWtbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L5
+3Igw/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaAx
MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
-ATANBgkqhkiG9w0BAQsFAAOCAQEArWOneHWE80agGbu8Dof4Zj7gh83t6T+9C6rp
-KJkNyTFU0avZo7iSiYy2lh2KezXVWAK8ScBkdVVXMOt3vT/KIph1WHtZCZ1MBt2z
-q7RJRcudD+GyaaWA39uawfchfixRijxrBPSSS23yXcw+yMqlVudgrg0OvX7JAIkz
-z4XJa55xEYUvYoX05EQkr5URc76xWO0zYir+UXzLGH9FWpfj/5ewPO0PjoRGkOWB
-c+ZZlQAWdvJmHLBF18IdeSv4sPHCaUV+ELcKyDx5iE8D3OrcJ7R6rjVvTCdRvLY/
-hhKjAdWjXg4qXDj13XaRpT13UIqE2eeStVXnUfQorVvS8Kicjw==
+ATANBgkqhkiG9w0BAQsFAAOCAQEAadheCKyi4LjlDjgFf6TM0urbVbsXfsPkFM3R
+G1p+eOWtjFMZLeNdKOdRHwmYPMiMcshmf0Yw7cEVQxZBj4P0wBveKcvPVdonk2Bh
+Z5aST4LnMfLbsvxntb8DE/wrrFNWnJ1G9+ZD44xJ8TZYMV1vPsjYL6mk7iMJnm1r
+8kwy/RP1m5MSUhcxU1yiPQ2ed7bAbHCw28CwQRuAYazsD5v5fjfWVQfW9CfnEV3R
+T30kEiG1IWAeu7KasxEjcujQ+oGVm7ANhTeJmgkd47DlUt9oNvcUF1wJauJ/EA3z
+BwaXqWtsQ27kSGM8xlLlz7e0DQi5t29YlemiOF8qIjpzAgrbqQ==
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-intermediate-csr.pem b/tls/tests/files/server-intermediate-csr.pem
index 4ab8f0ed..9cfcaabc 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
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAON5fzcX7h1+XmmMFjpbUiJdqIXworEf
-6ToQru0zxoKxfVzjmo6O02jSkIduKZgycUgT5KDHlQx3OrKd2KnFe47NqIsSlzap
-Qto9+VbbUFXFv31a+qZlQr1AO5z8UtoPBCXamRoraV0PzlilGp9/TETVgUya2Gsz
-0C+1F8iJAaha7DEgFSnapuRvEstd6iOPh8q2gdAigoGryENr61YL5ke13HU9hU3v
-wdsUnt7ZuNlKFBjS1NneXYtkQpeDgrV0ee3yauS9p0PWKUuN+ExWlUsgCG92mDZ0
-HqBOEamfu+akxZV6/zKGZrd6V4HgeFfBm5LfxtaogVqYsQG5KB1RDmsCAwEAAaAx
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdl434MfWmQOdgVOK52liMyCIrv8pDd
+rFTIwhk3aj59dpB/Rx8C7FbOHA8tyIBWpKaNNNT3S/y4buWHcJywr+3oqy31+KFf
+/hKnDDgR86j822PKazfwcjrR05GBfKN3oKo6HEtsJ9jiicGFVp5gZkr18OsSbJiV
+uWbjEhOgUe4etHU+oWwnvKfpwwc3R9mDkqEtP+58lrGXmvUmVICfDW8Hymm4SXGM
+H05p02+an6rqciFk0GNMbeUeYK8fyVprqZIO8aTRAr6+Lb5PpBm6BTKI3KVGpRse
+vCJTVH867phwp7QjImbsEpxbUo9sJsIHshhNsLwi0bl7w4QhFrGlKO0CAwEAAaAx
MC8GCSqGSIb3DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcD
-ATANBgkqhkiG9w0BAQsFAAOCAQEAPU29YEyZdXn2RsIwAnsDsbXblMsmLmVXVeKD
-BsgSTJQ4d+Aq6qLsZ4xfQWa8Hngb1zOPeOV/0gx5zrO0YXr2QmIdP27K0RWK1iWz
-RdQIFcXcFW/sn8kVHsWiPNVYKi9fNhj7INi5YK6RTIsa3Ej2jTuRwWsNpDcfn8L/
-XLa+k5hFrG0dnO16hOwOs9fURNxjgKF64runye/CYcSwak38Uz10e38AG9MoEksw
-L9JCAD7IrRJk5BtN+RTPZYXc/RSyUHDZzJZecD8t2rsdvdQ3twGX+cXq0U3siglr
-SUz9T3W8ZTvoxP5Vvud4WeRwZSw3OemvBoH6xlgOdWobEs9w6A==
+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==
-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-intermediate-key.pem b/tls/tests/files/server-intermediate-key.pem
index 44d4806d..cb4bfa7e 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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
+MIIEowIBAAKCAQEAp2Xjfgx9aZA52BU4rnaWIzIIiu/ykN2sVMjCGTdqPn12kH9H
+HwLsVs4cDy3IgFakpo001PdL/Lhu5YdwnLCv7eirLfX4oV/+EqcMOBHzqPzbY8pr
+N/ByOtHTkYF8o3egqjocS2wn2OKJwYVWnmBmSvXw6xJsmJW5ZuMSE6BR7h60dT6h
+bCe8p+nDBzdH2YOSoS0/7nyWsZea9SZUgJ8NbwfKabhJcYwfTmnTb5qfqupyIWTQ
+Y0xt5R5grx/JWmupkg7xpNECvr4tvk+kGboFMojcpUalGx68IlNUfzrumHCntCMi
+ZuwSnFtSj2wmwgeyGE2wvCLRuXvDhCEWsaUo7QIDAQABAoIBAG+OlDPdaPqfthzN
+z69csiOUZWMKE1H9mKoL/GZHqtMoU4pqd+Av14bl5ocrELKOiz2/XtUKVSZ/VtA6
+GY8ipKvc4a9Ie8A3s5+Emb0IIaSdliuDqz5lTArs6JzQeVqLD5RCE7cjxc5g8kL4
+dEgpoCIWks5lwd9R8HOjodlYfyE7Wx6kTXn2T4CEZHIEcNQuIgDYJn79sRqcsDdC
+Bn3q1TMIM972pUzYN/pjfwxW8fkBPFRn5KAocb0qitWKWUFWz9AMjC+WUIq4oYJi
+PFjKEOlTEcYzO7a070obdMV8LrPr3M2IF6vz6KCbJKtrE9QNKET0JwefQWnpk7p0
+xWp4gwECgYEA1iKiLlDlSSpAriK+FmgKx9Bmmt9wbHatPbvh4BMS8yeP+wFUx+is
+7r2YLMJb3E90e9SlRNLS5p3Cfjhy3iX7Bgrbp3tQQBbzwTHZu/cHhEhefKs08HeC
+NNNWN0v7aT3OvrhcD1sAB3vrsPYHGKfsxcw3B0V330KPxH+NWb6oQsECgYEAyCAT
+rV+2DegYAqGuu5a4xOnEtV7VNQrzxdhztKQHHeWAtt7jG9pNYvKIaMxPn+/Iw+Yo
+yy283B07GHQB5k/1kICppiy/TrQXy04jEW9zbhLZo2rbDEA+by015Rgvmxx5Wyyr
+OC9DasbxwqGVr7I+6R6hWzhSy9GfVgUDh2c1rS0CgYEAsAE5go41V6TmEvs1eJ89
+tSzDGSrscgo9rM9AAfhLjBaJjotyjvndIkIt0SRTcsrP+HQ4/0+1z5393dcx+wwG
+vtmv34JI3NTAt5vs1kVeJUmCeEAUvE3OdPL8G2lVlRQbWcGY0Xo/lOczO3mNLaPg
+xldrJ4ve0mAYYS9iFFDUZkECgYBNGEZcUPXSb6noQZ8Ntyeg/CmCcXETSQ/WFOem
+HFZ9hu9KA51cGoIbbzFrpeG6zGX8SctHUmxiI4Sji/U7Y2xHablxQeXFDQ3pjUVn
+Lxc5vVtIYB7Ynlsu+yy6/9E/IP4DSLcBIvwGw3NZNmRy1ej0Z49jk9QZnrySJ8ZP
+QExmVQKBgD05Nsx03op6d/jXmIjN0eqXiqf8lQoSj9eXm5l2AnEPS4KpKjxDv3p8
+dMpdS6+g3zMZIsc+YAY0E73uBGh2QN8J9l3QmkdwGQwWXxv6SDWv8/baDlO26ePw
+GCJ97wisAxavkK3VHd1oaui4K/rjNstrpyC3uixzg952dVECTSN1
-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-intermediate.pem b/tls/tests/files/server-intermediate.pem
index c498bed5..d98ddc95 100644
--- a/tls/tests/files/server-intermediate.pem
+++ b/tls/tests/files/server-intermediate.pem
@@ -3,20 +3,20 @@ MIIDuzCCAqOgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTIxMDYyMzIwMTYxNloXDTQ2MDYxNzIwMTYxNlow
+LWNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcyNTE4MTMxMFow
SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAON5fzcX7h1+XmmMFjpbUiJdqIXworEf6ToQru0zxoKxfVzj
-mo6O02jSkIduKZgycUgT5KDHlQx3OrKd2KnFe47NqIsSlzapQto9+VbbUFXFv31a
-+qZlQr1AO5z8UtoPBCXamRoraV0PzlilGp9/TETVgUya2Gsz0C+1F8iJAaha7DEg
-FSnapuRvEstd6iOPh8q2gdAigoGryENr61YL5ke13HU9hU3vwdsUnt7ZuNlKFBjS
-1NneXYtkQpeDgrV0ee3yauS9p0PWKUuN+ExWlUsgCG92mDZ0HqBOEamfu+akxZV6
-/zKGZrd6V4HgeFfBm5LfxtaogVqYsQG5KB1RDmsCAwEAAaNHMEUwCQYDVR0TBAIw
+ggEPADCCAQoCggEBAKdl434MfWmQOdgVOK52liMyCIrv8pDdrFTIwhk3aj59dpB/
+Rx8C7FbOHA8tyIBWpKaNNNT3S/y4buWHcJywr+3oqy31+KFf/hKnDDgR86j822PK
+azfwcjrR05GBfKN3oKo6HEtsJ9jiicGFVp5gZkr18OsSbJiVuWbjEhOgUe4etHU+
+oWwnvKfpwwc3R9mDkqEtP+58lrGXmvUmVICfDW8Hymm4SXGMH05p02+an6rqciFk
+0GNMbeUeYK8fyVprqZIO8aTRAr6+Lb5PpBm6BTKI3KVGpRsevCJTVH867phwp7Qj
+ImbsEpxbUo9sJsIHshhNsLwi0bl7w4QhFrGlKO0CAwEAAaNHMEUwCQYDVR0TBAIw
ADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEWghJzZXJ2ZXIu
-ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAIX8YaD7oV+ULhX4yrXRjZwz
-Rn1IiktJVxdCo3s8wx3LVHtyywWud4N5H0FtAbM3LMBWp9A4k+NUvVTVdPgfLkzS
-jYRn6hHBafSbp0tevXFBer1QH1m1K72B7RDUfP7L8tGz94zY6j/9adSj9pygr4qC
-V5BO/6Qh7gG1UTaAXsFWHntY0UWAc92r8Th3MhpKwOFeNGwNYb/N+BlgtfvMKRgT
-/v8FYyIWqB/DNymhyVQg3GgeDEeDWxX4qgeZoNSZu9fVHLUfPh143njBqd1BG0AE
-Sinzts1+adYA2qFua6ZaWizf6UlJjDdhk89sCUhlsRjJbTMfaLnwT60aoFSESNM=
+ZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAH44AdGFIuKyXGruD3XnuNZF
+eGOxLd3epXbWBsuY5tfol7ACO/hV6301VIrCHDGf4uovfyasLhu26kI6gCNZkROf
+NzODOhNOdNy6rSDApFn3TVIgEsmQ9Zm1MHfXc7Xz18L/1Cb1mjmXGRa+fMetNwSD
+jQLgxIKbA1LN4QPGQ9FnGeq/1KvXNHykAbV7dA8uRCkZnkgmXKVH5bjMZIi51Uo1
+Ls49sFAsrxL49rz4yvTVZe/13Gu7KCIVl1echy0nDk6J4C2qLrS5+WV/vyGdV6nk
+WZm6baVMEaGu/ygmJ8H6rUmrZy/rdIFv4yyQgOME8K6ZDW0/lYFqozDMxB5NucY=
-----END CERTIFICATE-----
diff --git a/tls/tests/files/server-key-pkcs8.der b/tls/tests/files/server-key-pkcs8.der
index f7f46958..b901ee38 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 cddeb1ff..c73ac7ff 100644
--- a/tls/tests/files/server-key-pkcs8.pem
+++ b/tls/tests/files/server-key-pkcs8.pem
@@ -1,28 +1,28 @@
-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDD2W1/mdCoksHZ
-6ebdilzCuxr/U25FXbLhOAtanwSg87hFXqhXeSjuUKAru7cUgcavEYa3NbBx+D31
-TMF7mxQs0WjwJ+MW9J3FZSL8Cge/o7z8cyqpSuqtUOxsXO3hv6FDpxH2mSYaWJbk
-0kXfJZNudUjJJ4GN436rH2r88W4DgGUbyDbYPpp07Y/JhObIhtYjYkXpqrYzWD+F
-yI0Xa4TFvQtEKfWsWlxoF0pYwB6hNgEF5kccqVvjpNk3a0sUARCvH51J4I9iTjUD
-Oo72SkcKHa6qUrx+UXzq8MR7tslKyoJ6jlrAHQD39dK0kZoK9HllXp54r9+AUBgz
-8SID+9r5AgMBAAECggEBAK/pLroK/Wk8kFPcDNp2ecUK7D/jv0sc0xwKC+C0riKn
-Zp8gW5JeKE6OKp+9dr87par/0gHjfn2P3I7lB3CvpVpwKZJ0MTwgMUnpAphhpf4S
-4x/ZjbsLqGhOJF1cxuobBo1OlgrqGlhVtAsJd2rsRFVVkS/khTBd4xtvF9jkPc1z
-w6V7khpscvSLl8iPYmkb9Sq3VjW6rfa+O85TlVOa7AOpe4mfLX85FpEDUd3dvJze
-nCtLnle2B7OjEE7ST0qGZ2wzkOTfILi4ihB0PeHdKy8FBUamm1VyGvp1hlbMAu4Y
-Beq2drYOYGT9DGqwqIxZUqKL63P7SkIe6Z+p4NEtAZECgYEA/Nqm9hXtNh5x9A4v
-vmT7rzNQmmH1VruOG6DAeKmxzJb0Z2jD4p/dFuqw1otRnozcgjWSTK0sVhs08I5i
-Ex7EyPMGCPcdzns8ATEb+W1WikOdJ9QADcbs18ux0iyngyFXh6yUNvKCy2A/WHvF
-37Gtmd+TgAvhiqbMQknu7Tc8iDUCgYEAxkk2r7IvcmXgLQ4Zz/W2x4cmF8vpzhTL
-QWiPHIIT0EprR9eB9q7sgC2jC+xLHGdUpEwzHE/wiGeWYBmUUrabmJVKQsz0/oKh
-n1x6vsna+XAXmmDeExgJn9OyyABBZY+NucEf1aaJGCYU+UFfIBQ3Yd6UL/2k3QI3
-RhMvvemqCDUCgYEA6CO19WfcCDubUv1TR/FeQFNUROh6Xc6DgUnsatsgqTxN1kKQ
-1JcAW/HLuKzfmjiomcKlNlAmzEbeK5wM3pD5CaRUfhah/teVF2MG09BWC0pYFiDE
-i+F9wAD6mIL2p6UMvzrqOCgdfKo4ffvkhqKRRxvER2KhBrJsBM/r001K/aECgYBh
-IF+/NEL1gF2M9ElEipGbruHD6kh+f8UIJxVi23ylHK7sI+4vTYPfTXt+TaKFKUBW
-slSe27Fwv3zzWdRDp9sTpJ0Zl5eyS36rtvsRFYNDh9qn7icZpz6foW0DdsyR2P2N
-LcJQPyEMSSsg5RqZdg2izQo9b7sf3wQAOUm7dweouQKBgQC8m0717khHaXIWa7+t
-f7+SEvqHa+Rgih3AvxG3Jdw5e22l+y1yTnmkWe72j/WauuLs+qw8mw/GAxE9uocS
-dmL9aS4c65JoM/j7diWwP2lQW09B2MugGVqQBvS80StoMNrD64hW+oGBnH425KcB
-qs+64AWE48JzZ5vkBHUpuoKmYg==
+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==
-----END PRIVATE KEY-----
diff --git a/tls/tests/files/server-key.der b/tls/tests/files/server-key.der
index ae06b089..a6017543 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 41aed5cf..cbb15119 100644
--- a/tls/tests/files/server-key.pem
+++ b/tls/tests/files/server-key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAw9ltf5nQqJLB2enm3Ypcwrsa/1NuRV2y4TgLWp8EoPO4RV6o
-V3ko7lCgK7u3FIHGrxGGtzWwcfg99UzBe5sULNFo8CfjFvSdxWUi/AoHv6O8/HMq
-qUrqrVDsbFzt4b+hQ6cR9pkmGliW5NJF3yWTbnVIySeBjeN+qx9q/PFuA4BlG8g2
-2D6adO2PyYTmyIbWI2JF6aq2M1g/hciNF2uExb0LRCn1rFpcaBdKWMAeoTYBBeZH
-HKlb46TZN2tLFAEQrx+dSeCPYk41AzqO9kpHCh2uqlK8flF86vDEe7bJSsqCeo5a
-wB0A9/XStJGaCvR5ZV6eeK/fgFAYM/EiA/va+QIDAQABAoIBAQCv6S66Cv1pPJBT
-3AzadnnFCuw/479LHNMcCgvgtK4ip2afIFuSXihOjiqfvXa/O6Wq/9IB4359j9yO
-5Qdwr6VacCmSdDE8IDFJ6QKYYaX+EuMf2Y27C6hoTiRdXMbqGwaNTpYK6hpYVbQL
-CXdq7ERVVZEv5IUwXeMbbxfY5D3Nc8Ole5IabHL0i5fIj2JpG/Uqt1Y1uq32vjvO
-U5VTmuwDqXuJny1/ORaRA1Hd3byc3pwrS55XtgezoxBO0k9KhmdsM5Dk3yC4uIoQ
-dD3h3SsvBQVGpptVchr6dYZWzALuGAXqtna2DmBk/QxqsKiMWVKii+tz+0pCHumf
-qeDRLQGRAoGBAPzapvYV7TYecfQOL75k+68zUJph9Va7jhugwHipscyW9Gdow+Kf
-3RbqsNaLUZ6M3II1kkytLFYbNPCOYhMexMjzBgj3Hc57PAExG/ltVopDnSfUAA3G
-7NfLsdIsp4MhV4eslDbygstgP1h7xd+xrZnfk4AL4YqmzEJJ7u03PIg1AoGBAMZJ
-Nq+yL3Jl4C0OGc/1tseHJhfL6c4Uy0FojxyCE9BKa0fXgfau7IAtowvsSxxnVKRM
-MxxP8IhnlmAZlFK2m5iVSkLM9P6CoZ9cer7J2vlwF5pg3hMYCZ/TssgAQWWPjbnB
-H9WmiRgmFPlBXyAUN2HelC/9pN0CN0YTL73pqgg1AoGBAOgjtfVn3Ag7m1L9U0fx
-XkBTVEToel3Og4FJ7GrbIKk8TdZCkNSXAFvxy7is35o4qJnCpTZQJsxG3iucDN6Q
-+QmkVH4Wof7XlRdjBtPQVgtKWBYgxIvhfcAA+piC9qelDL866jgoHXyqOH375Iai
-kUcbxEdioQaybATP69NNSv2hAoGAYSBfvzRC9YBdjPRJRIqRm67hw+pIfn/FCCcV
-Ytt8pRyu7CPuL02D3017fk2ihSlAVrJUntuxcL9881nUQ6fbE6SdGZeXskt+q7b7
-ERWDQ4fap+4nGac+n6FtA3bMkdj9jS3CUD8hDEkrIOUamXYNos0KPW+7H98EADlJ
-u3cHqLkCgYEAvJtO9e5IR2lyFmu/rX+/khL6h2vkYIodwL8RtyXcOXttpfstck55
-pFnu9o/1mrri7PqsPJsPxgMRPbqHEnZi/WkuHOuSaDP4+3YlsD9pUFtPQdjLoBla
-kAb0vNEraDDaw+uIVvqBgZx+NuSnAarPuuAFhOPCc2eb5AR1KbqCpmI=
+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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
new file mode 100644
index 00000000..a7b5a749
--- /dev/null
+++ b/tls/tests/files/server-ocsp-missing-and-key.pem
@@ -0,0 +1,49 @@
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
+NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
+Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
+DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
+2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
+tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
+/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAFQb1qQMC3ZI
+iJPlUjx98YZRC0cmqzFcXAIgJ2grnGmdykpLRuLnwhCSa3nUCaRyptjMD1o0LzbL
+0cULniGDOUoEOjWxHMpJ8oLojisRSssQgbjqoH5xkZEQg7BwtnOX6JCcLuVFu34H
+lnuf/r7aF5Cz3kxF1+86BQW2BICw2Moern8Jnx768Nv/3ocrYfl0Hz4dbrTxyQq8
+rrt0Y16267IqMNq+yyEx7yG+yzwGWzcQGFgNe4q4KwxOlzpLFMGxrL0FjGACe0fg
+rBlSghDBX7bfbwN7CfN2KPE/bWk0rhR/N3dicN2qbpW0qPInUzLzY1Te+vdwnIcv
+4UQidMpxipk=
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAyqK1nfFj8dEXmKsSuSWblv+6kLl745iBghsSK3bxQZvhUwqZ
+QLSju1mKULZAtuNrERTNExbVwrJTzGs1aGCsWmHgNeOK4fu9RlEMLWHX8zqMSXMM
+oIDX5XzLc1rM/oVLV/93tThxOkEvtt0/UFg448DpacFQ8Rg7lXHb6MPvdzLVdfno
+rremtsMsOPngKtpJBSXfQU+B9yWnCnkErNp0DApaBWEcjqaqFta1t6c2q0MDdByD
+u8NhQjkeuFE9m3rb/uHiYhUY1YVEv4d5ex+dibPCTqRrQvnciDD92UfxnAxLURoY
+HQRNvFQ/nqvU27NRUntw0YnZ12Wytg6jGHQIJQIDAQABAoIBABoBleOGZnhTiH68
+ffOrIvPXMD+AvqiwGvbyuHtBkacE9X8t3gtS46yYykqfiWCvgT849zTa+mY5cs3K
+eJlDxvr2ksr3wAxOvbT3k+ODKi76NaT7kgRLZOn8ATR109dajhfmHpvweX+rfA8x
+B/4sxGheitZazCOVI5iDe2C9PM+ESQqFAYPWjjxDjl8Ta1KfYIzW5OMBcOSpLHbw
+yroL8GdGU7mEkh+TYcvoICXJmHJjMwOe4Ofk8l/EJop7AJXXui/ZONVsuXBZIAtg
+sfHK7VMK6bsDoYiTv8XesEEBqpSYk6XyS9S/queHLN/5OJ5eyJ8PV74ckKZsITU5
+oy9eK8UCgYEA9KDXEIBA1f9R6O5GBIZfhaZEtsk57TNMhD0bfsAIeTfZ4Jz4ls2E
+Q1kx+cZj7/UYxeZwWQdXa5eFvyM589/egZMx3kKeWXvjDDDcmn727maWMl5p/0U+
+rTHWXCH63Ic5jFQnXXGZn3hATnr7tsmxtb0/vxcIVWm4v5qSTZ+jVksCgYEA1A4k
+VbSn4F3IiPD7jcj7WfaHvpWJZPoVbS9kmDEZXqdN0JzXUlfPLVQ+rfHB8fJoxl7F
+/cHZP5MwF5TM7hgBhc4qxofQJKPZySUfR7tk8cstfMQGDf9V8Wk15Cr2KzNYmPzT
+/sjk9Dusz7c9iX4amKKoHU6hVJ0CwstKZ+LA1U8CgYBPz+IbCh0dNK3+ty607zpf
+Gn40vLZfg2slgeJkmjapheVZ+RzJ5seOSZ2ahnW4plisyKBDC7gj7E3ArLeNr66i
+y+lrQIT1YQwUwCRZa68Y3POH/3HJzUfDrgzoBlYYeS33cMVfIV8jvlIMyOczHd8T
+Emmn6NXZOCMEsGOnW7wovQKBgDuDcI0hM5BToclVILRtOKXJ+9TwMOxHB6ZqC6hu
+9zjKaZtnuUKh5EJLh3/X/t+BcghiZtzN/8PI8lFb8JvN3veHohev3Cm8Vo4OPhYq
+sKzvoeeHOE/LXnpvVbGgoRAEzBO7uV+jUCZ/bQOq4Llqy9oUpGv9Omf93N2AonQ/
+fnEfAoGAaTZJ6f61OMKna8H812+3lyvPuIhLm6LZ8oBvBVB3ZsjcU3sQPS8zWw02
+zSzkleuZswtcZcTGneXdJRpzFyrWsYcGQlSfYsNWu7xvGKPt45XWjNJx+9S2xwn5
+Rww9wQGST+uAAnZXpJRByBcAmW1x9KtBSFfcrR3k76wbf1Nzox0=
+-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-ocsp-missing-csr.pem b/tls/tests/files/server-ocsp-missing-csr.pem
new file mode 100644
index 00000000..193dfff3
--- /dev/null
+++ b/tls/tests/files/server-ocsp-missing-csr.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICwTCCAakCAQAwSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixk
+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==
+-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-ocsp-missing.pem b/tls/tests/files/server-ocsp-missing.pem
new file mode 100644
index 00000000..2e72320d
--- /dev/null
+++ b/tls/tests/files/server-ocsp-missing.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
+NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
+Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
+DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
+2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
+tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
+/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
+CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAFQb1qQMC3ZI
+iJPlUjx98YZRC0cmqzFcXAIgJ2grnGmdykpLRuLnwhCSa3nUCaRyptjMD1o0LzbL
+0cULniGDOUoEOjWxHMpJ8oLojisRSssQgbjqoH5xkZEQg7BwtnOX6JCcLuVFu34H
+lnuf/r7aF5Cz3kxF1+86BQW2BICw2Moern8Jnx768Nv/3ocrYfl0Hz4dbrTxyQq8
+rrt0Y16267IqMNq+yyEx7yG+yzwGWzcQGFgNe4q4KwxOlzpLFMGxrL0FjGACe0fg
+rBlSghDBX7bfbwN7CfN2KPE/bWk0rhR/N3dicN2qbpW0qPInUzLzY1Te+vdwnIcv
+4UQidMpxipk=
+-----END CERTIFICATE-----
diff --git a/tls/tests/files/server-oscp-req.der b/tls/tests/files/server-oscp-req.der
new file mode 100644
index 00000000..27615f24
Binary files /dev/null and b/tls/tests/files/server-oscp-req.der differ
diff --git a/tls/tests/files/server-self.pem b/tls/tests/files/server-self.pem
index 0a509b3a..d59ab968 100644
--- a/tls/tests/files/server-self.pem
+++ b/tls/tests/files/server-self.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIIDHTCCAgUCFE+ZwxqnmDmtWeblAQEVRDFQaipnMA0GCSqGSIb3DQEBCwUAMEsx
+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
-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
+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
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw9ltf5nQqJLB2enm3Ypcwrsa/1NuRV2y
-4TgLWp8EoPO4RV6oV3ko7lCgK7u3FIHGrxGGtzWwcfg99UzBe5sULNFo8CfjFvSd
-xWUi/AoHv6O8/HMqqUrqrVDsbFzt4b+hQ6cR9pkmGliW5NJF3yWTbnVIySeBjeN+
-qx9q/PFuA4BlG8g22D6adO2PyYTmyIbWI2JF6aq2M1g/hciNF2uExb0LRCn1rFpc
-aBdKWMAeoTYBBeZHHKlb46TZN2tLFAEQrx+dSeCPYk41AzqO9kpHCh2uqlK8flF8
-6vDEe7bJSsqCeo5awB0A9/XStJGaCvR5ZV6eeK/fgFAYM/EiA/va+QIDAQABMA0G
-CSqGSIb3DQEBCwUAA4IBAQCMVlfzUJmkEQxqbuQu4pD9HrepvFqDyxglfOP9eWcf
-+BSJ9VaE5XUKeOPNFM0iCXpBoacuj4xbA2x8x5GuiyoPqwAyaYen/gyOYe/ucYW8
-1UfZo10KD4AhVRIRkh0AgloQ6olSPd9pTFasvTPL72gqPyAJseUgUhkkSMt5ggRf
-cvj1qQEZXBf4QF0EUco641xgK8w8y8Hz0bbW7ujWFSJ9ypAYZ7b8EAvsBrORgwAA
-1/BRxfLtsq34ESi5EPxw3hFEBDhuk/cycDRPKse5MCj6zABA2PNiEWXc9s7yv7oH
-0hsfkL0o22e3dV5VjMC0nsv99Yi2S9HOWrT4ib/e/GXn
+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
-----END CERTIFICATE-----
diff --git a/tls/tests/files/server.csr.pem b/tls/tests/files/server.csr.pem
new file mode 100644
index 00000000..0f2833dd
--- /dev/null
+++ b/tls/tests/files/server.csr.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIDHTCCAgUCAQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/Is
+ZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAV
+BgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxl
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDI1oGcdnQkf3rb
+6tSABVeqsuZzVpoA7NmcbGWZPOC5x7XTdBeSeU/Q+Fl6B048CwVlIxXgL3z44CFc
+Dee5Q3oIk3AiQenl4VIofbm8i43wXaPe9cf4m3lF88RQZsF6e8oTnuLnaqFOJyOo
+17cuzY+m9RayaOzS5/04gEZj19J+EbIAJh1uUnWYKtc+pAUKzvTtCMYygwHFq/5I
+lQ7Ns4O9j/wKaKnMNbC7PL90QUpgjZtWfyO5v1beEjAHigt00GUqOEhiVIEN9spF
+GqOf7sY0MOrluqC6fBnaKC4zKkEYLrib4X1ncCMffZ3pB1HoEp+RLq9NgF/PjWNL
+fVDr3gkCAwEAAaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0OBBYEFCV0vQnn8otx
+VrqLFvH/9w2raijeMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0G
+CSqGSIb3DQEBCwUAA4IBAQC2YkXnf6l6w8EjDK3aWEoaYv821GTenBFL5Ae7TylZ
+b2YpxHu+aQU9MPvYXT8Qh1TL/EKasXy2xV9s2vVbdIHnjp11U1wM7Z26QAdLDfT4
+Xn1oEswj0v8hEwm0YEsfxTSytHHLXtKBmrYdMBBL597MSjWjW1pZg6OUuf8q42yA
++m9lU8oLkZVR+KtkiE5+336Y2k/Zaza+mw3dBTSmeJyiG0NR09bc7RUJUhnZp+2U
+nQ3ObREyYs3GpMatXHWiAwpAQt3tar6BDQo7zN9Bx3ViJcrNI2GbuBlUioX+I0xx
+fI4HWDpvVsv5RDpYdm5SNaVd2nlwbFA1v3gusD7/S93q
+-----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server.der b/tls/tests/files/server.der
index 59d7c55d..cd9c10c2 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 37fd95f9..20055f7e 100644
--- a/tls/tests/files/server.pem
+++ b/tls/tests/files/server.pem
@@ -2,21 +2,21 @@
MIIDlDCCAnygAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDYyMzIwMTYxNVoXDTQ2MDYx
-NzIwMTYxNVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTIxMDczMTE4MTMxMFoXDTQ2MDcy
+NTE4MTMxMFowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMPZbX+Z0KiSwdnp5t2KXMK7Gv9TbkVdsuE4
-C1qfBKDzuEVeqFd5KO5QoCu7txSBxq8Rhrc1sHH4PfVMwXubFCzRaPAn4xb0ncVl
-IvwKB7+jvPxzKqlK6q1Q7Gxc7eG/oUOnEfaZJhpYluTSRd8lk251SMkngY3jfqsf
-avzxbgOAZRvINtg+mnTtj8mE5siG1iNiRemqtjNYP4XIjRdrhMW9C0Qp9axaXGgX
-SljAHqE2AQXmRxypW+Ok2TdrSxQBEK8fnUngj2JONQM6jvZKRwodrqpSvH5RfOrw
-xHu2yUrKgnqOWsAdAPf10rSRmgr0eWVenniv34BQGDPxIgP72vkCAwEAAaNHMEUw
+hvcNAQEBBQADggEPADCCAQoCggEBAMqitZ3xY/HRF5irErklm5b/upC5e+OYgYIb
+Eit28UGb4VMKmUC0o7tZilC2QLbjaxEUzRMW1cKyU8xrNWhgrFph4DXjiuH7vUZR
+DC1h1/M6jElzDKCA1+V8y3NazP6FS1f/d7U4cTpBL7bdP1BYOOPA6WnBUPEYO5Vx
+2+jD73cy1XX56K63prbDLDj54CraSQUl30FPgfclpwp5BKzadAwKWgVhHI6mqhbW
+tbenNqtDA3Qcg7vDYUI5HrhRPZt62/7h4mIVGNWFRL+HeXsfnYmzwk6ka0L53Igw
+/dlH8ZwMS1EaGB0ETbxUP56r1NuzUVJ7cNGJ2ddlsrYOoxh0CCUCAwEAAaNHMEUw
CQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATAjBgNVHREEHDAahwTAqAEK
-ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEOMZcqWdZw+
-DjI8kcdXoOXS3YlGboq+ulu2qzQic6EzR4tgFe/aEFSsV2K1rGxbl/bhvAd22/lR
-0LmrvgQgEdgtpQQGT/n0QmbXzahKksPxLKt0Bpi1H2a1BO+9gywVIGXpKxKm9XAH
-zhBb3de31311XlQRC5p665TFoc6Aguq5QVlki+LXAW4Kdi1L2r8CDdYneK/yg7qW
-0/I4WhT4Sl0JMHvHiIkEUKD61BIoLF8u0jBgzr9og2acmIacBICy5pOfmiR4lcQf
-mJ3NlbLXwZ96nfQKuStTgAFmONgU1ElQ5tlsF+tIjDCwPOrc1q5U1q0iFkz9hHV1
-ZYegUzlFqbo=
+ghJzZXJ2ZXIuZXhhbXBsZS5jb20wDQYJKoZIhvcNAQELBQADggEBAEjEBhx+ib3+
+u7O2OYD6z6pVLLTiQpXjESRfFF8sf/epSmmNtE/PpiUhWAXG2dOinup/40rjimAF
+j/8okMGvtTHst16vcV+LYu8AthBq4F41WVlC8/aLmIbkofbBulEUlD02HEBNszHJ
+rCkFBupwDTnbKStdLRPtjchuGLDobePDF7NEBDT4rWxoaQH7ZM3LOHnWoDjgF4ar
+3J6w2YpTl4vFf/e31Ikc+ctVy7tU1/X/II58fbxKqWjtKL67VESRBpHhCGNRlXfF
+ejxfiyHBKPzZbh6jqmyI4GqfotBq/vvbpt2XocKFHB6UDvW7M+oCrEgf/gL1uMLy
+/vq3kChJRdM=
-----END CERTIFICATE-----
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
