GNOME.org
 

[glib-networking] Update test certificates for use with GnuTLS 3.6

commit f1ca77000088afd95384a47b03386f58c5578dc8
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Apr 15 10:34:26 2018 -0500

    Update test certificates for use with GnuTLS 3.6
    
    We have to make two changes for our tests to pass with GnuTLS 3.6.2:
    
     * SHA-1 is no longer accepted as a signing algorithm, so switch most of
       certificates to SHA-256. An exception is made for the root CA
       certificates, in order to verify that using SHA-1 has no impact on
       the trust of the roots.
    
     * The CN field is no longer checked when a SubjectAltName is present.
       Currently our server cert puts its domain name in the CN field and
       uses SubjectAltName only for IP address. Add the DNS domain name to
       SubjectAltName to fix this.
    
    The former change is clearly desirable. I'm thinking the later change
    might cause problems with web compat, though. We'll have to see if we
    get bug reports.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=794286

 tls/tests/files/ca-alternative.pem           |   24 +++---
 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                    |   66 ++++++++--------
 tls/tests/files/client-and-key.pem           |   76 +++++++++---------
 tls/tests/files/client-future.pem            |   28 ++++---
 tls/tests/files/client-key.pem               |   50 ++++++------
 tls/tests/files/client-past.pem              |   24 +++---
 tls/tests/files/client.pem                   |   26 +++---
 tls/tests/files/client2-and-key.pem          |   76 +++++++++---------
 tls/tests/files/client2-key.pem              |   50 ++++++------
 tls/tests/files/client2.pem                  |   26 +++---
 tls/tests/files/intermediate-ca-csr.pem      |   12 ++--
 tls/tests/files/intermediate-ca-key.pem      |   14 ++--
 tls/tests/files/intermediate-ca.pem          |   24 +++---
 tls/tests/files/non-ca.pem                   |  109 +++++++++++++------------
 tls/tests/files/old-ca-key.pem               |   26 +++---
 tls/tests/files/old-ca.pem                   |   24 +++---
 tls/tests/files/root-ca-csr.pem              |   18 ++--
 tls/tests/files/server-and-key.pem           |   33 ++++----
 tls/tests/files/server-intermediate-csr.pem  |    8 +-
 tls/tests/files/server-intermediate-key.pem  |   14 ++--
 tls/tests/files/server-intermediate.pem      |   14 ++--
 tls/tests/files/server-key.der               |  Bin 319 -> 320 bytes
 tls/tests/files/server-key.pem               |   14 ++--
 tls/tests/files/server-self.pem              |   12 ++--
 tls/tests/files/server.der                   |  Bin 571 -> 591 bytes
 tls/tests/files/server.pem                   |   19 +++--
 tls/tests/files/ssl/ca.conf                  |    1 +
 tls/tests/files/ssl/client.conf              |    2 +-
 tls/tests/files/ssl/intermediate-ca.conf     |    2 +-
 tls/tests/files/ssl/server-intermediate.conf |    3 +-
 tls/tests/files/ssl/server.conf              |    3 +-
 35 files changed, 461 insertions(+), 447 deletions(-)
---
diff --git a/tls/tests/files/ca-alternative.pem b/tls/tests/files/ca-alternative.pem
index 695fc37..a8d3b8e 100644
--- a/tls/tests/files/ca-alternative.pem
+++ b/tls/tests/files/ca-alternative.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID8DCCA1mgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnzETMBEGCgmSJomT8ixk
+MIID8DCCA1mgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBnzETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxLDAqBgNVBAsMI09sZCBV
 bnRydXN0ZWQgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSIwIAYDVQQDDBlvbmNlLndh
 cy5hLmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxlLmNv
-bTAeFw0xNTA4MzAwMDIyMzFaFw00NTA4MjIwMDIyMzFaMIGGMRMwEQYKCZImiZPy
+bTAeFw0xODA0MTUxNTA5MzFaFw00ODA0MDcxNTA5MzFaMIGGMRMwEQYKCZImiZPy
 LGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2Vy
 dGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsG
 CSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBAL2qSsuOcbcaJ9+uvbKan/v5186d6u1i5kIk3dPu4etHegHpDG5baq+C
-IUdY1AyCcz6OL61J1lbB3Ksk6eyo9woKHHto0BJ9IVEb7K7pT+gau7QeS15MUK5m
-NfueUfIdXTCNpHez6Nzt4H57bgqJJrJnHnondOuEalEFgDtOBqilAgMBAAGjggFR
-MIIBTTAdBgNVHQ4EFgQUmAbQgRwBOJuIai3NygAtGQ9xlbEwgdQGA1UdIwSBzDCB
-yYAULu6rFocDkpwOJyAjyQrCxuefLW+hgaWkgaIwgZ8xEzARBgoJkiaJk/IsZAEZ
+MIGJAoGBALN4/lrWOYWOiJ7vaaVWFKxi2nWCtprsB52rwdIF/+PLRQLzK4c2w7cD
+yTa9CEEP24TiCmFm+4NHaJ0Ki3zhQNfa1lP00r+3eWgSH44yxRV3i/JVOXMTsNG4
+O+BS54cZXwwk/Lg1sHZXu/zDjMZc19zNZzsYOacysvCX1YOg1HvRAgMBAAGjggFR
+MIIBTTAdBgNVHQ4EFgQUURVAIyueSBto4VoQlEZQAg36h8MwgdQGA1UdIwSBzDCB
+yYAU2uUI1KzpetoO4lmbqXXAnJeYn+mhgaWkgaIwgZ8xEzARBgoJkiaJk/IsZAEZ
 FgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMSwwKgYDVQQLDCNPbGQgVW50
 cnVzdGVkIENlcnRpZmljYXRlIEF1dGhvcml0eTEiMCAGA1UEAwwZb25jZS53YXMu
 YS5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb22C
-CQD9kIwlfKYqXDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNV
+CQDQKaq1tADC4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNV
 HREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNv
-bTANBgkqhkiG9w0BAQUFAAOBgQA9CNpCI5kLKsccy73SZWyp2fEwMDrZHMJvChdv
-1CWaE1BYlLQWtr1bSy2aEPZujMVzUW5XtoRlLWpTBxUB7o888u7FJmFVhEv4Apq2
-DZ8yDlIy4yHFOShIQfmfdeDzYSoxXgoUINqxQDpfKXrQCB9OqQjI4yrJkw+lO7fs
-eIIk5w==
+bTANBgkqhkiG9w0BAQsFAAOBgQDgX2HBiVtQtSJYmMta6M/Oy9SRALrp+XN+a1qU
+4DBKWCk7Z6g2WvSBp5UDcdko8RYj5cTUIZaPq4hiVc6KAyl2lYcgknhgcdcaaCkr
+B5O1QMeh5yjRNg8jP4VctBXFZ56jBgTgvRDm2UE/s1fCaZmF5VUUrWEK0SaxLR/L
+uUaRdQ==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/ca-key.pem b/tls/tests/files/ca-key.pem
index 306604e..2e8c535 100644
--- a/tls/tests/files/ca-key.pem
+++ b/tls/tests/files/ca-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC9qkrLjnG3Giffrr2ymp/7+dfOnertYuZCJN3T7uHrR3oB6Qxu
-W2qvgiFHWNQMgnM+ji+tSdZWwdyrJOnsqPcKChx7aNASfSFRG+yu6U/oGru0Hkte
-TFCuZjX7nlHyHV0wjaR3s+jc7eB+e24KiSayZx56J3TrhGpRBYA7TgaopQIDAQAB
-AoGAY6BlA4HCV9TkZwnJ2VyBdwFpC75F3gYaP1pQL3gGsejsvL4m6n0YkDKBupF9
-aUjIsm5LuvHTJeVVPYz5V3f1syZr4fYYpmwoWjHkb6g55R9iAgmSd29gQwu0OdsP
-EhothysqPMvhWQi2gLHAz14U+EZVH9zKCZ50GW7bTrZoc20CQQD2LkPn6S2HQhPl
-Ks9HmPAsFkd0dKE0zE2IKvgsCiBsfvd4H1u0QO17ZWNR8AK9x16gnrDv0Xjpsw6H
-V9xaMsY7AkEAxTrzZKdaeu1BFDuLdgGuEj5YOUbhXjmldDwvw/xFXPU03MjCVDjo
-4V6MDZJ1HlpwWBCYO+pIyRd5NADXh33+nwJBAPT8d6FbYG6BKJFfd+V1YlVNWpCe
-3CpRwjpnII+bCEdQVu9YrYcFMhAhhqRs6B16QUYwhj4yRFS1VxkDK4srii8CQCdm
-U2D0HZsY8js8eeulAkUatz0Z78OG+Ipzy4b3SlP7mAfTAx8YD02WOZwsecEKiA7P
-odm2P7wMOGYvFN84SDkCQQCYg8rdrLdM1Wx+/k9aiFku1LmyHLZPtq39je4S/EJN
-ibWCMmhysz6cuIKykUYI7DKolQnxu4BWLnn9ff60T1xp
+MIICWwIBAAKBgQCzeP5a1jmFjoie72mlVhSsYtp1graa7Aedq8HSBf/jy0UC8yuH
+NsO3A8k2vQhBD9uE4gphZvuDR2idCot84UDX2tZT9NK/t3loEh+OMsUVd4vyVTlz
+E7DRuDvgUueHGV8MJPy4NbB2V7v8w4zGXNfczWc7GDmnMrLwl9WDoNR70QIDAQAB
+AoGASNBU+cuiSMJcQYdGqHK1Ln9ovHZM2avbJygRGcGfYO8OT7USuugIHY9mqlOl
+LqhdWptOtNfQQSHOmrA1iXPmFz9SzbpeaWkXmhh2XxAzX74jIkN5NjT8x+2Nn3XU
+yeVOdpMgWGM1r5sJgcgWVjDYMLNCrsCqVBUBZlWcM0RM3eUCQQDbdWonFWUM+78Y
+wpkVUQCQJEa4XonfG6MVLyqV/ebjX5nndnqRDRf21D9WiSbyxiO/WDf6gYQ0ZJCD
+VLlERSEbAkEA0VslRkCk7o0mVxZtUM4iHkk2h6ZL+kGVLB5n98arRctDbsg+5igB
+n+j5XUL0Cwb0Fvh0G4EJsAt3ftIGAKFRgwJACqYL3JGhMZwVjbIDk5E2ocfg1plf
+vz+sDh8XxedoCKhe42hQUjF8dDGgUSaeiTEsEuDI9pLKQ3CNwpGd274u+QJAD5OE
+dnGg087Up24XvAdaKn6v+++3f2sZuiqY+apiW9L/tWJYq68WT9t5kiLFHXzq9DqQ
+COvU2LBBt8HQiIN4GQJAWvxWh8mgCoVNOOqcfexkS/T7tQpxQdbNuuzvW7lUroWk
+ZEuDZM/S1Gwf4bPDbLZnnsvlYyOh4VH/D2NZDcflxA==
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/ca-roots-bad.pem b/tls/tests/files/ca-roots-bad.pem
index 0f8d7cc..77ac9bf 100644
--- a/tls/tests/files/ca-roots-bad.pem
+++ b/tls/tests/files/ca-roots-bad.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIDxjCCAy+gAwIBAgIJAO+Cui0EIECvMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
+MIIDxjCCAy+gAwIBAgIJAO9IFDrg1P39MA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
 CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UE
 CwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTUwODMwMDAyMjMx
-WhcNNDUwODIyMDAyMjMxWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
+bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTgwNDE1MTUwOTMx
+WhcNNDgwNDA3MTUwOTMxWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
 JomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0
 eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9qkrLjnG3Giff
-rr2ymp/7+dfOnertYuZCJN3T7uHrR3oB6QxuW2qvgiFHWNQMgnM+ji+tSdZWwdyr
-JOnsqPcKChx7aNASfSFRG+yu6U/oGru0HkteTFCuZjX7nlHyHV0wjaR3s+jc7eB+
-e24KiSayZx56J3TrhGpRBYA7TgaopQIDAQABo4IBODCCATQwHQYDVR0OBBYEFJgG
-0IEcATibiGotzcoALRkPcZWxMIG7BgNVHSMEgbMwgbCAFJgG0IEcATibiGotzcoA
-LRkPcZWxoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCzeP5a1jmFjoie
+72mlVhSsYtp1graa7Aedq8HSBf/jy0UC8yuHNsO3A8k2vQhBD9uE4gphZvuDR2id
+Cot84UDX2tZT9NK/t3loEh+OMsUVd4vyVTlzE7DRuDvgUueHGV8MJPy4NbB2V7v8
+w4zGXNfczWc7GDmnMrLwl9WDoNR70QIDAQABo4IBODCCATQwHQYDVR0OBBYEFFEV
+QCMrnkgbaOFaEJRGUAIN+ofDMIG7BgNVHSMEgbMwgbCAFFEVQCMrnkgbaOFaEJRG
+UAIN+ofDoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
 LGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcw
 FQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBs
-ZS5jb22CCQDvgrotBCBArzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+ZS5jb22CCQDvSBQ64NT9/TAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
 BjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQCuwCsxZxXctjLr059fFd94Yb6lDyPr
-Gd9H4luK9G4NNf2QiD94SfYAEy8C3Lw2/VIYf5kuNPJE2+0AOpCJ3pD3id2JC8Qf
-lnIsGHCclrxldY5NX3S/p2T8wsgBdz5wfzDGm1GANdI5M1YrTN0ExebOspXnXGed
-9jx8rdTVQwErTw==
+cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQB6Dd44jsephAVWHtHIQT1zH+eKZrQG
+3dYi694iQG11w45AapP47nSJPFVvsTEaflfIeX/KxmI9sMWun/Dk1iFMiNQD9St7
+1zAn7zFQ1c9yRmupPGjXVyrScqcFNfIIOchy4aFa52Z/BYvtgzuOGMXnSKsUURho
+BSPQ5X/7Eqg1Yw==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
diff --git a/tls/tests/files/ca-roots.pem b/tls/tests/files/ca-roots.pem
index 435a1da..9ae1635 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+gAwIBAgIJAO+Cui0EIECvMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
+MIIDxjCCAy+gAwIBAgIJAO9IFDrg1P39MA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
 CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UE
 CwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTUwODMwMDAyMjMx
-WhcNNDUwODIyMDAyMjMxWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
+bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTgwNDE1MTUwOTMx
+WhcNNDgwNDA3MTUwOTMxWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
 JomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0
 eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9qkrLjnG3Giff
-rr2ymp/7+dfOnertYuZCJN3T7uHrR3oB6QxuW2qvgiFHWNQMgnM+ji+tSdZWwdyr
-JOnsqPcKChx7aNASfSFRG+yu6U/oGru0HkteTFCuZjX7nlHyHV0wjaR3s+jc7eB+
-e24KiSayZx56J3TrhGpRBYA7TgaopQIDAQABo4IBODCCATQwHQYDVR0OBBYEFJgG
-0IEcATibiGotzcoALRkPcZWxMIG7BgNVHSMEgbMwgbCAFJgG0IEcATibiGotzcoA
-LRkPcZWxoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCzeP5a1jmFjoie
+72mlVhSsYtp1graa7Aedq8HSBf/jy0UC8yuHNsO3A8k2vQhBD9uE4gphZvuDR2id
+Cot84UDX2tZT9NK/t3loEh+OMsUVd4vyVTlzE7DRuDvgUueHGV8MJPy4NbB2V7v8
+w4zGXNfczWc7GDmnMrLwl9WDoNR70QIDAQABo4IBODCCATQwHQYDVR0OBBYEFFEV
+QCMrnkgbaOFaEJRGUAIN+ofDMIG7BgNVHSMEgbMwgbCAFFEVQCMrnkgbaOFaEJRG
+UAIN+ofDoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
 LGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcw
 FQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBs
-ZS5jb22CCQDvgrotBCBArzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+ZS5jb22CCQDvSBQ64NT9/TAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
 BjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQCuwCsxZxXctjLr059fFd94Yb6lDyPr
-Gd9H4luK9G4NNf2QiD94SfYAEy8C3Lw2/VIYf5kuNPJE2+0AOpCJ3pD3id2JC8Qf
-lnIsGHCclrxldY5NX3S/p2T8wsgBdz5wfzDGm1GANdI5M1YrTN0ExebOspXnXGed
-9jx8rdTVQwErTw==
+cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQB6Dd44jsephAVWHtHIQT1zH+eKZrQG
+3dYi694iQG11w45AapP47nSJPFVvsTEaflfIeX/KxmI9sMWun/Dk1iFMiNQD9St7
+1zAn7zFQ1c9yRmupPGjXVyrScqcFNfIIOchy4aFa52Z/BYvtgzuOGMXnSKsUURho
+BSPQ5X/7Eqg1Yw==
 -----END CERTIFICATE-----
 
 GLib shouldn't care about this comment
diff --git a/tls/tests/files/ca.pem b/tls/tests/files/ca.pem
index be5d6fc..acac517 100644
--- a/tls/tests/files/ca.pem
+++ b/tls/tests/files/ca.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIIDxjCCAy+gAwIBAgIJAO+Cui0EIECvMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
+MIIDxjCCAy+gAwIBAgIJAO9IFDrg1P39MA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
 CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UE
 CwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTUwODMwMDAyMjMx
-WhcNNDUwODIyMDAyMjMxWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
+bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTgwNDE1MTUwOTMx
+WhcNNDgwNDA3MTUwOTMxWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
 JomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0
 eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9qkrLjnG3Giff
-rr2ymp/7+dfOnertYuZCJN3T7uHrR3oB6QxuW2qvgiFHWNQMgnM+ji+tSdZWwdyr
-JOnsqPcKChx7aNASfSFRG+yu6U/oGru0HkteTFCuZjX7nlHyHV0wjaR3s+jc7eB+
-e24KiSayZx56J3TrhGpRBYA7TgaopQIDAQABo4IBODCCATQwHQYDVR0OBBYEFJgG
-0IEcATibiGotzcoALRkPcZWxMIG7BgNVHSMEgbMwgbCAFJgG0IEcATibiGotzcoA
-LRkPcZWxoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCzeP5a1jmFjoie
+72mlVhSsYtp1graa7Aedq8HSBf/jy0UC8yuHNsO3A8k2vQhBD9uE4gphZvuDR2id
+Cot84UDX2tZT9NK/t3loEh+OMsUVd4vyVTlzE7DRuDvgUueHGV8MJPy4NbB2V7v8
+w4zGXNfczWc7GDmnMrLwl9WDoNR70QIDAQABo4IBODCCATQwHQYDVR0OBBYEFFEV
+QCMrnkgbaOFaEJRGUAIN+ofDMIG7BgNVHSMEgbMwgbCAFFEVQCMrnkgbaOFaEJRG
+UAIN+ofDoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
 LGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcw
 FQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBs
-ZS5jb22CCQDvgrotBCBArzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+ZS5jb22CCQDvSBQ64NT9/TAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
 BjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQCuwCsxZxXctjLr059fFd94Yb6lDyPr
-Gd9H4luK9G4NNf2QiD94SfYAEy8C3Lw2/VIYf5kuNPJE2+0AOpCJ3pD3id2JC8Qf
-lnIsGHCclrxldY5NX3S/p2T8wsgBdz5wfzDGm1GANdI5M1YrTN0ExebOspXnXGed
-9jx8rdTVQwErTw==
+cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQB6Dd44jsephAVWHtHIQT1zH+eKZrQG
+3dYi694iQG11w45AapP47nSJPFVvsTEaflfIeX/KxmI9sMWun/Dk1iFMiNQD9St7
+1zAn7zFQ1c9yRmupPGjXVyrScqcFNfIIOchy4aFa52Z/BYvtgzuOGMXnSKsUURho
+BSPQ5X/7Eqg1Yw==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/chain.pem b/tls/tests/files/chain.pem
index 9fedf90..4c023ad 100644
--- a/tls/tests/files/chain.pem
+++ b/tls/tests/files/chain.pem
@@ -1,59 +1,59 @@
 -----BEGIN CERTIFICATE-----
-MIICHTCCAcegAwIBAgIBATANBgkqhkiG9w0BAQUFADCBrTETMBEGCgmSJomT8ixk
+MIICMTCCAdugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
 bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
 aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTE1MDgzMDAwMjIzOVoXDTQwMDgyMzAwMjIzOVow
+LWNhQGV4YW1wbGUuY29tMB4XDTE4MDQxNTE1MDk0MloXDTQzMDQwOTE1MDk0Mlow
 SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
 GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sA
-MEgCQQDNj0xKKyi/+5iG2FTs/lOgwKPorRg69o4zsmMcVOfvwI1IN4FRSsPpqaJN
-urHcGNqvGoj07hNBdWxdoixF4pmnAgMBAAGjMzAxMAkGA1UdEwQCMAAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwEwDwYDVR0RBAgwBocEwKgBFjANBgkqhkiG9w0BAQUFAANB
-ALl1WO7IZYOvPwhyQ4EpCLjSsTuGBcfbWFtw4XiQueZ8TILHcZARH4nW1tKoVWzc
-rIGhqRjNMWRmaH1wgSCGRiE=
+MEgCQQC0DUZQx6TplAAFsmdaTla84gl4/LFcJbcR9DmbpBo6NYfiyHdZfrO8oEN/
+ixTqDG2FLOPAGakyQyXHTOGetCTVAgMBAAGjRzBFMAkGA1UdEwQCMAAwEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwIwYDVR0RBBwwGocEwKgBFoISc2VydmVyLmV4YW1wbGUu
+Y29tMA0GCSqGSIb3DQEBCwUAA0EAS/Zgzq+lJ18rPyDmlqEz/qSLp11cqihwM27x
+dM1o19qWWhmBRCuaQS8BBA3dbno4s2srzC2KJ7xnHCr8YGXkEA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDrjCCAxegAwIBAgIBBjANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
+MIIDrjCCAxegAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE1MDgzMDAwMjIzOVoXDTQwMDgy
-MzAwMjIzOVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDQxNTE1MDk0MloXDTQzMDQw
+OTE1MDk0Mlowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
 FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
 aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
 BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTBcMA0GCSqG
-SIb3DQEBAQUAA0sAMEgCQQDRMidrtJAZ27tI9gA3hhIP7S5EtfjhMHUi8mDNL2Ju
-V7nMDGoAEUfHV3x/+Eb/TeymvBiRzlUD6YGQRK+2C8+LAgMBAAGjggFFMIIBQTAd
-BgNVHQ4EFgQUXfcpYB1wgmZiB/WN7EW342wlZwEwgbsGA1UdIwSBszCBsIAUmAbQ
-gRwBOJuIai3NygAtGQ9xlbGhgYykgYkwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00x
+SIb3DQEBAQUAA0sAMEgCQQDRiX9UaA2dXPT1JcqoDBD7dbV2M94bPOjdRxC+QIYg
+BO/p5frRpWp/TOaHTYf1pyDEj94SDrOcZxiKmyG89dYPAgMBAAGjggFFMIIBQTAd
+BgNVHQ4EFgQUEFmoMa5Co+QD2qvOHzWLtq6zMjUwgbsGA1UdIwSBszCBsIAUURVA
+IyueSBto4VoQlEZQAg36h8OhgYykgYkwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00x
 FzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBB
 dXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkB
-Fg5jYUBleGFtcGxlLmNvbYIJAO+Cui0EIECvMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+Fg5jYUBleGFtcGxlLmNvbYIJAO9IFDrg1P39MA8GA1UdEwEB/wQFMAMBAf8wDgYD
 VR0PAQH/BAQDAgEGMCYGA1UdEQQfMB2BG2ludGVybWVkaWF0ZS1jYUBleGFtcGxl
-LmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOB
-gQAmXVdwAZalZGtXBkdICHaWyVRmgCFRZfzVbGBOkeW+TEBiMgG+XrwlMQs5yyf/
-T8Mmw8TcqBJYdQhqcctbgFcSxejVAL7DnEfFcvH6acXy0K9l48pKAnYgcHstOAX2
-Fb+rSpmMDXgWuhKNudJyoOVQ/5H9LJyg6JYqoG5jqS9iQg==
+LmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
+gQB8blehEbn5Nuu1/rSJBMq+NoNL5vjjZw9p28pxjvdx9hZ33TuHF2igRFEP3sag
+pKPsRpYxJqq8PoGZAs/v8xcokl16HjEpuig9zOAAELammOOw5L71nNejtWb+UcPn
+81gYY+9fmcBb3Ws2LOO0sy5khhrVTGk7zhQxmDpfiftI4A==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDxjCCAy+gAwIBAgIJAO+Cui0EIECvMA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
+MIIDxjCCAy+gAwIBAgIJAO9IFDrg1P39MA0GCSqGSIb3DQEBBQUAMIGGMRMwEQYK
 CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEeMBwGA1UE
 CwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcwFQYDVQQDDA5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTUwODMwMDAyMjMx
-WhcNNDUwODIyMDAyMjMxWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
+bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb20wHhcNMTgwNDE1MTUwOTMx
+WhcNNDgwNDA3MTUwOTMxWjCBhjETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmS
 JomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRpZmljYXRlIEF1dGhvcml0
 eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9qkrLjnG3Giff
