diff --git a/testdata/ec-key.pem b/testdata/ec-key.pem
index 021f34653..9f595cc4c 100644
--- a/testdata/ec-key.pem
+++ b/testdata/ec-key.pem
@@ -1,5 +1,5 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEINs5XopZVBEWTsUCCF8mU4H14/UN1alo+j5BzBQZ0PKtoAoGCCqGSM49
-AwEHoUQDQgAEogflvYlpKaqJBcfKoL5yaScgJwWLkB11WOxCLMNXq5ni/qz49aIn
-LN8D+tO0y9gA+r/J4QekFQHWPTnebGekyw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgeVF5tINPDFkRxZBg
+AtwEVxi/ixVHsJYqV9zCV4CI3AqhRANCAAQmjbZdLlSo4sE7VeV+7AZFOfOkVJ/e
+ufqdgY5cdRTkiSSIfLvbCvAMQm1iQQ53dgw603T7ZzMgll5OUm4gkLl4
+-----END PRIVATE KEY-----
diff --git a/testdata/ec.pem b/testdata/ec.pem
index 8d98dfa59..2c0326fe2 100644
--- a/testdata/ec.pem
+++ b/testdata/ec.pem
@@ -1,15 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICYjCCAgmgAwIBAgIUB3CTDOU47sUC5K4kn/Caqnh114YwCgYIKoZIzj0EAwIw
-fzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh
-biBGcmFuY2lzY28xHzAdBgNVBAoTFkludGVybmV0IFdpZGdldHMsIEluYy4xDDAK
-BgNVBAsTA1dXVzEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTYxMDEyMTkzMTAw
-WhcNMjExMDExMTkzMTAwWjB/MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZv
-cm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEChMWSW50ZXJuZXQg
-V2lkZ2V0cywgSW5jLjEMMAoGA1UECxMDV1dXMRQwEgYDVQQDEwtleGFtcGxlLmNv
-bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKIH5b2JaSmqiQXHyqC+cmknICcF
-i5AddVjsQizDV6uZ4v6s+PWiJyzfA/rTtMvYAPq/yeEHpBUB1j053mxnpMujYzBh
-MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQXZ0I9
-qp6CP8TFHZ9bw5nRtZxIEDAfBgNVHSMEGDAWgBQXZ0I9qp6CP8TFHZ9bw5nRtZxI
-EDAKBggqhkjOPQQDAgNHADBEAiAHp5Rbp9Em1G/UmKn8WsCbqDfWecVbZPQj3RK4
-oG5kQQIgQAe4OOKYhJdh3f7URaKfGTf492/nmRmtK+ySKjpHSrU=
+MIICFzCCAb2gAwIBAgIUanMwscuJLb9XYbQf/kt1my+QsLEwCgYIKoZIzj0EAwIw
+aDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQK
+EwtIeXBlcmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMt
+Y2Etc2VydmVyMB4XDTIxMTEyMjE4NDUwMFoXDTM2MTExODE4NDUwMFowaDELMAkG
+A1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQKEwtIeXBl
+cmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMtY2Etc2Vy
+dmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEJo22XS5UqOLBO1XlfuwGRTnz
+pFSf3rn6nYGOXHUU5IkkiHy72wrwDEJtYkEOd3YMOtN0+2czIJZeTlJuIJC5eKNF
+MEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE
+FOWOkDQ8aMe9kC++W32y0Rx/BHxxMAoGCCqGSM49BAMCA0gAMEUCIQD9+qh8Hnsi
+Bl/q6X0UBN0avLbNenaKWpFilkElGzHi4AIgVSpFx/B6IRm5ZoMxKB+ZTaqHz6uV
+JOrQKvNUH79Y9P4=
 -----END CERTIFICATE-----
