GNOME.org
 

[glib-networking/wip/danw/sni: 2/3] tls/tests: add "other.pem" to certs, regenerate

commit 745c9034de0b47c7bebf0eee0bb00cf0c096c69f
Author: Dan Winship <danw gnome org>
Date:   Thu Dec 11 22:43:26 2014 +0100

    tls/tests: add "other.pem" to certs, regenerate
    
    Update create-files.sh to create a second server cert, for
    "other.example.com". Re-run it to regenerate the certs, with the new
    one added.

 tls/tests/file-database.c                   |    3 +-
 tls/tests/files/ca-key.pem                  |   26 +++---
 tls/tests/files/ca-roots-bad.pem            |   28 +++---
 tls/tests/files/ca-roots.pem                |   28 +++---
 tls/tests/files/ca.pem                      |   28 +++---
 tls/tests/files/chain.pem                   |   60 +++++++-------
 tls/tests/files/client-and-key.pem          |   76 +++++++++---------
 tls/tests/files/client-future.pem           |   22 +++---
 tls/tests/files/client-key.pem              |   50 ++++++------
 tls/tests/files/client-past.pem             |   22 +++---
 tls/tests/files/client.pem                  |   26 +++---
 tls/tests/files/create-files.sh             |   16 ++++
 tls/tests/files/intermediate-ca-key.pem     |   14 ++--
 tls/tests/files/intermediate-ca.pem         |   22 +++---
 tls/tests/files/non-ca.pem                  |  114 +++++++++++++++------------
 tls/tests/files/other-key.pem               |    9 ++
 tls/tests/files/other.pem                   |   14 +++
 tls/tests/files/server-and-key.pem          |   30 ++++----
 tls/tests/files/server-intermediate-key.pem |   14 ++--
 tls/tests/files/server-intermediate.pem     |   10 +-
 tls/tests/files/server-key.der              |  Bin 318 -> 320 bytes
 tls/tests/files/server-key.pem              |   14 ++--
 tls/tests/files/server-self.pem             |   12 ++--
 tls/tests/files/server.der                  |  Bin 571 -> 571 bytes
 tls/tests/files/server.pem                  |   16 ++--
 tls/tests/files/ssl/other.conf              |   27 ++++++
 26 files changed, 382 insertions(+), 299 deletions(-)
---
diff --git a/tls/tests/file-database.c b/tls/tests/file-database.c
index 1416e73..d8c0e3d 100644
--- a/tls/tests/file-database.c
+++ b/tls/tests/file-database.c
@@ -493,12 +493,13 @@ test_lookup_certificates_issued_by (void)
 
   g_byte_array_unref (issuer_dn);
 
-  g_assert_cmpuint (g_list_length (certificates), ==, 4);
+  g_assert_cmpuint (g_list_length (certificates), ==, 5);
 
   g_assert (certificate_is_in_list (certificates, tls_test_file_path ("client.pem")));
   g_assert (certificate_is_in_list (certificates, tls_test_file_path ("client-future.pem")));
   g_assert (certificate_is_in_list (certificates, tls_test_file_path ("client-past.pem")));
   g_assert (certificate_is_in_list (certificates, tls_test_file_path ("server.pem")));
+  g_assert (certificate_is_in_list (certificates, tls_test_file_path ("other.pem")));
   g_assert (!certificate_is_in_list (certificates, tls_test_file_path ("server-self.pem")));
 
   g_list_free_full (certificates, g_object_unref);
diff --git a/tls/tests/files/ca-key.pem b/tls/tests/files/ca-key.pem
index 65ee6f7..fc8fd9b 100644
--- a/tls/tests/files/ca-key.pem
+++ b/tls/tests/files/ca-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC8ZicF8jd7zECFFbAViXKwGqKBVdtAOm/cbqaGKDb3P7BFWmkU
-SSJPa126PCMuU1Ocf8uuVcgXD+08LUGc2VK5rdizxx20L1jr2PQ22QXueuq1CRyk
-zdCGpHlA/7D0Ir6ms/7ayFOG+Mj5sRue/KNBDCURNAdOmjhvgXMw9putKQIDAQAB
-AoGAHQF1PJsgI7U8scC3DXnN6IMRRexcBzV4B24ZwUnrvIFXuDXFO9ROrf+PvJ6J
-pBY8Jzodt8eJONPA6KTnFyj2bVAPrhXqhW+XEgHSDW8nl0Ii31sU1NKr1K4Q/++s
-jM17z+EU/TchdFyDF3QVwBI3qOMFRA0mCkbF7BMFez28FMkCQQDvh8ddsffVYyBC
-OOuxaiCisJEnmdPq6VPiqD1C8TWMMJmHWTerEOnw3VtsApcMVfE/lIjjmcL5aXmt
-KXVRljqfAkEAyVpbpsENO8FJQeMlXv6KQu/dZk0uxipzGisvdgAgKqi1NqwS8xNV
-Ydn1366eSrvAe5MK3b7myxKUYM65e4fLNwJAO3JeR2Go2Xu9gNHxpNlq+hWKIOLr
-lkyMNh98/MUyffV91PqOd1U+SjoVu2u1IymdMyNhCeOaYR4NRa2ZYUNAjwJBALwa
-3u59AcjmPHMCKkKBl1cLURGmX2Ef/SHgYFljqqlPrONjg9x0HlrozYtnTVfR6PNJ
-HmikVGY4eEesOJnP9acCQQCXoBXUhTF9yiRmNxYrxHDuO2Q5hE86gUeBGhMlHEl+
-vUGQ0dlqE5btZO8dffqSu4HMkHEwOlOHPluT4yMf6W4K
+MIICWwIBAAKBgQDJ0FX4J7UFmNwQWCEFIJMi/y4Gt559LycqxmcMoExBDi8J5YRc
+drIdW+0Sh1Ky9SI/EjiwXUHbuvvRchfPnCEZC89Pyz0Et8TajzWfDJtATfX/Di6b
+Cdt6lUslKZExdCfVWr4KGGgGfziy0l4k513fbeMzu9jIi4gN/tKVsQbErwIDAQAB
+AoGAR0p4RAxKzypbes6XA4epUnCQYsEUlKZGkL67gmNR7J1FEprocf1gGCz0B1qU
+ZTFhIqSeL/cRn7xi3m8OaEGAEwcJC5omgwItzwlZHsZaLmvnn93N+0JVwOB2Y7b7
+uuh7EuTU8HGisu2TUlBpnPIhxnk90kRcipz3Jp+u4jx4DykCQQDx8iYl/p0imwvi
+COU7b+eYYZQWdYbuhfWQzhuK4gEWcVck5TD7NhmfA4HF7xvM9pEC1/vQXewCy8ri
+QX8+K0e7AkEA1YlnUBjfYCpE9d4A9T2PsBsJ2l23zbJkXIGAw5F/9UK/GUlY9Vog
+F7n22qbzehFm/+EJyNZ8qwoXfYFUxx1lnQJALEZs1r0eUkvfQ9Du6g6Tah5JNEbz
+l0iqZIJjJeov2sSI9vZ+HSqMS74fjHIyOzLP3J5btYjKfMSAbyEfQOg4qwJACBPF
+e6slL+8JYr9+C8jDWab8LW1kGXzI/RLM+xjS3UUkE2HJ4qYBFsSrCMRN620jF0S8
+6QLr/lBIaS/uNAXxpQJAHQ0dvl9Gv8sm4j6ha+35uWg5MOlC9t2mpPNctBbYmKw7
+1mb3XUN7c63Xs3FO0bCe3e6N1Zv1CKJBUdj7FHSUPg==
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/ca-roots-bad.pem b/tls/tests/files/ca-roots-bad.pem
index 8efd883..38f7dc5 100644
--- a/tls/tests/files/ca-roots-bad.pem
+++ b/tls/tests/files/ca-roots-bad.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIDxjCCAy+gAwIBAgIJAL1m9WCMkFWUMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
+MIIDxjCCAy+gAwIBAgIJANEohODeSu2QMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
 CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UE
 CwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTQwNzE4MTUxNTUw
-WhcNNDQwNzEwMTUxNTUwWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
+bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTQxMjExMjE0MTQ1
+WhcNNDQxMjAzMjE0MTQ1WjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
 JomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0
 eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8ZicF8jd7zECF
-FbAViXKwGqKBVdtAOm/cbqaGKDb3P7BFWmkUSSJPa126PCMuU1Ocf8uuVcgXD+08
-LUGc2VK5rdizxx20L1jr2PQ22QXueuq1CRykzdCGpHlA/7D0Ir6ms/7ayFOG+Mj5
-sRue/KNBDCURNAdOmjhvgXMw9putKQIDAQABo4IBODCCATQwHQYDVR0OBBYEFPAS
-hqHGX6hRi49Q4DrninEiThdiMIG7BgNVHSMEgbMwgbCAFPAShqHGX6hRi49Q4Drn
-inEiThdioYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJ0FX4J7UFmNwQ
+WCEFIJMi/y4Gt559LycqxmcMoExBDi8J5YRcdrIdW+0Sh1Ky9SI/EjiwXUHbuvvR
+chfPnCEZC89Pyz0Et8TajzWfDJtATfX/Di6bCdt6lUslKZExdCfVWr4KGGgGfziy
+0l4k513fbeMzu9jIi4gN/tKVsQbErwIDAQABo4IBODCCATQwHQYDVR0OBBYEFAt0
+RvW5/TvkbLzAgavUaWD5CPYDMIG7BgNVHSMEgbMwgbCAFAt0RvW5/TvkbLzAgavU
+aWD5CPYDoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
 LGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcw
 FQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBs
-ZS5jb22CCQC9ZvVgjJBVlDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+ZS5jb22CCQDRKITg3krtkDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
 BjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQBrH0DY2TTMrYmmjkTXqszoK2XXL+NF