-rr2ymp/7+dfOnertYuZCJN3T7uHrR3oB6QxuW2qvgiFHWNQMgnM+ji+tSdZWwdyr
-JOnsqPcKChx7aNASfSFRG+yu6U/oGru0HkteTFCuZjX7nlHyHV0wjaR3s+jc7eB+
-e24KiSayZx56J3TrhGpRBYA7TgaopQIDAQABo4IBODCCATQwHQYDVR0OBBYEFJgG
-0IEcATibiGotzcoALRkPcZWxMIG7BgNVHSMEgbMwgbCAFJgG0IEcATibiGotzcoA
-LRkPcZWxoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
+YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCzeP5a1jmFjoie
+72mlVhSsYtp1graa7Aedq8HSBf/jy0UC8yuHNsO3A8k2vQhBD9uE4gphZvuDR2id
+Cot84UDX2tZT9NK/t3loEh+OMsUVd4vyVTlzE7DRuDvgUueHGV8MJPy4NbB2V7v8
+w4zGXNfczWc7GDmnMrLwl9WDoNR70QIDAQABo4IBODCCATQwHQYDVR0OBBYEFFEV
+QCMrnkgbaOFaEJRGUAIN+ofDMIG7BgNVHSMEgbMwgbCAFFEVQCMrnkgbaOFaEJRG
+UAIN+ofDoYGMpIGJMIGGMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPy
 LGQBGRYHRVhBTVBMRTEeMBwGA1UECwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MRcw
 FQYDVQQDDA5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBs
-ZS5jb22CCQDvgrotBCBArzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+ZS5jb22CCQDvSBQ64NT9/TAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
 BjAZBgNVHREEEjAQgQ5jYUBleGFtcGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFt
-cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQCuwCsxZxXctjLr059fFd94Yb6lDyPr
-Gd9H4luK9G4NNf2QiD94SfYAEy8C3Lw2/VIYf5kuNPJE2+0AOpCJ3pD3id2JC8Qf
-lnIsGHCclrxldY5NX3S/p2T8wsgBdz5wfzDGm1GANdI5M1YrTN0ExebOspXnXGed
-9jx8rdTVQwErTw==
+cGxlLmNvbTANBgkqhkiG9w0BAQUFAAOBgQB6Dd44jsephAVWHtHIQT1zH+eKZrQG
+3dYi694iQG11w45AapP47nSJPFVvsTEaflfIeX/KxmI9sMWun/Dk1iFMiNQD9St7
+1zAn7zFQ1c9yRmupPGjXVyrScqcFNfIIOchy4aFa52Z/BYvtgzuOGMXnSKsUURho
+BSPQ5X/7Eqg1Yw==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client-and-key.pem b/tls/tests/files/client-and-key.pem
index 86a405d..1d63db4 100644
--- a/tls/tests/files/client-and-key.pem
+++ b/tls/tests/files/client-and-key.pem
@@ -1,45 +1,45 @@
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNTA4MzAwMDIyMzJaFw00MDA4MjMwMDIy
-MzJaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xODA0MTUxNTA5MzFaFw00MzA0MDkxNTA5
+MzFaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOKRyGJ1ScDr
-yD07f0vAvjNU/GBvZEbeTAan3ZlYvgcFuaHbi+Svay+SaJmwXaHI4zgOF9aNl4zH
-IHUWAg+Y44lMPptNrffec4r2C+8gnmjot2ot5GrAfLrdR7xmKkqFx4Qr02sRPgy8
-AvSlbyW1qiW0/DKwb/JMsuejzUyMIB/T6UxPzUq3nrM18ltaSrWd6XjFRVep6soM
-ciUISr+eF0n0mhlonxDiegKXAbIXvKWTTAPIJADoeyPiX11tGecSbWBLzHWDK0VM
-85aEd3axkPdPj6RwQEa7FUTyLrU1Nj6k8Pl7NVyNWXbg5IKEMZB6V5pXESasV6nS
-i7vW4JYpA+ECAwEAATANBgkqhkiG9w0BAQUFAAOBgQA53KGbz0v7blt33ht62Ez9
-onmLHkegWW39OgRfNPircb9+pIOtkuksPr1yE2iBmWuGPg0OwNjqHROeOodoN1xC
-vSt1kUshtpPXiK8AuYmkv53FThyEEai8kpsGp6mLEY2ISaYRD0O6B6PyV2dT/nE2
-CWob7aQ/SlFQ+txnwJtOnA==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALngoibfdSI0
+HIkls4Zm6oo/Uns9UlNdmXmmXRrxkjwIEQo+WGJuoaXijotEiPE3elKQ2DMZt7yg
+7Nq/SHcP0QUL5601LLdB55kUYjRzFDXa6aaLu3jTXhO0KZfEfozQ1jdfEobI3g6z
+/wX07AolEfx3I3LTtl6SVxnzzheQ6ad0WDoNeoTuPrUDquoxx9h5/LA9X5uJaqzX
+UDGEL+2pKaRP1hXTMvn1h80heHeL9dvioUnESILe7n3jSYYYTZeA8LhXYOVK+Jx4
+k2e87/Zzq/o8B6JX8gGo8tXxOq/m4HcjwlcMpdsT8Yrng980n8ckGwVT8Jw1oxJ8
+p9nBK6o/G1MCAwEAATANBgkqhkiG9w0BAQsFAAOBgQAEpEyF6G1FEjWmuYY/JwmX
+7719WAjDnmEvoZUk4l9EyVhJoweson3Ib+dCQlhhBoEr93IbphYW3P8u9UNjGYF5
+goVIVQi2WpGsT3bowfVem8LGASgdlpvZoWTHggIUzFArYsc3aUtsiTU9szNNlD46
++jo9p2Je9PCc57/ThVCYOQ==
 -----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-future.pem b/tls/tests/files/client-future.pem
index bf08f8c..2e84a2f 100644
--- a/tls/tests/files/client-future.pem
+++ b/tls/tests/files/client-future.pem
@@ -1,18 +1,20 @@
+notBefore=Jul 18 00:00:00 2060 GMT
+notAfter=Jul 18 00:00:00 2061 GMT
 -----BEGIN CERTIFICATE-----
-MIIC4DCCAkkCAQUwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC4DCCAkkCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzIzMDAwMFoYDzIwNjEwNzE3
-MjMwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
+AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxODAwMDAwMFoYDzIwNjEwNzE4
+MDAwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
 RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDikchi
-dUnA68g9O39LwL4zVPxgb2RG3kwGp92ZWL4HBbmh24vkr2svkmiZsF2hyOM4DhfW
-jZeMxyB1FgIPmOOJTD6bTa333nOK9gvvIJ5o6LdqLeRqwHy63Ue8ZipKhceEK9Nr
-ET4MvAL0pW8ltaoltPwysG/yTLLno81MjCAf0+lMT81Kt56zNfJbWkq1nel4xUVX
-qerKDHIlCEq/nhdJ9JoZaJ8Q4noClwGyF7ylk0wDyCQA6Hsj4l9dbRnnEm1gS8x1
-gytFTPOWhHd2sZD3T4+kcEBGuxVE8i61NTY+pPD5ezVcjVl24OSChDGQeleaVxEm
-rFep0ou71uCWKQPhAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAaL1TVP7GBU/+Ujxm
-s1d6XlsczXcRTsK2SKPc7Ke8K30o7E85m5gTXtDVVdk2aCWFsrmqCW+sKSAl3TLr
-nWWlvI0k2Y3Ei81W1xkCSA8rX95K8m1FaVXz1ml5J8TjemHd/j+btzp4qjnF/S2M
-cbRhKzUoJD6FBuUq7OXOO+4T30c=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC54KIm
+33UiNByJJbOGZuqKP1J7PVJTXZl5pl0a8ZI8CBEKPlhibqGl4o6LRIjxN3pSkNgz
+Gbe8oOzav0h3D9EFC+etNSy3QeeZFGI0cxQ12ummi7t4014TtCmXxH6M0NY3XxKG
+yN4Os/8F9OwKJRH8dyNy07ZeklcZ884XkOmndFg6DXqE7j61A6rqMcfYefywPV+b
+iWqs11AxhC/tqSmkT9YV0zL59YfNIXh3i/Xb4qFJxEiC3u5940mGGE2XgPC4V2Dl
+SviceJNnvO/2c6v6PAeiV/IBqPLV8Tqv5uB3I8JXDKXbE/GK54PfNJ/HJBsFU/Cc
+NaMSfKfZwSuqPxtTAgMBAAEwDQYJKoZIhvcNAQELBQADgYEAine6DzvYeBjRjTCX
+fjatCEFHpf6zgQqHhp1XfSTYLnT27689jOvMp03S9/b3Twh5DS2kA05bPJ0d0kT1
+utsyC1MtR1VSrB0uxvDXgCeYBxRAtJZh0K7RXIfx7h4Aywo1A5IAZcMs1lDOCMB6
+7vq8+Ma/9ebQ9GrIfmYhaXGzx68=
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client-key.pem b/tls/tests/files/client-key.pem
index a9740dc..5fdbe36 100644
--- a/tls/tests/files/client-key.pem
+++ b/tls/tests/files/client-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client-past.pem b/tls/tests/files/client-past.pem
index f2e29e1..8ff6ca1 100644
--- a/tls/tests/files/client-past.pem
+++ b/tls/tests/files/client-past.pem
@@ -1,18 +1,20 @@
+notBefore=Jul 17 23:00:00 2000 GMT
+notAfter=Jul 17 23:00:00 2001 GMT
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQQwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
 AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcyMzAwMDBaFw0wMTA3MTcyMzAw
 MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOKRyGJ1ScDr