diff --git a/testdata/root.pem b/testdata/root.pem
index 8d98dfa59..2c0326fe2 100644
--- a/testdata/root.pem
+++ b/testdata/root.pem
@@ -1,15 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICYjCCAgmgAwIBAgIUB3CTDOU47sUC5K4kn/Caqnh114YwCgYIKoZIzj0EAwIw
-fzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh
-biBGcmFuY2lzY28xHzAdBgNVBAoTFkludGVybmV0IFdpZGdldHMsIEluYy4xDDAK
-BgNVBAsTA1dXVzEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTYxMDEyMTkzMTAw
-WhcNMjExMDExMTkzMTAwWjB/MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZv
-cm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEChMWSW50ZXJuZXQg
-V2lkZ2V0cywgSW5jLjEMMAoGA1UECxMDV1dXMRQwEgYDVQQDEwtleGFtcGxlLmNv
-bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABKIH5b2JaSmqiQXHyqC+cmknICcF
-i5AddVjsQizDV6uZ4v6s+PWiJyzfA/rTtMvYAPq/yeEHpBUB1j053mxnpMujYzBh
-MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQXZ0I9
-qp6CP8TFHZ9bw5nRtZxIEDAfBgNVHSMEGDAWgBQXZ0I9qp6CP8TFHZ9bw5nRtZxI
-EDAKBggqhkjOPQQDAgNHADBEAiAHp5Rbp9Em1G/UmKn8WsCbqDfWecVbZPQj3RK4
-oG5kQQIgQAe4OOKYhJdh3f7URaKfGTf492/nmRmtK+ySKjpHSrU=
+MIICFzCCAb2gAwIBAgIUanMwscuJLb9XYbQf/kt1my+QsLEwCgYIKoZIzj0EAwIw
+aDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQK
+EwtIeXBlcmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMt
+Y2Etc2VydmVyMB4XDTIxMTEyMjE4NDUwMFoXDTM2MTExODE4NDUwMFowaDELMAkG
+A1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQKEwtIeXBl
+cmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMtY2Etc2Vy
+dmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEJo22XS5UqOLBO1XlfuwGRTnz
+pFSf3rn6nYGOXHUU5IkkiHy72wrwDEJtYkEOd3YMOtN0+2czIJZeTlJuIJC5eKNF
+MEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE
+FOWOkDQ8aMe9kC++W32y0Rx/BHxxMAoGCCqGSM49BAMCA0gAMEUCIQD9+qh8Hnsi
+Bl/q6X0UBN0avLbNenaKWpFilkElGzHi4AIgVSpFx/B6IRm5ZoMxKB+ZTaqHz6uV
+JOrQKvNUH79Y9P4=
 -----END CERTIFICATE-----
diff --git a/testdata/tls_client-cert.pem b/testdata/tls_client-cert.pem
index 18a32265a..776195028 100644
--- a/testdata/tls_client-cert.pem
+++ b/testdata/tls_client-cert.pem
@@ -1,16 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICeDCCAh+gAwIBAgIUJO6MwGM/43sun4HYRUoQJ1fN0AowCgYIKoZIzj0EAwIw
-fzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh
-biBGcmFuY2lzY28xHzAdBgNVBAoTFkludGVybmV0IFdpZGdldHMsIEluYy4xDDAK
-BgNVBAsTA1dXVzEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTcxMjE3MTM1MDAw
-WhcNMjcxMjE1MTM1MDAwWjBhMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGgg
-Q2Fyb2xpbmExFDASBgNVBAoTC0h5cGVybGVkZ2VyMQ8wDQYDVQQLEwZjbGllbnQx
-EjAQBgNVBAMTCWxvY2FsaG9zdDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJ5l
-qPQgbKHjdHv7qtqO4Z85v2zgqom5l4iYjNwZhqdl7d1o8tNcx9cTE9ukqBshqUdM
-ncX+da0P9eVKeQrP7uqjgZYwgZMwDgYDVR0PAQH/BAQDAgOoMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTuTZ+e
-K/peblN/dzPGD/JNW1XxazAfBgNVHSMEGDAWgBQXZ0I9qp6CP8TFHZ9bw5nRtZxI
-EDAUBgNVHREEDTALgglsb2NhbGhvc3QwCgYIKoZIzj0EAwIDRwAwRAIgKsLBrhQm
-eR1YnuSd8AM9Bm+wiBVimWSE2XFMAwWZbtkCIA+T/YuLZKLH1KTcZT6ZUHC+sfLf
-7E/yBWDQ3RkYuYAb
+MIICOzCCAeGgAwIBAgIUEIohRQr9GVEsV3PzFHI7GKNvhxIwCgYIKoZIzj0EAwIw
+aDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQK
+EwtIeXBlcmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMt
+Y2Etc2VydmVyMB4XDTIxMTEyMjE4NDUwMFoXDTIyMTEyMjE5MTAwMFowXDELMAkG
+A1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQKEwtIeXBl
+cmxlZGdlcjEPMA0GA1UECxMGY2xpZW50MQ0wCwYDVQQDEwR1c2VyMFkwEwYHKoZI
+zj0CAQYIKoZIzj0DAQcDQgAE/oGeu5fKZdSKowg+ceb0g+018jR3J9Vqf4yQsfil
+D7XNceTHa27k08CZddFcg6AjoMGpCDucVUUv/iUm0CNec6N1MHMwDgYDVR0PAQH/
+BAQDAgeAMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFGLFS8/4S004bn8sHGSUt5eN
+I6dUMB8GA1UdIwQYMBaAFOWOkDQ8aMe9kC++W32y0Rx/BHxxMBMGA1UdEQQMMAqC
+CHRlc3Rob3N0MAoGCCqGSM49BAMCA0gAMEUCIQD6rwRGA1EZDt491dtQF9XFuUmn
+XH0brdpaKPPvCGfJgwIgQdYxG3eJYt7vTn+PCix7dDoDreW34rXRA+GjwMzRoOQ=
 -----END CERTIFICATE-----