-dsXXV24Y9JNunEV3oxpfOCvfQOsfiCU7qQwJHibRBgAM06gvN4xcMv07dOFcnoU3
-DQhyEuWfEBJ6BezsF5uDPxJGGfc/sVdeu0SH7zbmCdbIzx7g2+tUIqcRMTMMq4NZ
-Rga9sq60+ndF+g==
+cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQAKaux+QnzbJ3dzb9ypQE50cMf+dakV
+1nKKm/KmrTV7fNT/Drgtk471Ybj9t/D7i16Yt6iu+ePtSjq0Pljk+sv51hJ/FNoP
+EpbPJZ6ztMpr6tURm090YjkYJcZin5BUnuyLqFJ3QknF8ykffuX042tSs91D8zYF
+cYuh11SdlcKnyw==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
diff --git a/tls/tests/files/ca-roots.pem b/tls/tests/files/ca-roots.pem
index 713e25b..f5adeb4 100644
--- a/tls/tests/files/ca-roots.pem
+++ b/tls/tests/files/ca-roots.pem
@@ -1,27 +1,27 @@
 These are some CA certificates
 
 -----BEGIN CERTIFICATE-----
-MIIDxjCCAy+gAwIBAgIJAL1m9WCMkFWUMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
+MIIDxjCCAy+gAwIBAgIJANEohODeSu2QMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
 CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UE
 CwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTQwNzE4MTUxNTUw
-WhcNNDQwNzEwMTUxNTUwWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
+bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTQxMjExMjE0MTQ1
+WhcNNDQxMjAzMjE0MTQ1WjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
 JomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0
 eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8ZicF8jd7zECF
-FbAViXKwGqKBVdtAOm/cbqaGKDb3P7BFWmkUSSJPa126PCMuU1Ocf8uuVcgXD+08
-LUGc2VK5rdizxx20L1jr2PQ22QXueuq1CRykzdCGpHlA/7D0Ir6ms/7ayFOG+Mj5
-sRue/KNBDCURNAdOmjhvgXMw9putKQIDAQABo4IBODCCATQwHQYDVR0OBBYEFPAS
-hqHGX6hRi49Q4DrninEiThdiMIG7BgNVHSMEgbMwgbCAFPAShqHGX6hRi49Q4Drn
-inEiThdioYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJ0FX4J7UFmNwQ
+WCEFIJMi/y4Gt559LycqxmcMoExBDi8J5YRcdrIdW+0Sh1Ky9SI/EjiwXUHbuvvR
+chfPnCEZC89Pyz0Et8TajzWfDJtATfX/Di6bCdt6lUslKZExdCfVWr4KGGgGfziy
+0l4k513fbeMzu9jIi4gN/tKVsQbErwIDAQABo4IBODCCATQwHQYDVR0OBBYEFAt0
+RvW5/TvkbLzAgavUaWD5CPYDMIG7BgNVHSMEgbMwgbCAFAt0RvW5/TvkbLzAgavU
+aWD5CPYDoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
 LGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcw
 FQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBs
-ZS5jb22CCQC9ZvVgjJBVlDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+ZS5jb22CCQDRKITg3krtkDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
 BjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQBrH0DY2TTMrYmmjkTXqszoK2XXL+NF
-dsXXV24Y9JNunEV3oxpfOCvfQOsfiCU7qQwJHibRBgAM06gvN4xcMv07dOFcnoU3
-DQhyEuWfEBJ6BezsF5uDPxJGGfc/sVdeu0SH7zbmCdbIzx7g2+tUIqcRMTMMq4NZ
-Rga9sq60+ndF+g==
+cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQAKaux+QnzbJ3dzb9ypQE50cMf+dakV
+1nKKm/KmrTV7fNT/Drgtk471Ybj9t/D7i16Yt6iu+ePtSjq0Pljk+sv51hJ/FNoP
+EpbPJZ6ztMpr6tURm090YjkYJcZin5BUnuyLqFJ3QknF8ykffuX042tSs91D8zYF
+cYuh11SdlcKnyw==
 -----END CERTIFICATE-----
 
 GLib shouldn't care about this comment
diff --git a/tls/tests/files/ca.pem b/tls/tests/files/ca.pem
index 10322b2..8e630c3 100644
--- a/tls/tests/files/ca.pem
+++ b/tls/tests/files/ca.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIIDxjCCAy+gAwIBAgIJAL1m9WCMkFWUMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
+MIIDxjCCAy+gAwIBAgIJANEohODeSu2QMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
 CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UE
 CwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTQwNzE4MTUxNTUw
-WhcNNDQwNzEwMTUxNTUwWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
+bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTQxMjExMjE0MTQ1
+WhcNNDQxMjAzMjE0MTQ1WjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
 JomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0
 eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8ZicF8jd7zECF
-FbAViXKwGqKBVdtAOm/cbqaGKDb3P7BFWmkUSSJPa126PCMuU1Ocf8uuVcgXD+08
-LUGc2VK5rdizxx20L1jr2PQ22QXueuq1CRykzdCGpHlA/7D0Ir6ms/7ayFOG+Mj5
-sRue/KNBDCURNAdOmjhvgXMw9putKQIDAQABo4IBODCCATQwHQYDVR0OBBYEFPAS
-hqHGX6hRi49Q4DrninEiThdiMIG7BgNVHSMEgbMwgbCAFPAShqHGX6hRi49Q4Drn
-inEiThdioYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJ0FX4J7UFmNwQ
+WCEFIJMi/y4Gt559LycqxmcMoExBDi8J5YRcdrIdW+0Sh1Ky9SI/EjiwXUHbuvvR
+chfPnCEZC89Pyz0Et8TajzWfDJtATfX/Di6bCdt6lUslKZExdCfVWr4KGGgGfziy
+0l4k513fbeMzu9jIi4gN/tKVsQbErwIDAQABo4IBODCCATQwHQYDVR0OBBYEFAt0
+RvW5/TvkbLzAgavUaWD5CPYDMIG7BgNVHSMEgbMwgbCAFAt0RvW5/TvkbLzAgavU
+aWD5CPYDoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
 LGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcw
 FQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBs
-ZS5jb22CCQC9ZvVgjJBVlDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+ZS5jb22CCQDRKITg3krtkDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
 BjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQBrH0DY2TTMrYmmjkTXqszoK2XXL+NF
-dsXXV24Y9JNunEV3oxpfOCvfQOsfiCU7qQwJHibRBgAM06gvN4xcMv07dOFcnoU3
-DQhyEuWfEBJ6BezsF5uDPxJGGfc/sVdeu0SH7zbmCdbIzx7g2+tUIqcRMTMMq4NZ
-Rga9sq60+ndF+g==
+cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQAKaux+QnzbJ3dzb9ypQE50cMf+dakV
+1nKKm/KmrTV7fNT/Drgtk471Ybj9t/D7i16Yt6iu+ePtSjq0Pljk+sv51hJ/FNoP
+EpbPJZ6ztMpr6tURm090YjkYJcZin5BUnuyLqFJ3QknF8ykffuX042tSs91D8zYF
+cYuh11SdlcKnyw==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/chain.pem b/tls/tests/files/chain.pem
index dc21b3e..1e466cc 100644
--- a/tls/tests/files/chain.pem
+++ b/tls/tests/files/chain.pem
@@ -3,57 +3,57 @@ MIICKjCCAdSgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBrTETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
 bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
 aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTE0MDczMTE4MDQwNVoXDTM5MDcyNTE4MDQwNVow
+LWNhQGV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE1MVoXDTM5MTIwNTIxNDE1MVow
 WDETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
 KDAmBgNVBAMMH3NlcnZlci1pbnRlcm1lZGlhdGUuZXhhbXBsZS5jb20wXDANBgkq
-hkiG9w0BAQEFAANLADBIAkEAtJ7gH4CHiiALnnOqu79ToTGj8I1xd8m62+WDGwib
-tMfNrQ+Jjw7SU0gjv2GFk3TX3HY456Sp/OnCPTB2C3lx5wIDAQABozMwMTAJBgNV
+hkiG9w0BAQEFAANLADBIAkEA48KP18DSDHNDr34pYMg+2SMDeOHIVF3E0sMViYfT
+L64DHsvjKLenvhdgEwHikru8woJnrfb65gMbP89ndmGAfwIDAQABozMwMTAJBgNV
 HRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdEQQIMAaHBMCoARYwDQYJ
-KoZIhvcNAQEFBQADQQBPcxVN1ylw3GKWeZMm6ZD+CSTSfgFjlbm/c0oGZCnz8fvs
-vCf7OpmCBLaArbkZlxNP6a6dAP23mcx6+WwKP8km
+KoZIhvcNAQEFBQADQQAZJUrUp7zzs9dqbMO59HoUs9Sfk74El5de7ct+rplW0HEW
+A5bNeSk+bCHrNXC1dFYZzMiYR92vfJkMVURTbBQp
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDrjCCAxegAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
+MIIDrjCCAxegAwIBAgIBBjANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MDczMTE4MDQwNVoXDTM5MDcy
-NTE4MDQwNVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE1MVoXDTM5MTIw
+NTIxNDE1MVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
 FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
 aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
 BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTBcMA0GCSqG
-SIb3DQEBAQUAA0sAMEgCQQDZy5UlNwps/3/XguGKO8EmWhzTXJl6LcRmFaDcrlXO
-Dg8bak8LftX8e3coQR2/1UBHGrc/vx3iuaPo4zqb6klvAgMBAAGjggFFMIIBQTAd
-BgNVHQ4EFgQUY8cTwoNkLNWWDASVAmwmL8Upfk0wgbsGA1UdIwSBszCBsIAUuR3p
-wFSjo4H3Mb3UQDjQ4rxKDTehgYykgYkwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00x
+SIb3DQEBAQUAA0sAMEgCQQC8VRLZvjx8c38//zvi562kAK8hIkpbqqAyUDafdhZ8
+ml99WTAA/jChu6urvmLBGHPYXdMUofbZnxxtsRpsu1xbAgMBAAGjggFFMIIBQTAd
+BgNVHQ4EFgQUC2Pqf4MlFmLJeloYapjxTLwLovowgbsGA1UdIwSBszCBsIAUC3RG
+9bn9O+RsvMCBq9RpYPkI9gOhgYykgYkwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00x
 FzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBB
 dXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkB
-Fg5jYUBleGFtcGxlLmNvbYIJAIKoNLAclgPoMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+Fg5jYUBleGFtcGxlLmNvbYIJANEohODeSu2QMA8GA1UdEwEB/wQFMAMBAf8wDgYD
 VR0PAQH/BAQDAgEGMCYGA1UdEQQfMB2BG2ludGVybWVkaWF0ZS1jYUBleGFtcGxl
 LmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOB
-gQBVb72AEGUWEbE9ZUZIy/zNJrsywSl3SDWcUIbHwCFihH0V7RfgmR+v22aPWSfq
-3r8Y3FIZ82RuFhAc1q0W1ZlbOvdVgVvCC/R97m2t/AzZ5Xo797aJYZ9TY+b6wVJH
-H/P3JPD/RrBXIW/OaK+L70n6O/ikhXwWDkpenPIoY4BBsg==
+gQAKHRvDoz4kpxfqrEaiEakL+hLLZ9i7If1dAmQbwe9UZvRIExHApc74ainZm/hf
+bl/GBI6vj6Dzn1sXrNO/WKBVAl38e73e0e0nMEihaDmq3KwlfTuAdI9vI50KV3vK
+543K64QGhO/I/YOpwS8xs7JqGI9WzU5CHVaXl6vzIELMMg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDxjCCAy+gAwIBAgIJAIKoNLAclgPoMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
+MIIDxjCCAy+gAwIBAgIJANEohODeSu2QMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
 CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UE
 CwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMDAwNzE3MTYwMDUz
-WhcNMzAwNzEwMTYwMDUzWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
+bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTQxMjExMjE0MTQ1
+WhcNNDQxMjAzMjE0MTQ1WjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
 JomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0
 eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGfSd/mHqbKBQe
-5aIe3T/ZgVAxP0IczXrpP1CYeohiDfvcSff9000/6dk46XlVhSM4JPIMbrd23YPf
-u8bnlzHqrPD1+HdqwhnmwMhLl3GphB/0PuWoOeEDoFhYSE2XWccCLLc1GtX9nKiS
-GOH3Uam4WrQCibQ4IVL3WKs++U77jwIDAQABo4IBODCCATQwHQYDVR0OBBYEFLkd
-6cBUo6OB9zG91EA40OK8Sg03MIG7BgNVHSMEgbMwgbCAFLkd6cBUo6OB9zG91EA4
-0OK8Sg03oYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJ0FX4J7UFmNwQ
+WCEFIJMi/y4Gt559LycqxmcMoExBDi8J5YRcdrIdW+0Sh1Ky9SI/EjiwXUHbuvvR
+chfPnCEZC89Pyz0Et8TajzWfDJtATfX/Di6bCdt6lUslKZExdCfVWr4KGGgGfziy
+0l4k513fbeMzu9jIi4gN/tKVsQbErwIDAQABo4IBODCCATQwHQYDVR0OBBYEFAt0
+RvW5/TvkbLzAgavUaWD5CPYDMIG7BgNVHSMEgbMwgbCAFAt0RvW5/TvkbLzAgavU
+aWD5CPYDoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
 LGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcw
 FQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBs
-ZS5jb22CCQCCqDSwHJYD6DAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+ZS5jb22CCQDRKITg3krtkDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
 BjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQAnIzWB2+yQIsyKfD6CpsPy9f/njn2A
-KZGI0CSJxOMPr4vxL7JvZHtGc3LLRdMtxlk1QlNQlGTr/SsEzZDQfYIF+gzVPZ+h
-bUy8HHWYerWh6Vz1yOe07I7XyGAyvu9xRaIN2DjDUEvXTd4wgZ+6TjzmwX34bvon
-JEOrMtYPA+tV4Q==
+cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQAKaux+QnzbJ3dzb9ypQE50cMf+dakV
+1nKKm/KmrTV7fNT/Drgtk471Ybj9t/D7i16Yt6iu+ePtSjq0Pljk+sv51hJ/FNoP
+EpbPJZ6ztMpr6tURm090YjkYJcZin5BUnuyLqFJ3QknF8ykffuX042tSs91D8zYF
+cYuh11SdlcKnyw==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client-and-key.pem b/tls/tests/files/client-and-key.pem
index de984ae..6742744 100644
--- a/tls/tests/files/client-and-key.pem
+++ b/tls/tests/files/client-and-key.pem
@@ -1,45 +1,45 @@
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQIwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNDA3MTgxNTE1NTBaFw0zOTA3MTIxNTE1
-NTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNDEyMTEyMTQxNDVaFw0zOTEyMDUyMTQx
+NDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSAYGCBlZxm
-A7C18riylpFiCWYvhdw7nbLs7ixBdtBK1SCWJc4qj0IrEENSiIfBphfbRGbvu5YQ
-lAC0+1MyqaTqC7U0CbwQlamiAf4PZp/asSrtFlZK17tI/BJwOZKaduuLqVvZi3vc
-eZdfY4zMxGdxItNhkpysOIlqNhGaIv8e1XPThoVNyvkz2XIc3ja5/gS+52eRbT2W
-ZmPqP8fBHs9wMVqHgCrJTucK5q5B5EZnLHrHT+i90Qek5309vV+TQdrxaeNTL0PE
-lDEKSgStzaNkx1pP9qvXIGbV9/zkpNOwwRqbBwIdmiE8O48Lc5UPYSp2WgOwJQKy
-HNmdjQMegpECAwEAATANBgkqhkiG9w0BAQsFAAOBgQB3ZtwtBZDj0FQpVAp3UzY0
-QEnF4ZLksFr79Z0P+1JGo/CCwAVsH/QwE+fAMH9G65fECPSRYCy6MWYJ7+g7iwJn
-kfh2gd5SZY/iOOpRu5rJXVkUvFyq5pJ7OKzAjYdLWpzRu6Xk/I1Lo8dgoTJqp1/Y
-vF623hzx0M3UDEyWLBnJzw==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEeg2Jq4/Dw
+0bxOuZ7Ylp6BVUUpGHALu0b8SiJVxHRyYOotcUVyAMO7AZmuzQx3boUnb6mm0/qt
+xWFiZCvPpcKKk4UoExGNB7SGpn22U26R32gcmM8gTunFrVTvjaNqe7t1cq0ejHxe
+vmlM5dqnotL/S9h6iP349XztJyXVlv8+IBDBPOayyH4lLj14mL3/JMICINRt4ZuD
+CC46yqGS10zo2/F/qn1I32bcWQfzZC2vpZ7vS3MUguInRIkXHW//GRqIkPvr4uEu
+oShL17UBCJS3ICxHDSArfJtYQuMWyxYMVKBa5Oj5QyZYaf5GF7V6tLoaklR560ir
+RleitI+aUDcCAwEAATANBgkqhkiG9w0BAQUFAAOBgQADnv2uGaFVCQg6q9XC/YPw
+PIe+dlDXidxRKxycgkzFwTYzHbcbv6S9hUoatyI/qiHYvPaFJyIhyZ/XcZGGKXtr
+OLst1D7cnx4MsWoDCNEW4VBHaERZrOJXlJKGqf4s1f37LizjrS84g7TksRuuCcDn
+9yMFtvNq4GKQokMJcHXc8Q==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEowIBAAKCAQEA8R6DYmrj8PDRvE65ntiWnoFVRSkYcAu7RvxKIlXEdHJg6i1x
+RXIAw7sBma7NDHduhSdvqabT+q3FYWJkK8+lwoqThSgTEY0HtIamfbZTbpHfaByY
+zyBO6cWtVO+No2p7u3VyrR6MfF6+aUzl2qei0v9L2HqI/fj1fO0nJdWW/z4gEME8
+5rLIfiUuPXiYvf8kwgIg1G3hm4MILjrKoZLXTOjb8X+qfUjfZtxZB/NkLa+lnu9L
+cxSC4idEiRcdb/8ZGoiQ++vi4S6hKEvXtQEIlLcgLEcNICt8m1hC4xbLFgxUoFrk
+6PlDJlhp/kYXtXq0uhqSVHnrSKtGV6K0j5pQNwIDAQABAoIBADDvpXCzCwIajiau
+v6OKh78xtpGrzobnCqJUj+M6Dv4nPJ4qjOOwSJFxAdkkDf+quaaSo2oGLt2gqP+j
+zXrK0PST1W7f/EbCnb642U+IUpSNTI8/xo+7Gej+MribSd7RvL0GEDksiwyu2exb
+LAddoIE8STNtYyJQhdpN83UNTXEN0O0sPARsfi/sBfTVgcYPCybIJSN7J8AUGpe8
+cbIC5vqY7lxdQCMc0apZPsG+Z9dpCmFpv+HJB0fnJubCKu42ImEz7++XJBxBbCs7
+T0Vh0/dBVioEXx08AI545eo5sV5G6aIlicrs+qO8YaCbT/tKL2VECK9UM7JyEscL
+clet6rECgYEA/LuPgu/DbDk31ZwOfF79zdwhjwcc/GDoAzZd0heWx1mfwxwAFvA7
+GK5YiyjaYjpDYS6/DlkAhEqOjNQzXjRmDYQESv3NeCaVH7EILnQe5m7EWROxxPrt
+MhXGZNZ3BDaCCKH/tRLgOypuA10MNxl20HmdMlmJ4iFcZCjJ7ajvuAkCgYEA9DyE
+VFlGkxhUG0ZeapkTck7/MUmCVe7VjgvNUKQ5v4JFU1GlmSAjQoMbaH/crWJwo+52
+njrCu9iVkJ5K7zUcRuZTmIz8QoPVJJt6MlCgDYiP/ueSH3JEKlUKSU8DcaZGpYI7
+KVxKO+rENWC2X270naV87uYnRfD6rM9IYYbBVj8CgYBecg0YZldGWz+VUQNM0QbR
+5mCYHZVkbyZlBO0ctPoAt2pvtEgISnAbMhQetP6fVJyXdauqRfJefao10Jr9qmE0
+zc/44k3lh62UsUiYa4acoGo5y5VUQl1fqSmBx2+koGYJqdhwJ4SqN5nzIdONx7NS
+BxCKn1FasxLezyte6BHlWQKBgH0F7YdwG9x4e7VqlDJlIbtGDQQh6QIsPE12ZSd+
+qcEK4ooAJZD5DpOhoYogycpHtfl0vGvLEJwwBn/9R8ajnVH93ZUdtpQmABm5LRhM
+hWHoIi4ORJKsX5B778QPGmg3Abr/q2FEyQta5g2c8D5yAe4hJI72aew3q1qC0T57
+SMTpAoGBAMJobxfXbSTpBpnPBEG9HMEIVs3gMhin7sFM8FLGr5wxVz4Of8Fc72B3
+CEh43T7R8MX86FtSB55fUMb/iFgXkY8zfUW9jzsuSapFAent9DnKx4WYXP2MhxnE
+CO+r8rEy7dd6GGOtGTZn4L2Duz1rYtmnrg5ZBts7JF5EXcPx6hls
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client-future.pem b/tls/tests/files/client-future.pem
index 1efc7b1..724f966 100644
--- a/tls/tests/files/client-future.pem
+++ b/tls/tests/files/client-future.pem
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC4DCCAkkCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC4DCCAkkCAQUwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
 AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzE2MDAwMFoYDzIwNjEwNzE3
 MTYwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
 RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0gGBg