-yD07f0vAvjNU/GBvZEbeTAan3ZlYvgcFuaHbi+Svay+SaJmwXaHI4zgOF9aNl4zH
-IHUWAg+Y44lMPptNrffec4r2C+8gnmjot2ot5GrAfLrdR7xmKkqFx4Qr02sRPgy8
-AvSlbyW1qiW0/DKwb/JMsuejzUyMIB/T6UxPzUq3nrM18ltaSrWd6XjFRVep6soM
-ciUISr+eF0n0mhlonxDiegKXAbIXvKWTTAPIJADoeyPiX11tGecSbWBLzHWDK0VM
-85aEd3axkPdPj6RwQEa7FUTyLrU1Nj6k8Pl7NVyNWXbg5IKEMZB6V5pXESasV6nS
-i7vW4JYpA+ECAwEAATANBgkqhkiG9w0BAQUFAAOBgQAXsez9MUY7+zHe4CevgYHk
-VUGFl2BV/cncVO5M42qlYvGhzPNb3VSXlrIk0CZP/A1UrB+7+vMFQCccoXE2Yb//
-hOcumZkz4OJjz+qgsWlksaUjCnpGPIfsrW3jYBRKvL1iYo5Si1aIiQ+ej93a2Bsg
-Iy/P6Hx0b2bZ5H6v/y6bqw==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALngoibfdSI0
+HIkls4Zm6oo/Uns9UlNdmXmmXRrxkjwIEQo+WGJuoaXijotEiPE3elKQ2DMZt7yg
+7Nq/SHcP0QUL5601LLdB55kUYjRzFDXa6aaLu3jTXhO0KZfEfozQ1jdfEobI3g6z
+/wX07AolEfx3I3LTtl6SVxnzzheQ6ad0WDoNeoTuPrUDquoxx9h5/LA9X5uJaqzX
+UDGEL+2pKaRP1hXTMvn1h80heHeL9dvioUnESILe7n3jSYYYTZeA8LhXYOVK+Jx4
+k2e87/Zzq/o8B6JX8gGo8tXxOq/m4HcjwlcMpdsT8Yrng980n8ckGwVT8Jw1oxJ8
+p9nBK6o/G1MCAwEAATANBgkqhkiG9w0BAQsFAAOBgQBGHqa7mBWC67OXg74mqG44
+SM+dj2X4t8FlxriOH428V1KUVn/iPKZKaoacUWVkFKQdqQp4cnFb5ieif1/kVzjf
+HIKBeYQIMFeGQS+2DDQGXDUbxO9Kkp0izFsv8xm8CnJUSsX51wx7cQ8QAC4BeWxn
+yRVIoDjMhjGCPks8iwC5+w==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client.pem b/tls/tests/files/client.pem
index 75fae57..dda0953 100644
--- a/tls/tests/files/client.pem
+++ b/tls/tests/files/client.pem
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNTA4MzAwMDIyMzJaFw00MDA4MjMwMDIy
-MzJaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xODA0MTUxNTA5MzFaFw00MzA0MDkxNTA5
+MzFaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOKRyGJ1ScDr
-yD07f0vAvjNU/GBvZEbeTAan3ZlYvgcFuaHbi+Svay+SaJmwXaHI4zgOF9aNl4zH
-IHUWAg+Y44lMPptNrffec4r2C+8gnmjot2ot5GrAfLrdR7xmKkqFx4Qr02sRPgy8
-AvSlbyW1qiW0/DKwb/JMsuejzUyMIB/T6UxPzUq3nrM18ltaSrWd6XjFRVep6soM
-ciUISr+eF0n0mhlonxDiegKXAbIXvKWTTAPIJADoeyPiX11tGecSbWBLzHWDK0VM
-85aEd3axkPdPj6RwQEa7FUTyLrU1Nj6k8Pl7NVyNWXbg5IKEMZB6V5pXESasV6nS
-i7vW4JYpA+ECAwEAATANBgkqhkiG9w0BAQUFAAOBgQA53KGbz0v7blt33ht62Ez9
-onmLHkegWW39OgRfNPircb9+pIOtkuksPr1yE2iBmWuGPg0OwNjqHROeOodoN1xC
-vSt1kUshtpPXiK8AuYmkv53FThyEEai8kpsGp6mLEY2ISaYRD0O6B6PyV2dT/nE2
-CWob7aQ/SlFQ+txnwJtOnA==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALngoibfdSI0
+HIkls4Zm6oo/Uns9UlNdmXmmXRrxkjwIEQo+WGJuoaXijotEiPE3elKQ2DMZt7yg
+7Nq/SHcP0QUL5601LLdB55kUYjRzFDXa6aaLu3jTXhO0KZfEfozQ1jdfEobI3g6z
+/wX07AolEfx3I3LTtl6SVxnzzheQ6ad0WDoNeoTuPrUDquoxx9h5/LA9X5uJaqzX
+UDGEL+2pKaRP1hXTMvn1h80heHeL9dvioUnESILe7n3jSYYYTZeA8LhXYOVK+Jx4
+k2e87/Zzq/o8B6JX8gGo8tXxOq/m4HcjwlcMpdsT8Yrng980n8ckGwVT8Jw1oxJ8
+p9nBK6o/G1MCAwEAATANBgkqhkiG9w0BAQsFAAOBgQAEpEyF6G1FEjWmuYY/JwmX
+7719WAjDnmEvoZUk4l9EyVhJoweson3Ib+dCQlhhBoEr93IbphYW3P8u9UNjGYF5
+goVIVQi2WpGsT3bowfVem8LGASgdlpvZoWTHggIUzFArYsc3aUtsiTU9szNNlD46
++jo9p2Je9PCc57/ThVCYOQ==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/client2-and-key.pem b/tls/tests/files/client2-and-key.pem
index 0f1e98d..9704891 100644
--- a/tls/tests/files/client2-and-key.pem
+++ b/tls/tests/files/client2-and-key.pem
@@ -1,45 +1,45 @@
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQEwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNzA0MjEwODUwMjdaFw00MjA0MTUwODUw
-MjdaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xODA0MTUxNTA5NDJaFw00MzA0MDkxNTA5
+NDJaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcDxJFF30lE
-s/w8KN7ENjhaXosDqOe/IiNTStg+f1CL+/bKdcSu8wTyQsltv/+fi/jiw4ls1chP
-Eni7r+HtkPdMVG5mvuaGzPFyVCl1YkOihS0v0+YQkm83LcC7jU2+dvrDQYMFWH9d
-ehfFur9Cwmur5EH5Xl2nKehYifMYmljh/jPMPdCj6xWGUN6p/k459hz1JGvfWlqa
-1o/35j9uakjBtsFeOKT5SEZsg2S9DudYsHfC/ncXl1LrJCFzQBY1ifhDr3FHrEsM
-ieoAi4+qNq1ZZxwzppB81MAyggaJmqHUo/IpvJxWF8AhK202skiDYURk7k1kyT7g
-ZWRwl72Wz/kCAwEAATANBgkqhkiG9w0BAQsFAAOBgQAPiq0yRWbFD+17cz5TrRsG
-kapRrVmwqpX4nrv+pvBgzT6aatV5SZDXq+jqw1L2n2B/DEUwDXJ0R8vV0J2hE/KE
-+7YRWgM0LyT/iYp5CC1n3GKpirxarz5hwXHVmNsMnYjLRc/4NVGkyDOqTZIPN106
-C8hyhUIMHGLBqWMxCG7myQ==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXv0Omjny/f
+1gDHjEHAG+zbfS80lWpMQGN6h3p+ZhNpmDcTIiOgcfvUHioLGPSU6UQ3mRH/iv/B
+HhD7L+Xvm+LCTzycOWWscrnazczR+79uO+lJomyAyOCAXk/B+TyTBiffN99FnxqZ
+9IOc9/xVsDMVwrj3Xbv+95LWogflB+bOJHWzD3hG1msNlatN+orFCzsmVUdDc1Dn
+hldS2UVWL2lUVqYN7k8dD7Roee3Fk6XQ56bkvx9nIZhm3ZBd1NFK6Zthlbq5OwAi
+canbWwinsBSvD0lrIUIrDc6I7Pl8x8/vD1ORcCEjmnfdIM91zvwOtnPP6fDTFqlZ
+S/Cb8e80lJ8CAwEAATANBgkqhkiG9w0BAQsFAAOBgQCxBQocwq+1k1mnr9UaDgj0
+IfcWRHnbpWTn2Ra5qNUs6jTNyIdnQG/lSk/Cx8C+BoPYBViXNpRdg5D46mIYOCKn
+poF8gNVF5naRZHDsUnG8y5wATKyXmOhHflaM7sCxOOwk2MYoT1lJuGmaU3bnxJPK
+9zpZTSKmSdEAZHM7Ma0PwQ==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEpAIBAAKCAQEApe/Q6aOfL9/WAMeMQcAb7Nt9LzSVakxAY3qHen5mE2mYNxMi
+I6Bx+9QeKgsY9JTpRDeZEf+K/8EeEPsv5e+b4sJPPJw5ZaxyudrNzNH7v2476Umi
+bIDI4IBeT8H5PJMGJ98330WfGpn0g5z3/FWwMxXCuPddu/73ktaiB+UH5s4kdbMP
+eEbWaw2Vq036isULOyZVR0NzUOeGV1LZRVYvaVRWpg3uTx0PtGh57cWTpdDnpuS/
+H2chmGbdkF3U0Urpm2GVurk7ACJxqdtbCKewFK8PSWshQisNzojs+XzHz+8PU5Fw
+ISOad90gz3XO/A62c8/p8NMWqVlL8Jvx7zSUnwIDAQABAoIBAFdiqMExorZiiV+V
+tr41fj9JA27loT3+c/YvY8NVZ0oX1MpEMDlU2FIHTe9UMssy1HlRUjIRQlEXkU7e
+CUZs3coYDARePTfXDf/kQ3b2qj4QvkpHtdqwI5le4Mvd2fRVdOtweQsCrhwjMYpS
+EqJ3ObhdYFNqKZnEVvqkP2Yq7fNUiH0kB37yaYu3DBJwfltnLCOklEjzaXhKfhTX
+AmgXj9IRXhfcHEQMNTxrKLkGDmYPhwIdR/+1IzPK1fLQ5+K+yjpw0sLZh3bU57aQ
+LMdSruEZXYOn33Yt7s8OUoS4i0oRT+2YOa1SGl6XTJfTySo4V2M/qVFl3DrdRkL0
+O7hoYkECgYEA3ENv3G5FPZxnu3EFe2boRzUxaeG0WGSl5IAc9Rf3QfK9si3yVhhd
+9D+Nbx6Lew/POcpqMKrjUPriewis8LTUQ+EuhZJAuprbUClKBqhzI+0u4IOm0Fzr
+IS65e/Lf815B41QtuBCJwDmvwIakRZLnHURxd7XOv9PYGaXshN9oBX8CgYEAwNvw
+9txy27/JRccZomk6EuMvgsbEfFqXhiYQsrtAvTFjpV9W2h37wCZeQbR7KL9w9LVZ
+a/Lz140aGBc0rCf8OMjuI2TiUTPtMJBNEFiktp0YinmQZmuyQBBRYmQK/KwIaDap
+3yTBhgjJ4GBQdwme+nu9NTqGrLzxDSSqu7CYQOECgYEArA0hO5YHD/E0Nf46wgHI
+PpcWWharwMAdtTc9Z1WpFiJ+esfZG9c8zKU33SyG10GqJQIvoIRbu829S02jiQI3
+LC6hIET1us1rsloOMNUz20RR8Z3kl619HRZaXK+Cr59Y6DHA5J5Ge5iT6FdDyfTO
+AtaLq26gaMcZbi9laQT5RBECgYAcuWVlTyYoRqNSqjnOL7//iijMYJBpORDyYP8B
+r9QPmaiOu+lyqR6S2uQVAy2IvyKyv8PmyRO6WgC179bfgUEWsA6P5Pm0QHimUAe6
+VImLzVAXZ82zA31T/1ovvljIk1LZOrMIUjAkp3Bx48Z4RE2SXxWqNOJUHfwFCh4H
+wGCc4QKBgQDA17Mo89D7jeaLHObkh/CT/aEjsiNTRwEwAdN+9C/vFTz0EBtJq7D3
+swjY1Z1IrgcwcmqJpDTntbtmgw/aUwJakMvat07Js+d6Lwgh0wf6CF2KVcS8EOZg
+ODM7SUJRu6HiE12AVxie1yrt/xNRMCm3G+R+MXe9GI86Zf7G3+hUgA==
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client2-key.pem b/tls/tests/files/client2-key.pem
index 26964c6..625efad 100644
--- a/tls/tests/files/client2-key.pem
+++ b/tls/tests/files/client2-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/client2.pem b/tls/tests/files/client2.pem
index f5696e2..94b5c1c 100644
--- a/tls/tests/files/client2.pem
+++ b/tls/tests/files/client2.pem
@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQEwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQYwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNzA0MjEwODUwMjdaFw00MjA0MTUwODUw
-MjdaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xODA0MTUxNTA5NDJaFw00MzA0MDkxNTA5
+NDJaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcDxJFF30lE
-s/w8KN7ENjhaXosDqOe/IiNTStg+f1CL+/bKdcSu8wTyQsltv/+fi/jiw4ls1chP
-Eni7r+HtkPdMVG5mvuaGzPFyVCl1YkOihS0v0+YQkm83LcC7jU2+dvrDQYMFWH9d
-ehfFur9Cwmur5EH5Xl2nKehYifMYmljh/jPMPdCj6xWGUN6p/k459hz1JGvfWlqa
-1o/35j9uakjBtsFeOKT5SEZsg2S9DudYsHfC/ncXl1LrJCFzQBY1ifhDr3FHrEsM
-ieoAi4+qNq1ZZxwzppB81MAyggaJmqHUo/IpvJxWF8AhK202skiDYURk7k1kyT7g
-ZWRwl72Wz/kCAwEAATANBgkqhkiG9w0BAQsFAAOBgQAPiq0yRWbFD+17cz5TrRsG
-kapRrVmwqpX4nrv+pvBgzT6aatV5SZDXq+jqw1L2n2B/DEUwDXJ0R8vV0J2hE/KE
-+7YRWgM0LyT/iYp5CC1n3GKpirxarz5hwXHVmNsMnYjLRc/4NVGkyDOqTZIPN106
-C8hyhUIMHGLBqWMxCG7myQ==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXv0Omjny/f
+1gDHjEHAG+zbfS80lWpMQGN6h3p+ZhNpmDcTIiOgcfvUHioLGPSU6UQ3mRH/iv/B
+HhD7L+Xvm+LCTzycOWWscrnazczR+79uO+lJomyAyOCAXk/B+TyTBiffN99FnxqZ
+9IOc9/xVsDMVwrj3Xbv+95LWogflB+bOJHWzD3hG1msNlatN+orFCzsmVUdDc1Dn
+hldS2UVWL2lUVqYN7k8dD7Roee3Fk6XQ56bkvx9nIZhm3ZBd1NFK6Zthlbq5OwAi
+canbWwinsBSvD0lrIUIrDc6I7Pl8x8/vD1ORcCEjmnfdIM91zvwOtnPP6fDTFqlZ
+S/Cb8e80lJ8CAwEAATANBgkqhkiG9w0BAQsFAAOBgQCxBQocwq+1k1mnr9UaDgj0
+IfcWRHnbpWTn2Ra5qNUs6jTNyIdnQG/lSk/Cx8C+BoPYBViXNpRdg5D46mIYOCKn
+poF8gNVF5naRZHDsUnG8y5wATKyXmOhHflaM7sCxOOwk2MYoT1lJuGmaU3bnxJPK
+9zpZTSKmSdEAZHM7Ma0PwQ==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/intermediate-ca-csr.pem b/tls/tests/files/intermediate-ca-csr.pem
index 189a2d3..8c138e1 100644
--- a/tls/tests/files/intermediate-ca-csr.pem
+++ b/tls/tests/files/intermediate-ca-csr.pem
@@ -3,10 +3,10 @@ MIIBujCCAWQCAQAwga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/Is
 ZAEZFgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUg
 QXV0aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20x
 KjAoBgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTBcMA0G
-CSqGSIb3DQEBAQUAA0sAMEgCQQDRMidrtJAZ27tI9gA3hhIP7S5EtfjhMHUi8mDN
-L2JuV7nMDGoAEUfHV3x/+Eb/TeymvBiRzlUD6YGQRK+2C8+LAgMBAAGgUTBPBgkq
-hkiG9w0BCQ4xQjBAMB0GA1UdDgQWBBRd9ylgHXCCZmIH9Y3sRbfjbCVnATAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAANBAIp7
-2/fnWAYyd4QxpW8qqajTKyuGiS5rwm5knLZvriM3qR6mAtuI3vluk431YcQ1G/jn
-QdPf5uYuttJC1GzrZDE=
+CSqGSIb3DQEBAQUAA0sAMEgCQQDRiX9UaA2dXPT1JcqoDBD7dbV2M94bPOjdRxC+
+QIYgBO/p5frRpWp/TOaHTYf1pyDEj94SDrOcZxiKmyG89dYPAgMBAAGgUTBPBgkq
+hkiG9w0BCQ4xQjBAMB0GA1UdDgQWBBQQWagxrkKj5APaq84fNYu2rrMyNTAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAANBAMRE
+puvj7M7SJ9XmLoFdBEVCKA8pKiuQu5bbG9CDAF91YoW75UoI0MLDclnxlYNrRTXK
+yuB6omXdqWEKOB0jMGk=
 -----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/intermediate-ca-key.pem b/tls/tests/files/intermediate-ca-key.pem