diff --git a/testdata/tls_client-key.pem b/testdata/tls_client-key.pem
index f29f14d30..90f2a2bd3 100644
--- a/testdata/tls_client-key.pem
+++ b/testdata/tls_client-key.pem
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0cmsKA+28OSzluHS
-zL0MszfVHUEhsEqFhIscceHahXChRANCAASeZaj0IGyh43R7+6rajuGfOb9s4KqJ
-uZeImIzcGYanZe3daPLTXMfXExPbpKgbIalHTJ3F/nWtD/XlSnkKz+7q
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgkuBrw60V5BDUmsGn
+Hh1PDZsfIzxWO45izSbw1JeghwqhRANCAAT+gZ67l8pl1IqjCD5x5vSD7TXyNHcn
+1Wp/jJCx+KUPtc1x5MdrbuTTwJl10VyDoCOgwakIO5xVRS/+JSbQI15z
 -----END PRIVATE KEY-----
diff --git a/testdata/tls_server-cert.pem b/testdata/tls_server-cert.pem
index 8dd31f098..b3ef19c9e 100644
--- a/testdata/tls_server-cert.pem
+++ b/testdata/tls_server-cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICeTCCAh+gAwIBAgIUUiMV01AxesrxnAh7dH+g0BK/02owCgYIKoZIzj0EAwIw
-fzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh
-biBGcmFuY2lzY28xHzAdBgNVBAoTFkludGVybmV0IFdpZGdldHMsIEluYy4xDDAK
-BgNVBAsTA1dXVzEUMBIGA1UEAxMLZXhhbXBsZS5jb20wHhcNMTcxMjE3MTM1MjAw
-WhcNMjcxMjE1MTM1MjAwWjBhMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGgg
-Q2Fyb2xpbmExFDASBgNVBAoTC0h5cGVybGVkZ2VyMQ8wDQYDVQQLEwZjbGllbnQx
-EjAQBgNVBAMTCWxvY2FsaG9zdDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNec
-NNB5yoIw9h3s8iVYwsg6rZocILgwX9BAvQkgvSz4AGTWI/EhyPyG5defdYMg3r7s
-3U+y7varh7fu1ayPa2SjgZYwgZMwDgYDVR0PAQH/BAQDAgOoMB0GA1UdJQQWMBQG
-CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRV1WMl
-79QzMBg/6qq2jInfVEbaFzAfBgNVHSMEGDAWgBQXZ0I9qp6CP8TFHZ9bw5nRtZxI
-EDAUBgNVHREEDTALgglsb2NhbGhvc3QwCgYIKoZIzj0EAwIDSAAwRQIhAON1NBtQ
-1revLhmREfKuYEXCFKrjefuHpvwZz5DuZwjVAiAhKZxSdQJJRG3xReHqVrikbxoq
-xTCNdmrFBE4r7GKhoQ==
+MIICbjCCAhWgAwIBAgIUPhGE3d0V9abCIO1oyh+p4AP/0GgwCgYIKoZIzj0EAwIw
+aDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQK
+EwtIeXBlcmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMt
+Y2Etc2VydmVyMB4XDTIxMTEyMjE4NDUwMFoXDTIyMTEyMjE4NDUwMFowYjELMAkG
+A1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQKEwtIeXBl
+cmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRMwEQYDVQQDEwpmdWppLmxvY2FsMFkw
+EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEqTEfDloFZ+jhm0yItwavlinyL2PNXkmr
+2HqMSc7QcAqhRevbr2Rn/iTaVzGN4lEE4M5bsBj/4TlACBKYSEv5faOBojCBnzAO
+BgNVHQ8BAf8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG
+A1UdEwEB/wQCMAAwHQYDVR0OBBYEFBHDWBkc2WzpDIuZqNOTgeJYwXwaMB8GA1Ud
+IwQYMBaAFOWOkDQ8aMe9kC++W32y0Rx/BHxxMCAGA1UdEQQZMBeCCmZ1amkubG9j
+YWyCCWxvY2FsaG9zdDAKBggqhkjOPQQDAgNHADBEAiAEgv77MV3O1S1NFrhqTfY6
+LLDUE5BT5cFrEGqUgvcKIwIgZk/S1i08kQwGRtCG5qYyf26xXM1AiNJqIPEJd0k9
+TqM=
 -----END CERTIFICATE-----
diff --git a/testdata/tls_server-key.pem b/testdata/tls_server-key.pem
index 0234fa011..b3931bb4b 100644
--- a/testdata/tls_server-key.pem
+++ b/testdata/tls_server-key.pem
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgU0MPT80bohUM38aC
-A0maooqCnz6bnc+kDPu/noWiPIahRANCAATXnDTQecqCMPYd7PIlWMLIOq2aHCC4
-MF/QQL0JIL0s+ABk1iPxIcj8huXXn3WDIN6+7N1Psu72q4e37tWsj2tk
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgebKTzCOtJ0/V/FE4
+TZa3gExp0mBEeqJlS/BhasbS1GyhRANCAASpMR8OWgVn6OGbTIi3Bq+WKfIvY81e
+SavYeoxJztBwCqFF69uvZGf+JNpXMY3iUQTgzluwGP/hOUAIEphIS/l9
 -----END PRIVATE KEY-----