-gZWcZgOwtfK4spaRYglmL4XcO52y7O4sQXbQStUgliXOKo9CKxBDUoiHwaYX20Rm
-77uWEJQAtPtTMqmk6gu1NAm8EJWpogH+D2af2rEq7RZWSte7SPwScDmSmnbri6lb
-2Yt73HmXX2OMzMRncSLTYZKcrDiJajYRmiL/HtVz04aFTcr5M9lyHN42uf4Evudn
-kW09lmZj6j/HwR7PcDFah4AqyU7nCuauQeRGZyx6x0/ovdEHpOd9Pb1fk0Ha8Wnj
-Uy9DxJQxCkoErc2jZMdaT/ar1yBm1ff85KTTsMEamwcCHZohPDuPC3OVD2EqdloD
-sCUCshzZnY0DHoKRAgMBAAEwDQYJKoZIhvcNAQELBQADgYEAlvwZaozayj5zWaEK
-VoXBZgiC+X9LNjQBf4Nyn6aaxdcWZxerzcK6IZXfpoIfFg8fMf5GoMQtv7lwEnlv
-YpHhYBLJIkuaiRWGe66BLuE4ptFwpW74A1l75q8lb0Tne+sFJUQskq/0MjFHzhPN
-VP9m5ioo12rNhafGNOYjyM+pmXA=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxHoNi
+auPw8NG8Trme2JaegVVFKRhwC7tG/EoiVcR0cmDqLXFFcgDDuwGZrs0Md26FJ2+p
+ptP6rcVhYmQrz6XCipOFKBMRjQe0hqZ9tlNukd9oHJjPIE7pxa1U742janu7dXKt
+Hox8Xr5pTOXap6LS/0vYeoj9+PV87Scl1Zb/PiAQwTzmssh+JS49eJi9/yTCAiDU
+beGbgwguOsqhktdM6Nvxf6p9SN9m3FkH82Qtr6We70tzFILiJ0SJFx1v/xkaiJD7
+6+LhLqEoS9e1AQiUtyAsRw0gK3ybWELjFssWDFSgWuTo+UMmWGn+Rhe1erS6GpJU
+eetIq0ZXorSPmlA3AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEATpEu3JwborOT7ao8
+ZH2xMniq+ApM++8MysMFf9wZ4IfKs00ey9B3xVsNppgEpLZfq1dGpYRcgcmlDe9D
+FLMvDbjHXixdGlA518wS3ghlkPTQw7Q3unZ8kHnRgXsQpgOQO8vDnO3HOP0Ec/+d
+TJHunZjHo2+WVEvxnakqL1H7Ck4=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client-key.pem b/tls/tests/files/client-key.pem
index e74b785..b9f3880 100644
--- a/tls/tests/files/client-key.pem
+++ b/tls/tests/files/client-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAtIBgYIGVnGYDsLXyuLKWkWIJZi+F3DudsuzuLEF20ErVIJYl
-ziqPQisQQ1KIh8GmF9tEZu+7lhCUALT7UzKppOoLtTQJvBCVqaIB/g9mn9qxKu0W
-VkrXu0j8EnA5kpp264upW9mLe9x5l19jjMzEZ3Ei02GSnKw4iWo2EZoi/x7Vc9OG
-hU3K+TPZchzeNrn+BL7nZ5FtPZZmY+o/x8Eez3AxWoeAKslO5wrmrkHkRmcsesdP
-6L3RB6TnfT29X5NB2vFp41MvQ8SUMQpKBK3No2THWk/2q9cgZtX3/OSk07DBGpsH
-Ah2aITw7jwtzlQ9hKnZaA7AlArIc2Z2NAx6CkQIDAQABAoIBAQCRElDjn6LgZbl3
-kHT5b0fGp1XIlE9w91VC1lyCo0bcGBj9rM/LyLcFRlk20qG7Aq/8opVyaiGJdd+O
-RedtMd3ZFua8B4v/ZBD1mqkhSb2AoyMbzhvS1SpYc0ttglczdgQ4QjKnCMyri0MK
-n3cCVh1QykRkQhq041I5V20HbqvMAODQ8UbRHCrzY25lzW+b8JUbv8PU3DWWmUZO
-1CMhALj5PLaoQM5Wnou0HrRULvKC4piBmvsWLpRf1unwNZxo2gfut8Kwrvibk/Vt
-7sMJkAkkImU3bZf90CZnPIE4LvVrbdsXhhauL+8Elf+1BudQ26+NE1ELAjNwmJLV
-RtxIQAHlAoGBAOY9LYBJxj3zbpA0KlsMbYjgAL0nsPDXvZeobyygjpj0twM68l4L
-dQRHqN71MmujHTVtrgI+Ut3U8bf4jjhyxs4XYyJsia5omGr2a8GF4gZXnS0qD1qJ
-3jsPgJpg9CVYZmeFr43ClqM4itdY+2UD4neZrFvuKVb6pqG2tbz9N3a3AoGBAMiy
-jGwPoKr/VXvSGJIFXYHBCrSCPM7BIuCHoVgTF26vpi6ofI/uXRJ/uMW7YxoMyIqi
-XzQz04YPjznsX/IInvoCDKWGkxob/+d9o+Eoa64AueyPQVFDvDXuQcWnBRA0vSFR
-iFlv3Q+97ttOBniRlC3rlSWyoqp/6ogjVu2VBMj3AoGAJcpi3oy9aku7mRXG4fzv
-Oaky1dle9JkkuHDgFp4f6cE5DOGvCHqu8U3lzPrIFNzIHY3sItgh9+FM75pvlZpZ
-QVibX/oauzLV2bCqzS/xgoL8/H3L2VuJy33m6PADAuI4pMNPpmALI61TNLeZQ+JY
-WLMzlD9KL8miciawO94ALY8CgYBg/BdrqOmleJogqdiBx+H18AlyTXWBHEf0ZNaN
-LzylmnAeIAGBtFh5tgreUr2DOyY2CF0lZt4S7LXz8cwztALPIepmmu+/MESr40Us
-a1IN1gAC1v9je+4ZybczApEp0bKLxVC0l6AmGUyx4bSy0vbecfezLe35orL9csZx
-LRAQ5QKBgE5Xc1Pj7veJfsrcJX3Sh7qfJrhozGQjXMglUkOhTg2a6II9IEykprFR
-AccJ00IBIEgYZ2OBKulsG2hSO4iatArKRtzywvWyFFI7LgFf8b8wxhzAsgrmy7tr
-TDs1oDvc3esS8CTkL9+m5TLeTTQOXoHvDRapWJNN/u7vC1O/07d2
+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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 7c22f28..fa200cb 100644
--- a/tls/tests/files/client-past.pem
+++ b/tls/tests/files/client-past.pem
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQQwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
 AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcxNjAwMDBaFw0wMTA3MTcxNjAw
 MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSAYGCBlZxm
-A7C18riylpFiCWYvhdw7nbLs7ixBdtBK1SCWJc4qj0IrEENSiIfBphfbRGbvu5YQ
-lAC0+1MyqaTqC7U0CbwQlamiAf4PZp/asSrtFlZK17tI/BJwOZKaduuLqVvZi3vc
-eZdfY4zMxGdxItNhkpysOIlqNhGaIv8e1XPThoVNyvkz2XIc3ja5/gS+52eRbT2W
-ZmPqP8fBHs9wMVqHgCrJTucK5q5B5EZnLHrHT+i90Qek5309vV+TQdrxaeNTL0PE
-lDEKSgStzaNkx1pP9qvXIGbV9/zkpNOwwRqbBwIdmiE8O48Lc5UPYSp2WgOwJQKy
-HNmdjQMegpECAwEAATANBgkqhkiG9w0BAQsFAAOBgQAT1xUWWPSwDuW0aEX4P+Tb
-6QOmZXnsSFNK1C4tt7N96x2HPP2CEEqvge8wwXTzdm50qrAYMCqoX3O4yNWhe7TO
-KWFIiuzdPfLvgDR/OZS+rilEFuj89X03LYLqJuy94tz3e54z1HenEcPDLSrNXHI9
-H39pXiBnpiVmSaRUHMsszw==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEeg2Jq4/Dw
+0bxOuZ7Ylp6BVUUpGHALu0b8SiJVxHRyYOotcUVyAMO7AZmuzQx3boUnb6mm0/qt
+xWFiZCvPpcKKk4UoExGNB7SGpn22U26R32gcmM8gTunFrVTvjaNqe7t1cq0ejHxe
+vmlM5dqnotL/S9h6iP349XztJyXVlv8+IBDBPOayyH4lLj14mL3/JMICINRt4ZuD
+CC46yqGS10zo2/F/qn1I32bcWQfzZC2vpZ7vS3MUguInRIkXHW//GRqIkPvr4uEu
+oShL17UBCJS3ICxHDSArfJtYQuMWyxYMVKBa5Oj5QyZYaf5GF7V6tLoaklR560ir
+RleitI+aUDcCAwEAATANBgkqhkiG9w0BAQUFAAOBgQCwaQ8M656dQj0qxBOlCoP7
+r656CQ4WsdB2wO5GNfsFnucg/tXlNCCVXtfjvYQSZs3uUqh7+2fdaWBEEsGTnxRp
+g13LDTMejTbI5aj/n4qDQo3GLQnRmYfh2c9O+IpnLoWHKnL9HOirRaewjoEAnXxK
+UZFF52Q9oCIF20S7/iGDCQ==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client.pem b/tls/tests/files/client.pem
index a6dce66..62692c8 100644
--- a/tls/tests/files/client.pem
+++ b/tls/tests/files/client.pem
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQIwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNDA3MTgxNTE1NTBaFw0zOTA3MTIxNTE1
-NTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNDEyMTEyMTQxNDVaFw0zOTEyMDUyMTQx
+NDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSAYGCBlZxm
-A7C18riylpFiCWYvhdw7nbLs7ixBdtBK1SCWJc4qj0IrEENSiIfBphfbRGbvu5YQ
-lAC0+1MyqaTqC7U0CbwQlamiAf4PZp/asSrtFlZK17tI/BJwOZKaduuLqVvZi3vc
-eZdfY4zMxGdxItNhkpysOIlqNhGaIv8e1XPThoVNyvkz2XIc3ja5/gS+52eRbT2W
-ZmPqP8fBHs9wMVqHgCrJTucK5q5B5EZnLHrHT+i90Qek5309vV+TQdrxaeNTL0PE
-lDEKSgStzaNkx1pP9qvXIGbV9/zkpNOwwRqbBwIdmiE8O48Lc5UPYSp2WgOwJQKy
-HNmdjQMegpECAwEAATANBgkqhkiG9w0BAQsFAAOBgQB3ZtwtBZDj0FQpVAp3UzY0
-QEnF4ZLksFr79Z0P+1JGo/CCwAVsH/QwE+fAMH9G65fECPSRYCy6MWYJ7+g7iwJn
-kfh2gd5SZY/iOOpRu5rJXVkUvFyq5pJ7OKzAjYdLWpzRu6Xk/I1Lo8dgoTJqp1/Y
-vF623hzx0M3UDEyWLBnJzw==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEeg2Jq4/Dw
+0bxOuZ7Ylp6BVUUpGHALu0b8SiJVxHRyYOotcUVyAMO7AZmuzQx3boUnb6mm0/qt
+xWFiZCvPpcKKk4UoExGNB7SGpn22U26R32gcmM8gTunFrVTvjaNqe7t1cq0ejHxe
+vmlM5dqnotL/S9h6iP349XztJyXVlv8+IBDBPOayyH4lLj14mL3/JMICINRt4ZuD
+CC46yqGS10zo2/F/qn1I32bcWQfzZC2vpZ7vS3MUguInRIkXHW//GRqIkPvr4uEu
+oShL17UBCJS3ICxHDSArfJtYQuMWyxYMVKBa5Oj5QyZYaf5GF7V6tLoaklR560ir
+RleitI+aUDcCAwEAATANBgkqhkiG9w0BAQUFAAOBgQADnv2uGaFVCQg6q9XC/YPw
+PIe+dlDXidxRKxycgkzFwTYzHbcbv6S9hUoatyI/qiHYvPaFJyIhyZ/XcZGGKXtr
+OLst1D7cnx4MsWoDCNEW4VBHaERZrOJXlJKGqf4s1f37LizjrS84g7TksRuuCcDn
+9yMFtvNq4GKQokMJcHXc8Q==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/create-files.sh b/tls/tests/files/create-files.sh
index 35aa38d..5e21b6a 100755
--- a/tls/tests/files/create-files.sh
+++ b/tls/tests/files/create-files.sh
@@ -72,6 +72,19 @@ msg "Converting server private key from PEM to DER"
 openssl rsa -in server-key.pem -outform DER -out server-key.der
 
 #######################################################################
+### Other server
+#######################################################################
+
+msg "Creating other server private key"
+openssl genrsa -out other-key.pem 512
+
+msg "Creating other server certificate request"
+openssl req -config ssl/other.conf -key other-key.pem -new -out other-csr.pem
+
+msg "Creating other server certificate"
+openssl x509 -req -in other-csr.pem -days 9125 -CA ca.pem -CAkey ca-key.pem -CAserial serial -extfile 
ssl/other.conf -extensions v3_req_ext -out other.pem
+
+#######################################################################
 ### Server (self-signed)
 #######################################################################
 
@@ -126,6 +139,9 @@ echo >> non-ca.pem
 echo "server.pem:" >> non-ca.pem
 cat server.pem >> non-ca.pem
 echo >> non-ca.pem
+echo "other.pem:" >> non-ca.pem
+cat other.pem >> non-ca.pem
+echo >> non-ca.pem
 echo "server-self.pem:" >> non-ca.pem
 cat server-self.pem >> non-ca.pem
 
diff --git a/tls/tests/files/intermediate-ca-key.pem b/tls/tests/files/intermediate-ca-key.pem
index 9b29fd8..cc309b9 100644
--- a/tls/tests/files/intermediate-ca-key.pem
+++ b/tls/tests/files/intermediate-ca-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBANnLlSU3Cmz/f9eC4Yo7wSZaHNNcmXotxGYVoNyuVc4ODxtqTwt+
-1fx7dyhBHb/VQEcatz+/HeK5o+jjOpvqSW8CAwEAAQJBAJBMZwOiJQE0guIpr/7j
-OkSLvb94AaPGgPJV8B9mTilXRFqOhU2fw/i+SbX42JM6wVY+ByomPfpNj1V/sI4K
-hrECIQDt6B6V//oXOLzsPx3idn3lPa9OUtKsneFU+0IIP6NvVwIhAOpb6BRPghIl
-Oq/jLHkRWOKaoU553YgEeMmKx/kMn9+pAiEAqBITAY9MQ/l+ZjwUxbdGK5xPa7rR
-QMdsuBelR6SFtpMCIQCIVntHBZIX2Eyx8ij3LZ5WBbr9mmvEK0XRickYG74OMQIg
-agZFDu2+IR8oP+KcXvT9gcMs1fgC90poZYiCsKD7Jss=
+MIIBOgIBAAJBALxVEtm+PHxzfz//O+LnraQAryEiSluqoDJQNp92FnyaX31ZMAD+
+MKG7q6u+YsEYc9hd0xSh9tmfHG2xGmy7XFsCAwEAAQJAaRWvJwAXD/oCDtuDtuA+
+6zvWfE593xgduvU3BVMGyQ8EIa6DMeJMQ1MHgvI+l7B8xTyEBe5RAJ1dXndz31WO
+QQIhAPA6XSv7BePVHBSMfVfR9M8gbaIXVS09AUlHHO8yO7o1AiEAyLJ47eYCK34q
+PU3IOoZqdXdMl1mUialI/bAYC3tmDk8CIANU++fZQnqngQ0z6aUnL1sUGxEte6v1
+9aebieYzbyqlAiEAkLbgK+pmNiZLHtkvP8Qcj4buW1Pknz7JuuN28xCPjlECICT/
+IzaWPq/maPkFiQIFndKB0ulCqQdSabXNfahILbRq
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/intermediate-ca.pem b/tls/tests/files/intermediate-ca.pem
index 2de5efd..04c66a6 100644
--- a/tls/tests/files/intermediate-ca.pem
+++ b/tls/tests/files/intermediate-ca.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDrjCCAxegAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
+MIIDrjCCAxegAwIBAgIBBjANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MDczMTE4MDQwNVoXDTM5MDcy
-NTE4MDQwNVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE1MVoXDTM5MTIw
+NTIxNDE1MVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
 FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
 aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
 BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTBcMA0GCSqG
-SIb3DQEBAQUAA0sAMEgCQQDZy5UlNwps/3/XguGKO8EmWhzTXJl6LcRmFaDcrlXO
-Dg8bak8LftX8e3coQR2/1UBHGrc/vx3iuaPo4zqb6klvAgMBAAGjggFFMIIBQTAd
-BgNVHQ4EFgQUY8cTwoNkLNWWDASVAmwmL8Upfk0wgbsGA1UdIwSBszCBsIAUuR3p
-wFSjo4H3Mb3UQDjQ4rxKDTehgYykgYkwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00x
+SIb3DQEBAQUAA0sAMEgCQQC8VRLZvjx8c38//zvi562kAK8hIkpbqqAyUDafdhZ8
+ml99WTAA/jChu6urvmLBGHPYXdMUofbZnxxtsRpsu1xbAgMBAAGjggFFMIIBQTAd
+BgNVHQ4EFgQUC2Pqf4MlFmLJeloYapjxTLwLovowgbsGA1UdIwSBszCBsIAUC3RG
+9bn9O+RsvMCBq9RpYPkI9gOhgYykgYkwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00x
 FzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBB
 dXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkB
-Fg5jYUBleGFtcGxlLmNvbYIJAIKoNLAclgPoMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+Fg5jYUBleGFtcGxlLmNvbYIJANEohODeSu2QMA8GA1UdEwEB/wQFMAMBAf8wDgYD
 VR0PAQH/BAQDAgEGMCYGA1UdEQQfMB2BG2ludGVybWVkaWF0ZS1jYUBleGFtcGxl
 LmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOB
-gQBVb72AEGUWEbE9ZUZIy/zNJrsywSl3SDWcUIbHwCFihH0V7RfgmR+v22aPWSfq
-3r8Y3FIZ82RuFhAc1q0W1ZlbOvdVgVvCC/R97m2t/AzZ5Xo797aJYZ9TY+b6wVJH
-H/P3JPD/RrBXIW/OaK+L70n6O/ikhXwWDkpenPIoY4BBsg==
+gQAKHRvDoz4kpxfqrEaiEakL+hLLZ9i7If1dAmQbwe9UZvRIExHApc74ainZm/hf
+bl/GBI6vj6Dzn1sXrNO/WKBVAl38e73e0e0nMEihaDmq3KwlfTuAdI9vI50KV3vK
+543K64QGhO/I/YOpwS8xs7JqGI9WzU5CHVaXl6vzIELMMg==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/non-ca.pem b/tls/tests/files/non-ca.pem
index 2e990c2..56aac23 100644
--- a/tls/tests/files/non-ca.pem
+++ b/tls/tests/files/non-ca.pem
@@ -1,88 +1,104 @@
 client.pem:
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQIwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNDA3MTgxNTE1NTBaFw0zOTA3MTIxNTE1
-NTBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNDEyMTEyMTQxNDVaFw0zOTEyMDUyMTQx
+NDVaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSAYGCBlZxm
-A7C18riylpFiCWYvhdw7nbLs7ixBdtBK1SCWJc4qj0IrEENSiIfBphfbRGbvu5YQ
-lAC0+1MyqaTqC7U0CbwQlamiAf4PZp/asSrtFlZK17tI/BJwOZKaduuLqVvZi3vc
-eZdfY4zMxGdxItNhkpysOIlqNhGaIv8e1XPThoVNyvkz2XIc3ja5/gS+52eRbT2W
-ZmPqP8fBHs9wMVqHgCrJTucK5q5B5EZnLHrHT+i90Qek5309vV+TQdrxaeNTL0PE
-lDEKSgStzaNkx1pP9qvXIGbV9/zkpNOwwRqbBwIdmiE8O48Lc5UPYSp2WgOwJQKy
-HNmdjQMegpECAwEAATANBgkqhkiG9w0BAQsFAAOBgQB3ZtwtBZDj0FQpVAp3UzY0
-QEnF4ZLksFr79Z0P+1JGo/CCwAVsH/QwE+fAMH9G65fECPSRYCy6MWYJ7+g7iwJn
-kfh2gd5SZY/iOOpRu5rJXVkUvFyq5pJ7OKzAjYdLWpzRu6Xk/I1Lo8dgoTJqp1/Y
-vF623hzx0M3UDEyWLBnJzw==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEeg2Jq4/Dw
+0bxOuZ7Ylp6BVUUpGHALu0b8SiJVxHRyYOotcUVyAMO7AZmuzQx3boUnb6mm0/qt
+xWFiZCvPpcKKk4UoExGNB7SGpn22U26R32gcmM8gTunFrVTvjaNqe7t1cq0ejHxe
+vmlM5dqnotL/S9h6iP349XztJyXVlv8+IBDBPOayyH4lLj14mL3/JMICINRt4ZuD
+CC46yqGS10zo2/F/qn1I32bcWQfzZC2vpZ7vS3MUguInRIkXHW//GRqIkPvr4uEu
+oShL17UBCJS3ICxHDSArfJtYQuMWyxYMVKBa5Oj5QyZYaf5GF7V6tLoaklR560ir
+RleitI+aUDcCAwEAATANBgkqhkiG9w0BAQUFAAOBgQADnv2uGaFVCQg6q9XC/YPw
+PIe+dlDXidxRKxycgkzFwTYzHbcbv6S9hUoatyI/qiHYvPaFJyIhyZ/XcZGGKXtr
+OLst1D7cnx4MsWoDCNEW4VBHaERZrOJXlJKGqf4s1f37LizjrS84g7TksRuuCcDn
+9yMFtvNq4GKQokMJcHXc8Q==
 -----END CERTIFICATE-----
 
 client-future.pem:
 -----BEGIN CERTIFICATE-----
-MIIC4DCCAkkCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC4DCCAkkCAQUwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
 AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzE2MDAwMFoYDzIwNjEwNzE3
 MTYwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
 RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0gGBg
-gZWcZgOwtfK4spaRYglmL4XcO52y7O4sQXbQStUgliXOKo9CKxBDUoiHwaYX20Rm
-77uWEJQAtPtTMqmk6gu1NAm8EJWpogH+D2af2rEq7RZWSte7SPwScDmSmnbri6lb
-2Yt73HmXX2OMzMRncSLTYZKcrDiJajYRmiL/HtVz04aFTcr5M9lyHN42uf4Evudn
-kW09lmZj6j/HwR7PcDFah4AqyU7nCuauQeRGZyx6x0/ovdEHpOd9Pb1fk0Ha8Wnj
-Uy9DxJQxCkoErc2jZMdaT/ar1yBm1ff85KTTsMEamwcCHZohPDuPC3OVD2EqdloD
-sCUCshzZnY0DHoKRAgMBAAEwDQYJKoZIhvcNAQELBQADgYEAlvwZaozayj5zWaEK
-VoXBZgiC+X9LNjQBf4Nyn6aaxdcWZxerzcK6IZXfpoIfFg8fMf5GoMQtv7lwEnlv
-YpHhYBLJIkuaiRWGe66BLuE4ptFwpW74A1l75q8lb0Tne+sFJUQskq/0MjFHzhPN
-VP9m5ioo12rNhafGNOYjyM+pmXA=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxHoNi
+auPw8NG8Trme2JaegVVFKRhwC7tG/EoiVcR0cmDqLXFFcgDDuwGZrs0Md26FJ2+p
+ptP6rcVhYmQrz6XCipOFKBMRjQe0hqZ9tlNukd9oHJjPIE7pxa1U742janu7dXKt
+Hox8Xr5pTOXap6LS/0vYeoj9+PV87Scl1Zb/PiAQwTzmssh+JS49eJi9/yTCAiDU
+beGbgwguOsqhktdM6Nvxf6p9SN9m3FkH82Qtr6We70tzFILiJ0SJFx1v/xkaiJD7
+6+LhLqEoS9e1AQiUtyAsRw0gK3ybWELjFssWDFSgWuTo+UMmWGn+Rhe1erS6GpJU
+eetIq0ZXorSPmlA3AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEATpEu3JwborOT7ao8
+ZH2xMniq+ApM++8MysMFf9wZ4IfKs00ey9B3xVsNppgEpLZfq1dGpYRcgcmlDe9D
+FLMvDbjHXixdGlA518wS3ghlkPTQw7Q3unZ8kHnRgXsQpgOQO8vDnO3HOP0Ec/+d
+TJHunZjHo2+WVEvxnakqL1H7Ck4=
 -----END CERTIFICATE-----
 
 client-past.pem:
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQQwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
 AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcxNjAwMDBaFw0wMTA3MTcxNjAw
 MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSAYGCBlZxm
-A7C18riylpFiCWYvhdw7nbLs7ixBdtBK1SCWJc4qj0IrEENSiIfBphfbRGbvu5YQ
-lAC0+1MyqaTqC7U0CbwQlamiAf4PZp/asSrtFlZK17tI/BJwOZKaduuLqVvZi3vc
-eZdfY4zMxGdxItNhkpysOIlqNhGaIv8e1XPThoVNyvkz2XIc3ja5/gS+52eRbT2W
-ZmPqP8fBHs9wMVqHgCrJTucK5q5B5EZnLHrHT+i90Qek5309vV+TQdrxaeNTL0PE
-lDEKSgStzaNkx1pP9qvXIGbV9/zkpNOwwRqbBwIdmiE8O48Lc5UPYSp2WgOwJQKy
-HNmdjQMegpECAwEAATANBgkqhkiG9w0BAQsFAAOBgQAT1xUWWPSwDuW0aEX4P+Tb
-6QOmZXnsSFNK1C4tt7N96x2HPP2CEEqvge8wwXTzdm50qrAYMCqoX3O4yNWhe7TO
-KWFIiuzdPfLvgDR/OZS+rilEFuj89X03LYLqJuy94tz3e54z1HenEcPDLSrNXHI9
-H39pXiBnpiVmSaRUHMsszw==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPEeg2Jq4/Dw
+0bxOuZ7Ylp6BVUUpGHALu0b8SiJVxHRyYOotcUVyAMO7AZmuzQx3boUnb6mm0/qt
+xWFiZCvPpcKKk4UoExGNB7SGpn22U26R32gcmM8gTunFrVTvjaNqe7t1cq0ejHxe
+vmlM5dqnotL/S9h6iP349XztJyXVlv8+IBDBPOayyH4lLj14mL3/JMICINRt4ZuD
+CC46yqGS10zo2/F/qn1I32bcWQfzZC2vpZ7vS3MUguInRIkXHW//GRqIkPvr4uEu
+oShL17UBCJS3ICxHDSArfJtYQuMWyxYMVKBa5Oj5QyZYaf5GF7V6tLoaklR560ir
+RleitI+aUDcCAwEAATANBgkqhkiG9w0BAQUFAAOBgQCwaQ8M656dQj0qxBOlCoP7
+r656CQ4WsdB2wO5GNfsFnucg/tXlNCCVXtfjvYQSZs3uUqh7+2fdaWBEEsGTnxRp
+g13LDTMejTbI5aj/n4qDQo3GLQnRmYfh2c9O+IpnLoWHKnL9HOirRaewjoEAnXxK
+UZFF52Q9oCIF20S7/iGDCQ==
 -----END CERTIFICATE-----
 
 server.pem:
 -----BEGIN CERTIFICATE-----
-MIICNzCCAaCgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIICNzCCAaCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MDcxODE1NDg0M1oXDTM5MDcx
-MjE1NDg0M1owSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE0NVoXDTM5MTIw
+NTIxNDE0NVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
 B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3
-DQEBAQUAA0sAMEgCQQDYr/S4UqathXoTeBKb94cGUHph+2Qtlap+eONpInhAsfka
-NovCeCUmjHS/pOBOsKAdyckLhb/BAabX4qgFwIcfAgMBAAGjMzAxMAkGA1UdEwQC
+DQEBAQUAA0sAMEgCQQC/9UfLdOHPtnRO6XTeMjHh06XZl5RRuvseLsYabTSOF7QZ
+fCio+XrZ7Dr9kcPYD0T6q+Huoe8AecuyC91VA/i/AgMBAAGjMzAxMAkGA1UdEwQC
 MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0RBAgwBocEwKgBCjANBgkqhkiG
-9w0BAQsFAAOBgQA2DvQ4t6ScSANCWNpCwLlG/Mzmv/Nu/95pivh/MSJha1Cr2zLy
-6yyzi1atmSXhRcEn63dUoYuPdrd5P679fQVyepQ1EEksa9TaEaf8GcfUQFnBxrqq
-h/Uky1rKIhFkboLF+3yASZ/V70MYl+Rr8RNa2VKilKNh5rFw6tqg/sBiNw==
+9w0BAQUFAAOBgQCPuMR5c5vFmyeTddPPR0nMYt+zkuw6JL8vqY4LQWBF5CpP2vTi
+mKjC/Jj7W/YTyD4t9mE/tznBqLqGxQQRwad+mMkvy0MsgKxFNz0pCXDit2qWHG66
+LW4YtT7ieLTv2G0oYkdGsLldRdf0XK6buxWpd734dS2CXpAJCHAreMGT2Q==
+-----END CERTIFICATE-----
+
+other.pem:
+-----BEGIN CERTIFICATE-----
+MIICNjCCAZ+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE0NVoXDTM5MTIw
+NTIxNDE0NVowSjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGjAYBgNVBAMMEW90aGVyLmV4YW1wbGUuY29tMFwwDQYJKoZIhvcN
+AQEBBQADSwAwSAJBAM/nAc2ou52eFP28Vzs5KRk0UAN2lpPtLRPJMxGibyidPmfz
+v3iU80qkzOF+4Y3Ym9jUhKJ8PAMrqwL+fVHlipECAwEAAaMzMDEwCQYDVR0TBAIw
+ADATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHREECDAGhwTAqAEKMA0GCSqGSIb3
+DQEBBQUAA4GBAKhIZRGxglW/zxCdgF3v+hb+f7Btg2Ev+79zKsa8NzwZGstBCtLT
++GDc7nj8jsWeHtBYaJBWWRoDaqnszS8sSbxVT1IKg2rlBi5DMoTvYRLSSc4Sv39z
+m27LXf4li3vKzUrI3QcAlaMNhsWaTWzyPfHUuUdgqqe4EIsfOr8IEooe
 -----END CERTIFICATE-----
 
 server-self.pem:
 -----BEGIN CERTIFICATE-----