index e449282..ac0f596 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-----
-MIIBOgIBAAJBANEyJ2u0kBnbu0j2ADeGEg/tLkS1+OEwdSLyYM0vYm5XucwMagAR
-R8dXfH/4Rv9N7Ka8GJHOVQPpgZBEr7YLz4sCAwEAAQJAUPmw+Kfz/45meF+Axf1H
-kJKmjkJCDCjNrrFTdxkYaM0pCDPjHeclMHZ9mhtKQs2/8ER4tvdNIUCba/f9n4lI
-QQIhAO6s3jWb4JVobvpC0r5OE/HLOLgnnieQPQGl/sBoqL6fAiEA4GF+A8XaSF/C
-V5tFTFMDN1hw9bvOxhwaVAgcBNzHA5UCIFI5t+wcIYkXi3QoZVYuq+xXKNk4vOHA
-bWQN/e/nnordAiEA26qWU9s+99vHxzybez1JyMUs0WYr6IdavymxRJFfxIECIEra
-zEU8vYbm02cECN2fB6SRAlyD8Gb6KAMP+A4RXVWO
+MIIBPAIBAAJBANGJf1RoDZ1c9PUlyqgMEPt1tXYz3hs86N1HEL5AhiAE7+nl+tGl
+an9M5odNh/WnIMSP3hIOs5xnGIqbIbz11g8CAwEAAQJAUSOvXN4WN5Ohf7SsrzpM
+8TL5m9Yl8eI6QkWcpC+UQJ01aUpkg0+uc22x1awpoHm2Z+6V2ZrfGEWTksGbITqf
+sQIhAOxMup3leyEzi4ifcVKJO/goTiwXIW1JqOT9DLynxyBbAiEA4wGVBW0+Gbt7
+ls4ymttTtNmea+kgEXQLiJZHs/VZT10CIQC8z3p12/2Mw/EEU9JqzrkaSqpb1Iej
+Ga5YelIJFE6p7QIhAKWRqddjbj/mdqXvjwlTnyHw95NNXY5dTWw57+JZuOIhAiEA
+jCo2PBZjrkPjOtzPB+JUps/ZSZKZ0GLKnsFMsutw/ao=
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/intermediate-ca.pem b/tls/tests/files/intermediate-ca.pem
index 179d030..97988d2 100644
--- a/tls/tests/files/intermediate-ca.pem
+++ b/tls/tests/files/intermediate-ca.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDrjCCAxegAwIBAgIBBjANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
+MIIDrjCCAxegAwIBAgIBBzANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE1MDgzMDAwMjIzOVoXDTQwMDgy
-MzAwMjIzOVowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDQxNTE1MDk0MloXDTQzMDQw
+OTE1MDk0Mlowga0xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZ
 FgdFWEFNUExFMSswKQYDVQQLDCJJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUgQXV0
 aG9yaXR5MSQwIgYDVQQDDBtpbnRlcm1lZGlhdGUtY2EuZXhhbXBsZS5jb20xKjAo
 BgkqhkiG9w0BCQEWG2ludGVybWVkaWF0ZS1jYUBleGFtcGxlLmNvbTBcMA0GCSqG
-SIb3DQEBAQUAA0sAMEgCQQDRMidrtJAZ27tI9gA3hhIP7S5EtfjhMHUi8mDNL2Ju
-V7nMDGoAEUfHV3x/+Eb/TeymvBiRzlUD6YGQRK+2C8+LAgMBAAGjggFFMIIBQTAd
-BgNVHQ4EFgQUXfcpYB1wgmZiB/WN7EW342wlZwEwgbsGA1UdIwSBszCBsIAUmAbQ
-gRwBOJuIai3NygAtGQ9xlbGhgYykgYkwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00x
+SIb3DQEBAQUAA0sAMEgCQQDRiX9UaA2dXPT1JcqoDBD7dbV2M94bPOjdRxC+QIYg
+BO/p5frRpWp/TOaHTYf1pyDEj94SDrOcZxiKmyG89dYPAgMBAAGjggFFMIIBQTAd
+BgNVHQ4EFgQUEFmoMa5Co+QD2qvOHzWLtq6zMjUwgbsGA1UdIwSBszCBsIAUURVA
+IyueSBto4VoQlEZQAg36h8OhgYykgYkwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00x
 FzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBB
 dXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkB
-Fg5jYUBleGFtcGxlLmNvbYIJAO+Cui0EIECvMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+Fg5jYUBleGFtcGxlLmNvbYIJAO9IFDrg1P39MA8GA1UdEwEB/wQFMAMBAf8wDgYD
 VR0PAQH/BAQDAgEGMCYGA1UdEQQfMB2BG2ludGVybWVkaWF0ZS1jYUBleGFtcGxl
-LmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUFAAOB
-gQAmXVdwAZalZGtXBkdICHaWyVRmgCFRZfzVbGBOkeW+TEBiMgG+XrwlMQs5yyf/
-T8Mmw8TcqBJYdQhqcctbgFcSxejVAL7DnEfFcvH6acXy0K9l48pKAnYgcHstOAX2
-Fb+rSpmMDXgWuhKNudJyoOVQ/5H9LJyg6JYqoG5jqS9iQg==
+LmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQsFAAOB
+gQB8blehEbn5Nuu1/rSJBMq+NoNL5vjjZw9p28pxjvdx9hZ33TuHF2igRFEP3sag
+pKPsRpYxJqq8PoGZAs/v8xcokl16HjEpuig9zOAAELammOOw5L71nNejtWb+UcPn
+81gYY+9fmcBb3Ws2LOO0sy5khhrVTGk7zhQxmDpfiftI4A==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/non-ca.pem b/tls/tests/files/non-ca.pem
index 068263b..060d72c 100644
--- a/tls/tests/files/non-ca.pem
+++ b/tls/tests/files/non-ca.pem
@@ -1,88 +1,93 @@
 client.pem:
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQMwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xNTA4MzAwMDIyMzJaFw00MDA4MjMwMDIy
-MzJaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
+AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0xODA0MTUxNTA5MzFaFw00MzA0MDkxNTA5
+MzFaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOKRyGJ1ScDr
-yD07f0vAvjNU/GBvZEbeTAan3ZlYvgcFuaHbi+Svay+SaJmwXaHI4zgOF9aNl4zH
-IHUWAg+Y44lMPptNrffec4r2C+8gnmjot2ot5GrAfLrdR7xmKkqFx4Qr02sRPgy8
-AvSlbyW1qiW0/DKwb/JMsuejzUyMIB/T6UxPzUq3nrM18ltaSrWd6XjFRVep6soM
-ciUISr+eF0n0mhlonxDiegKXAbIXvKWTTAPIJADoeyPiX11tGecSbWBLzHWDK0VM
-85aEd3axkPdPj6RwQEa7FUTyLrU1Nj6k8Pl7NVyNWXbg5IKEMZB6V5pXESasV6nS
-i7vW4JYpA+ECAwEAATANBgkqhkiG9w0BAQUFAAOBgQA53KGbz0v7blt33ht62Ez9
-onmLHkegWW39OgRfNPircb9+pIOtkuksPr1yE2iBmWuGPg0OwNjqHROeOodoN1xC
-vSt1kUshtpPXiK8AuYmkv53FThyEEai8kpsGp6mLEY2ISaYRD0O6B6PyV2dT/nE2
-CWob7aQ/SlFQ+txnwJtOnA==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALngoibfdSI0
+HIkls4Zm6oo/Uns9UlNdmXmmXRrxkjwIEQo+WGJuoaXijotEiPE3elKQ2DMZt7yg
+7Nq/SHcP0QUL5601LLdB55kUYjRzFDXa6aaLu3jTXhO0KZfEfozQ1jdfEobI3g6z
+/wX07AolEfx3I3LTtl6SVxnzzheQ6ad0WDoNeoTuPrUDquoxx9h5/LA9X5uJaqzX
+UDGEL+2pKaRP1hXTMvn1h80heHeL9dvioUnESILe7n3jSYYYTZeA8LhXYOVK+Jx4
+k2e87/Zzq/o8B6JX8gGo8tXxOq/m4HcjwlcMpdsT8Yrng980n8ckGwVT8Jw1oxJ8
+p9nBK6o/G1MCAwEAATANBgkqhkiG9w0BAQsFAAOBgQAEpEyF6G1FEjWmuYY/JwmX
+7719WAjDnmEvoZUk4l9EyVhJoweson3Ib+dCQlhhBoEr93IbphYW3P8u9UNjGYF5
+goVIVQi2WpGsT3bowfVem8LGASgdlpvZoWTHggIUzFArYsc3aUtsiTU9szNNlD46
++jo9p2Je9PCc57/ThVCYOQ==
 -----END CERTIFICATE-----
 
 client-future.pem:
+notBefore=Jul 18 00:00:00 2060 GMT
+notAfter=Jul 18 00:00:00 2061 GMT
 -----BEGIN CERTIFICATE-----
-MIIC4DCCAkkCAQUwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC4DCCAkkCAQUwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
-AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxNzIzMDAwMFoYDzIwNjEwNzE3
-MjMwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
+AQkBFg5jYUBleGFtcGxlLmNvbTAiGA8yMDYwMDcxODAwMDAwMFoYDzIwNjEwNzE4
+MDAwMDAwWjBiMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYH
 RVhBTVBMRTEPMA0GA1UEAwwGQ2xpZW50MSEwHwYJKoZIhvcNAQkBFhJjbGllbnRA
-ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDikchi
-dUnA68g9O39LwL4zVPxgb2RG3kwGp92ZWL4HBbmh24vkr2svkmiZsF2hyOM4DhfW
-jZeMxyB1FgIPmOOJTD6bTa333nOK9gvvIJ5o6LdqLeRqwHy63Ue8ZipKhceEK9Nr
-ET4MvAL0pW8ltaoltPwysG/yTLLno81MjCAf0+lMT81Kt56zNfJbWkq1nel4xUVX
-qerKDHIlCEq/nhdJ9JoZaJ8Q4noClwGyF7ylk0wDyCQA6Hsj4l9dbRnnEm1gS8x1
-gytFTPOWhHd2sZD3T4+kcEBGuxVE8i61NTY+pPD5ezVcjVl24OSChDGQeleaVxEm
-rFep0ou71uCWKQPhAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAaL1TVP7GBU/+Ujxm
-s1d6XlsczXcRTsK2SKPc7Ke8K30o7E85m5gTXtDVVdk2aCWFsrmqCW+sKSAl3TLr
-nWWlvI0k2Y3Ei81W1xkCSA8rX95K8m1FaVXz1ml5J8TjemHd/j+btzp4qjnF/S2M
-cbRhKzUoJD6FBuUq7OXOO+4T30c=
+ZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC54KIm
+33UiNByJJbOGZuqKP1J7PVJTXZl5pl0a8ZI8CBEKPlhibqGl4o6LRIjxN3pSkNgz
+Gbe8oOzav0h3D9EFC+etNSy3QeeZFGI0cxQ12ummi7t4014TtCmXxH6M0NY3XxKG
+yN4Os/8F9OwKJRH8dyNy07ZeklcZ884XkOmndFg6DXqE7j61A6rqMcfYefywPV+b
+iWqs11AxhC/tqSmkT9YV0zL59YfNIXh3i/Xb4qFJxEiC3u5940mGGE2XgPC4V2Dl
+SviceJNnvO/2c6v6PAeiV/IBqPLV8Tqv5uB3I8JXDKXbE/GK54PfNJ/HJBsFU/Cc
+NaMSfKfZwSuqPxtTAgMBAAEwDQYJKoZIhvcNAQELBQADgYEAine6DzvYeBjRjTCX
+fjatCEFHpf6zgQqHhp1XfSTYLnT27689jOvMp03S9/b3Twh5DS2kA05bPJ0d0kT1
+utsyC1MtR1VSrB0uxvDXgCeYBxRAtJZh0K7RXIfx7h4Aywo1A5IAZcMs1lDOCMB6
+7vq8+Ma/9ebQ9GrIfmYhaXGzx68=
 -----END CERTIFICATE-----
 
 client-past.pem:
+notBefore=Jul 17 23:00:00 2000 GMT
+notAfter=Jul 17 23:00:00 2001 GMT
 -----BEGIN CERTIFICATE-----
-MIIC3DCCAkUCAQQwDQYJKoZIhvcNAQEFBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
+MIIC3DCCAkUCAQQwDQYJKoZIhvcNAQELBQAwgYYxEzARBgoJkiaJk/IsZAEZFgND
 T00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0
 ZSBBdXRob3JpdHkxFzAVBgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcN
 AQkBFg5jYUBleGFtcGxlLmNvbTAeFw0wMDA3MTcyMzAwMDBaFw0wMTA3MTcyMzAw
 MDBaMGIxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFN
 UExFMQ8wDQYDVQQDDAZDbGllbnQxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFt
-cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOKRyGJ1ScDr
-yD07f0vAvjNU/GBvZEbeTAan3ZlYvgcFuaHbi+Svay+SaJmwXaHI4zgOF9aNl4zH
-IHUWAg+Y44lMPptNrffec4r2C+8gnmjot2ot5GrAfLrdR7xmKkqFx4Qr02sRPgy8
-AvSlbyW1qiW0/DKwb/JMsuejzUyMIB/T6UxPzUq3nrM18ltaSrWd6XjFRVep6soM
-ciUISr+eF0n0mhlonxDiegKXAbIXvKWTTAPIJADoeyPiX11tGecSbWBLzHWDK0VM
-85aEd3axkPdPj6RwQEa7FUTyLrU1Nj6k8Pl7NVyNWXbg5IKEMZB6V5pXESasV6nS
-i7vW4JYpA+ECAwEAATANBgkqhkiG9w0BAQUFAAOBgQAXsez9MUY7+zHe4CevgYHk
-VUGFl2BV/cncVO5M42qlYvGhzPNb3VSXlrIk0CZP/A1UrB+7+vMFQCccoXE2Yb//
-hOcumZkz4OJjz+qgsWlksaUjCnpGPIfsrW3jYBRKvL1iYo5Si1aIiQ+ej93a2Bsg
-Iy/P6Hx0b2bZ5H6v/y6bqw==
+cGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALngoibfdSI0
+HIkls4Zm6oo/Uns9UlNdmXmmXRrxkjwIEQo+WGJuoaXijotEiPE3elKQ2DMZt7yg
+7Nq/SHcP0QUL5601LLdB55kUYjRzFDXa6aaLu3jTXhO0KZfEfozQ1jdfEobI3g6z
+/wX07AolEfx3I3LTtl6SVxnzzheQ6ad0WDoNeoTuPrUDquoxx9h5/LA9X5uJaqzX
+UDGEL+2pKaRP1hXTMvn1h80heHeL9dvioUnESILe7n3jSYYYTZeA8LhXYOVK+Jx4
+k2e87/Zzq/o8B6JX8gGo8tXxOq/m4HcjwlcMpdsT8Yrng980n8ckGwVT8Jw1oxJ8
+p9nBK6o/G1MCAwEAATANBgkqhkiG9w0BAQsFAAOBgQBGHqa7mBWC67OXg74mqG44
+SM+dj2X4t8FlxriOH428V1KUVn/iPKZKaoacUWVkFKQdqQp4cnFb5ieif1/kVzjf
+HIKBeYQIMFeGQS+2DDQGXDUbxO9Kkp0izFsv8xm8CnJUSsX51wx7cQ8QAC4BeWxn
+yRVIoDjMhjGCPks8iwC5+w==
 -----END CERTIFICATE-----
 
 server.pem:
 -----BEGIN CERTIFICATE-----
-MIICNzCCAaCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
+MIICSzCCAbSgAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE1MDgzMDAwMjIzMVoXDTQwMDgy
-MzAwMjIzMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDQxNTE1MDkzMVoXDTQzMDQw
+OTE1MDkzMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
 B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3
-DQEBAQUAA0sAMEgCQQDk6Op18H8aRZvr8jfjhSkw3P4Gy070eb3hrpkIiZl05UxO
-crI+cO3SaE5zgmcW18UPpXfwWl4uy/Q6nagkZDXvAgMBAAGjMzAxMAkGA1UdEwQC
-MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0RBAgwBocEwKgBCjANBgkqhkiG
-9w0BAQUFAAOBgQBmJQF4mdpoinkWTB5khs2ZVWZWf4QPLH2I/sP8IY1pWIVNtOVG
-YiTURtsdIHffSAoJ+9H+KrZhxk7TO9v7LR2Au1fGC6FuGjRizYb6UTe7tpoaZvlj
-JZj3sE/Rw/zCHCjA9xNTeYvQlKBzuohbUVGS+kEhxI7ScDmd7ylKSLIbBQ==
+DQEBAQUAA0sAMEgCQQCtuqYVuUH8iSQw4OEJKeYivQ3Vz8gqya7MoFAVM/oo9BVk
+Ahiz3YiyfIraNrbcMOv7WeiWIHbt3eGnV9fbKeNHAgMBAAGjRzBFMAkGA1UdEwQC
+MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIwYDVR0RBBwwGocEwKgBCoISc2VydmVy
+LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBALLKakcRqiJXYjLZP25/v+Tm
+nMpjf5DV+4i46CGcN7TFX7tg6o6+kgeuUrGNlX/36cNoCR8lZ+N8VpSrSu69WYhH
+jSb1gThzr/rE8Qxc3hx5WSwvRAKcmm6vUP4S12uygoznSIL1zuhJ4upP6ZKBTugp
+e2RcHsnLV+7oBuDhzUOo
 -----END CERTIFICATE-----
 
 server-self.pem:
 -----BEGIN CERTIFICATE-----
-MIIBiDCCATICCQD8Rn+cHcihijANBgkqhkiG9w0BAQUFADBLMRMwEQYKCZImiZPy
+MIIBiDCCATICCQDG/6CUMieoNTANBgkqhkiG9w0BAQsFADBLMRMwEQYKCZImiZPy
 LGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEbMBkGA1UEAwwSc2Vy
-dmVyLmV4YW1wbGUuY29tMB4XDTE1MDgzMDAwMjIzMVoXDTQwMDgyMzAwMjIzMVow
+dmVyLmV4YW1wbGUuY29tMB4XDTE4MDQxNTE1MDkzMVoXDTQzMDQwOTE1MDkzMVow
 SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
 GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sA
-MEgCQQDk6Op18H8aRZvr8jfjhSkw3P4Gy070eb3hrpkIiZl05UxOcrI+cO3SaE5z
-gmcW18UPpXfwWl4uy/Q6nagkZDXvAgMBAAEwDQYJKoZIhvcNAQEFBQADQQADBJbF
-pDpocLDuQo5DXoXVlloJAputR6oKQLtTFRorEr0iASEr/8DEXfFoOI+US/8EZ/IT
-6JR2XOHSot4zsr68
+MEgCQQCtuqYVuUH8iSQw4OEJKeYivQ3Vz8gqya7MoFAVM/oo9BVkAhiz3YiyfIra
+NrbcMOv7WeiWIHbt3eGnV9fbKeNHAgMBAAEwDQYJKoZIhvcNAQELBQADQQBt0a9H
+NaI47J0dW1IOsaxmAMrTEz2UAaUMhRC/02fbbzp1b5fp/UsICECFLvHh3G3xWcmi
+6U0aifAZ0yGD2ecZ
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/old-ca-key.pem b/tls/tests/files/old-ca-key.pem
index c0eb15d..9c148ff 100644
--- a/tls/tests/files/old-ca-key.pem
+++ b/tls/tests/files/old-ca-key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDAcmBlQzZO0JXytrD6hG7mLM4UOcv/Mq0Spdko3VfLkBXMJKF5
-TC8gJYFw5/YhWH5rQ3hQoSUq/GbaHZh1XrJpHBYHQn4sS0m4Nlrd/q1pyvSMNr0s
-Ywe+McBw9TFqGgimV6rgDGsjqz3uxqOlo5goovOS7BT9XxcHMBW3/uQuIQIDAQAB
-AoGBAIxYXTg8BfUAZPo2hWaNAhtWfYt+gui/WjyJOo90rDxF/b98z02YY527/GQM
-phC3aqpq7+lNO7/XhmJ2xuKBhvWgw7sVjhEG5bqigofH8Rc3W/SvNyo1xh658HDF
-3IgpUVAMKVb3puvZNOqBn+3WxfFP7cawSPH+gU2GTdk+e5nJAkEA4LWOlU3vlVnp
-Rd3ngQNrfrh0MR2tD34Pu0xvvpNq9KWUjREVtcNGCFx0M4WYl1caiwtmWUtmdfhy
-Yd49v0E1VwJBANs+ujWmjh8hfwAZ1lQ5DfJROAvmxYrrn98sdj9RzuhnGdFoE+Ld
-BkpAQU1PvTPp2ot60633pwEDLZzd7tfb1UcCQDUcdIDxlMkWIT60Pj2OE2A2NLBP
-NVJOF2XLoTXIHiWI5V2aRilZ6DmdsJFk6DYNDmcC4MQGQEdt24sqPinwPa0CQE6S
-kWtu0FpJx9kCaXRvqhbgkqR5ROx/eyEhLxOMPwm9AVyx3wabzYhItN5/KEB1m7QH
-Bdu/+GL9f5hLVTCZATsCQQCyc9HNvPb2V4q4ksn+RuQH7VHI/cOtqTvldBXm1HhV
-XlM4brBTQjS1WbSmjlTcnzwfaLQXk+pGsqThOgbLwDvq
+MIICXAIBAAKBgQDonwmetJ4h2lRx+dcwJ5dO2KO58hGFtKpxo7uvTTW5bkxR1uTE
+t0qRUojS7PL6oWPZPXK18K2lcaBD86jF5ouloZ/cxuvOlTcyA9Ra/oUPofgI6Y5B
+A+ogPok2UNRoVFa1MyUsZERSSB5/GsiH3Q4GEo7G0hKJUtaR4roz7md+ZQIDAQAB
+AoGALgeKN8U1pS02mHb/hZ/P6OIlQ54KqZJeR65GbSGyB8czgt4q1mIOd0MFn/cS
+/VUCFPJ7yFSfh6U8OTX1p3M/Hl6Q0AepGD4AGsp8L4UgzxyyswUVV5bNyFZ+kEKq
+UhjU1ChpnzXCCK9hpDg4DLMsKV3Puh0eIS2lXqhRZ3mPJAECQQD165xzIzHkCKMW
+K/8DKEziPbbhNSveFiWhyNtq6WTQM8xblxm8t526EDp/m+TJHRHG1MLSt9uawZlq
+0USrbwFFAkEA8ifhuDQBJtSunt9HRHnkwKO+DyG3QdVCYn94uNuZzPZGjBwOj4Un
+0FbX6l6aVArsM9un1I0XTD8NXEV76o8KoQJAS8xbZIGslwSyf9r/txFs4S70d2XU
+J5fb8YnfV4yoriPJEVH5dNmDnB30afC7C+IR4J8jjZ9t6L1TdEEcUVrdoQJAAMPN
+e7Z2VngPgSL1Z6r25QDfZc7WdFfHGOaMLBFNgA87E9A2348tHARaNDxOQnuyWUuV
+UR+M9kmwshzqEkiXYQJBALW8s+qf9g33TMi6G3FHgjrojJ4W2l05/VBBvNbzGc5I
+0LqeyEuZaIFaOjPK/Nv+2/IUYzdLvDpKyEgISDnXTqc=
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/old-ca.pem b/tls/tests/files/old-ca.pem
index cdee6c2..53c2724 100644
--- a/tls/tests/files/old-ca.pem
+++ b/tls/tests/files/old-ca.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEETCCA3qgAwIBAgIJAP2QjCV8pipcMA0GCSqGSIb3DQEBBQUAMIGfMRMwEQYK
+MIIEETCCA3qgAwIBAgIJANApqrW0AMLjMA0GCSqGSIb3DQEBBQUAMIGfMRMwEQYK
 CZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEsMCoGA1UE
 CwwjT2xkIFVudHJ1c3RlZCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxIjAgBgNVBAMM
 GW9uY2Uud2FzLmEuY2EuZXhhbXBsZS5jb20xHTAbBgkqhkiG9w0BCQEWDmNhQGV4
-YW1wbGUuY29tMB4XDTE1MDgzMDAwMjIzMVoXDTQ1MDgyMjAwMjIzMVowgZ8xEzAR
+YW1wbGUuY29tMB4XDTE4MDQxNTE1MDkzMVoXDTQ4MDQwNzE1MDkzMVowgZ8xEzAR
 BgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/IsZAEZFgdFWEFNUExFMSwwKgYD
 VQQLDCNPbGQgVW50cnVzdGVkIENlcnRpZmljYXRlIEF1dGhvcml0eTEiMCAGA1UE
 AwwZb25jZS53YXMuYS5jYS5leGFtcGxlLmNvbTEdMBsGCSqGSIb3DQEJARYOY2FA
-ZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMByYGVDNk7Q
-lfK2sPqEbuYszhQ5y/8yrRKl2SjdV8uQFcwkoXlMLyAlgXDn9iFYfmtDeFChJSr8
-ZtodmHVesmkcFgdCfixLSbg2Wt3+rWnK9Iw2vSxjB74xwHD1MWoaCKZXquAMayOr
-Pe7Go6WjmCii85LsFP1fFwcwFbf+5C4hAgMBAAGjggFRMIIBTTAdBgNVHQ4EFgQU
-Lu6rFocDkpwOJyAjyQrCxuefLW8wgdQGA1UdIwSBzDCByYAULu6rFocDkpwOJyAj
-yQrCxuefLW+hgaWkgaIwgZ8xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJ
+ZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOifCZ60niHa
+VHH51zAnl07Yo7nyEYW0qnGju69NNbluTFHW5MS3SpFSiNLs8vqhY9k9crXwraVx
+oEPzqMXmi6Whn9zG686VNzID1Fr+hQ+h+AjpjkED6iA+iTZQ1GhUVrUzJSxkRFJI
+Hn8ayIfdDgYSjsbSEolS1pHiujPuZ35lAgMBAAGjggFRMIIBTTAdBgNVHQ4EFgQU
+2uUI1KzpetoO4lmbqXXAnJeYn+kwgdQGA1UdIwSBzDCByYAU2uUI1KzpetoO4lmb
+qXXAnJeYn+mhgaWkgaIwgZ8xEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJ
 k/IsZAEZFgdFWEFNUExFMSwwKgYDVQQLDCNPbGQgVW50cnVzdGVkIENlcnRpZmlj
 YXRlIEF1dGhvcml0eTEiMCAGA1UEAwwZb25jZS53YXMuYS5jYS5leGFtcGxlLmNv
-bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb22CCQD9kIwlfKYqXDAPBgNV
+bTEdMBsGCSqGSIb3DQEJARYOY2FAZXhhbXBsZS5jb22CCQDQKaq1tADC4zAPBgNV
 HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAZBgNVHREEEjAQgQ5jYUBleGFt
 cGxlLmNvbTAZBgNVHRIEEjAQgQ5jYUBleGFtcGxlLmNvbTANBgkqhkiG9w0BAQUF
-AAOBgQAQLX3HpbnxH3gLf6rhj7IQEizZhAEGpvLMURlDdUdoH9ZYPsQ49rZ2kcjD
-FFUKa4Y9/smcBOkF1Za9xepinsftz8ALhsfyo3azXUJTm7sRcQzQkwaSsAh0smIv
-UbmMskbCbFVDwW8xu+SCRJac/+NAuxjxkgrytZksJPvQB545XQ==
+AAOBgQCJjsk/D1hAmXecXQJhPIZgwaqnusKEG01v7mEpzyGr0wi6oBlNRoYR6xMK
+4Zwrb9B+YPV7MdtZ9EyQZ6Z6BAbr7o5dD6N1N4beQtGjGn0Y3Q80IMPpOj+36DGV
+0SAmjACK0cWoK1awfUNZ0xKp9bUoLrChi/Y2V+zxbr7Drka0RQ==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/root-ca-csr.pem b/tls/tests/files/root-ca-csr.pem
index 48f5365..199c4b3 100644
--- a/tls/tests/files/root-ca-csr.pem
+++ b/tls/tests/files/root-ca-csr.pem
@@ -2,13 +2,13 @@
 MIICGDCCAYECAQAwgYYxEzARBgoJkiaJk/IsZAEZFgNDT00xFzAVBgoJkiaJk/Is
 ZAEZFgdFWEFNUExFMR4wHAYDVQQLDBVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAV
 BgNVBAMMDmNhLmV4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkBFg5jYUBleGFtcGxl
-LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvapKy45xtxon3669spqf
-+/nXzp3q7WLmQiTd0+7h60d6AekMbltqr4IhR1jUDIJzPo4vrUnWVsHcqyTp7Kj3
-Cgoce2jQEn0hURvsrulP6Bq7tB5LXkxQrmY1+55R8h1dMI2kd7Po3O3gfntuCokm
-smceeid064RqUQWAO04GqKUCAwEAAaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0O
-BBYEFJgG0IEcATibiGotzcoALRkPcZWxMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBACd9IesNyKrVhriex7hMBZv+1M1A
-9/1ZPstHARbjRJ4AhOKQGvu3Bz7yiuzWUyVaY+naMYlu1rPcA01588xbKdBCGF9Z
-noOeVHlTZwu1OOV57KjwoilRBtjNNbmUUl3t4nlw6+sz5pPjyVYPBunMiig3n1Ke
-8jYPdl0bW/kX+8ve
+LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs3j+WtY5hY6Inu9ppVYU
+rGLadYK2muwHnavB0gX/48tFAvMrhzbDtwPJNr0IQQ/bhOIKYWb7g0donQqLfOFA
+19rWU/TSv7d5aBIfjjLFFXeL8lU5cxOw0bg74FLnhxlfDCT8uDWwdle7/MOMxlzX
+3M1nOxg5pzKy8JfVg6DUe9ECAwEAAaBRME8GCSqGSIb3DQEJDjFCMEAwHQYDVR0O
+BBYEFFEVQCMrnkgbaOFaEJRGUAIN+ofDMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4GBAG5AmHVk1e5/th83Bawo2OZ3tyPh
+IZ2jmgBAUaqowimnaP0gcybOEi41h3dWF2mhiPyOic+mvXKqIfxsj0j762dFBZSK
+8KyIxH5CNyPdji8a7v17pFgtPT1XzboDMafIp/RNH8onDhNxxsx9K8Rm/+D1hXY+
+WAtaH8ckjxPXTLJ+
 -----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-and-key.pem b/tls/tests/files/server-and-key.pem
index a74436a..5b2e067 100644
--- a/tls/tests/files/server-and-key.pem
+++ b/tls/tests/files/server-and-key.pem
@@ -1,23 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIICNzCCAaCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
+MIICSzCCAbSgAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE1MDgzMDAwMjIzMVoXDTQwMDgy
-MzAwMjIzMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDQxNTE1MDkzMVoXDTQzMDQw
+OTE1MDkzMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
 B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3
-DQEBAQUAA0sAMEgCQQDk6Op18H8aRZvr8jfjhSkw3P4Gy070eb3hrpkIiZl05UxO
-crI+cO3SaE5zgmcW18UPpXfwWl4uy/Q6nagkZDXvAgMBAAGjMzAxMAkGA1UdEwQC
-MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0RBAgwBocEwKgBCjANBgkqhkiG
-9w0BAQUFAAOBgQBmJQF4mdpoinkWTB5khs2ZVWZWf4QPLH2I/sP8IY1pWIVNtOVG
-YiTURtsdIHffSAoJ+9H+KrZhxk7TO9v7LR2Au1fGC6FuGjRizYb6UTe7tpoaZvlj
-JZj3sE/Rw/zCHCjA9xNTeYvQlKBzuohbUVGS+kEhxI7ScDmd7ylKSLIbBQ==
+DQEBAQUAA0sAMEgCQQCtuqYVuUH8iSQw4OEJKeYivQ3Vz8gqya7MoFAVM/oo9BVk
+Ahiz3YiyfIraNrbcMOv7WeiWIHbt3eGnV9fbKeNHAgMBAAGjRzBFMAkGA1UdEwQC
+MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIwYDVR0RBBwwGocEwKgBCoISc2VydmVy
+LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBALLKakcRqiJXYjLZP25/v+Tm
+nMpjf5DV+4i46CGcN7TFX7tg6o6+kgeuUrGNlX/36cNoCR8lZ+N8VpSrSu69WYhH
+jSb1gThzr/rE8Qxc3hx5WSwvRAKcmm6vUP4S12uygoznSIL1zuhJ4upP6ZKBTugp
+e2RcHsnLV+7oBuDhzUOo
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAOTo6nXwfxpFm+vyN+OFKTDc/gbLTvR5veGumQiJmXTlTE5ysj5w
-7dJoTnOCZxbXxQ+ld/BaXi7L9DqdqCRkNe8CAwEAAQJBAIbwSm411Cc/i3eeNJX5
-hFuammCU7rktHuLv0qR2wLBn8Sj2XXtJPlBEdolhQdO+YECBMxUG8f92LeJ4T2OF
-YhkCIQD/2tu/Sq5iVLkrocnCpppbxcZ5JUYDgnD2TrbvSghj+wIhAOUKJVyo5xRH
-DpyAfthRJa6VDUip3hVUz+Zz8PDmkp+dAiAX2nGuTeogJMH2vWiwCxRNBg1Q8haq
-8RhS/lezy3UozQIhANa8QHMzWBNG24gXYNVmnzGjRSUPPcw6DAFASnFRe75xAiAq
-c0wJZWOMbezOsSgAwPt/xsabERIVXSNhzt1il/lPjA==
+MIIBPAIBAAJBAK26phW5QfyJJDDg4Qkp5iK9DdXPyCrJrsygUBUz+ij0FWQCGLPd
+iLJ8ito2ttww6/tZ6JYgdu3d4adX19sp40cCAwEAAQJBAI9utojg9xXktDiWsbS7
+HwI3TCDm98A721GeWf/ndfYwkdhr4rcsmzbQS7cvg+Bmnnd7aCEZTPqTLBcLbnXM
+MwECIQDkLiWqdenSbUSueGBEKn/P0yj4pLPwtk8ruWVKICyg4QIhAMLo/3vpDqGR
+rZAnfsW85xIiu1t9+VYSdqnE4drEzIEnAiEAxwZFTkBY+XTbYj6W4P4cy14IL5Ah
+b0TlG2MzKQuVQaECIEeddMICj+2tqSgeWuYs0npHaK/lSYfmoNMgFBxd0wZhAiEA
+sOGQq1lOnsMkvZ4OY24kdBRUI5CAaXC1LKx/2t7lQyA=
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-intermediate-csr.pem b/tls/tests/files/server-intermediate-csr.pem
index c112d6c..6d3bdcc 100644
--- a/tls/tests/files/server-intermediate-csr.pem
+++ b/tls/tests/files/server-intermediate-csr.pem
@@ -1,9 +1,9 @@
 -----BEGIN CERTIFICATE REQUEST-----
 MIIBNjCB4QIBADBLMRMwEQYKCZImiZPyLGQBGRYDQ09NMRcwFQYKCZImiZPyLGQB
 GRYHRVhBTVBMRTEbMBkGA1UEAwwSc2VydmVyLmV4YW1wbGUuY29tMFwwDQYJKoZI
-hvcNAQEBBQADSwAwSAJBAM2PTEorKL/7mIbYVOz+U6DAo+itGDr2jjOyYxxU5+/A
-jUg3gVFKw+mpok26sdwY2q8aiPTuE0F1bF2iLEXimacCAwEAAaAxMC8GCSqGSIb3
+hvcNAQEBBQADSwAwSAJBALQNRlDHpOmUAAWyZ1pOVrziCXj8sVwltxH0OZukGjo1
+h+LId1l+s7ygQ3+LFOoMbYUs48AZqTJDJcdM4Z60JNUCAwEAAaAxMC8GCSqGSIb3
 DQEJDjEiMCAwCQYDVR0TBAIwADATBgNVHSUEDDAKBggrBgEFBQcDATANBgkqhkiG
-9w0BAQUFAANBADtTaSyvJDUzCuim8Wlk8MVVsGQzC2czFRshO5JcPgjq08gN9FXM
-KUYeUQYLGGVnVXkTqWdAOog769XukpDGv2g=
+9w0BAQsFAANBAHdfDP1Yk0d9Xm/GF4t9VDEUqIyLTdWq7dy5HBuVFAbaieklLW4V
+OMYdVmfHY/c+5OysAHvy9ku35sPtkTzNkJ0=
 -----END CERTIFICATE REQUEST-----
diff --git a/tls/tests/files/server-intermediate-key.pem b/tls/tests/files/server-intermediate-key.pem
index 32661d5..5e7fee8 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-----
-MIIBOQIBAAJBAM2PTEorKL/7mIbYVOz+U6DAo+itGDr2jjOyYxxU5+/AjUg3gVFK
-w+mpok26sdwY2q8aiPTuE0F1bF2iLEXimacCAwEAAQJACu1/RMIenHYnmaOOgDrU
-/0q+a/QnwZqx3JWzJyJsYhZmAJRw7/0MjsrD+UoPggvliu77FmnYihYEPxdlM39D
-QQIhAPE0Lu0W1vhiXxuEwIP7w7ix/IlTgZ/xIhoOltfwKSMPAiEA2itd/y6MvNgq
-39ZZDiAn5mjyDoSNJuafRi1FNY4fP+kCIGcNRH9HItE8NiYrsZSyHAzs/lgttVQA
-UfGQCiJ4GRtBAiBc+I4d6KBg+V2L9bQNqPZX4fEE7seYBD9rkG8l22LFwQIgOKPr
-BUkGlw/IMHWVXhQkPKSAPoSLHEvGiQCIyIckCMc=
+MIIBOQIBAAJBALQNRlDHpOmUAAWyZ1pOVrziCXj8sVwltxH0OZukGjo1h+LId1l+
+s7ygQ3+LFOoMbYUs48AZqTJDJcdM4Z60JNUCAwEAAQJAO9K5TTe4PH+XLk1jd6bV
+vPZhbViQWWySkh2SUntI15PIrCEbF+Gv38Z17wbhSlDEOFJbeZfHb49qMKdbPdUB
+tQIhAOX3/O/uVOfQskIZ0Oh+KC8ShuadPWZSPHOU6wKl9DznAiEAyG7M/vW6qg6h
+mkxJw9IXTu335kInSqFmhu6ES6jEPOMCIFrXOvMMEj4AEmpKCFvOedEeYGt4cWiZ
+04dUrAC/zVrBAiBH9lAvsjZE3F/1MDLD1eh8dEAvMc09pFlVVMm3CG78lQIgMeuJ
+zS2AhfX5RgY1M2IMjxKDNXo1BKCNhk7gUzWNk5g=
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-intermediate.pem b/tls/tests/files/server-intermediate.pem
index 6e4246a..384b2c4 100644
--- a/tls/tests/files/server-intermediate.pem
+++ b/tls/tests/files/server-intermediate.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICHTCCAcegAwIBAgIBATANBgkqhkiG9w0BAQUFADCBrTETMBEGCgmSJomT8ixk
+MIICMTCCAdugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBrTETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxKzApBgNVBAsMIkludGVy
 bWVkaWF0ZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxJDAiBgNVBAMMG2ludGVybWVk
 aWF0ZS1jYS5leGFtcGxlLmNvbTEqMCgGCSqGSIb3DQEJARYbaW50ZXJtZWRpYXRl