-MIIBiDCCATICCQCGr5DYAwta3jANBgkqhkiG9w0BAQsFADBLMRMwEQYKCZImiZPy
+MIIBiDCCATICCQD/yBO67QWnEDANBgkqhkiG9w0BAQUFADBLMRMwEQYKCZImiZPy
 LGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEbMBkGA1UEAwwSc2Vy
-dmVyLmV4YW1wbGUuY29tMB4XDTE0MDcxODE1MTU1MFoXDTM5MDcxMjE1MTU1MFow
+dmVyLmV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE0NVoXDTM5MTIwNTIxNDE0NVow
 SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
 GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sA
-MEgCQQDAUI4hEDPatu3gIu+7GWekO2Rn5Dez761UKqO+BEzBPq+k0c4vM3zSxHSN
-+qs4GXo4c5NjE4B2bd4vBQbjdMxBAgMBAAEwDQYJKoZIhvcNAQELBQADQQA5cctq
-qwmQTXiBR60skzFdqiEED6KHOCS1UU0ufF0dA0Wb3maet5QPIZcAYMjMChftdhPB
-Uvdhf9VIwnUZ85KW
+MEgCQQC/9UfLdOHPtnRO6XTeMjHh06XZl5RRuvseLsYabTSOF7QZfCio+XrZ7Dr9
+kcPYD0T6q+Huoe8AecuyC91VA/i/AgMBAAEwDQYJKoZIhvcNAQEFBQADQQCiLnu1
+Fh5vCwjs3ZlLAi3xH1Tv0nIplONA/8S9ljcxV0IUBz5EZQWX1gJfIfgdfsURuKN4
+tpcttmqw0KZAtSn7
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/other-key.pem b/tls/tests/files/other-key.pem
new file mode 100644
index 0000000..8384688
--- /dev/null
+++ b/tls/tests/files/other-key.pem
@@ -0,0 +1,9 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIBOwIBAAJBAM/nAc2ou52eFP28Vzs5KRk0UAN2lpPtLRPJMxGibyidPmfzv3iU
+80qkzOF+4Y3Ym9jUhKJ8PAMrqwL+fVHlipECAwEAAQJBAIjk0iIqFYeefLHqnwGn
+DLHE6V6uak3zIPhjRhY5f7ocRrihHJTAoLcqFz3HfoVHPlDhcIJemJPw2gU4XygD
+vPECIQD9rPzDfzAWH6FB/enrd78wfZmOutzva4UcBRyCcYo0bQIhANHOp8SYorlZ
+e7rrFoE/29TwrKJv9CNyuZV8vQltHXA1AiBH9O/mDIf5XpOBgqL99gO3n4kVYZAW
+IeuqHREPN2G6qQIgET+4M0WJO0vMDFX/h6jEXgFbcA9cNv3bnBqhQAEkhnECIQDx
+Fg5aN4/1LJnwba4IrXzQjUkMp4NvqRX2P9+CrY6uvg==
+-----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/other.pem b/tls/tests/files/other.pem
new file mode 100644
index 0000000..1ed9278
--- /dev/null
+++ b/tls/tests/files/other.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICNjCCAZ+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
+ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
+ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE0NVoXDTM5MTIw
+NTIxNDE0NVowSjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+B0VYQU1QTEUxGjAYBgNVBAMMEW90aGVyLmV4YW1wbGUuY29tMFwwDQYJKoZIhvcN
+AQEBBQADSwAwSAJBAM/nAc2ou52eFP28Vzs5KRk0UAN2lpPtLRPJMxGibyidPmfz
+v3iU80qkzOF+4Y3Ym9jUhKJ8PAMrqwL+fVHlipECAwEAAaMzMDEwCQYDVR0TBAIw
+ADATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHREECDAGhwTAqAEKMA0GCSqGSIb3
+DQEBBQUAA4GBAKhIZRGxglW/zxCdgF3v+hb+f7Btg2Ev+79zKsa8NzwZGstBCtLT
++GDc7nj8jsWeHtBYaJBWWRoDaqnszS8sSbxVT1IKg2rlBi5DMoTvYRLSSc4Sv39z
+m27LXf4li3vKzUrI3QcAlaMNhsWaTWzyPfHUuUdgqqe4EIsfOr8IEooe
+-----END CERTIFICATE-----
diff --git a/tls/tests/files/server-and-key.pem b/tls/tests/files/server-and-key.pem
index b6ea2af..bd98954 100644
--- a/tls/tests/files/server-and-key.pem
+++ b/tls/tests/files/server-and-key.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIICNzCCAaCgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIICNzCCAaCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MDcxODE1NDg0M1oXDTM5MDcx
-MjE1NDg0M1owSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE0NVoXDTM5MTIw
+NTIxNDE0NVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
 B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3
-DQEBAQUAA0sAMEgCQQDYr/S4UqathXoTeBKb94cGUHph+2Qtlap+eONpInhAsfka
-NovCeCUmjHS/pOBOsKAdyckLhb/BAabX4qgFwIcfAgMBAAGjMzAxMAkGA1UdEwQC
+DQEBAQUAA0sAMEgCQQC/9UfLdOHPtnRO6XTeMjHh06XZl5RRuvseLsYabTSOF7QZ
+fCio+XrZ7Dr9kcPYD0T6q+Huoe8AecuyC91VA/i/AgMBAAGjMzAxMAkGA1UdEwQC
 MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0RBAgwBocEwKgBCjANBgkqhkiG
-9w0BAQsFAAOBgQA2DvQ4t6ScSANCWNpCwLlG/Mzmv/Nu/95pivh/MSJha1Cr2zLy
-6yyzi1atmSXhRcEn63dUoYuPdrd5P679fQVyepQ1EEksa9TaEaf8GcfUQFnBxrqq
-h/Uky1rKIhFkboLF+3yASZ/V70MYl+Rr8RNa2VKilKNh5rFw6tqg/sBiNw==
+9w0BAQUFAAOBgQCPuMR5c5vFmyeTddPPR0nMYt+zkuw6JL8vqY4LQWBF5CpP2vTi
+mKjC/Jj7W/YTyD4t9mE/tznBqLqGxQQRwad+mMkvy0MsgKxFNz0pCXDit2qWHG66
+LW4YtT7ieLTv2G0oYkdGsLldRdf0XK6buxWpd734dS2CXpAJCHAreMGT2Q==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBANiv9LhSpq2FehN4Epv3hwZQemH7ZC2Vqn5442kieECx+Ro2i8J4
-JSaMdL+k4E6woB3JyQuFv8EBptfiqAXAhx8CAwEAAQJAEMr6JTrKjhIVFuMsVggF
-39hm06ce6WV69Bg8T46LUUAVM39HdsNDIRkhYXExpQUmiYRFzcrLF1ot8S/4u889
-yQIhAOwDbAqT2QrEcGIWi8aZP1N5gDv8h67UcHBcftveklC7AiEA6wmPopj8qFoh
-/xM4GCKtdAYUdbfqUFMTFo7ZmD+Tvu0CIBafdVnGNkXL8qHUW22b/u/3c41MdY0S
-m/yJQTe+K/RFAiAoStxP0JBHwCPh2YadRJydrkkloSDPIl68WELfQc7vRQIhAM9E
-FvuChciFJzfnNNzKpH93hH9f2YMDsVWvgz0fIRz0
+MIIBPAIBAAJBAL/1R8t04c+2dE7pdN4yMeHTpdmXlFG6+x4uxhptNI4XtBl8KKj5
+etnsOv2Rw9gPRPqr4e6h7wB5y7IL3VUD+L8CAwEAAQJAT4f/fANsP5QXsk41lo3z
+bt4y2+lakVZIDuRQPci7OpdNRJfIESdkmnj1MF8VzREMWD5RddedMwkSALsj7fn+
+4QIhAPBBnp7EeyXG5NiTvOAp0tXPLFdNOTASrM2oCmLoGeYRAiEAzIlxPeTDN0rY
+2cnQ6LuMxrm7qFiiH+PtUh7P6KD+4c8CIQCu6vdzHBWUgWPnklg20/xeEgF0ZhK2
+v0H0UN2O+PCyIQIhAJlhsFQTyvkZ3chkeY8tpgIYoks6PEnh6MQeaxcuNDUtAiEA
+m3zoMCU5pZNFo5YRgWAn0+WpB4oXnNa6cI294o17GDw=
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-intermediate-key.pem b/tls/tests/files/server-intermediate-key.pem
index e161e74..e51a5a1 100644
--- a/tls/tests/files/server-intermediate-key.pem
+++ b/tls/tests/files/server-intermediate-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBALSe4B+Ah4ogC55zqru/U6Exo/CNcXfJutvlgxsIm7THza0PiY8O
-0lNII79hhZN019x2OOekqfzpwj0wdgt5cecCAwEAAQJAGdZsWzVIrlKdNuJ29vqM
-nQ970yp4o9kguNohIhneJEL/NFnjMUAJTd5CIgXvKTzLtuT0l8QSeS3vu0m61RzY
-eQIhAN4glP7Hh8LeWf8y7R0MjufwC7LNLNIZGK6tSZ6G0h0rAiEA0Cn0JrJb0ZwZ
-lm/j3nyvyhW9d9tfH88NbTQqgSbIODUCID82EnB2o6HG2OGQwn1Tx48ldo7JaInZ
-bna3BY5BW6XFAiEAlvWF2LZJ/hWNPNrBzqxvs0bW01/keSXnn8VP+b9NPe0CIGtO
-aVNEJl+f7cGqtjXe9FYM0A2yn7YoBYH3yCpPOPRb
+MIIBPQIBAAJBAOPCj9fA0gxzQ69+KWDIPtkjA3jhyFRdxNLDFYmH0y+uAx7L4yi3
+p74XYBMB4pK7vMKCZ632+uYDGz/PZ3ZhgH8CAwEAAQJBANrMF78eXyrSuB0ox7tP
+4wBZYIaJ8BcMFX6bJl9+eeR8J+xzSbxWeaGflAS6Skgta5PCxge3qFW7FjwoNgUh
+YOECIQD77CZVHAzIX7DvBI1T3XuRLhXGPQwqojhQBq3GzER81wIhAOdyS0rkwspB
+siwLKyZ3BdAmhYZXh3WwRc4EAjgyw7yZAiEAjr71zX4SZCuMpzLuHdo/HTl+zxBi
+Z3n57KaMKzwthosCIQCGPME0uAfOfVoUt4mYbrIdbypEp+G2Pb3O5n5PEAp9CQIh
+AN05K9WvgffmGrg4VEGGc1ddZgNwGfhsXczF5qsYuKmG
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-intermediate.pem b/tls/tests/files/server-intermediate.pem
index 577bf85..91e1005 100644
--- a/tls/tests/files/server-intermediate.pem
+++ b/tls/tests/files/server-intermediate.pem
@@ -3,12 +3,12 @@ MIICKjCCAdSgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBrTETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
 bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
 aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTE0MDczMTE4MDQwNVoXDTM5MDcyNTE4MDQwNVow
+LWNhQGV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE1MVoXDTM5MTIwNTIxNDE1MVow
 WDETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
 KDAmBgNVBAMMH3NlcnZlci1pbnRlcm1lZGlhdGUuZXhhbXBsZS5jb20wXDANBgkq
-hkiG9w0BAQEFAANLADBIAkEAtJ7gH4CHiiALnnOqu79ToTGj8I1xd8m62+WDGwib
-tMfNrQ+Jjw7SU0gjv2GFk3TX3HY456Sp/OnCPTB2C3lx5wIDAQABozMwMTAJBgNV
+hkiG9w0BAQEFAANLADBIAkEA48KP18DSDHNDr34pYMg+2SMDeOHIVF3E0sMViYfT
+L64DHsvjKLenvhdgEwHikru8woJnrfb65gMbP89ndmGAfwIDAQABozMwMTAJBgNV
 HRMEAjAAMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdEQQIMAaHBMCoARYwDQYJ
-KoZIhvcNAQEFBQADQQBPcxVN1ylw3GKWeZMm6ZD+CSTSfgFjlbm/c0oGZCnz8fvs
-vCf7OpmCBLaArbkZlxNP6a6dAP23mcx6+WwKP8km
+KoZIhvcNAQEFBQADQQAZJUrUp7zzs9dqbMO59HoUs9Sfk74El5de7ct+rplW0HEW
+A5bNeSk+bCHrNXC1dFYZzMiYR92vfJkMVURTbBQp
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/server-key.der b/tls/tests/files/server-key.der
index 31c1ea0..3459b63 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 0f167a7..b6f5d8e 100644
--- a/tls/tests/files/server-key.pem
+++ b/tls/tests/files/server-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBANiv9LhSpq2FehN4Epv3hwZQemH7ZC2Vqn5442kieECx+Ro2i8J4
-JSaMdL+k4E6woB3JyQuFv8EBptfiqAXAhx8CAwEAAQJAEMr6JTrKjhIVFuMsVggF
-39hm06ce6WV69Bg8T46LUUAVM39HdsNDIRkhYXExpQUmiYRFzcrLF1ot8S/4u889
-yQIhAOwDbAqT2QrEcGIWi8aZP1N5gDv8h67UcHBcftveklC7AiEA6wmPopj8qFoh
-/xM4GCKtdAYUdbfqUFMTFo7ZmD+Tvu0CIBafdVnGNkXL8qHUW22b/u/3c41MdY0S
-m/yJQTe+K/RFAiAoStxP0JBHwCPh2YadRJydrkkloSDPIl68WELfQc7vRQIhAM9E
-FvuChciFJzfnNNzKpH93hH9f2YMDsVWvgz0fIRz0
+MIIBPAIBAAJBAL/1R8t04c+2dE7pdN4yMeHTpdmXlFG6+x4uxhptNI4XtBl8KKj5
+etnsOv2Rw9gPRPqr4e6h7wB5y7IL3VUD+L8CAwEAAQJAT4f/fANsP5QXsk41lo3z
+bt4y2+lakVZIDuRQPci7OpdNRJfIESdkmnj1MF8VzREMWD5RddedMwkSALsj7fn+
+4QIhAPBBnp7EeyXG5NiTvOAp0tXPLFdNOTASrM2oCmLoGeYRAiEAzIlxPeTDN0rY
+2cnQ6LuMxrm7qFiiH+PtUh7P6KD+4c8CIQCu6vdzHBWUgWPnklg20/xeEgF0ZhK2
+v0H0UN2O+PCyIQIhAJlhsFQTyvkZ3chkeY8tpgIYoks6PEnh6MQeaxcuNDUtAiEA
+m3zoMCU5pZNFo5YRgWAn0+WpB4oXnNa6cI294o17GDw=
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-self.pem b/tls/tests/files/server-self.pem
index 2082f8b..a221378 100644
--- a/tls/tests/files/server-self.pem
+++ b/tls/tests/files/server-self.pem
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBiDCCATICCQCGr5DYAwta3jANBgkqhkiG9w0BAQsFADBLMRMwEQYKCZImiZPy
+MIIBiDCCATICCQD/yBO67QWnEDANBgkqhkiG9w0BAQUFADBLMRMwEQYKCZImiZPy
 LGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEbMBkGA1UEAwwSc2Vy
-dmVyLmV4YW1wbGUuY29tMB4XDTE0MDcxODE1MTU1MFoXDTM5MDcxMjE1MTU1MFow
+dmVyLmV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE0NVoXDTM5MTIwNTIxNDE0NVow
 SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
 GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sA
-MEgCQQDAUI4hEDPatu3gIu+7GWekO2Rn5Dez761UKqO+BEzBPq+k0c4vM3zSxHSN
-+qs4GXo4c5NjE4B2bd4vBQbjdMxBAgMBAAEwDQYJKoZIhvcNAQELBQADQQA5cctq
-qwmQTXiBR60skzFdqiEED6KHOCS1UU0ufF0dA0Wb3maet5QPIZcAYMjMChftdhPB
-Uvdhf9VIwnUZ85KW
+MEgCQQC/9UfLdOHPtnRO6XTeMjHh06XZl5RRuvseLsYabTSOF7QZfCio+XrZ7Dr9
+kcPYD0T6q+Huoe8AecuyC91VA/i/AgMBAAEwDQYJKoZIhvcNAQEFBQADQQCiLnu1
+Fh5vCwjs3ZlLAi3xH1Tv0nIplONA/8S9ljcxV0IUBz5EZQWX1gJfIfgdfsURuKN4
+tpcttmqw0KZAtSn7
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/server.der b/tls/tests/files/server.der
index cbee9a6..1877728 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 e749e63..e1b24f4 100644
--- a/tls/tests/files/server.pem
+++ b/tls/tests/files/server.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICNzCCAaCgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
+MIICNzCCAaCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MDcxODE1NDg0M1oXDTM5MDcx
-MjE1NDg0M1owSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE0MTIxMTIxNDE0NVoXDTM5MTIw
+NTIxNDE0NVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
 B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3
-DQEBAQUAA0sAMEgCQQDYr/S4UqathXoTeBKb94cGUHph+2Qtlap+eONpInhAsfka
-NovCeCUmjHS/pOBOsKAdyckLhb/BAabX4qgFwIcfAgMBAAGjMzAxMAkGA1UdEwQC
+DQEBAQUAA0sAMEgCQQC/9UfLdOHPtnRO6XTeMjHh06XZl5RRuvseLsYabTSOF7QZ
+fCio+XrZ7Dr9kcPYD0T6q+Huoe8AecuyC91VA/i/AgMBAAGjMzAxMAkGA1UdEwQC
 MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0RBAgwBocEwKgBCjANBgkqhkiG
-9w0BAQsFAAOBgQA2DvQ4t6ScSANCWNpCwLlG/Mzmv/Nu/95pivh/MSJha1Cr2zLy
-6yyzi1atmSXhRcEn63dUoYuPdrd5P679fQVyepQ1EEksa9TaEaf8GcfUQFnBxrqq
-h/Uky1rKIhFkboLF+3yASZ/V70MYl+Rr8RNa2VKilKNh5rFw6tqg/sBiNw==
+9w0BAQUFAAOBgQCPuMR5c5vFmyeTddPPR0nMYt+zkuw6JL8vqY4LQWBF5CpP2vTi
+mKjC/Jj7W/YTyD4t9mE/tznBqLqGxQQRwad+mMkvy0MsgKxFNz0pCXDit2qWHG66
+LW4YtT7ieLTv2G0oYkdGsLldRdf0XK6buxWpd734dS2CXpAJCHAreMGT2Q==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/ssl/other.conf b/tls/tests/files/ssl/other.conf
new file mode 100644
index 0000000..344dc86
--- /dev/null
+++ b/tls/tests/files/ssl/other.conf
@@ -0,0 +1,27 @@
+# Server's other name
+
+[ req ]
+default_md              = sha1
+utf8                    = yes
+string_mask             = utf8only
+prompt                  = no
+distinguished_name      = req_dn
+req_extensions          = req_ext
+x509_extensions         = v3_req_ext
+
+[ req_dn ]
+0.domainComponent       = "COM"
+1.domainComponent       = "EXAMPLE"
+commonName              = "other.example.com"
+
+[ req_ext ]
+basicConstraints        = CA:false
+extendedKeyUsage        = serverAuth
+
+[ v3_req_ext ]
+basicConstraints        = CA:false
+extendedKeyUsage        = serverAuth
+subjectAltName          = @alt_names
+
+[ alt_names ]
+IP.0                    = 192.168.1.10
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]