-LWNhQGV4YW1wbGUuY29tMB4XDTE1MDgzMDAwMjIzOVoXDTQwMDgyMzAwMjIzOVow
+LWNhQGV4YW1wbGUuY29tMB4XDTE4MDQxNTE1MDk0MloXDTQzMDQwOTE1MDk0Mlow
 SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
 GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sA
-MEgCQQDNj0xKKyi/+5iG2FTs/lOgwKPorRg69o4zsmMcVOfvwI1IN4FRSsPpqaJN
-urHcGNqvGoj07hNBdWxdoixF4pmnAgMBAAGjMzAxMAkGA1UdEwQCMAAwEwYDVR0l
-BAwwCgYIKwYBBQUHAwEwDwYDVR0RBAgwBocEwKgBFjANBgkqhkiG9w0BAQUFAANB
-ALl1WO7IZYOvPwhyQ4EpCLjSsTuGBcfbWFtw4XiQueZ8TILHcZARH4nW1tKoVWzc
-rIGhqRjNMWRmaH1wgSCGRiE=
+MEgCQQC0DUZQx6TplAAFsmdaTla84gl4/LFcJbcR9DmbpBo6NYfiyHdZfrO8oEN/
+ixTqDG2FLOPAGakyQyXHTOGetCTVAgMBAAGjRzBFMAkGA1UdEwQCMAAwEwYDVR0l
+BAwwCgYIKwYBBQUHAwEwIwYDVR0RBBwwGocEwKgBFoISc2VydmVyLmV4YW1wbGUu
+Y29tMA0GCSqGSIb3DQEBCwUAA0EAS/Zgzq+lJ18rPyDmlqEz/qSLp11cqihwM27x
+dM1o19qWWhmBRCuaQS8BBA3dbno4s2srzC2KJ7xnHCr8YGXkEA==
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/server-key.der b/tls/tests/files/server-key.der
index abd1336..607cdba 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 93a9cc5..bb073df 100644
--- a/tls/tests/files/server-key.pem
+++ b/tls/tests/files/server-key.pem
@@ -1,9 +1,9 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAOTo6nXwfxpFm+vyN+OFKTDc/gbLTvR5veGumQiJmXTlTE5ysj5w
-7dJoTnOCZxbXxQ+ld/BaXi7L9DqdqCRkNe8CAwEAAQJBAIbwSm411Cc/i3eeNJX5
-hFuammCU7rktHuLv0qR2wLBn8Sj2XXtJPlBEdolhQdO+YECBMxUG8f92LeJ4T2OF
-YhkCIQD/2tu/Sq5iVLkrocnCpppbxcZ5JUYDgnD2TrbvSghj+wIhAOUKJVyo5xRH
-DpyAfthRJa6VDUip3hVUz+Zz8PDmkp+dAiAX2nGuTeogJMH2vWiwCxRNBg1Q8haq
-8RhS/lezy3UozQIhANa8QHMzWBNG24gXYNVmnzGjRSUPPcw6DAFASnFRe75xAiAq
-c0wJZWOMbezOsSgAwPt/xsabERIVXSNhzt1il/lPjA==
+MIIBPAIBAAJBAK26phW5QfyJJDDg4Qkp5iK9DdXPyCrJrsygUBUz+ij0FWQCGLPd
+iLJ8ito2ttww6/tZ6JYgdu3d4adX19sp40cCAwEAAQJBAI9utojg9xXktDiWsbS7
+HwI3TCDm98A721GeWf/ndfYwkdhr4rcsmzbQS7cvg+Bmnnd7aCEZTPqTLBcLbnXM
+MwECIQDkLiWqdenSbUSueGBEKn/P0yj4pLPwtk8ruWVKICyg4QIhAMLo/3vpDqGR
+rZAnfsW85xIiu1t9+VYSdqnE4drEzIEnAiEAxwZFTkBY+XTbYj6W4P4cy14IL5Ah
+b0TlG2MzKQuVQaECIEeddMICj+2tqSgeWuYs0npHaK/lSYfmoNMgFBxd0wZhAiEA
+sOGQq1lOnsMkvZ4OY24kdBRUI5CAaXC1LKx/2t7lQyA=
 -----END RSA PRIVATE KEY-----
diff --git a/tls/tests/files/server-self.pem b/tls/tests/files/server-self.pem
index 3827cda..5a221bb 100644
--- a/tls/tests/files/server-self.pem
+++ b/tls/tests/files/server-self.pem
@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBiDCCATICCQD8Rn+cHcihijANBgkqhkiG9w0BAQUFADBLMRMwEQYKCZImiZPy
+MIIBiDCCATICCQDG/6CUMieoNTANBgkqhkiG9w0BAQsFADBLMRMwEQYKCZImiZPy
 LGQBGRYDQ09NMRcwFQYKCZImiZPyLGQBGRYHRVhBTVBMRTEbMBkGA1UEAwwSc2Vy
-dmVyLmV4YW1wbGUuY29tMB4XDTE1MDgzMDAwMjIzMVoXDTQwMDgyMzAwMjIzMVow
+dmVyLmV4YW1wbGUuY29tMB4XDTE4MDQxNTE1MDkzMVoXDTQzMDQwOTE1MDkzMVow
 SzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUx
 GzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sA
-MEgCQQDk6Op18H8aRZvr8jfjhSkw3P4Gy070eb3hrpkIiZl05UxOcrI+cO3SaE5z
-gmcW18UPpXfwWl4uy/Q6nagkZDXvAgMBAAEwDQYJKoZIhvcNAQEFBQADQQADBJbF
-pDpocLDuQo5DXoXVlloJAputR6oKQLtTFRorEr0iASEr/8DEXfFoOI+US/8EZ/IT
-6JR2XOHSot4zsr68
+MEgCQQCtuqYVuUH8iSQw4OEJKeYivQ3Vz8gqya7MoFAVM/oo9BVkAhiz3YiyfIra
+NrbcMOv7WeiWIHbt3eGnV9fbKeNHAgMBAAEwDQYJKoZIhvcNAQELBQADQQBt0a9H
+NaI47J0dW1IOsaxmAMrTEz2UAaUMhRC/02fbbzp1b5fp/UsICECFLvHh3G3xWcmi
+6U0aifAZ0yGD2ecZ
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/server.der b/tls/tests/files/server.der
index a3a4b39..c537168 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 56be360..8985e06 100644
--- a/tls/tests/files/server.pem
+++ b/tls/tests/files/server.pem
@@ -1,14 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICNzCCAaCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBhjETMBEGCgmSJomT8ixk
+MIICSzCCAbSgAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBhjETMBEGCgmSJomT8ixk
 ARkWA0NPTTEXMBUGCgmSJomT8ixkARkWB0VYQU1QTEUxHjAcBgNVBAsMFUNlcnRp
 ZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOY2EuZXhhbXBsZS5jb20xHTAbBgkq
-hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE1MDgzMDAwMjIzMVoXDTQwMDgy
-MzAwMjIzMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
+hkiG9w0BCQEWDmNhQGV4YW1wbGUuY29tMB4XDTE4MDQxNTE1MDkzMVoXDTQzMDQw
+OTE1MDkzMVowSzETMBEGCgmSJomT8ixkARkWA0NPTTEXMBUGCgmSJomT8ixkARkW
 B0VYQU1QTEUxGzAZBgNVBAMMEnNlcnZlci5leGFtcGxlLmNvbTBcMA0GCSqGSIb3
-DQEBAQUAA0sAMEgCQQDk6Op18H8aRZvr8jfjhSkw3P4Gy070eb3hrpkIiZl05UxO
-crI+cO3SaE5zgmcW18UPpXfwWl4uy/Q6nagkZDXvAgMBAAGjMzAxMAkGA1UdEwQC
-MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0RBAgwBocEwKgBCjANBgkqhkiG
-9w0BAQUFAAOBgQBmJQF4mdpoinkWTB5khs2ZVWZWf4QPLH2I/sP8IY1pWIVNtOVG
-YiTURtsdIHffSAoJ+9H+KrZhxk7TO9v7LR2Au1fGC6FuGjRizYb6UTe7tpoaZvlj
-JZj3sE/Rw/zCHCjA9xNTeYvQlKBzuohbUVGS+kEhxI7ScDmd7ylKSLIbBQ==
+DQEBAQUAA0sAMEgCQQCtuqYVuUH8iSQw4OEJKeYivQ3Vz8gqya7MoFAVM/oo9BVk
+Ahiz3YiyfIraNrbcMOv7WeiWIHbt3eGnV9fbKeNHAgMBAAGjRzBFMAkGA1UdEwQC
+MAAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwIwYDVR0RBBwwGocEwKgBCoISc2VydmVy
+LmV4YW1wbGUuY29tMA0GCSqGSIb3DQEBCwUAA4GBALLKakcRqiJXYjLZP25/v+Tm
+nMpjf5DV+4i46CGcN7TFX7tg6o6+kgeuUrGNlX/36cNoCR8lZ+N8VpSrSu69WYhH
+jSb1gThzr/rE8Qxc3hx5WSwvRAKcmm6vUP4S12uygoznSIL1zuhJ4upP6ZKBTugp
+e2RcHsnLV+7oBuDhzUOo
 -----END CERTIFICATE-----
diff --git a/tls/tests/files/ssl/ca.conf b/tls/tests/files/ssl/ca.conf
index 8e1844e..bf776ec 100644
--- a/tls/tests/files/ssl/ca.conf
+++ b/tls/tests/files/ssl/ca.conf
@@ -1,6 +1,7 @@
 # Root CA
 
 [ req ]
+# Use SHA-1 to verify that it does not affect the trust of root certificates.
 default_md              = sha1
 utf8                    = yes
 string_mask             = utf8only
diff --git a/tls/tests/files/ssl/client.conf b/tls/tests/files/ssl/client.conf
index be59460..2ba2c77 100644
--- a/tls/tests/files/ssl/client.conf
+++ b/tls/tests/files/ssl/client.conf
@@ -1,7 +1,7 @@
 # Client
 
 [ req ]
-default_md              = sha1
+default_md              = sha256
 utf8                    = yes
 string_mask             = utf8only
 prompt                  = no
diff --git a/tls/tests/files/ssl/intermediate-ca.conf b/tls/tests/files/ssl/intermediate-ca.conf
index f766c14..53b1f7e 100644
--- a/tls/tests/files/ssl/intermediate-ca.conf
+++ b/tls/tests/files/ssl/intermediate-ca.conf
@@ -1,7 +1,7 @@
 # Intermediate Root CA
 
 [ req ]
-default_md              = sha1
+default_md              = sha256
 utf8                    = yes
 string_mask             = utf8only
 prompt                  = no
diff --git a/tls/tests/files/ssl/server-intermediate.conf b/tls/tests/files/ssl/server-intermediate.conf
index d899a0f..8dbf236 100644
--- a/tls/tests/files/ssl/server-intermediate.conf
+++ b/tls/tests/files/ssl/server-intermediate.conf
@@ -1,7 +1,7 @@
 # Server
 
 [ req ]
-default_md              = sha1
+default_md              = sha256
 utf8                    = yes
 string_mask             = utf8only
 prompt                  = no
@@ -25,3 +25,4 @@ subjectAltName          = @alt_names
 
 [ alt_names ]
 IP.0                    = 192.168.1.22
+DNS.0                   = "server.example.com"
diff --git a/tls/tests/files/ssl/server.conf b/tls/tests/files/ssl/server.conf
index 6a98029..7adb406 100644
--- a/tls/tests/files/ssl/server.conf
+++ b/tls/tests/files/ssl/server.conf
@@ -1,7 +1,7 @@
 # Server
 
 [ req ]
-default_md              = sha1
+default_md              = sha256
 utf8                    = yes
 string_mask             = utf8only
 prompt                  = no
@@ -25,3 +25,4 @@ subjectAltName          = @alt_names
 
 [ alt_names ]
 IP.0                    = 192.168.1.10
+DNS.0                   = "server.example.com"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]