diff --git a/test/config/integration/certs/cacert.pem b/test/config/integration/certs/cacert.pem
index 021f465ac3ef2..04f63fa1261d8 100644
--- a/test/config/integration/certs/cacert.pem
+++ b/test/config/integration/certs/cacert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID0jCCArqgAwIBAgIJAJxgLCQiz7YlMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow
-djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCpZHOUq+nidd+Gz44RC80QG9De9jcFUStEMGucXlnvvp2cH3GV4GmO
-IZPdCwasxuruO3VM/Yt8tUAO2OrTQayuL9GXTt8MTpkCrviebMBzjYjbgyLgDpZy
-cMoEJjBx0JsfQV+9IUDROLlIehTYzjcIWuLEOqMjZXQQCOI+jA3CEWZx1TFhRWhi
-9aBnQQzWCSZPV5ErKSSRg2T2Xnuhusue7ETtgSt36hDrOxLhJaeS1/YlovyhX94j
-JPhASK3LutJUDO2tk8L713Y3WHkFzDMfkGrklRbBB/ZKXRRGiJDWElpbUCUVFbuw
-7laBtTn0t74DQxBXqal9sIr9vV7LLQszAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQUM9b2kmz7njy/vuxkzKiwDLZN
-5DAfBgNVHSMEGDAWgBQUM9b2kmz7njy/vuxkzKiwDLZN5DANBgkqhkiG9w0BAQsF
-AAOCAQEAkWqORue+2exZldWbYaDUX3ANP0ATBNIbZM70uTNO8Iy+r5Fvxtae/PsV
-Iac9LzVY5dY5eqIND9wo7osFfxEhJdJn+/tpTU2h9IhsuWMm0Ogj87NS3sy0xwDc
-xBhnVXI8nCDYU3qU3p+AeC0VfEbNb+dRKHH/FL77jvIL64GP/WGxxS9u7LRTUUoR
-g97ZWeayKEsHAicRao4/k3jgpNIUN0BOlkjLvCe1ExU0id5R3UtdITmbuSSe6GJx
-j8xsEV8PxmOIaJ/M+fqE+Zi2Ljp3a+9X/nLakR6ohMNTbrGMQWrGIpFqCj6pIwek
-6Uemmmca+JeVohl8P3enMlW1d6/24w==
+MIID3TCCAsWgAwIBAgIUS384+9W3ElCWnIYOC2en2RpHoLowDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTcwOTQ0WhcNMjIx
+MjIyMTcwOTQ0WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMQA4X+qoVzQOLaEA4Jiuz5jh7fPuGo6P+EoQP//
+BZ6u+SToUUUKFNGLTakp9W1Jglv1PZUZWWIMjMmvXQusoX8JSGdQrrYmRpkF7gWm
+cAuSiu1f/kfvk4pxgmGOn0hWyHhLdM7hT0xhehMJJ6SC7oWqUe0hYs729N2EaD4+
+QsaELeLW28XL93lQsQavZq/NYY6SkpHlwwKIFKRX7HGb7sVRwUkNsP0kbbVb5vB1
+yH13Us9I44QoP7a1owHbTxr+VruiP9L9aHNAFIy96CKZMg9R/VBQ7dGW7u0L6/99
+DivPDn5MelmxrNszoZwWKqhHB+GOv6drNnGC5kZPt4ZB+pECAwEAAaNjMGEwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMhj1pK77Mj8
+AVUQjjcYRODidh7pMB8GA1UdIwQYMBaAFMhj1pK77Mj8AVUQjjcYRODidh7pMA0G
+CSqGSIb3DQEBCwUAA4IBAQC4BtnHpUy+FHoKe3+jW4SmtaVjj4vpbjVYT4MlQ19Y
+p0uZO8pv9tqRGrbjv6ejkdpTTZf20f5xj+CjVIirTcnmmyi9JdwwRD5msKddSc5q
+U0yvw6FhBB6MG4KE4klNjz7x0rLX2cXFJw/7yyfBYIWJ+uQjvYglo/RY6AQ/fpas
+3NGevjaAhU8QzSxjNFWw034wwsJBOsxOo1EJbS2ECfCLU3fAbJH9mnIRVIPj6PZf
+XvGtguix6YknuWjYpdsXIAYeQuE+rjQAzOqO8J2gidBTF1WFvDyQj0+Ikxtym5UJ
+Apqd3s5xmzVN0svVsi7FUYahPJ/cyE/q5iTmVqZ5vyb6
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/cakey.pem b/test/config/integration/certs/cakey.pem
index 030b80b3d860b..aa9ec6596dcb1 100644
--- a/test/config/integration/certs/cakey.pem
+++ b/test/config/integration/certs/cakey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/config/integration/certs/client_ecdsacert.pem b/test/config/integration/certs/client_ecdsacert.pem
index d32aea145091d..436fefeb8b5bc 100644
--- a/test/config/integration/certs/client_ecdsacert.pem
+++ b/test/config/integration/certs/client_ecdsacert.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDmTCCAoGgAwIBAgIJAILStmLgUUcYMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow
-gagxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
-YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu
-ZWVyaW5nMRswGQYDVQQDDBJUZXN0IEZyb250ZW5kIFRlYW0xJTAjBgkqhkiG9w0B
-CQEWFmZyb250ZW5kLXRlYW1AbHlmdC5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMB
-BwNCAAT9UPlVN7p2GE0w7a7G7v+AqYYKwpsI1exZyLK4MiEBdiFxnQnjPP0Cfjpq
-8PvQCZdthQ7+WL+HhRirpCHPaVHno4HBMIG+MAwGA1UdEwEB/wQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBCBgNVHREEOzA5
-hh9zcGlmZmU6Ly9seWZ0LmNvbS9mcm9udGVuZC10ZWFtgghseWZ0LmNvbYIMd3d3
-Lmx5ZnQuY29tMB0GA1UdDgQWBBQLeMuyYBahRJ6gH43BRFYhMfBYxTAfBgNVHSME
-GDAWgBQUM9b2kmz7njy/vuxkzKiwDLZN5DANBgkqhkiG9w0BAQsFAAOCAQEAEh3S
-cW+nQzgbRCbfDkj+qcEslAOWJc6pNf6npKHtfn78YehVUKOiKkMdqTcW4zuhGjYA
-ifVkoyTgTHyqdxkNdgELIi7/7JDY0N73AgndCpA/F/OqqMHATVtUMzTZzk7EB+yx
-L6KyGuXVH6WtNnJ9Zo+f87FgjCtVZvnWqZKEynqtBRv930UaMkPPXQ/YLsrjkMC0
-VX2cyUG6tblYNxCeT73SRTs07KeT9wXOoZaUNxBJo0zPUYk3D1gEaCVCPMpqIOUF
-kHkEPCdBDeGE1/UT/rPeFcWI+fCpKDU7c41ojMQ4/HxxorecyzBHxCpuqKZFGzD5
-+SAdcodf60sCDUt8lA==
+MIIDpDCCAoygAwIBAgIUOXEYFeeueN2JsADaKGXPhjPfmi4wDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTcwOTQ1WhcNMjIx
+MjIyMTcwOTQ1WjCBqDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
+EEx5ZnQgRW5naW5lZXJpbmcxGzAZBgNVBAMMElRlc3QgRnJvbnRlbmQgVGVhbTEl
+MCMGCSqGSIb3DQEJARYWZnJvbnRlbmQtdGVhbUBseWZ0LmNvbTBZMBMGByqGSM49
+AgEGCCqGSM49AwEHA0IABNq4v58s7ucRCnCVHU7V5I/bcm2gdOZzxpsJuBp/Gkc3
+N18BXU6ptWCMvy+2PNC+jkziP++6Nbi9Z5Ksaq6JnuajgcEwgb4wDAYDVR0TAQH/
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MEIGA1UdEQQ7MDmGH3NwaWZmZTovL2x5ZnQuY29tL2Zyb250ZW5kLXRlYW2CCGx5
+ZnQuY29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFEeFOmGoMANQn7DfFjMDmERL
+uzJJMB8GA1UdIwQYMBaAFMhj1pK77Mj8AVUQjjcYRODidh7pMA0GCSqGSIb3DQEB
+CwUAA4IBAQCk5tSiCdg33AwDro683lItaTVehHvLZLPvQ7/g+W0D0xCUihegLV1m
+0eipEP/LITZYfOlVybVBFM+SywN744TDNxAHyR++37prUmi5XTOdwRCsgDGv9y39
+ZGyDizQgz23W9CFcmkBZZgsEuugysgHrX/eCXK+DZojLhXtGfuCGGFNITvMe47iF
+t7PWkgJ1EKY2RTRCfYCI2b79vMzkNImzuNvN8xVC0kbuu2LKNhQm3/+oy3guWui1
+v4OM8HE6iTu3TJcNBDbIlzt96aX1NajwSxAEuiSkR0hVGdDlAAfcLywK8QgMOzLj
+IHitNOAn/WW+xzgy0d0bJbe9jHWrWMSV
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/client_ecdsacert_hash.h b/test/config/integration/certs/client_ecdsacert_hash.h
index 787f4511b3b49..1b36f7b28548c 100644
--- a/test/config/integration/certs/client_ecdsacert_hash.h
+++ b/test/config/integration/certs/client_ecdsacert_hash.h
@@ -1,3 +1,3 @@
 // NOLINT(namespace-envoy)
-constexpr char TEST_CLIENT_ECDSA_CERT_HASH[] = "DC:B2:C0:82:AD:8C:C3:4E:06:2E:65:15:F9:F7:39:D0:4C:"
-                                               "8A:60:AF:1E:B6:01:18:C5:90:AE:AE:47:7D:B8:FC";
+constexpr char TEST_CLIENT_ECDSA_CERT_HASH[] = "D7:30:31:92:77:6D:D1:59:B9:30:7A:9D:FE:A3:8E:6E:7B:"
+                                               "4C:0F:C5:48:73:2A:0E:48:8F:E5:1A:DA:40:3D:B2";
diff --git a/test/config/integration/certs/client_ecdsakey.pem b/test/config/integration/certs/client_ecdsakey.pem
index e352e35a540fc..e1ddec7f7a72d 100644
--- a/test/config/integration/certs/client_ecdsakey.pem
+++ b/test/config/integration/certs/client_ecdsakey.pem
@@ -2,7 +2,7 @@
 BggqhkjOPQMBBw==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIOoeoqRYQ6raBXh0ejEFGvOvP8XNgbKnj7tDYDLFH7t1oAoGCCqGSM49
-AwEHoUQDQgAE/VD5VTe6dhhNMO2uxu7/gKmGCsKbCNXsWciyuDIhAXYhcZ0J4zz9
-An46avD70AmXbYUO/li/h4UYq6Qhz2lR5w==
+MHcCAQEEIBznyScGCMUqFLW7L6+lwvVLXlFIVDwZJ5Qc5TzdokwcoAoGCCqGSM49
+AwEHoUQDQgAE2ri/nyzu5xEKcJUdTtXkj9tybaB05nPGmwm4Gn8aRzc3XwFdTqm1
+YIy/L7Y80L6OTOI/77o1uL1nkqxqrome5g==
 -----END EC PRIVATE KEY-----
diff --git a/test/config/integration/certs/clientcert.pem b/test/config/integration/certs/clientcert.pem
index edca455abfba6..64889da83db76 100644
--- a/test/config/integration/certs/clientcert.pem
+++ b/test/config/integration/certs/clientcert.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIEZDCCA0ygAwIBAgIJAILStmLgUUcXMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow
-gagxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
-YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu
-ZWVyaW5nMRswGQYDVQQDDBJUZXN0IEZyb250ZW5kIFRlYW0xJTAjBgkqhkiG9w0B
-CQEWFmZyb250ZW5kLXRlYW1AbHlmdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCouLlGbMfpOV5Sh/zbUNo6GHzhpB1Q/UqxzkdmgdF4tzm3w83Q
-qka2/Q4R4/Xi3gmbUlszfw2Ax8ouIbPlx5m/1/ytvUVOcyvksu+ae92WP62nukL3
-RLLt4ctvSiA0i9FeFrNmuM+R/cSdMf9tl20heL2/bgCmIlNr6i+KMsZQlWm3GRna
-rfh8RWwyzqVDLLTvOO+h9jxHfKanN1BwIm0RYHRgxfyehel4av6t9xsylE4dtGvk
-4DO7aO98IfNtn6rHyuIY2g8Wp4Mwbs9Z+uXSCc8/NTCOm9GSvG2hJSMIdqdnETLf
-5eTiRUB3FF4el3nXNhOTFr0iAydL7bIYqkprAgMBAAGjgcEwgb4wDAYDVR0TAQH/
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MEIGA1UdEQQ7MDmGH3NwaWZmZTovL2x5ZnQuY29tL2Zyb250ZW5kLXRlYW2CCGx5
-ZnQuY29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFJD5l1K7mp/dUUNXvXPBWJ5l
-oJOnMB8GA1UdIwQYMBaAFBQz1vaSbPuePL++7GTMqLAMtk3kMA0GCSqGSIb3DQEB
-CwUAA4IBAQCJOUQB5d8ZCEeMrY0jLwefY8L0UluhPFWNlw1t2LyDjAa8qRNkWJ/2
-bky7IHBMxPQIdYBVPsQGOQ4bkg3S7Eqyc0WZYpLlKEQeUFPG752642GInzjgY3KG
-f1hIHz1quIYARjF5GJ+buZpw3DgcGDnhYygFQDWqgyRnfz84M1ycEx06yHidupyp
-eMHZHXcrSXPcGin7a6tBEppDFm5CcrJQ2hySDVkl9qnbgHr0+0JZg/Qekik4aWv5
-ACWk3wTxIPUv6mc8kbBMRMPkETzWt4m/qdLnUUhFKJdyACPlb6onJe1TGuYJvc2x
-rNV3U8Yo8a1iskQtHqNfc+kqVd3MpgsB
+MIIEbzCCA1egAwIBAgIUOXEYFeeueN2JsADaKGXPhjPfmi0wDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTcwOTQ1WhcNMjIx
+MjIyMTcwOTQ1WjCBqDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
+EEx5ZnQgRW5naW5lZXJpbmcxGzAZBgNVBAMMElRlc3QgRnJvbnRlbmQgVGVhbTEl
+MCMGCSqGSIb3DQEJARYWZnJvbnRlbmQtdGVhbUBseWZ0LmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALT+FRsC6xc9dEXa+u3e024LmnpmvIHJq04J
+YauVUFZMwhA4pPT0ARbQiHmsa7iEdjABuhZVG52SOA2L87fnX5FE2ungmGFmNthG
+lO43jcLdQzmNh9AImmLnez9G4ERM4MsYayEpRMNNnuz03jmT6F4Cb20YHEeCtZOL
+8xgEzikBIAkaPylg8CdW4OgWM97yRXnnx8ryYlAanXA1nJH+AZoY8oUDCFAShr84
+FVPGtz0hhNvdJd2iNTZMFqshG6Gko338W/Qitmemn7V/P4TSNNWz3Ann/ApvE0AJ
+KXQLR80Scl6nLksqwgrrAB6xSBfU5iwXzB4O2G3Z+ShNswUlp80CAwEAAaOBwTCB
+vjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwQgYDVR0RBDswOYYfc3BpZmZlOi8vbHlmdC5jb20vZnJvbnRl
+bmQtdGVhbYIIbHlmdC5jb22CDHd3dy5seWZ0LmNvbTAdBgNVHQ4EFgQU3v/yURjn
+/r1KhDOdxgJsfAAuvt8wHwYDVR0jBBgwFoAUyGPWkrvsyPwBVRCONxhE4OJ2Hukw
+DQYJKoZIhvcNAQELBQADggEBAMNZHrgl2ELPUMt1oTYvlSBRky6FzvKHdXgeA5O0
+OEM8kr4ypr/w6cbzc020tY3vxblZkFiUCUVZ8O1F5iEAu64de5TgW9C9ZCiMVHTG
+DU3wV/PBjI2R8DYdk05V0HW80fyEGLqEU6LYupVH2YBxe9HpnSmAcZ0aSpe/2QcT
+YNM+mz4rBQcwM7tB7+TziRAtcNv8iUWcUn6RsN4tJNClDwhV8UbHIMhop3mmIZKt
+zNxEvN15sgUUW688agnRIAJYgqT8dNhfhRmYYBg4HN5OJphwmLaOkqlT5HRCOuN0
+o4mk73cyq87nlO/SuFpP/xCV0DnT5dN2G/pGd7BYiArXh6Q=
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/clientcert_hash.h b/test/config/integration/certs/clientcert_hash.h
index cd77a55df7cf7..4e2b4bae02dd5 100644
--- a/test/config/integration/certs/clientcert_hash.h
+++ b/test/config/integration/certs/clientcert_hash.h
@@ -1,3 +1,3 @@
 // NOLINT(namespace-envoy)
-constexpr char TEST_CLIENT_CERT_HASH[] = "90:CA:A3:E0:B0:AD:8E:E6:4F:BC:11:6C:7B:E5:9D:35:11:2B:46:"
-                                         "71:5F:4D:5C:52:85:37:23:08:38:28:B4:D6";
+constexpr char TEST_CLIENT_CERT_HASH[] = "9A:69:F1:4D:D1:56:0E:9E:2A:7A:0D:DE:9D:26:4C:84:04:D6:91:"
+                                         "AA:19:98:CC:00:7E:0C:5B:03:F9:F6:69:49";
diff --git a/test/config/integration/certs/clientkey.pem b/test/config/integration/certs/clientkey.pem
index e1b46d735ec62..eb9fc65e723ec 100644
--- a/test/config/integration/certs/clientkey.pem
+++ b/test/config/integration/certs/clientkey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/config/integration/certs/server_ecdsacert.pem b/test/config/integration/certs/server_ecdsacert.pem
index d63b3852359ff..0e881733e823f 100644
--- a/test/config/integration/certs/server_ecdsacert.pem
+++ b/test/config/integration/certs/server_ecdsacert.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDljCCAn6gAwIBAgIJAILStmLgUUcWMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow
-gaYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
-YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu
-ZWVyaW5nMRowGAYDVQQDDBFUZXN0IEJhY2tlbmQgVGVhbTEkMCIGCSqGSIb3DQEJ
-ARYVYmFja2VuZC10ZWFtQGx5ZnQuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEgVE4DzGyifdO4yefn1bEhFfkTrUjfV3Lay9NQz6D1SosrCnk7KZtl6Nbc/U6
-KiGlN+9GpD0ulKEljgjn7TTtT6OBwDCBvTAMBgNVHRMBAf8EAjAAMAsGA1UdDwQE
-AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwQQYDVR0RBDowOIYe
-c3BpZmZlOi8vbHlmdC5jb20vYmFja2VuZC10ZWFtgghseWZ0LmNvbYIMd3d3Lmx5
-ZnQuY29tMB0GA1UdDgQWBBQDO72plAAjzF3GWFAC+8fyzUpl0zAfBgNVHSMEGDAW
-gBQUM9b2kmz7njy/vuxkzKiwDLZN5DANBgkqhkiG9w0BAQsFAAOCAQEAppJXn2t3
-7qER7Dj4HjNq3GdASgiLsCgjus5Mbfje4rGbb73WJnsMVpOZtWwC4KyIxDHBzFmR
-ntS3g4eJ3FxFkr5ls+RDzSAyIJBzh/Bwt1Yrkn3Yh3HxgsYy6Rd7z4+hHgaqnrza
-ESdmWHoMGg7AJy17drIDmxAK7Os5qObWxytsrUL+lTIBJ3OS2IDiB2tT/WrRMSx9
-umYff6YsGLsOGtVgRsc640wKex7r468p1tkwj5r2PxvH9V9L3hp9QuH+W4gR6IYe
-HhcCTllp+3iH0vmcXCZRP984nnwRBPP3tBuT+/zmUyDp0UPBHqF+jcHxMB/YA9An
-SziyfTA1g4CzRA==
+MIIDoTCCAomgAwIBAgIUOXEYFeeueN2JsADaKGXPhjPfmiwwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTcwOTQ1WhcNMjIx
+MjIyMTcwOTQ1WjCBpjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
+EEx5ZnQgRW5naW5lZXJpbmcxGjAYBgNVBAMMEVRlc3QgQmFja2VuZCBUZWFtMSQw
+IgYJKoZIhvcNAQkBFhViYWNrZW5kLXRlYW1AbHlmdC5jb20wWTATBgcqhkjOPQIB
+BggqhkjOPQMBBwNCAAT+2FZe/IFQscDR2EX9v858Sxq0jlQRtjvlJWd4nECNLkxc
+hkjh5e4JUZS81BJ4AYU35D9tkMaRIRHa4u8OAuS1o4HAMIG9MAwGA1UdEwEB/wQC
+MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBB
+BgNVHREEOjA4hh5zcGlmZmU6Ly9seWZ0LmNvbS9iYWNrZW5kLXRlYW2CCGx5ZnQu
+Y29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFP+kMdo3r9jEd3U0GwJhpv9FPyti
+MB8GA1UdIwQYMBaAFMhj1pK77Mj8AVUQjjcYRODidh7pMA0GCSqGSIb3DQEBCwUA
+A4IBAQAhrKd0ZlXNeF11ivhm8UCbe2lAxXYrJyLTucthndqYQ2Wbt9r1pa5I5+uD
+p6uhl8SZMrhjqDLrsM8qWgdEQOaxeYp/OXHBcoibCi0Sv4YLfHvwS/X+UPyCawqe
+zN6k62JticIkyjeeTRzHS07pdiNvQVxvQLg/s4W2ZtzZe6Vm7Dqu8Ets/AWGqrxX
+md6UWPK+Jo7hVKNV5pQzrg8ubwr9iLb4oGi1Dr3l4Oq8XGAd7HSyjQjEA22SjO4q
+Ake+m51xEYSTsLiaK6j+rRI4UsnS5hvpaiiuwIwMOFdElc3Rt6WDnxXmc1p72Mg+
+RWRedTP0uKppEsNOE3qHBm8VTOnQ
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/server_ecdsacert_hash.h b/test/config/integration/certs/server_ecdsacert_hash.h
index 309feff186436..2603d75e6b726 100644
--- a/test/config/integration/certs/server_ecdsacert_hash.h
+++ b/test/config/integration/certs/server_ecdsacert_hash.h
@@ -1,3 +1,3 @@
 // NOLINT(namespace-envoy)
-constexpr char TEST_SERVER_ECDSA_CERT_HASH[] = "95:9A:D0:18:52:40:D9:88:35:B9:52:96:C1:50:86:82:76:"
-                                               "FD:24:AD:48:F9:8F:0C:13:36:BA:2D:36:F2:4C:F3";
+constexpr char TEST_SERVER_ECDSA_CERT_HASH[] = "62:5D:90:9F:2D:C9:BC:0E:18:39:9D:40:12:17:1C:CC:BD:"
+                                               "63:FF:6B:B6:D3:E3:08:8E:88:0B:24:63:83:31:22";
diff --git a/test/config/integration/certs/server_ecdsakey.pem b/test/config/integration/certs/server_ecdsakey.pem
index a46830f1a653b..7a6fab834bf1a 100644
--- a/test/config/integration/certs/server_ecdsakey.pem
+++ b/test/config/integration/certs/server_ecdsakey.pem
@@ -2,7 +2,7 @@
 BggqhkjOPQMBBw==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICqemTBghfUmDlTHDq5GCz5CV51QLvQEkUGOxhtOR6hboAoGCCqGSM49
-AwEHoUQDQgAEgVE4DzGyifdO4yefn1bEhFfkTrUjfV3Lay9NQz6D1SosrCnk7KZt
-l6Nbc/U6KiGlN+9GpD0ulKEljgjn7TTtTw==
+MHcCAQEEIIqTd+Eo3IqogXh7YC0I6h5kaHPkF7WuJ7X2pkApCESaoAoGCCqGSM49
+AwEHoUQDQgAE/thWXvyBULHA0dhF/b/OfEsatI5UEbY75SVneJxAjS5MXIZI4eXu
+CVGUvNQSeAGFN+Q/bZDGkSER2uLvDgLktQ==
 -----END EC PRIVATE KEY-----
diff --git a/test/config/integration/certs/servercert.pem b/test/config/integration/certs/servercert.pem
index f65b3b34ae7c1..f68bf0cd232ee 100644
--- a/test/config/integration/certs/servercert.pem
+++ b/test/config/integration/certs/servercert.pem
@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIEYTCCA0mgAwIBAgIJAILStmLgUUcVMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxNzIwMTgwMFoXDTIwMTIxNjIwMTgwMFow
-gaYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
-YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu
-ZWVyaW5nMRowGAYDVQQDDBFUZXN0IEJhY2tlbmQgVGVhbTEkMCIGCSqGSIb3DQEJ
-ARYVYmFja2VuZC10ZWFtQGx5ZnQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAuvPdQdmwZongPAgQho/Vipd3PZWrQ6BKxIb4l/RvqtVP321IUTLs
-4vVwpXoYJ+12L+XOO3jCInszs53tHjFpTI1GE8/sasmgR6LRr2krwSoVRHPqUoc9
-tzkDG1SzKP2TRTi1MTI3FO+TnLFahntO9Zstxhv1Epz5GZ/xQLE0/LLoRYzcynL/
-iflk18iL1KM8i0Hy4cKjclOaUdnh2nh753iJfxCSb5wJfx4FH1qverYHHT6FopYR
-V40Cg0yYXcYo8yNwrg+EBY8QAT2JOMDokXNKbZpmVKiBlh0QYMX6BBiW249v3sYl
-3Ve+fZvCkle3W0xP0xJw8PdX0NRbvGOrBQIDAQABo4HAMIG9MAwGA1UdEwEB/wQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBB
-BgNVHREEOjA4hh5zcGlmZmU6Ly9seWZ0LmNvbS9iYWNrZW5kLXRlYW2CCGx5ZnQu
-Y29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFLHmMm0DV9jCHJSWVRwyPYpBw62r
-MB8GA1UdIwQYMBaAFBQz1vaSbPuePL++7GTMqLAMtk3kMA0GCSqGSIb3DQEBCwUA
-A4IBAQAwx3/M2o00W8GlQ3OT4y/hQGb5K2aytxx8QeSmJaaZTJbvaHhe0x3/fLgq
-uWrW3WEWFtwasilySjOrFOtB9UNmJmNOHSJD3Bslbv5htRaWnoFPCXdwZtVMdoTq
-IHIQqLoos/xj3kVD5sJSYySrveMeKaeUILTkb5ZubSivye1X2yiJLR7AtuwuiMio
-CdIOqhn6xJqYhT7z0IhdKpLNPk4w1tBZSKOXqzrXS4uoJgTC67hWslWWZ2VC6IvZ
-FmKuuGZamCCj6F1QF2IjMVM8evl84hEnN0ajdkA/QWnil9kcWvBm15Ho+oTvvJ7s
-M8MD3RDSq/90FSiME4vbyNEyTmj0
+MIIEbDCCA1SgAwIBAgIUOXEYFeeueN2JsADaKGXPhjPfmiswDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTcwOTQ0WhcNMjIx
+MjIyMTcwOTQ0WjCBpjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
+EEx5ZnQgRW5naW5lZXJpbmcxGjAYBgNVBAMMEVRlc3QgQmFja2VuZCBUZWFtMSQw
+IgYJKoZIhvcNAQkBFhViYWNrZW5kLXRlYW1AbHlmdC5jb20wggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDbTDlbKD/3J95nNs675lawD9T9zWDFrIhZVUEW
+Qrf7WGtU4npYo+2aCkkqsqxCWJwcq3Kl6Av+m1tzkxOeWTxzg6Otu+iHmlVYWzyT
+pa2GHxxWEXyYXkekLjLwgduHlOV4Tyah8n73lBWUJLMcdY58Uzw5QAl58bSNSiEu
+JuNHn5gE9bzFPLtNtmJ0rjaVPrggobQgA4ijNrPxJ4D3pn/B3U9cS4VTtt+ml/vh
+ggFQ6lLG1TO543u+Fenb3Y/TrSq8kAfFgGktJFr0+OXZQJ4Ihf8SCVXQTFDZ3Tsg
+gfpSE+rh++7X1prYFvcfI4UvwtYNk+5WNbSf6mrHtZMTk1O/AgMBAAGjgcAwgb0w
+DAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
+CCsGAQUFBwMBMEEGA1UdEQQ6MDiGHnNwaWZmZTovL2x5ZnQuY29tL2JhY2tlbmQt
+dGVhbYIIbHlmdC5jb22CDHd3dy5seWZ0LmNvbTAdBgNVHQ4EFgQUFtVRJXollJL4
+ChVTWkDKW63NjvIwHwYDVR0jBBgwFoAUyGPWkrvsyPwBVRCONxhE4OJ2HukwDQYJ
+KoZIhvcNAQELBQADggEBACMbkanR5Rns90Yg/OSyyxYABrTLpxlKuDLgyAN7RbNk
+a5GxktTCSHxdLbxHvtVz6nk7nsbLosOp6z89RdENdHOe2T8Dlp78qMkvJ/ipAzp5
+5LWv6CtgY3fUzV7NeW8hVs6lQuzRMkDkApiNOFYbh5onwgHaVtKWUZ6Mztf0iF9A
+mWyW4BzOhoT13jw1wXjzsqRp6Pv+GT9AwazGpf3zf6ECG24BJL2wo+e2J3T5/sVx
+8UA6LZW+1o9EFc/rSLXvji6wFvTdLgw0VNZrurmlOnb3at/kqcsS5xLz9bKagWDv
+R9haYXMy8SZRR/mRTpYE8NWao564MCAW9YQG9R24swI=
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/servercert_hash.h b/test/config/integration/certs/servercert_hash.h
index 6e83ce9705274..d75e92d109e19 100644
--- a/test/config/integration/certs/servercert_hash.h
+++ b/test/config/integration/certs/servercert_hash.h
@@ -1,3 +1,3 @@
 // NOLINT(namespace-envoy)
-constexpr char TEST_SERVER_CERT_HASH[] = "D3:F5:97:8F:8F:7E:CA:63:C3:FF:61:89:95:D7:47:31:E3:BA:9B:"
-                                         "3C:44:10:A1:57:61:B7:9F:4D:65:90:F8:7F";
+constexpr char TEST_SERVER_CERT_HASH[] = "ED:92:7C:D4:CF:ED:3C:4B:36:84:0E:2E:62:48:38:7B:35:23:56:"
+                                         "21:75:0D:96:97:C3:82:8C:93:2B:9F:54:A6";
diff --git a/test/config/integration/certs/serverkey.pem b/test/config/integration/certs/serverkey.pem
index 6870eed5bfc6b..a21eabfdc4ea7 100644
--- a/test/config/integration/certs/serverkey.pem
+++ b/test/config/integration/certs/serverkey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/config/integration/certs/upstreamcacert.pem b/test/config/integration/certs/upstreamcacert.pem
index c3d5692354bd7..efcddb17a5025 100644
--- a/test/config/integration/certs/upstreamcacert.pem
+++ b/test/config/integration/certs/upstreamcacert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIUQygBeIE4nv9JGaDKixnhwkK5viEwDQYJKoZIhvcNAQEL
+MIID7zCCAtegAwIBAgIUNlt/XPRTPAfdY5eN0XCJJ4i8fRswDQYJKoZIhvcNAQEL
 BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMTkwNzA4MjE0
-NTU2WhcNMjEwNzA3MjE0NTU2WjB/MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs
+aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAxMjIyMTcw
+OTQ1WhcNMjIxMjIyMTcwOTQ1WjB/MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs
 aWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZ
 MBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEZMBcGA1UEAwwQVGVzdCBVcHN0cmVh
-bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJ7AetbhOCUxB/A
-yYt+4rxyMVUFX9izqbOU9nuUxsB/avGhYpVjj5cNaLPdGX+c7g65Vz0yGDSskDGD
-ukcSFqRSZ2E4/S4gKSIMEslBr2OX+Dqh0XmoAwl4IrtZefCE3inivJdzm0JwI7Yr
-k2qQqsTpJnsWkMSxXUQJYTJ56UFXTkKqF3jSReIQtFMV65T/2x2NLRJ8KuMS7Mbo
-BTBATRsUfbJJWCnzcp2LrKV5sZ/HsJLK/F74jdcvfJQMW49Lq1TZaB5NYSVyFEf6
-tiT43JOcvVkRPBgHDtaiDhWF2WTmPSEB6cHaRwGgBFwjQ1SvZR6f6xexocn44GZE
-oSqWJN8CAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFOLTMLryzNAcuxe3cKEhClkL7IduMB8GA1UdIwQYMBaAFOLTMLry
-zNAcuxe3cKEhClkL7IduMA0GCSqGSIb3DQEBCwUAA4IBAQBT88sT8RsoAk6PnnVs
-KWBoC75BnIZr8o1nxBK0zog6Ez4J32aVzEXPicgBg6hf6v77eqbbQ+O7Ayf+YQWj
-l9w9IiXRW1x94tKBrX44O85qTr/xtkfpmQWGKq5fBpdJnZp7lSfGfaG9gasPUNpG
-gfvF/vlYrrJoyvUOG6HQjZ7n7m6f8GEUymCtC68oJcLVL0xkvx/jcvGeJfI5U6yr
-z9nc1W7FcOhrFEetOIH2BwlIN5To3vPbN4zEzt9VPUHZ3m2899hUiMZJaanEexp7
-TZJJ12rHSIJ4MKwQQ5fEmioeluM0uY7EIR72VEsudA8bkXSkbDGs6Q49K9OX+nRB
-4P3c
+bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALtqsiG/owq9WaK1
+pW2O8BduHnUM5ikPryIuWeRCObz8wI6hqpnxRwd+9KGD3al/8EI1SBXckMUmXqJt
+X76o/vGAknFTteztfcTLXF1OXemxI28WPhfgf6wiG7dJmszL933liodBz2D1BWxP
+ujxKbTeWyzN+OA4FGAtJEdl//tRIWhJCXepucSKL9Oihd9H33UYqSwfA6ZHuRxM8
+3JC86kPWePV5w5XMtxGRsDsOlSsbxrz/AKPAbk7v0JXHc9D75Vhftwj1KZD47+SR
+aBRza+OU1wUYy39Pyp+EJxLGQWGjRHx1NWTDv+mqE4aDPmcLoadCFKW/nPW7fafL
+ZmqvqRkCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFERIYDTr5cFmlHu/zfGuR5U53pZZMB8GA1UdIwQYMBaAFERIYDTr
+5cFmlHu/zfGuR5U53pZZMA0GCSqGSIb3DQEBCwUAA4IBAQAZwWF1t48gBQW4dEfF
+VcdzzuqV6BAnUO7VqGPAKl4VTeOTZkJLdk9Wu+TTUyZRK9lkH/cc/hq6duxYce2N
++TwEXxlRoKhyvkGUSi4L/zktLCmc4SzswMy2G9Q36gUqJQ73WgcR/SjbZvaornYl
+PkynPLFxlIcx0rTCc90GZUeTc9PgHccfxIXcRtIZ8/Yt5nOU7yGhIYYsHtt4AVvD
+/CEMYgDvrAjxN61ATfGatLhD9sfGp6MyF0lNJvKeTv3ag1Z+2VdYONM6NB4LnAMV
+dB2VtcVRyW1STDEB7MiqTA+b95EDIuxnBJDa2p8op6dilhBSUETJgNU8HD/P0wdd
+FOmx
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/upstreamcakey.pem b/test/config/integration/certs/upstreamcakey.pem
index 2fe99b9c2c105..2810d7f03351b 100644
--- a/test/config/integration/certs/upstreamcakey.pem
+++ b/test/config/integration/certs/upstreamcakey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/config/integration/certs/upstreamcert.pem b/test/config/integration/certs/upstreamcert.pem
index 509397d6caa86..ee5b80f0c742c 100644
--- a/test/config/integration/certs/upstreamcert.pem
+++ b/test/config/integration/certs/upstreamcert.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEPjCCAyagAwIBAgIUS0ht/ypqxlVqt86GiCya6cw/jJwwDQYJKoZIhvcNAQEL
+MIIEPjCCAyagAwIBAgIUcYthKvM355SAIg5bWtkKprJDcV0wDQYJKoZIhvcNAQEL
 BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMTkwNzA4MjE0
-NTU3WhcNMjEwNzA3MjE0NTU3WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
+aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAxMjIyMTcw
+OTQ1WhcNMjIxMjIyMTcwOTQ1WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
 bGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQx
 GTAXBgNVBAsMEEx5ZnQgRW5naW5lZXJpbmcxHTAbBgNVBAMMFFRlc3QgVXBzdHJl
-YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+evHY2ld
-y4iKlGEHtenqIK26QeFpU9t2iqiRjUz0+lZ+92haR+I+x1nL41SO71i2SaHp8L2Q
-5cWkOS0zuYivsZSz/l9dHinAS+N50QsERo01moWOMyxfqSEbnZHMQS4OI/mf1dja
-Rykp7zhCXie2BlUtmiBMW+YnvLmBm1z6icwg7ZBJ8mt2ChpeH6qBggzwQQms9wvK
-/mcHR5HYHalLQdjhou3wwa6MB9bbeEoDd8I0tueRgnrq55mVJrm3yg1TSgUwkWCB
-J3VUrvdk3olgGwHv4njAB+uNfUn3od7MuipyHL8GJQJHOcus63M/Ax/UVxu0BiDy
-LfWW4MVO/5OX5QIDAQABo4GsMIGpMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg
+YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuuY92+Rg
+Opp5+k/jyXWNHa/XzOAzmbUNrd/o6p0gDw39UsIUsvusCH477sQw132Xzv8r57Qw
+o+yjA94vbSPvg05a3Vq9CdqK63ZCLUqkSsjrNyDWI5sDgq9uwoKiPhWbAEeEg9gC
+h3z7asURLI6G/BKr5OnbT2Nhmuwb57H6y3w79i6nscKxzISui0lBO+p1X/PYmQSg
+5R8eNmQSfME0BmwZHLouPsvsCfDtdEa0ZuC5J5R9x9z3kDOsy9E0bevGENZ4MIsB
+B7pvPtq+kf60WN83mSftgp0dwmrhIVTvJl0mExF62aLRS2lpXSuyrEi0ahTz5Ozi
+H+fFb8+HRyIO1QIDAQABo4GsMIGpMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg
 MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAtBgNVHREEJjAkggoqLmx5
-ZnQuY29thwQAAAAAhxAAAAAAAAAAAAAAAAAAAAAAMB0GA1UdDgQWBBR3BvXiz3zi
-p+/5cojIhCEz3nn39jAfBgNVHSMEGDAWgBTi0zC68szQHLsXt3ChIQpZC+yHbjAN
-BgkqhkiG9w0BAQsFAAOCAQEAEB9RWuGIcRhZMM2AqXyOr4FOG63yfVg4fi3/WIcu
-p7iVPhtdByefx4FQxg7913rdJyeQrI+hab0uPl/CjylwMVwWtBqRx4oKo8im59/4
-N7MRYZKJ44/fBSIGoM0pibSpDzfd7y6Drusp1mqi3CXGPXsVFIDQ66d7yoFt+t7h
-nB2A565e/C1eXaS80XTHeJzfS5dJ6ssjgyszTGM5PdN9C335pDGfQV0CqGNAMZqo
-tbBI1B0NgQ2KJJ787Wi3pexxi3haliMNrSKEAkLVDZ6R0a1PgpN/hBth3Nf2Oj+O
-+pBNtkiA0fnkoKS6ps9Vgj+NB08OLeYNpfGFHa9xxFdPoA==
+ZnQuY29thwQAAAAAhxAAAAAAAAAAAAAAAAAAAAAAMB0GA1UdDgQWBBQ6ivxO1MmR
+SzhYa2f9sr1f0Mvh8TAfBgNVHSMEGDAWgBRESGA06+XBZpR7v83xrkeVOd6WWTAN
+BgkqhkiG9w0BAQsFAAOCAQEAUq36O5G0gg7+irFr11jmfJUGq7JJXE5csiPAxIfD
+oEyH5GZ2cEFnMCxZlh/2Rviz8J8WTR7zZ5Q1sj/008UrY8QtibIAjNyzLzHhycil
+hgYIQQXqSXUY0l0S68tVF/hyKRelwmHJIY90ywq9yUXv0gXzZx+cgdtOfwQN49oX
+5yLOV6dEK/sdCbzmxlmzYVbDKYoPoHa/941uSLpaju9Ado2Z/fWBlWGM+OiumGDu
+/M5rfr5OrLhYLJuBdYhtOWgGf1bxDggJBqHci0S4ybP+sXV3JvWVOOaz0Fu91Y0C
+2YOvks4e4fcTHMHH4chTlRSRp8eMaJNFb7dldKeMmvXVXw==
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/upstreamcert_hash.h b/test/config/integration/certs/upstreamcert_hash.h
index 4342078b93804..b38f1c1494ffe 100644
--- a/test/config/integration/certs/upstreamcert_hash.h
+++ b/test/config/integration/certs/upstreamcert_hash.h
@@ -1,3 +1,3 @@
 // NOLINT(namespace-envoy)
-constexpr char TEST_UPSTREAM_CERT_HASH[] = "57:0E:EF:74:60:9C:8E:3D:AA:EA:3F:3E:02:69:89:40:E6:00:"
-                                           "AD:CA:86:69:73:BA:9E:0B:01:A2:E2:F3:75:7F";
+constexpr char TEST_UPSTREAM_CERT_HASH[] = "6E:7B:01:70:7C:F8:90:05:86:FE:F4:6F:04:E2:51:DE:F1:2F:"
+                                           "F0:FB:AC:D7:C5:AC:84:04:62:80:67:B5:29:5A";
diff --git a/test/config/integration/certs/upstreamkey.pem b/test/config/integration/certs/upstreamkey.pem
index 58945f2125add..becf701af24e0 100644
--- a/test/config/integration/certs/upstreamkey.pem
+++ b/test/config/integration/certs/upstreamkey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/config/integration/certs/upstreamlocalhostcert.pem b/test/config/integration/certs/upstreamlocalhostcert.pem
index 169d1c63e5680..22cb283780efe 100644
--- a/test/config/integration/certs/upstreamlocalhostcert.pem
+++ b/test/config/integration/certs/upstreamlocalhostcert.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEPTCCAyWgAwIBAgIUfoTig3pqtlASJyyhMZ2/x0Hg33UwDQYJKoZIhvcNAQEL
+MIIEPTCCAyWgAwIBAgIUcYthKvM355SAIg5bWtkKprJDcV4wDQYJKoZIhvcNAQEL
 BQAwfzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
 DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
-aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMTkwNzEyMjI0
-MzQ1WhcNMjEwNzExMjI0MzQ1WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
+aW5lZXJpbmcxGTAXBgNVBAMMEFRlc3QgVXBzdHJlYW0gQ0EwHhcNMjAxMjIyMTcw
+OTQ1WhcNMjIxMjIyMTcwOTQ1WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNh
 bGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQx
 GTAXBgNVBAsMEEx5ZnQgRW5naW5lZXJpbmcxHTAbBgNVBAMMFFRlc3QgVXBzdHJl
-YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApWnYvUff
-dh+TcLEYxQiw+ZUaGfBedmVmaxOHAbsWwBcMcwt3ITAjRPLPFEUt/DUxgmXO80zo
-6YOc9uUIUGU0vqIFTQP3JfS9kMevrvQIkZbsO2rtNMYQ+F7HOmGUS3RiKdNNbHnX
-NKKPsHe/UFiFCBwxVCT+NSGI3yHZFUSFlvH9BEO+a1lx4pp2R7UJTLdBVaGx42t1
-pTTR2E2S6E1tKXhtS/qN4+X+dDaUFfi7mz+QiNFsYKu5QgO9f8ewfdOPj9MImZvG
-4l37/eNtNjzwTMx8Ph4moTSo4yH9ZBGHffPDm4ljPXpLUfiVyIvzR6ygG468ODcP
-umQjprHM3TTxlQIDAQABo4GrMIGoMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg
+YW0gU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz3MmpLIJ
+ANQI8IQ6vEMqX8NNS3sx8cZ7scfDZJPUUm9HTT4WHGuXuCWIMkk6dRgiNzWvkbfN
+mCznTms6YYxRt9agmDZpUfAiIbWxHUejf4Rkpz99v+hPYB7CJldwRotAuyHMiNtp
+X4g1chX0bVlOWWoqKg8j1xyLjGnwLRsNaDq6PsA62sHBdeI18G6vYz1AX6w/n1Rd
+toyzohORCAsq9YKvT7+K0U58x1+VSRMDGa30gJzWlDcKG480xDPGtwdknei4PLRN
+66+kTP1kwhMQ3SF9dzwU90EE5FMiuziDB3H32ugXtN4yYsEC5T2GdhmNIugsSYXG
+fDEGesCtQiDV4QIDAQABo4GrMIGoMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg
 MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAsBgNVHREEJTAjgglsb2Nh
-bGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwHQYDVR0OBBYEFFhoq2tgE+IN
-uLyrUa1YpgsOpkwTMB8GA1UdIwQYMBaAFOLTMLryzNAcuxe3cKEhClkL7IduMA0G
-CSqGSIb3DQEBCwUAA4IBAQB6jYcrAtO+8rLWdBp2W2tj9lgTHE8+W9BzMONrFwVo
-PNMPHKPl2XfqKbv64sW3Z9sIA7ThSUu0nAe8i3ddaL4xQvPnaOwTdSnhykyMg2Hp
-dDVAT8nCQb7Q87cuiFKE7o87XaQeOS3hgKeQ4uKexA48MkKwNYTVRMb7iC64yZcg
-DY5H0nxRISs6pIAD9SPvPOQv+KZ35/LDJy59Kvso1zPoM9e+CJcdHU3hKM3RBK5J
-FOjDL8qFair7vyjO9DUPDgoAZJntCQYGC0ToYxTe8cQVJD+sW5gqqIBLRchMr3gL
-ni7rAL+oUyufHIEu3upRId+FdVF/hQMCLF2xk54/KX0V
+bGhvc3SHBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwHQYDVR0OBBYEFPp5HjQtjvSe
+4o6z53TeLoWtQrLxMB8GA1UdIwQYMBaAFERIYDTr5cFmlHu/zfGuR5U53pZZMA0G
+CSqGSIb3DQEBCwUAA4IBAQBXXj7r+qxz2P5fnSxAP1dnZRD2XuNTZ5qxvD2qKjpn
+K5pS3P6n88hQCoboCkei1PV9phe2NNnUyed7cMYjg5kwVM2IgC836pnuPCsrB5sc
+ZnPEAeVnT6LB06GHh7wza1QImX4inovIazZ8eeYVy7FRfsZJS7binhWjERKazVp/
+7DEv1XuMWywttwgfjha9NQjKqrJKjCqmUgsGNGD8j+jOgZjfdPGrEM+yWwEQ2zb5
+S8eIYKNClBmTWhhobTNKRCbSEZxn75YWBGtpmXS44xKWAC3bGB3vEmiygpnwdSUH
+eKJ1QqeEGqMOyWhs1YL8tJRB9Rp7BsDq7V5noeRbb7pH
 -----END CERTIFICATE-----
diff --git a/test/config/integration/certs/upstreamlocalhostcert_hash.h b/test/config/integration/certs/upstreamlocalhostcert_hash.h
index 9f81e65fcd83d..070cf33410951 100644
--- a/test/config/integration/certs/upstreamlocalhostcert_hash.h
+++ b/test/config/integration/certs/upstreamlocalhostcert_hash.h
@@ -1,4 +1,4 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_UPSTREAMLOCALHOST_CERT_HASH[] =
-    "44:A1:C4:AD:71:B5:AE:A0:A2:24:63:DA:C8:FF:0C:FC:26:6E:4B:D7:08:DE:64:60:34:A0:72:42:6E:18:BA:"
-    "87";
+    "0A:F9:13:31:2F:74:14:81:27:E9:A5:5C:CD:65:ED:F4:F1:AE:73:6B:B6:30:17:EF:69:55:1A:B0:01:EA:49:"
+    "6B";
diff --git a/test/config/integration/certs/upstreamlocalhostkey.pem b/test/config/integration/certs/upstreamlocalhostkey.pem
index 5331d810952cf..4c4ce3395b631 100644
--- a/test/config/integration/certs/upstreamlocalhostkey.pem
+++ b/test/config/integration/certs/upstreamlocalhostkey.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/ca_cert.crl b/test/extensions/transport_sockets/tls/test_data/ca_cert.crl
index 45a4c85a7b54e..7b1aeb4c6de17 100644
--- a/test/extensions/transport_sockets/tls/test_data/ca_cert.crl
+++ b/test/extensions/transport_sockets/tls/test_data/ca_cert.crl
@@ -1,13 +1,13 @@
 -----BEGIN X509 CRL-----
-MIIB7TCB1gIBATANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJVUzETMBEGA1UE
+MIIB+DCB4QIBATANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJVUzETMBEGA1UE
 CAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwE
 THlmdDEZMBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBD
-QRcNMTgxMjE4MDE1MDM3WhcNMjgxMjE1MDE1MDM3WjAcMBoCCQC4tezImPISShcN
-MTgxMjE4MDE1MDM3WqAOMAwwCgYDVR0UBAMCAQAwDQYJKoZIhvcNAQELBQADggEB
-ADyOntMRaZ9+nnGrWEd0t6+WhmSSuu8Mx4Ho/9tqFXEf8zVP90Y9QXlWhnJoKThy
-sOFeRPc8fZH4nh5grY6afwaOA5AJjVvfizCDBNyj6tcniyWbViG+qAC7+JEdKINU
-8/ATBFKTKt9hU84+NyAt9CB7X8Nzv6dC65XF/t9LZHEo3cYf7ZMP0BZoMQNOTGlD
-2vrIBr4xcJNaE7G9cDyM7YVaNFuJfSf5QLA0sz5IMp/W4WhKiftnLOpREsbpz7pt
-zMlMdBzY2aAu2mixPOcOtqm7Ty6YGhj/nx11qeeB1Alf1oNUI8tNq5ssCVDr0TTn
-z49wwXND+/QqT3RwiUEaXnE=
+QRcNMjAxMjIyMTczMjMxWhcNMzAxMjIwMTczMjMxWjAnMCUCFHLjgoLTKh2Jp1Bs
+hgJNUsDjBjL8Fw0yMDEyMjIxNzMyMzFaoA4wDDAKBgNVHRQEAwIBADANBgkqhkiG
+9w0BAQsFAAOCAQEAW+Pfar21tUIljnoVemB1rnpCCmJyxLgvFKC99RMe79heXl0U
+sJVAcAmSXn8HcRMoGlHRxxvdajDJccoalhJMKB8SQT2Zmqb2hI2WWs7niijP97kw
+XLwfOGJXdp1UIuDzqybnPEQVTYUOp+rrABkKRsmxBbqzbAkF48Jl/Al0yXxhDaZr
+IipKx8OCy3TXr3wtALEv7YalnuvhFxBiHdqMGOa7q1DtUd7dmW2xLUVVZ811F43V
+ugsWyn64ETiQRtpjSSXI6oBi+8aScfRf4wnDWYyAqmyLzfOOxmDdK3vmA7JjyuGP
+vEB4hbEZ5Nmh4oWmvheI0AWY0CVAQZBsAx9Y/Q==
 -----END X509 CRL-----
diff --git a/test/extensions/transport_sockets/tls/test_data/ca_cert.pem b/test/extensions/transport_sockets/tls/test_data/ca_cert.pem
index addaf9d494778..4c2588d10f8c0 100644
--- a/test/extensions/transport_sockets/tls/test_data/ca_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/ca_cert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID0jCCArqgAwIBAgIJANagOJjOojEuMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzM1oXDTIwMTIxNzAxNTAzM1ow
-djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+qck5ri2uMuga33i+2ourLrqLQFdP5YUMb4FqM4RVLkDAB0VOApvY
-WTPD+T8bqZTAQXUs6aMczhQQrGs+cgdzB5CznLq72uNphZ0RTHhNHk1K1QoHqB13
-AhrqcBgznAGClGrDYtbUTi1LNaSJEKBDqo/morg44xTolsgsP+R0OXAS2AoquRUv
-b5q/rutnVGxLRoI1O6SLwEJIXEbM5ksj2YtzfN5ngGOaOWsqJsXnYfO1q1CHuQse
-z7VJTZEHpZug0QN0kqH4bf7NbPRZJv0HgHGs7xXCpwVfuj3mfawyXmd3Tarrm7W0
-VFygMzAk5cI5cBQIaZYNC4YtDasVisCNAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSLgpmApTtprdcKFiTUZxUkLNRh
-ZTAfBgNVHSMEGDAWgBSLgpmApTtprdcKFiTUZxUkLNRhZTANBgkqhkiG9w0BAQsF
-AAOCAQEAlNQMMQEFv6JTwV0gFt1Fzs4DG+d7vtvS8by/OjvTJ+Qkr2qqe9A1M36E
-XsPBELsK+AecyKekPWFnQOyVw1vqLuFAmgkrhvgv4yeTNPyFD0vw21BePhotWpsH
-xKNsxbTiwOJFeVnA5dqeKcRH7QvWdB5cjEpGrNrgdXNXFyLp+HUU0fxt+d1taycI
-4uiJ3e+4SjDQ59ELee6vuYePLklIAVQ+CyOhCjZj24Nfd7QS2ol18wyFB3VmjK8m
-3giApQTu9oG1Y5bL46OpnOfJW1Ta/c8xjpEkqRj1DiKgl2m81vW1as4DZvLJv7V8
-SVKBxp3gLliCE0MuJAaHR3vvNX6Ryg==
+MIID3TCCAsWgAwIBAgIUMyLHvbbf4Wrfu3MdBiEuUFoSctUwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTczMjI3WhcNMjIx
+MjIyMTczMjI3WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBANZDE48oE/5NT0Z7u/omgJTUGxcxeEVA/dgA+LDP
+RTlKjLk5Qj0Bg4zSSmOD3Ijt2Pr/CjWrMe7DgoEBJe9n778bXTT3fgLh3u6jN/Ox
+HLSMNS8yKwSP0owIp5ZreOnXWEKijOXvUknvOSeok/6s8vrGmjqiu6e4z0cwQreG
+2v7nRz7h9MtVxpJX7rkkiTIcHKW9+NaYcvzUpf6H9v+FUAiZCD/2iQvExJX45O0a
+ewjQQo6c6u82fHLz+t5JIE4j4v+gJkOYi1XdbVLo07EjzQNiIqndp9y+vxCrRA/n
+kmTJJyzVPwktQFs2x3XKjvU60w3q2P3xKn0nxfkzK7Nn0qcCAwEAAaNjMGEwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBTk+6CsqpiX
+1nn22Ndi0sJyyUJnMB8GA1UdIwQYMBaAFBTk+6CsqpiX1nn22Ndi0sJyyUJnMA0G
+CSqGSIb3DQEBCwUAA4IBAQBRu7EQXcrGvswzB/bcDcRBDk2oZcsPXMvQrxfJgBVW
+5gDdEoL/fzv2jSPRKt9evk4xJffFvZEHj1YBI3dI3N5c4zOVZ71HmJZo2s4diCju
+48VaufSYTnjIjlUeqv+UcvHRc2P3FV/Fn8MCiusz/CiiYQkUKl5M3sX4tAYk5NL+
+OD2sOWBM6H5dSWwAOGHYU/y8MvcIKQMvdJD6nUOQnG9bDQ4Ph5LSHPfrHDuZoxAq
+93WmF3PeRWSL0/CztDfTu/FC/NfybQlVrQHqrax/AC/ser05kDgCxUuAwrsYzNBx
+buDkRkvUS+6hhRJAXa3LQeTJfgZ8jPeG5JNV4nPOgWd5
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/ca_cert_with_crl.pem b/test/extensions/transport_sockets/tls/test_data/ca_cert_with_crl.pem
index f8808b563dc5e..e21c868d4d2d3 100644
--- a/test/extensions/transport_sockets/tls/test_data/ca_cert_with_crl.pem
+++ b/test/extensions/transport_sockets/tls/test_data/ca_cert_with_crl.pem
@@ -1,36 +1,36 @@
 -----BEGIN CERTIFICATE-----
-MIID0jCCArqgAwIBAgIJANagOJjOojEuMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzM1oXDTIwMTIxNzAxNTAzM1ow
-djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+qck5ri2uMuga33i+2ourLrqLQFdP5YUMb4FqM4RVLkDAB0VOApvY
-WTPD+T8bqZTAQXUs6aMczhQQrGs+cgdzB5CznLq72uNphZ0RTHhNHk1K1QoHqB13
-AhrqcBgznAGClGrDYtbUTi1LNaSJEKBDqo/morg44xTolsgsP+R0OXAS2AoquRUv
-b5q/rutnVGxLRoI1O6SLwEJIXEbM5ksj2YtzfN5ngGOaOWsqJsXnYfO1q1CHuQse
-z7VJTZEHpZug0QN0kqH4bf7NbPRZJv0HgHGs7xXCpwVfuj3mfawyXmd3Tarrm7W0
-VFygMzAk5cI5cBQIaZYNC4YtDasVisCNAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSLgpmApTtprdcKFiTUZxUkLNRh
-ZTAfBgNVHSMEGDAWgBSLgpmApTtprdcKFiTUZxUkLNRhZTANBgkqhkiG9w0BAQsF
-AAOCAQEAlNQMMQEFv6JTwV0gFt1Fzs4DG+d7vtvS8by/OjvTJ+Qkr2qqe9A1M36E
-XsPBELsK+AecyKekPWFnQOyVw1vqLuFAmgkrhvgv4yeTNPyFD0vw21BePhotWpsH
-xKNsxbTiwOJFeVnA5dqeKcRH7QvWdB5cjEpGrNrgdXNXFyLp+HUU0fxt+d1taycI
-4uiJ3e+4SjDQ59ELee6vuYePLklIAVQ+CyOhCjZj24Nfd7QS2ol18wyFB3VmjK8m
-3giApQTu9oG1Y5bL46OpnOfJW1Ta/c8xjpEkqRj1DiKgl2m81vW1as4DZvLJv7V8
-SVKBxp3gLliCE0MuJAaHR3vvNX6Ryg==
+MIID3TCCAsWgAwIBAgIUMyLHvbbf4Wrfu3MdBiEuUFoSctUwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTczMjI3WhcNMjIx
+MjIyMTczMjI3WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBANZDE48oE/5NT0Z7u/omgJTUGxcxeEVA/dgA+LDP
+RTlKjLk5Qj0Bg4zSSmOD3Ijt2Pr/CjWrMe7DgoEBJe9n778bXTT3fgLh3u6jN/Ox
+HLSMNS8yKwSP0owIp5ZreOnXWEKijOXvUknvOSeok/6s8vrGmjqiu6e4z0cwQreG
+2v7nRz7h9MtVxpJX7rkkiTIcHKW9+NaYcvzUpf6H9v+FUAiZCD/2iQvExJX45O0a
+ewjQQo6c6u82fHLz+t5JIE4j4v+gJkOYi1XdbVLo07EjzQNiIqndp9y+vxCrRA/n
+kmTJJyzVPwktQFs2x3XKjvU60w3q2P3xKn0nxfkzK7Nn0qcCAwEAAaNjMGEwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBTk+6CsqpiX
+1nn22Ndi0sJyyUJnMB8GA1UdIwQYMBaAFBTk+6CsqpiX1nn22Ndi0sJyyUJnMA0G
+CSqGSIb3DQEBCwUAA4IBAQBRu7EQXcrGvswzB/bcDcRBDk2oZcsPXMvQrxfJgBVW
+5gDdEoL/fzv2jSPRKt9evk4xJffFvZEHj1YBI3dI3N5c4zOVZ71HmJZo2s4diCju
+48VaufSYTnjIjlUeqv+UcvHRc2P3FV/Fn8MCiusz/CiiYQkUKl5M3sX4tAYk5NL+
+OD2sOWBM6H5dSWwAOGHYU/y8MvcIKQMvdJD6nUOQnG9bDQ4Ph5LSHPfrHDuZoxAq
+93WmF3PeRWSL0/CztDfTu/FC/NfybQlVrQHqrax/AC/ser05kDgCxUuAwrsYzNBx
+buDkRkvUS+6hhRJAXa3LQeTJfgZ8jPeG5JNV4nPOgWd5
 -----END CERTIFICATE-----
 -----BEGIN X509 CRL-----
-MIIB7TCB1gIBATANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJVUzETMBEGA1UE
+MIIB+DCB4QIBATANBgkqhkiG9w0BAQsFADB2MQswCQYDVQQGEwJVUzETMBEGA1UE
 CAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwE
 THlmdDEZMBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBD
-QRcNMTgxMjE4MDE1MDM3WhcNMjgxMjE1MDE1MDM3WjAcMBoCCQC4tezImPISShcN
-MTgxMjE4MDE1MDM3WqAOMAwwCgYDVR0UBAMCAQAwDQYJKoZIhvcNAQELBQADggEB
-ADyOntMRaZ9+nnGrWEd0t6+WhmSSuu8Mx4Ho/9tqFXEf8zVP90Y9QXlWhnJoKThy
-sOFeRPc8fZH4nh5grY6afwaOA5AJjVvfizCDBNyj6tcniyWbViG+qAC7+JEdKINU
-8/ATBFKTKt9hU84+NyAt9CB7X8Nzv6dC65XF/t9LZHEo3cYf7ZMP0BZoMQNOTGlD
-2vrIBr4xcJNaE7G9cDyM7YVaNFuJfSf5QLA0sz5IMp/W4WhKiftnLOpREsbpz7pt
-zMlMdBzY2aAu2mixPOcOtqm7Ty6YGhj/nx11qeeB1Alf1oNUI8tNq5ssCVDr0TTn
-z49wwXND+/QqT3RwiUEaXnE=
+QRcNMjAxMjIyMTczMjMxWhcNMzAxMjIwMTczMjMxWjAnMCUCFHLjgoLTKh2Jp1Bs
+hgJNUsDjBjL8Fw0yMDEyMjIxNzMyMzFaoA4wDDAKBgNVHRQEAwIBADANBgkqhkiG
+9w0BAQsFAAOCAQEAW+Pfar21tUIljnoVemB1rnpCCmJyxLgvFKC99RMe79heXl0U
+sJVAcAmSXn8HcRMoGlHRxxvdajDJccoalhJMKB8SQT2Zmqb2hI2WWs7niijP97kw
+XLwfOGJXdp1UIuDzqybnPEQVTYUOp+rrABkKRsmxBbqzbAkF48Jl/Al0yXxhDaZr
+IipKx8OCy3TXr3wtALEv7YalnuvhFxBiHdqMGOa7q1DtUd7dmW2xLUVVZ811F43V
+ugsWyn64ETiQRtpjSSXI6oBi+8aScfRf4wnDWYyAqmyLzfOOxmDdK3vmA7JjyuGP
+vEB4hbEZ5Nmh4oWmvheI0AWY0CVAQZBsAx9Y/Q==
 -----END X509 CRL-----
diff --git a/test/extensions/transport_sockets/tls/test_data/ca_certificates.pem b/test/extensions/transport_sockets/tls/test_data/ca_certificates.pem
index f5b0adc202a09..fdf2270de81b5 100644
--- a/test/extensions/transport_sockets/tls/test_data/ca_certificates.pem
+++ b/test/extensions/transport_sockets/tls/test_data/ca_certificates.pem
@@ -1,46 +1,46 @@
 -----BEGIN CERTIFICATE-----
-MIID0jCCArqgAwIBAgIJALuj6F1BLlksMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdGYWtlIENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow
-djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxEDAOBgNVBAMMB0Zha2UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDHsTXPjNKXh6HecrOQEM+m846BXEXKFNd9qsWQtA92G0M4HRP2PkYZ
-pHKr9HiHFmbqUciOGGJv3gEkVBO3YlwOOJH4pAy7Y0q/9yvxlByfsRMuvhxZqrk1
-6gTjvSMuUcilUYmX+t+6emAaoHiDSFBgT64H/B6L75Ed1KUTEzSz1KuX+A7GO7Tp
-p/ZfjXIxdtPw0nigKiHtGgX2KQaZbD0mJYmk3YPzM7EjhCjohmRnKcBI0mZ9kr4E
-9Nq+SJYo0fU7QIo3kKopdhs/Mv7kFjzTxBmDfpc8YrLuvlCENOUE+oRlA0YXFCnq
-IvQZdnKTGq2LpKjl/e/NZx4DphgYjVhXAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS4iJCg8HwgaK+XwT3d8b4cDxAL
-QTAfBgNVHSMEGDAWgBS4iJCg8HwgaK+XwT3d8b4cDxALQTANBgkqhkiG9w0BAQsF
-AAOCAQEATI/97ZMR8EZpNmnYATUJ6oeKmigkzZssEcaGuFpA6t0ahkBXuk4/AKLl
-cjizHW52G2T8AUxWckVylZuTOLfauOFdgUaJEO+BdtWUm9KTDA2j7cIZazW9LZKM
-ezBB4l1pK9sOnzsNm5Hn90pNt6GL4aC33LaSUWY2WqPLKyBQ1VoZJ2/iFs7stX+X
-seUlYajUc4q9oP8IcVxEmzjTKla+CuO4Mxwxl/Lq9iwFWdPC2nrSyk4+sR4MF96C
-6SeMO7jqVtELYq7X7Wcx5KyVkr9cIEeZGY7tSvdWwPevGsiojqev2fbiMMbI/Xlc
-9HZ5soYEzRTdm+WR+E9UJdrkVylBpw==
+MIID3TCCAsWgAwIBAgIUThm7broFtUpbejf1l4o8JsF10nUwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB0Zha2UgQ0EwHhcNMjAxMjIyMTczMjI3WhcNMjIx
+MjIyMTczMjI3WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHRmFrZSBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMcjeeaSHcb9Iaw+BvzTKRbCVr6KVQV5+HSJgpE6
+q2PB43lgkeTGEKn42t0HBqKljg7T1WKvgnnHKsqdhilY4RHASN+Xnu0K0QvfSGS0
+iidJtiCPuKXWg2Aj53lmMLwXYDCg+03Oai7kFUF+MUcLRDGLeHzAQSWoxjYnN1YM
+F1eqmYm5GAUyqTNHuMjMqTgsKQTfLWv0LA2SpZoVRhXlPSgmSTSqG8Wg9Qre2bEA
+N0OlCWgwFqD+i8v4jP264VsH0TyK8tP/Oxv8EANERUHJD8QdH3zTLLoxf6C8j1w8
+tYtZi6WpZzBMsgRnXKLblLRFf6FhpeHQ2Q/InpUtfm/t7scCAwEAAaNjMGEwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJvFzVni006z
+pI1egkwuBg+sXj6JMB8GA1UdIwQYMBaAFJvFzVni006zpI1egkwuBg+sXj6JMA0G
+CSqGSIb3DQEBCwUAA4IBAQAgSwIDmHjdTQEDElNhKYjLkvzuN542CPEWGPrZVel9
+77XRjHUf8yvK62+Z3rs1qo/TLjYKoq7YHae0TOUk69VtVO/pfMET7OS5+8mwJFGL
+1R0JT7p/ufjnDQvZemp/iyT0vpzZHEoA4Zfpeac5zOig2cH+6u5VjJMdjvjoQ3Ac
+4+ae8KA1cHjH4vLXsXyk2GgSWU3bRxiVdf35VlcEXCaUgC0FNU6ixKVOCku8T0Al
+v4pqfgxmMTqj/gw0XYZ78pwk844SR8fIU8i5PVYBITyObFKAaGOS5TdYq7PgTDxO
+s3XfUqIzgp/iYs87pyggQI85/eawunbCdsu8HGbI6pr+
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIID0jCCArqgAwIBAgIJANagOJjOojEuMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzM1oXDTIwMTIxNzAxNTAzM1ow
-djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+qck5ri2uMuga33i+2ourLrqLQFdP5YUMb4FqM4RVLkDAB0VOApvY
-WTPD+T8bqZTAQXUs6aMczhQQrGs+cgdzB5CznLq72uNphZ0RTHhNHk1K1QoHqB13
-AhrqcBgznAGClGrDYtbUTi1LNaSJEKBDqo/morg44xTolsgsP+R0OXAS2AoquRUv
-b5q/rutnVGxLRoI1O6SLwEJIXEbM5ksj2YtzfN5ngGOaOWsqJsXnYfO1q1CHuQse
-z7VJTZEHpZug0QN0kqH4bf7NbPRZJv0HgHGs7xXCpwVfuj3mfawyXmd3Tarrm7W0
-VFygMzAk5cI5cBQIaZYNC4YtDasVisCNAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSLgpmApTtprdcKFiTUZxUkLNRh
-ZTAfBgNVHSMEGDAWgBSLgpmApTtprdcKFiTUZxUkLNRhZTANBgkqhkiG9w0BAQsF
-AAOCAQEAlNQMMQEFv6JTwV0gFt1Fzs4DG+d7vtvS8by/OjvTJ+Qkr2qqe9A1M36E
-XsPBELsK+AecyKekPWFnQOyVw1vqLuFAmgkrhvgv4yeTNPyFD0vw21BePhotWpsH
-xKNsxbTiwOJFeVnA5dqeKcRH7QvWdB5cjEpGrNrgdXNXFyLp+HUU0fxt+d1taycI
-4uiJ3e+4SjDQ59ELee6vuYePLklIAVQ+CyOhCjZj24Nfd7QS2ol18wyFB3VmjK8m
-3giApQTu9oG1Y5bL46OpnOfJW1Ta/c8xjpEkqRj1DiKgl2m81vW1as4DZvLJv7V8
-SVKBxp3gLliCE0MuJAaHR3vvNX6Ryg==
+MIID3TCCAsWgAwIBAgIUMyLHvbbf4Wrfu3MdBiEuUFoSctUwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTczMjI3WhcNMjIx
+MjIyMTczMjI3WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBANZDE48oE/5NT0Z7u/omgJTUGxcxeEVA/dgA+LDP
+RTlKjLk5Qj0Bg4zSSmOD3Ijt2Pr/CjWrMe7DgoEBJe9n778bXTT3fgLh3u6jN/Ox
+HLSMNS8yKwSP0owIp5ZreOnXWEKijOXvUknvOSeok/6s8vrGmjqiu6e4z0cwQreG
+2v7nRz7h9MtVxpJX7rkkiTIcHKW9+NaYcvzUpf6H9v+FUAiZCD/2iQvExJX45O0a
+ewjQQo6c6u82fHLz+t5JIE4j4v+gJkOYi1XdbVLo07EjzQNiIqndp9y+vxCrRA/n
+kmTJJyzVPwktQFs2x3XKjvU60w3q2P3xKn0nxfkzK7Nn0qcCAwEAAaNjMGEwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBTk+6CsqpiX
+1nn22Ndi0sJyyUJnMB8GA1UdIwQYMBaAFBTk+6CsqpiX1nn22Ndi0sJyyUJnMA0G
+CSqGSIb3DQEBCwUAA4IBAQBRu7EQXcrGvswzB/bcDcRBDk2oZcsPXMvQrxfJgBVW
+5gDdEoL/fzv2jSPRKt9evk4xJffFvZEHj1YBI3dI3N5c4zOVZ71HmJZo2s4diCju
+48VaufSYTnjIjlUeqv+UcvHRc2P3FV/Fn8MCiusz/CiiYQkUKl5M3sX4tAYk5NL+
+OD2sOWBM6H5dSWwAOGHYU/y8MvcIKQMvdJD6nUOQnG9bDQ4Ph5LSHPfrHDuZoxAq
+93WmF3PeRWSL0/CztDfTu/FC/NfybQlVrQHqrax/AC/ser05kDgCxUuAwrsYzNBx
+buDkRkvUS+6hhRJAXa3LQeTJfgZ8jPeG5JNV4nPOgWd5
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/ca_key.pem b/test/extensions/transport_sockets/tls/test_data/ca_key.pem
index 331fea897d9d0..c014ae9d6bd72 100644
--- a/test/extensions/transport_sockets/tls/test_data/ca_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/ca_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/expired_cert.pem b/test/extensions/transport_sockets/tls/test_data/expired_cert.pem
index 7e85f616c3f33..2e76c30cb0255 100644
--- a/test/extensions/transport_sockets/tls/test_data/expired_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/expired_cert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/expired_cert_info.h b/test/extensions/transport_sockets/tls/test_data/expired_cert_info.h
index 00478f2bdec23..87d0059f940d7 100644
--- a/test/extensions/transport_sockets/tls/test_data/expired_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/expired_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_EXPIRED_CERT_HASH[] =
-    "9fcc6c35f2b11b3d7f83d9f29e6522c58f1c2915163582b362118f1da15032d9";
-constexpr char TEST_EXPIRED_CERT_SPKI[] = "kZWKpY3SlkVCIky+/7eOpkuH/qS1H5k7xXi8G/YG/Nc=";
-constexpr char TEST_EXPIRED_CERT_SERIAL[] = "b8b5ecc898f21250";
-constexpr char TEST_EXPIRED_CERT_NOT_BEFORE[] = "Dec 18 01:50:37 2018 GMT";
-constexpr char TEST_EXPIRED_CERT_NOT_AFTER[] = "Dec 18 01:50:37 2017 GMT";
+    "09a9753bffe81d2607f5fe7a77fe210276ad1d71ef6795bea5ecbc82956810ff";
+constexpr char TEST_EXPIRED_CERT_SPKI[] = "f5Vnt1pypzRpAewOIWF06eZg34YRdeSyXajiKQZmFyI=";
+constexpr char TEST_EXPIRED_CERT_SERIAL[] = "72e38282d32a1d89a7506c86024d52c0e3063303";
+constexpr char TEST_EXPIRED_CERT_NOT_BEFORE[] = "Dec 22 17:32:30 2020 GMT";
+constexpr char TEST_EXPIRED_CERT_NOT_AFTER[] = "Dec 23 17:32:30 2019 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/expired_key.pem b/test/extensions/transport_sockets/tls/test_data/expired_key.pem
index e30a4c284c692..cdad802769e0a 100644
--- a/test/extensions/transport_sockets/tls/test_data/expired_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/expired_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/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert.pem b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert.pem
index ca0681cfc1468..6e3ac695464b2 100644
--- a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert.pem
@@ -1,24 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEGTCCAwGgAwIBAgIJALi17MiY8hJRMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzN1oXDTE3MTIxODAxNTAzN1ow
-ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAr92OxJ/WZ1VM2jxTV2t1YT0laplTsuksMJzjPtJSEkmjkUxK
-RiRbPGTxxxjHm0Dx/+ikOQtGJArRP+hOsu7bQKa2kqRTIs+d+lB6reHodONWDAcs
-9A3dowY/U2OVsfRoboymLTR5SqNYDnBb/gpCyGUXNfKVGX7cGfb2QJIWTORp4nOW
-Aoq4NF8Z7w8pzyUi+mXxvZM2YJ3phYuMGKeMzytJ40lhs/6rPUe5dJQ8aGeQDJfx
-VQPP/u8g9Vuc+eqdfy21DKPZ6c+m+SE0LTbLdCkc7Te1XmWyirKbOVe2eBUTLY2E
-P+71ScNZL1yNRDSNg5jfR1EvUw3+uU1OAg3NnQIDAQABo4GlMIGiMAwGA1UdEwEB
-/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAmBgNVHREEHzAdhhtzcGlmZmU6Ly9seWZ0LmNvbS90ZXN0LXRlYW0wHQYDVR0O
-BBYEFIsT1Y9NAch0sQORvly90owXcpWVMB8GA1UdIwQYMBaAFIuCmYClO2mt1woW
-JNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQBcijE/G4Si/YeVUZFkxTrcKO3V
-5lHWnSx5oZV9z4CdtDyfkOQ22Z7K2bYPyWFS2yNddg1KOJgE5E3Xp2Ptmhdgwp29
-OYJmtkX+SpVX6gYWsuNYirdt4Q0ydqP1UsLGP+h7IFNN7z9Mgg0jSSHbBotf96qR
-agzm+td4+jKYR/uGeF/dHyHhVXMBnd7Cv7f9gXkdQMbItDrFMR5edwuyKZIe3KyK
-gC0s+M18OJ1CdW9Oh6101RdoVsM+UALG7S1q1YZoiLTKOyGwKqMCzT72S4lhMmvc
-TbTXp/eUKs7mfkMFhnzB3QW0dMaOMxXJYuAY8DY/nAwmp0BQiIOM6GR2FsGZ
+MIIEJDCCAwygAwIBAgIUcuOCgtMqHYmnUGyGAk1SwOMGMwQwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTczMjMxWhcNMTkx
+MjIzMTczMjMxWjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8wajf+notwMYrEpa/mDrr3Fk48CML6Mz7
+NoL7Ees2/afdASzHPAA64Md8g4m3iMPpvB015m7eDewMdhcR/VlBR8z55YzowlTz
+UwoOprD2m0m9uC3os/X9u7Ri60wbD93CbR+cxtXnr8oAelzMLLp0eXWBkt/7FoTr
+YVEUAgi6ZTNmt1D6Oty9HPASaUez/cKacUXHguqfx3OFm9AE4YUDLLjtF3PiNKhX
+Yh+0v+Sbkfn1cqJEPL4CLogDwGpzgMKgQl3jkF6XpWX79iBf/0uVWwlLUCGYoeYm
+hDM/RDxukzHgnkytHvcc0rQR3+pGsPjI6fHJpNuEMiYpZ2qCF7e/AgMBAAGjgaUw
+gaIwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwIGCCsGAQUFBwMBMCYGA1UdEQQfMB2GG3NwaWZmZTovL2x5ZnQuY29tL3Rlc3Qt
+dGVhbTAdBgNVHQ4EFgQUpfOVf4mEwS5DGMyIS4D3d2ppiLEwHwYDVR0jBBgwFoAU
+FOT7oKyqmJfWefbY12LSwnLJQmcwDQYJKoZIhvcNAQELBQADggEBAMN8e+4w6r1B
+dz5ivX01mBMuB5WiX0gU+PNljbNO+5hg/+3qo5ux1FmvE8zOeauwGyTFbx/0p3xm
+PDKqMB5SlLPqfZRXyk+lVBpDmRkyPfXI3ExxLje7tsDwijp5y1SWSHfFS1ZJGdmv
+9XgJgn22U/asXdEI4gKXDz6nbWgtQIKMRA/AVpIMuQwnZYxyfnmPCOitlsZnPWz4
+NZDAI/UyvW6gIgwJEZas0aosWR82PEvm6vSRRI8najmrMaUryS8FZZBMsv6ysvD4
+Bxvf+RdR3fYUY5rQA06sCk6zRH7HIe/gfcGPoAjmMBH/8EaZTrA8aZ6VNJ5mjdTK
+3exsFKBu14I=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert_info.h b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert_info.h
index d30a17faecfe7..3b6294d0b7f90 100644
--- a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_EXPIRED_SAN_URI_CERT_HASH[] =
-    "01b0d11baa149f0ec36e9bef2d31aca960bb648ab8026e3b4d1f7d014ff18a6d";
-constexpr char TEST_EXPIRED_SAN_URI_CERT_SPKI[] = "RdPaALSmcp989omHpVD3/LCgJRhnPr1T+X4m2zGKPBY=";
-constexpr char TEST_EXPIRED_SAN_URI_CERT_SERIAL[] = "b8b5ecc898f21251";
-constexpr char TEST_EXPIRED_SAN_URI_CERT_NOT_BEFORE[] = "Dec 18 01:50:37 2018 GMT";
-constexpr char TEST_EXPIRED_SAN_URI_CERT_NOT_AFTER[] = "Dec 18 01:50:37 2017 GMT";
+    "3e33178e047682ec61555e77817b2ae2cd05a239bc2079b0888b85c64cbcfc62";
+constexpr char TEST_EXPIRED_SAN_URI_CERT_SPKI[] = "t39YWiVwmlkDu1mEFdD13YOKnHTnhLYsRFSlSCif4xU=";
+constexpr char TEST_EXPIRED_SAN_URI_CERT_SERIAL[] = "72e38282d32a1d89a7506c86024d52c0e3063304";
+constexpr char TEST_EXPIRED_SAN_URI_CERT_NOT_BEFORE[] = "Dec 22 17:32:31 2020 GMT";
+constexpr char TEST_EXPIRED_SAN_URI_CERT_NOT_AFTER[] = "Dec 23 17:32:31 2019 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_key.pem b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_key.pem
index 7686296bd83c8..2f3aeb3e16d21 100644
--- a/test/extensions/transport_sockets/tls/test_data/expired_san_uri_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/expired_san_uri_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAr92OxJ/WZ1VM2jxTV2t1YT0laplTsuksMJzjPtJSEkmjkUxK
-RiRbPGTxxxjHm0Dx/+ikOQtGJArRP+hOsu7bQKa2kqRTIs+d+lB6reHodONWDAcs
-9A3dowY/U2OVsfRoboymLTR5SqNYDnBb/gpCyGUXNfKVGX7cGfb2QJIWTORp4nOW
-Aoq4NF8Z7w8pzyUi+mXxvZM2YJ3phYuMGKeMzytJ40lhs/6rPUe5dJQ8aGeQDJfx
-VQPP/u8g9Vuc+eqdfy21DKPZ6c+m+SE0LTbLdCkc7Te1XmWyirKbOVe2eBUTLY2E
-P+71ScNZL1yNRDSNg5jfR1EvUw3+uU1OAg3NnQIDAQABAoIBAQCG9Mq+cLojif3z
-6x85kqj8+eNgrlDglrbmhz6L0vJQPlpbAeRtdzDcY8p2MrnaljgfXfPIIrKsrfBt
-zmO2RD3Umxq35Yo2yIQ+tsut7BJqwJojmM4SayGOHRkzcNRLP3d0flJ3ljEN6dOF
-IQw3IsCk746kQ4fPjN5yvmWyn2ilj80o1X62CSksllawXbBOMv/liA2XHmOsa25N
-zvC5KWaH4vo45OHUiiIwxt/lybdRpWtFJzmEWCnjuZHX0bzbQidqXK67jI8sbg/c
-cWxlWBTJBkQ6V8dL0PjSwxTtTgpOeSX+LXJfNseb9LLrdFdeZG2MQo0iqcUT5Dr4
-WzUIfSwxAoGBANuQknev49l1Y2IcXo6Oy8538VcyT6xKosNpk4ylVKK4vnlrZbxR
-1/6ZyaMPppRPil67/jWgG7R9uJrxG+exGyF72pPNH3/Q3xRmklDiM6a8EKr3EqF4
-OH6omvgdYHM7PeHo1xSvbCMT7mpWDuRRlbs8nse4N6LRwK1NXSOrCGovAoGBAM0M
-k7pvCS1uyI3n9x0Ny7+wC1IqHwSLJLEmGivWTwbpj9hUDut6uiLHfErSGKdTn1S6
-5KDKn5cY3Xn54x9xK9QnTWHp7C39gc6F7YBnzOk36CmixCFW6iFGRPZnjS7vXpIr
-lwQN+F8n/BKfXAVAQh4easiXrWmTzbiMLdUCFW3zAoGACjRv+kwchPDly5uR8YJF
-irUcbHcUKOfXJMn1Z6YPhvibMb2CHvyW02iGbKO/lEkWH00RhaCJaRwmxlzKdTxQ
-DIBbKl9wRVqJ48LYrhW1XNyE0c1l+kdCKPDhMwL6hqCMQcG2rWlx1zeH7z1Mt+Pq
-16b7okC3pUOmduePmqbKX1UCgYEAk1+pwcJSZ0wLayrAiipDObeOu3Q4rOxQ593J
-y54RWJd/4myv+IFRzPNxmtkcDQ9mIeDdt89KGrAtZqC6o/uUE7xXursFHBzrMgNC
-KxrvxOOAwoQQ0SGFz3qQ0ESmzYgPgaFAvhJIZCP54WyWF9QScVFNUHTrl0k6/5wI
-yOLhgg8CgYBeit7bkO1CgvHNL7gbMS6JSqaO4okF2nxBrTDjnmdoIyl3K5HTdwVN
-kSA6o9Hl3wFoF4niG8zjVPJfjaefcqJi3qEYGQhw/9+nDAT49fibpgD78IU0VY3Z
-morQAxP74KZv2RJL/7U3KRkYjkCzUQy9yS2zkwUHH9T3h/lah2qPoQ==
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/fake_ca_cert.pem b/test/extensions/transport_sockets/tls/test_data/fake_ca_cert.pem
index d84d441042dcf..21985e2ea30aa 100644
--- a/test/extensions/transport_sockets/tls/test_data/fake_ca_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/fake_ca_cert.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID0jCCArqgAwIBAgIJALuj6F1BLlksMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdGYWtlIENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow
-djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxEDAOBgNVBAMMB0Zha2UgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDHsTXPjNKXh6HecrOQEM+m846BXEXKFNd9qsWQtA92G0M4HRP2PkYZ
-pHKr9HiHFmbqUciOGGJv3gEkVBO3YlwOOJH4pAy7Y0q/9yvxlByfsRMuvhxZqrk1
-6gTjvSMuUcilUYmX+t+6emAaoHiDSFBgT64H/B6L75Ed1KUTEzSz1KuX+A7GO7Tp
-p/ZfjXIxdtPw0nigKiHtGgX2KQaZbD0mJYmk3YPzM7EjhCjohmRnKcBI0mZ9kr4E
-9Nq+SJYo0fU7QIo3kKopdhs/Mv7kFjzTxBmDfpc8YrLuvlCENOUE+oRlA0YXFCnq
-IvQZdnKTGq2LpKjl/e/NZx4DphgYjVhXAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS4iJCg8HwgaK+XwT3d8b4cDxAL
-QTAfBgNVHSMEGDAWgBS4iJCg8HwgaK+XwT3d8b4cDxALQTANBgkqhkiG9w0BAQsF
-AAOCAQEATI/97ZMR8EZpNmnYATUJ6oeKmigkzZssEcaGuFpA6t0ahkBXuk4/AKLl
-cjizHW52G2T8AUxWckVylZuTOLfauOFdgUaJEO+BdtWUm9KTDA2j7cIZazW9LZKM
-ezBB4l1pK9sOnzsNm5Hn90pNt6GL4aC33LaSUWY2WqPLKyBQ1VoZJ2/iFs7stX+X
-seUlYajUc4q9oP8IcVxEmzjTKla+CuO4Mxwxl/Lq9iwFWdPC2nrSyk4+sR4MF96C
-6SeMO7jqVtELYq7X7Wcx5KyVkr9cIEeZGY7tSvdWwPevGsiojqev2fbiMMbI/Xlc
-9HZ5soYEzRTdm+WR+E9UJdrkVylBpw==
+MIID3TCCAsWgAwIBAgIUThm7broFtUpbejf1l4o8JsF10nUwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB0Zha2UgQ0EwHhcNMjAxMjIyMTczMjI3WhcNMjIx
+MjIyMTczMjI3WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHRmFrZSBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMcjeeaSHcb9Iaw+BvzTKRbCVr6KVQV5+HSJgpE6
+q2PB43lgkeTGEKn42t0HBqKljg7T1WKvgnnHKsqdhilY4RHASN+Xnu0K0QvfSGS0
+iidJtiCPuKXWg2Aj53lmMLwXYDCg+03Oai7kFUF+MUcLRDGLeHzAQSWoxjYnN1YM
+F1eqmYm5GAUyqTNHuMjMqTgsKQTfLWv0LA2SpZoVRhXlPSgmSTSqG8Wg9Qre2bEA
+N0OlCWgwFqD+i8v4jP264VsH0TyK8tP/Oxv8EANERUHJD8QdH3zTLLoxf6C8j1w8
+tYtZi6WpZzBMsgRnXKLblLRFf6FhpeHQ2Q/InpUtfm/t7scCAwEAAaNjMGEwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJvFzVni006z
+pI1egkwuBg+sXj6JMB8GA1UdIwQYMBaAFJvFzVni006zpI1egkwuBg+sXj6JMA0G
+CSqGSIb3DQEBCwUAA4IBAQAgSwIDmHjdTQEDElNhKYjLkvzuN542CPEWGPrZVel9
+77XRjHUf8yvK62+Z3rs1qo/TLjYKoq7YHae0TOUk69VtVO/pfMET7OS5+8mwJFGL
+1R0JT7p/ufjnDQvZemp/iyT0vpzZHEoA4Zfpeac5zOig2cH+6u5VjJMdjvjoQ3Ac
+4+ae8KA1cHjH4vLXsXyk2GgSWU3bRxiVdf35VlcEXCaUgC0FNU6ixKVOCku8T0Al
+v4pqfgxmMTqj/gw0XYZ78pwk844SR8fIU8i5PVYBITyObFKAaGOS5TdYq7PgTDxO
+s3XfUqIzgp/iYs87pyggQI85/eawunbCdsu8HGbI6pr+
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/fake_ca_key.pem b/test/extensions/transport_sockets/tls/test_data/fake_ca_key.pem
index c28e3244d3697..34ca0620a2262 100644
--- a/test/extensions/transport_sockets/tls/test_data/fake_ca_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/fake_ca_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEpAIBAAKCAQEAxyN55pIdxv0hrD4G/NMpFsJWvopVBXn4dImCkTqrY8HjeWCR
+5MYQqfja3QcGoqWODtPVYq+Ceccqyp2GKVjhEcBI35ee7QrRC99IZLSKJ0m2II+4
+pdaDYCPneWYwvBdgMKD7Tc5qLuQVQX4xRwtEMYt4fMBBJajGNic3VgwXV6qZibkY
+BTKpM0e4yMypOCwpBN8ta/QsDZKlmhVGFeU9KCZJNKobxaD1Ct7ZsQA3Q6UJaDAW
+oP6Ly/iM/brhWwfRPIry0/87G/wQA0RFQckPxB0ffNMsujF/oLyPXDy1i1mLpaln
+MEyyBGdcotuUtEV/oWGl4dDZD8ielS1+b+3uxwIDAQABAoIBAHAr95p9a/CO3czc
+E6uOdnKvfZVO7p1rGxzp6HZOCgTjTnMshoHLX8+esgoWzxIHF4IaqPQx0Nkv61a+
+bLgVrJIHMgVgrtDvatm5KFoxqDCBQOoOiwA/WTlqgBTOD12j/TbnNyeYwg8vwxll
+L/TIz9zopzH+SbQg4aXXaUA7B1sFaqv+h04aH7VOJTHI5EyCEAmggagG9XUpuDEe
+MumHn1wkr5KBr0HrOV5CVjJiKhLIYfiRt2gk5Rm5ikZEf8/pqA/88Bt6JUOCZLdc
+6CSdO5tQceKHrEPaDAPA5q1Wcmwl9CT2wYUHUAl3W0FbXLVvwm/Qrnj7FNczsEDc
+2LDbOQECgYEA9j4Ple9r7XhfT0oDJsRujc5X4jCrybwrbDBGYufQWNRVk/SXZFvv
+h1IN0DqxrSbsz2lOl5gDqzj9jTM6iUdHYuqqWf9S6cxwnCeycWz4Xx5zYWxVOTBW
+roEpdXeN9vW/LFQqHQxwE1sw5NhUIf7wOW8uRpG8/QL4HyRdlxezUeECgYEAzweV
+SqGRtlM1OxbHzZYexWC+MZHStNbxWnVGfwuc1TYidK4ouozSHBOppRlE0+sM6Ex3
+z+h32+VYj8ifpYVGmlt+5ptnqMl1Xvxtvi9C6o/G4y+TgzpeE700/qqI2upQcmHe
+4zQVSE4fjQGZkygyEyHXSrgdTkorLeKdvc7eJacCgYEAhs7tK3GbDbPzwe3MEeJC
+gCHyXSO2OMhqoV1Ae49bsfX1L/4dD9WBKf1TEKfBdAE2bkrBux5/C7M0pKPiLRu3
+ykCcqI6urs6869CT0aMNys1Z74EmmxuKqRiPQP8F2qkpUzR0pdiUVxR6jR6d2MrA
+a0Eh/YJ2C7IfcrUvA7P2+SECgYEApjmkeMO5RvcQKl1kF4GNO1Ut4IcA8woRx1ua
+Oq+MQPSyPZUIRqCCouB2uYTMaoqzVmDvYhN5CSngLbIb3L5hrdYA0g+87xyyDI4J
+X0Z7J/JA8nBktFzM5HRqdH9gWsT/ypciarKK0/9F/eVm9Wy0p//n6KpjfVS3zqPB
+m4DZhMkCgYBrPmsmA+3k6iLawISez7/eU8uV7Q0HdSIwjGizTZeN6wEEeHLkhdEN
+TsDKw01sE5BBcNE4lDWQ7IYWhZcVCHhYCWtnHmBjFVVmD6Qy/b5esU/MYJE0ucdT
+Y3rZXYkPojhSdsO+3KZDDKRxODByV5xS8ExlYIaODB04RxYl9wwa5Q==
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/intermediate_ca_cert.pem b/test/extensions/transport_sockets/tls/test_data/intermediate_ca_cert.pem
index 8c4d78720a5be..8dfbff1349385 100644
--- a/test/extensions/transport_sockets/tls/test_data/intermediate_ca_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/intermediate_ca_cert.pem
@@ -1,25 +1,26 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+0R4moODTPSQ=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/intermediate_ca_key.pem b/test/extensions/transport_sockets/tls/test_data/intermediate_ca_key.pem
index 993cc3de0bd48..faff36d370906 100644
--- a/test/extensions/transport_sockets/tls/test_data/intermediate_ca_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/intermediate_ca_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/long_validity_cert.pem b/test/extensions/transport_sockets/tls/test_data/long_validity_cert.pem
index 68dd88e19e12b..023917a87db9f 100644
--- a/test/extensions/transport_sockets/tls/test_data/long_validity_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/long_validity_cert.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwIBcNMjAxMjIyMTczMjMwWhgPMjA3
+MDEyMTAxNzMyMzBaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlh
 MRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQL
 DBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjCCASIwDQYJ
-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
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJrcKE0BcRWPFhh+GOigR5igRLOPQs4S
+Jj+CXDBCamyl3jBw7cGJbz2v15aNW8f9ku93LwIFOLP6zzSxCgHXxCYFUCGefMVt
+X9W1HeRWinlhrhkXI2YIHtBRXjVXMMoVPt1hnWODb6enUbgPi9DoIjXkv7SEg7uw
+XInhnnclYPdlnMkE7fX1VKNj8ZT++suG0WBQy4QNMDy37uzpGnU1DAzmDJs2NfpZ
+Ie8ZYaz8G2i/xSzr4gaL999ivDmE4VfcDfAgeEcx6U6HnqWYP6FYs3umPU0Ccj4/
+8cz0A2SfEUyCbmfgacaEdo8D9ZTy5gnecalvoCDXJeLFK8czsNZhMy0CAwEAAaOB
 nTCBmjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
 BQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxlLmNvbTAd
-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
-360=
+BgNVHQ4EFgQUie0FerEpZ8iRC4HRrozWqWtNQWMwHwYDVR0jBBgwFoAUFOT7oKyq
+mJfWefbY12LSwnLJQmcwDQYJKoZIhvcNAQELBQADggEBAF0GujoAftU5vC7SM9My
+ATOGTl2KBlNxPjcYnEaJLXDucuFpJaBRXv5tm5j2swW/HD+SL2xr0r3Pchw3uyUm
+68zoHM8k/DnLZuKbtCIKXhNQm6MhHci+prZEhMmQ4SHtLTMQDgnH2VFlSeawhed1
+CQZUDsjvbmPNfYgtb2dvNCwkc1B/A9ii86B4SemLrWdg9/y5+KKuVKYTYT8DjBOM
+sefDY3U2JyfXuz+MxHajg6Iv9KKSSRdOKqRgtQeuwjcWjj1DEFluBsipVn5Da9rM
+1JjgGjpugic6z9oF8IKnrOF223DnUmWsJyZmYzcPpNNHs1OcwGaU1ts8NVK1vzFI
+1K4=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/long_validity_cert_info.h b/test/extensions/transport_sockets/tls/test_data/long_validity_cert_info.h
index 7c870080e4c27..fa8987f8c8e93 100644
--- a/test/extensions/transport_sockets/tls/test_data/long_validity_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/long_validity_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_LONG_VALIDITY_CERT_HASH[] =
-    "b16402844ccc874a072bca0d23a17ba350aeb90328f086bb102ee55f8c627b3e";
-constexpr char TEST_LONG_VALIDITY_CERT_SPKI[] = "2Nr2dJbHttdmsuOA7/qVCfUpxcjYUWtONoiSPKOUeis=";
-constexpr char TEST_LONG_VALIDITY_CERT_SERIAL[] = "1fbc5bbbe57db3038b22dbea827c9de96b531265";
-constexpr char TEST_LONG_VALIDITY_CERT_NOT_BEFORE[] = "Oct 11 05:12:03 2019 GMT";
-constexpr char TEST_LONG_VALIDITY_CERT_NOT_AFTER[] = "Sep 28 05:12:03 2069 GMT";
+    "955d004f1fd265becd4a9473b3f5542e9f0a70a5f8d4fdd119bf3e8da56faf49";
+constexpr char TEST_LONG_VALIDITY_CERT_SPKI[] = "gFf6NVArrb4MgXfd1pTOAQdCLfCXYPhFEPssxHUso8U=";
+constexpr char TEST_LONG_VALIDITY_CERT_SERIAL[] = "72e38282d32a1d89a7506c86024d52c0e3063302";
+constexpr char TEST_LONG_VALIDITY_CERT_NOT_BEFORE[] = "Dec 22 17:32:30 2020 GMT";
+constexpr char TEST_LONG_VALIDITY_CERT_NOT_AFTER[] = "Dec 10 17:32:30 2070 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/long_validity_key.pem b/test/extensions/transport_sockets/tls/test_data/long_validity_key.pem
index 3c7d39550a170..3aea289096724 100644
--- a/test/extensions/transport_sockets/tls/test_data/long_validity_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/long_validity_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/test/extensions/transport_sockets/tls/test_data/no_san_cert.pem b/test/extensions/transport_sockets/tls/test_data/no_san_cert.pem
index c5e9288e34da5..6a5a992e54e9c 100644
--- a/test/extensions/transport_sockets/tls/test_data/no_san_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/no_san_cert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIJALi17MiY8hJJMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow
-ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAmjaiwZ3HXkBest7OydGQvpeRUUJWDs9gb0TglgpZd6Z3xQ51
-gpuh3KLJBKcQU9Tgc7KtFrGkMg14agDX8JA6y+g0WLXZWD78z3Qphy/FIE9mwvyD
-yYeBQ617o6a+NlT6GDOkuR50OsN8zVbdML5nnbPVE1Sm3UVBQIcZFcs7LwT9Z62f
-BrzQJXwPwJkI/6k6AAskCz8yOtulivyfjto0zrW8zkDAhqmmbQgNNONy+Df5trDi
-hYTs2sclUALyAK4uxKBO2B+2yme9KQQZUuHp2bWAMVSzZWdd5a1d+DYHZs0RbCsC
-LTxtAtgzcTIK2YxV2pDHIVtvKlX6a5RWoq4x9wIDAQABo3wwejAMBgNVHRMBAf8E
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFFNmiA4RPzGVD8tbsQkw4VT47H8GMB8GA1UdIwQYMBaAFIuCmYCl
-O2mt1woWJNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQCBCQxu1RRDgxyW+1Vr
-6mvdHRS9TRnakIYr8RlUMJ1SPOnMyzHzL1t7vJGVmyIGUJi9MxF05xAU5y7o7hoi
-CP0z45lv7vKSXzZ12Y16U/yqgE/HsSqjn3n9n7vWDK6aQ71PcWA3HySpwT3WOx0D
-z0ZMPo25FIbIjVZBMFzqQr1BcPVdwuyZrADms/lcIMfMggBdnhxUxjCrr1S/BFtF
-GFGFKm9xRzNBexvbAO54U4uc4NthO+ysDDsKBl3xE2zyQfN/ZiJrqv/S/LLTyku9
-QfNMFpgP0xvzH1znP7lnlNFOED6+Q65V9H358zgMukGlUua6w7v9Zox6xTaH2Xbj
-ry5I
+MIID+jCCAuKgAwIBAgIUcuOCgtMqHYmnUGyGAk1SwOMGMvswDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTczMjI3WhcNMjIx
+MjIyMTczMjI3WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKI6XjcBp4IZaRjFD4sNqRvc3pn1VQWGdV
+h+fDdI6uGzb2BQRvhgdJ9SWVLYTawf/BMWrDJOIVi6Wme4o9IlmnJy3juyQ7+EAH
+u44Y6mN7gED73cvvC2VMfezFfyjk8Dz9YFEc2W6Ne7TwOR1mb9hDjxUoDjp0+ubt
+PtgVFV4XE4MJrkE93G9De4cQQct8Dga3x/C5xNpRBgAiCYWETvTxkQLoMvE3y2eP
+6WwTtgSU8OBprtMUp3/fPQ1Z/OkoktesCViIrjy6ySgAjTnTjTMAYFd7zoyVyez/
+Q1h0dbSSrIRb/Am31AaaTzDNoHSk2e5GaQmtS1keQbnvd9SLFD+TAgMBAAGjfDB6
+MAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
+BggrBgEFBQcDATAdBgNVHQ4EFgQUQMHkckAyCkv0Ln9dIBWWhE9z/IUwHwYDVR0j
+BBgwFoAUFOT7oKyqmJfWefbY12LSwnLJQmcwDQYJKoZIhvcNAQELBQADggEBAFnZ
+aV/QCBQP9+U3jMp72pR9xIWlFkuuFBI2CNZ0WJF4UxldJnaI9aY2AHLiozAbRhqO
+XhXycQwHWvecg4ZzObEyDXGNBU9vbRv5mSwlBYF/biwF/34MKxCQUqoeG74Ony0X
+zGlr2Rl50tDB2VPvsMSvUbT0HrLVK5ILtf4mPIqNEZgO1lHWkGlKUZV5BGueUB+D
+2jWX4NxngkdGNeIg9GNXM2Dwa/GGGD8KpoHTX0bE++ZSb9rgxSFDt7RUidcPy0Ll
+8w9gLfPsB6p9jxLSnOby0biQK7nrI0diL39i/qyx+s/wmvP9yQmNnSWHgZbKyBAm
+alh7ZQj2mwgw5Ho2ZB4=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/no_san_cert_info.h b/test/extensions/transport_sockets/tls/test_data/no_san_cert_info.h
index bb1ec52cbe6ac..ace24c3bfa0ea 100644
--- a/test/extensions/transport_sockets/tls/test_data/no_san_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/no_san_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_NO_SAN_CERT_HASH[] =
-    "0035c2f2cefc21bd5e1e52b945ff26c474dad33343ae00aa8f86f4877aa02eca";
-constexpr char TEST_NO_SAN_CERT_SPKI[] = "xVbSFNk3uh/hr0XoZArX7fc1RrKx0oQ+OkVcGa1HCzY=";
-constexpr char TEST_NO_SAN_CERT_SERIAL[] = "b8b5ecc898f21249";
-constexpr char TEST_NO_SAN_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT";
-constexpr char TEST_NO_SAN_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT";
+    "7a3ad7b1183f3e3badfd5b49e45a44cfff2b4c1712bb50816493b4dcc140756c";
+constexpr char TEST_NO_SAN_CERT_SPKI[] = "ZxvlCHz4/e9/yO0I/wXnLbCyajcGpGx79cbfcATgzEI=";
+constexpr char TEST_NO_SAN_CERT_SERIAL[] = "72e38282d32a1d89a7506c86024d52c0e30632fb";
+constexpr char TEST_NO_SAN_CERT_NOT_BEFORE[] = "Dec 22 17:32:27 2020 GMT";
+constexpr char TEST_NO_SAN_CERT_NOT_AFTER[] = "Dec 22 17:32:27 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/no_san_chain.pem b/test/extensions/transport_sockets/tls/test_data/no_san_chain.pem
index f3686ed02b4cd..0cc9c146e6c6e 100644
--- a/test/extensions/transport_sockets/tls/test_data/no_san_chain.pem
+++ b/test/extensions/transport_sockets/tls/test_data/no_san_chain.pem
@@ -1,49 +1,50 @@
 -----BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIJALi17MiY8hJJMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow
-ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAmjaiwZ3HXkBest7OydGQvpeRUUJWDs9gb0TglgpZd6Z3xQ51
-gpuh3KLJBKcQU9Tgc7KtFrGkMg14agDX8JA6y+g0WLXZWD78z3Qphy/FIE9mwvyD
-yYeBQ617o6a+NlT6GDOkuR50OsN8zVbdML5nnbPVE1Sm3UVBQIcZFcs7LwT9Z62f
-BrzQJXwPwJkI/6k6AAskCz8yOtulivyfjto0zrW8zkDAhqmmbQgNNONy+Df5trDi
-hYTs2sclUALyAK4uxKBO2B+2yme9KQQZUuHp2bWAMVSzZWdd5a1d+DYHZs0RbCsC
-LTxtAtgzcTIK2YxV2pDHIVtvKlX6a5RWoq4x9wIDAQABo3wwejAMBgNVHRMBAf8E
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFFNmiA4RPzGVD8tbsQkw4VT47H8GMB8GA1UdIwQYMBaAFIuCmYCl
-O2mt1woWJNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQCBCQxu1RRDgxyW+1Vr
-6mvdHRS9TRnakIYr8RlUMJ1SPOnMyzHzL1t7vJGVmyIGUJi9MxF05xAU5y7o7hoi
-CP0z45lv7vKSXzZ12Y16U/yqgE/HsSqjn3n9n7vWDK6aQ71PcWA3HySpwT3WOx0D
-z0ZMPo25FIbIjVZBMFzqQr1BcPVdwuyZrADms/lcIMfMggBdnhxUxjCrr1S/BFtF
-GFGFKm9xRzNBexvbAO54U4uc4NthO+ysDDsKBl3xE2zyQfN/ZiJrqv/S/LLTyku9
-QfNMFpgP0xvzH1znP7lnlNFOED6+Q65V9H358zgMukGlUua6w7v9Zox6xTaH2Xbj
-ry5I
+MIID+jCCAuKgAwIBAgIUcuOCgtMqHYmnUGyGAk1SwOMGMvswDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTczMjI3WhcNMjIx
+MjIyMTczMjI3WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKI6XjcBp4IZaRjFD4sNqRvc3pn1VQWGdV
+h+fDdI6uGzb2BQRvhgdJ9SWVLYTawf/BMWrDJOIVi6Wme4o9IlmnJy3juyQ7+EAH
+u44Y6mN7gED73cvvC2VMfezFfyjk8Dz9YFEc2W6Ne7TwOR1mb9hDjxUoDjp0+ubt
+PtgVFV4XE4MJrkE93G9De4cQQct8Dga3x/C5xNpRBgAiCYWETvTxkQLoMvE3y2eP
+6WwTtgSU8OBprtMUp3/fPQ1Z/OkoktesCViIrjy6ySgAjTnTjTMAYFd7zoyVyez/
+Q1h0dbSSrIRb/Am31AaaTzDNoHSk2e5GaQmtS1keQbnvd9SLFD+TAgMBAAGjfDB6
+MAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
+BggrBgEFBQcDATAdBgNVHQ4EFgQUQMHkckAyCkv0Ln9dIBWWhE9z/IUwHwYDVR0j
+BBgwFoAUFOT7oKyqmJfWefbY12LSwnLJQmcwDQYJKoZIhvcNAQELBQADggEBAFnZ
+aV/QCBQP9+U3jMp72pR9xIWlFkuuFBI2CNZ0WJF4UxldJnaI9aY2AHLiozAbRhqO
+XhXycQwHWvecg4ZzObEyDXGNBU9vbRv5mSwlBYF/biwF/34MKxCQUqoeG74Ony0X
+zGlr2Rl50tDB2VPvsMSvUbT0HrLVK5ILtf4mPIqNEZgO1lHWkGlKUZV5BGueUB+D
+2jWX4NxngkdGNeIg9GNXM2Dwa/GGGD8KpoHTX0bE++ZSb9rgxSFDt7RUidcPy0Ll
+8w9gLfPsB6p9jxLSnOby0biQK7nrI0diL39i/qyx+s/wmvP9yQmNnSWHgZbKyBAm
+alh7ZQj2mwgw5Ho2ZB4=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
+0R4moODTPSQ=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/no_san_key.pem b/test/extensions/transport_sockets/tls/test_data/no_san_key.pem
index 3720deb9fb3b2..65b421c450dd4 100644
--- a/test/extensions/transport_sockets/tls/test_data/no_san_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/no_san_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+MIIEpAIBAAKCAQEAyiOl43AaeCGWkYxQ+LDakb3N6Z9VUFhnVYfnw3SOrhs29gUE
+b4YHSfUllS2E2sH/wTFqwyTiFYulpnuKPSJZpyct47skO/hAB7uOGOpje4BA+93L
+7wtlTH3sxX8o5PA8/WBRHNlujXu08DkdZm/YQ48VKA46dPrm7T7YFRVeFxODCa5B
+PdxvQ3uHEEHLfA4Gt8fwucTaUQYAIgmFhE708ZEC6DLxN8tnj+lsE7YElPDgaa7T
+FKd/3z0NWfzpKJLXrAlYiK48uskoAI05040zAGBXe86Mlcns/0NYdHW0kqyEW/wJ
+t9QGmk8wzaB0pNnuRmkJrUtZHkG573fUixQ/kwIDAQABAoIBAQDApUbFQqLHWOOB
+5WOKECrOeUEUZTjOsOISnsqf+aa9gcxYnaGDlA3AS3W8/bu/LOLNQYaJYs5hUEzY
+JKcz6lfdOTa/8ivvR4HmnLYpQsD7A9lq8RAZyxeI1f5gnvbfcaH+rNvBDewRxRNF
+WnmNlgxbHrNAEIdf03tgIeOX/FxGyizVUvPvqLAZbfpm8tnz+lTSvzLUiKPEpypv
+JXPvvaciZDlIIE6IcN2leoJvvgPUGJmHkcXI9PAfMzA/S47PiLvaLNk0BuDtTb+g
+WkzPOFnNYMUvQsmIjC+sIR6MZoZJ+/giPh6ca6n/7z435GUV7s1Tb6VlL5iRQswn
+ep1Z7KRRAoGBAOv08bQYD6F+6RQ+lbIQZyGqc5ANONEe2Yyvh6OhSFLjYBN6Ilb/
+jMuUEAK6InCsTLUz/cfLRp4kzjMfdbXowo6h9bRmfCBiiueRYLu0mN47p1mf2lbr
+MccFq809Db8+l0uIZf4tdW2o+49FFimR4JVXXZCCYZ5imq5UPHKPvswLAoGBANtP
+UNyBA4a/2JDCn/vl+vBs9L2VjSuGgSI0tj4mz8wUQGvktQoDMZAVeT+ZgYdmK4mn
+tjYJfT2BajX9/96HbHXNMBWhgTlLAXfq9WbJ/wMgthRKi30tzoqH6V4En38vjehK
+XoIpnFN4t7l09EPTh+cf32N1It28hRtDIbBSaAeZAoGAD9aGLs96pR1uqbQ1uhkN
+wx282gt5J9hJQ/84PIyD3URz23rUOUC4A6YxmO1DiIqYL4WI4FNNrynLSXUwIoC4
+JnjKlExYwpe6uSZx9sd9h1U7u3FWZ4Ur9y7zRDh35sFdyG0kY3ZLrousLwa1IR8w
+kvWlSyDlSotV1KPE1u+9H9cCgYAS8nFL+6FwXNa6+vWTb7UUXHVwg6Ekp4Q0jlVI
+XVYKjZ1bNPEnIkt/5TsKcZqtNfiA9gpZ9MvrKmkgrQcUFKMcMlP7Km7doktILvZw
+oPb1MDhK3H3cnL6BXWieBMw60sLx1KsBl9K3q3BEB4Sq73WIVEqabx5KBeWCC3S3
+pQbz0QKBgQDXoT4SpIf8zRrSAfo5dXHCI+zkZgTJ5Ax0jfExWKREtNyMLwT0Reuo
+9FWS3CV/XcBKgWsjnYndE8iG3V3FnUrIJ4wDXqfFH5iBT/22x3kxQAjYnnaQfuAT
+cbOWFSD4MCwNwOId6KqDYaEFlGMnrq4jY20AOAVlvCXC3L+NEXbA5g==
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/password_protected_cert.pem b/test/extensions/transport_sockets/tls/test_data/password_protected_cert.pem
index dbc4f3a373399..125e9d106365d 100644
--- a/test/extensions/transport_sockets/tls/test_data/password_protected_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/password_protected_cert.pem
@@ -1,24 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEGTCCAwGgAwIBAgIJALi17MiY8hJPMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNVoXDTIwMTIxNzAxNTAzNVow
-ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAoF+1fZVsBl4XKIcIxHDRZUzaBgRMptgdUcoU4td2ipsm3o36
-YKWNBM8DLUrm6d+nSjNaZkawDMHw+OOEpg1IwqPrCQpUtQtIJnEspr/RuX4U08o8
-G84Wa/+0dqRhrbrE3kM6UIF+dtTBcu33wTVYNDY/dJMtHsnPOxCzD3GGmGON3AyD
-WVU/uBc0jGr3PwWoHAHZxStmnoje20fpB5ZDil75geeWc4z7dAFLAaGwOPr6jkSj
-WP3rNUZ6NqgfKC5mKPqpJj3WJvX2+tiwEt5GVJA/fJeGvAUBakUMmEeXD8zSbxy5
-DFLL7oa4/nNzLAHlm2M9g/XtHZoGQFV2d7o7fwIDAQABo4GlMIGiMAwGA1UdEwEB
-/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAmBgNVHREEHzAdhhtzcGlmZmU6Ly9seWZ0LmNvbS90ZXN0LXRlYW0wHQYDVR0O
-BBYEFF63X4Jyb8iWArNsVAzfsV9QECK5MB8GA1UdIwQYMBaAFIuCmYClO2mt1woW
-JNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQAPzxAJhhHJeetKyAWg+q68/1DJ
-CnrChUszC8zmyIdlSw4fZ2gMkDLYRRM+n8vzrA5aQvqALa00ArexrI6xUN7s4Q2G
-GS0Ja4wamJqJ4hJcj41+JJPfspssew6r6Xk82j+qko7gzyI5dSnDNguQFeOH7o21
-MyLS7JnZHGxmhXt5ebKgqefX9rVlJi4d3/LP1j5mKjFspBP9N7t4NwTn6ue5yjr7
-xux0Ucvr178kvmBFrOviiACeZwVIeKCVY/nuk/PskPHoU2t2F//USBFaRxqGD+nh
-OI00z4s/ch3JgC2I18c04fyKihBJJyjy3dE0JRsKzqbXdIOaZPfk2UKfxU81
+MIIEJDCCAwygAwIBAgIUcuOCgtMqHYmnUGyGAk1SwOMGMwEwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTczMjI5WhcNMjIx
+MjIyMTczMjI5WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMydVO473KbtSKzkJziecVTVZlBftfovNK
+qv5+wYrjzY/igoT0dcOiXgiyzWy+Okv216m8rCb3Io4YoeCeCGeuzKDBEo/ERQK6
+gpt+8RUVmKBQC5PPwUL8Agc/gf8mirhmW3EigkEpEbwngrRm/FQiYLmS4/9GDyKS
+Y26Yenz4nVKgHyFjnxoLnQd1SKY6/IkNkRMPFj77YekTmxon4uWN4nJCcWmQJKO5
+qge3a/E9l5oRzDarPWRzey/wjVdRmaBWM2eqp94Et2GnT9Ii61dRu9Ou1qgfRLd9
+78AgLuEFy5Wj9IuMZccjlaaYkuTcaBQvwgbTXmahn9Uh7t1+GgkpAgMBAAGjgaUw
+gaIwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwIGCCsGAQUFBwMBMCYGA1UdEQQfMB2GG3NwaWZmZTovL2x5ZnQuY29tL3Rlc3Qt
+dGVhbTAdBgNVHQ4EFgQUUco1CNHKR48I6G9aPvuUNqeA7i4wHwYDVR0jBBgwFoAU
+FOT7oKyqmJfWefbY12LSwnLJQmcwDQYJKoZIhvcNAQELBQADggEBAHp5ur1rBvVg
+o91hDcsxpEXdL0qyVZqM3/KFKIRSXR9wm91JF5KZ9YQbMgRmSWtpvFhRZ4PLvxzz
+hUCs/yoluqnj+yCB0TC0s+7eMe1W0QBB1DycyY8TPYKjnzkYiYB9HyCUryu/+bAw
+zZj+2+KkX6kuYAONsj9PnXMkAaNcL9RpQ+BdQ3zuwcPUrBcahvr0qMpagC/pAEna
+VJGoAdMIVLnDEMdjlugPf1N8igQ0VamMMPtmf++UbN3QxPPdARRodSNtrrsi0g4e
+cSJ2lV0goWKygqD4Pfl2VksTTX4KlkNoJyKnOz50muXR70jNHbMVRuFvrNXDfxsk
+/q6TFOd0lYc=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/password_protected_cert_info.h b/test/extensions/transport_sockets/tls/test_data/password_protected_cert_info.h
index 1683c0366894d..0b9e2853599eb 100644
--- a/test/extensions/transport_sockets/tls/test_data/password_protected_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/password_protected_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_PASSWORD_PROTECTED_CERT_HASH[] =
-    "93b251a830c5d9fe28d399d8a35917d2909d3f80c1717965b875a50d451f6201";
-constexpr char TEST_PASSWORD_PROTECTED_CERT_SPKI[] = "jrYWvpgM1G+OadfgpmWUpaVCD+4WbNs3R4kAGVWFXJk=";
-constexpr char TEST_PASSWORD_PROTECTED_CERT_SERIAL[] = "b8b5ecc898f2124f";
-constexpr char TEST_PASSWORD_PROTECTED_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT";
-constexpr char TEST_PASSWORD_PROTECTED_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT";
+    "664b20ed79a876cc915f48617ed045afbe429768e54fd1da1ccf7c5841eb8b27";
+constexpr char TEST_PASSWORD_PROTECTED_CERT_SPKI[] = "23hIvNKuIqhj4AjQrCJY8V2cOHOAUNRRdp1T7K94YbE=";
+constexpr char TEST_PASSWORD_PROTECTED_CERT_SERIAL[] = "72e38282d32a1d89a7506c86024d52c0e3063301";
+constexpr char TEST_PASSWORD_PROTECTED_CERT_NOT_BEFORE[] = "Dec 22 17:32:29 2020 GMT";
+constexpr char TEST_PASSWORD_PROTECTED_CERT_NOT_AFTER[] = "Dec 22 17:32:29 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/password_protected_key.pem b/test/extensions/transport_sockets/tls/test_data/password_protected_key.pem
index 76d6e1175f66a..8ed8101f579a5 100644
--- a/test/extensions/transport_sockets/tls/test_data/password_protected_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/password_protected_key.pem
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,3F37F60B0ACD2836F2835B7C5F64DC84
+DEK-Info: AES-128-CBC,3A5C2B8B1C4CD2EEE19E0BC9A96E3B43
 
-strLPVIk/j3j9jPR4h17Ht4Nj891rSqXG9X8XfFuSCRxmH6dQ4M4+83koWLC5bJq
-AK4c7LCbX4QQjbieXT5O1fm4wHrA3V/pA11db+7M1TW+mNCLJ+tz1pjS9MW5SPW5
-4l5hM/TMfcADcgZALY66CYbqHQBz73cxgpj0dw/NMAD72G+lgItDNvBYZSlrMy+E
-zI3hzKvOplZqS1AOrMGC35cEIyJEs4TBuKSxTfru9RHdb9DtPUlsxqhRyoNWpzya
-EXNlFS49wClS4Z+WV8HC7dDtgFVeodnqzZ+0fEEx12E8P95qECet2G9UQGiqIACF
-RYBgyaNg5V5hKtaCebtgS74n8FsJH/oBijEEY2NZ9rPWK5zd8tsSFhE8wN77ZWBU
-rQQWg+bSbx0Atmd9Z0kOtD7zeO20VoiIcfRm8FX08g66wyoPz7gSE6/dg0Zc71Yb
-l7CvIHj/V5efzBLVjrgPvNVQmLcrR8bdUeW5gafl/29EBEBgCANBTjaTJ7uHiDsb
-yPR7evBKckOSrknP7Q0XVgJdDQtvXmGTr14zJCxwKY5D7gCc++xYm4cIsfBTPFeW
-I8Zg0rdwzrbrtrQVYFL+W1DUpPDzg+w8FE9CUMSsRQoR3U7p36wgCTNgdAIwM3lK
-dgJHAA49icngVgRaCEZQocjqOApWAANGqNE91KCnEeCo9utjTRKGgtZGXuAuBcMz
-HyykZuCSE35d6pw3xFJC+N2FHx37YR8gN7xpCcUWsQs4v0d5uZ33CRPR3OP8f+N6
-adskT5qL5yIQiIiPmsEvyycsRh1PUzMPy/wK0Sr6VMKKleHcPWzNXN4DaMGOlMqm
-4IC3oCMMpp5JkISD3s+nfie3zADU+oB5EeoZX1d+UqNIS/q3U4SN3h2RJdso4naS
-kShtC7+goKFbWj5r6Mskuj+u4A2W/tnEm5Sfpo4ZR8/SsptFZH0wDp58FreT1TUz
-Q1cbtsDg67yYXyqIF/yqeGpHCLQMjtffpHoUFiB9HgUegkivFLXFJ/14Zf0I9dXj
-Dbh1M+EBmQEmyL1EwPDbTHuFpTK4BPzqXMnSbE1eFjmeQm3jxr3JVSQwSYSETiOR
-4NmaeGtOt2IKMAIP1YAF5bT1QiocT1e986TM1hO3dUT1wmhCL9mIsbUXDAE50rGq
-KbFJRmrosk0hHijrIC0Yl3pjq7NgtqeVAly8GB+/XWxI7C0yiEA65+4UcJqtbGhU
-10YUexRIjaPOS3FzcXuut3WYVCnwgOLtf4+PisVJIgy8OyzO5JB2dSoqTZ4uBFNx
-OZeIVQdMsP27V/5rzdi/zC6JQFUVjZCtz+OAKr7HUy/mYw6UUNXYRKDtNoCu4Lrq
-T5bYs63mV6scoy6NxClx8LPzaimNc3cz+7/JaAdxPPTg1f2BsBQJTHCaZJdBeG09
-SIIaugiTQFC5Hlzff9hW1SMSVA222PjANWwSRavWPACzfTPP2yfFHjSMfMoC+uPm
-ZB3gnqTaCjucTu1ZiayMONtxHeMmCSV5MNJLUUUaX83iSQxUpvBhZ4tD0dDqtUTb
-KVGe/go2TurJ9qqNDaRW+OVa2WhVZ/w0Ddp2DUSjOuv8Tk9wMKZXc4O1vR3c0Fn5
+jwiaI3ZsgIwTutJXfY/YvflGMdcfK4TqfOhmGe60tYEppjNnVYp5/MqwjLPaFIOh
+O3d/W/6RC9ByQy2+Fz8Gd9KHxagU10RBLWPeJleFmm9gRpPLi5zA0+2XwwtK9d1U
+vy4+HITzdkxfpGl8TIQpNoryl7x48fHa31/cQdL/RHSAj3jTsaeUI7DZV5pDt9wb
+PCY/Zqkeg9so7buw1cMpKMatwHb4OJJUUTlzwSU0eZAPLEsIbgbNC4fAEVmUSQwI
+AyiuLdxfElK9Yhgt0GTkJoaMv3HFItVH0e2fWxGDqBHwTWRP8cwH5xjIFHMx/zz9
+C5/OVowVeIPHa50QWKJb62ji0YNEgwQ3qsR1KaN2jv2xv7eJubNF68s/6KmDUqm2
+7nIK4VA9E8RIo5IFANgvxM2RXcYOfjpU0lzxh3mWR3veCpRjjElVmiN4H+rsb8pA
+IILycb0fUUVsLYB8dwNWO1T7OGVaVtak4j2QUrG8SaAIkiImPjnj7CjvUd5mCtUj
+N6Bce2wMK74KDf4R5W706bJiGbDTWajvVDCjDS+/9HavL9aBnj9XwnWtPcmkEF5d
+GbeLVei9C1ON2h+22ygyVJ+zWwKmAZtP9Iqi7mEjP2062XS/K+wme/QPjqM6IDEu
+FzMe8/rHNncvueLkmJF6MqhFaeWX4mf/NJZWJ11KaWWZA10JMhR+SSiqyg4iwk0U
+NUqm0YVM5K8mVTYJDGe+kUtKEM+7cwV55bjEW2yviWyGE3G/e6t9qV8VKRTSvTgq
+B+Ms5mrAasnS1BrMr8T6PE6C65Ekk7ELREQych8q70+Mm5GIdu6Kg5RNN/1shIoN
+P86lXkrVLyrLUAhQrSO0CO/VZSIa4InIZQQpc4k6VSRX9st0hzVoS+8lVOgdS9s/
+irwci0vGhr1Zbcr4v66Gvq/FEf1WxAtEwNGGYOeC+1Z4fFBYR+oGRrF0yRmBPn6M
+05h5XQkZKJeKbzp5Me0fGWoCoDu358njxh8zUnQEI2FlK2g4Udjg0xiUP2ho+4q7
+AKPtJXrrcRrYVlAxRE5DFYj7R5OEx3GDW90KszrK5ZggmaR8+MSJOEfAcBmH/qig
+prJeYK0Vv6nukr2PRutJxZ8xlQeSZTS6eBJmm2VCBCcY82f9ccGZZRyt9VNIfTjX
+L1Vui6vaYaBgBKm2n9oJScLVmTO/CASqm58G4S1lTuA44uxgJz0Kph+CVBbT0Jz2
+o8qOul64Ypryi9vm8pWItKgW/j1Taxq5PikFIHirx2L0r5UjGc5cqWRxOwMLKir1
+8umdQt0jgE5Clt01Xs1x2jez3fARq++RHCJnNZnjtb6SJfSm6nGPuXqJNhIzfj+5
+Z6alakjF+B0x98jhrhyrQMv/s21bEKdm82KUygtOEHKYOnX3+5/h0NjZRDr1qXkT
+AVb11LigcjRunL8GohyZ3x2FbDUu1vlPsKh5ljNez9xrt3v11rljwQ8asm8Oozvw
+NmJzPggkCCt7H3VZT6n8SvzF5ZaTZdzyOb41h+Vx5LNW4SPLD/vkE8sj67cqBrXd
+ZqMZULedYlXsPB8t1knFCcNvWwJibXRX298e7fQ+T/Ore7iRmvWWp2iSntrLwCgy
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns2_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_dns2_cert.pem
index 4632eaca7292a..391ee1d6b9781 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_dns2_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_dns2_cert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEETCCAvmgAwIBAgIJALi17MiY8hJLMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow
-ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA0QfXxNjXCcixefe0P49I2CJ6rLsMiJqPfKyqnOYyR57TQLOK
-hXmA+TAWA5UqhPnsO9ekhgtsGS1v5V4ImNTRrkUoqgQFU8EBoyYnOjgzVy2MPxRa
-SOcyf8iw8WwAA25zS+6k+zBcJ11TkWrRQgkU2vz5+gWuSVIPfm6FNxpq8ZsniLeG
-RK04XUpON0TewWKwwthxhHA0MKrNJd1MtEYsD9s/sHrOqEUXAZosIHirt/TsALUY
-pgXUQFKxU2w8cQZEoLE6HFJPd1fV/eXimjFrcIihQiIgbZeCIbgotKTy9G9oRfdQ
-9q46PcYPJEsJt3qn45pwElPVsHMwUdGiHWSpVQIDAQABo4GdMIGaMAwGA1UdEwEB
-/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAeBgNVHREEFzAVghNzZXJ2ZXIxLmV4YW1wbGUuY29tMB0GA1UdDgQWBBR0+HKL
-tbwXrF1DOTKdk/xf7KVOLTAfBgNVHSMEGDAWgBSLgpmApTtprdcKFiTUZxUkLNRh
-ZTANBgkqhkiG9w0BAQsFAAOCAQEAAP66DMJLjPO35L1ZBTsw5NUC89gcS6tacTMB
-sTdCho75YBcEyZWrmbmlZa3CPKDGsJ/BDuv22xVj5D3oc6vgpMBtVE3qqrxgEi40
-6KZLxUx84nYVMi406fQLxa2yK1ZiJsURGFRjq8fa+1bcKfPdZWp5ymm3y0551vHW
-bKjQbxedCpsrklw4iFmCayNcm1eWzr3dJxYaZ5OOxkhrT1nkt/Niw5CG7Ew8P3II
-xbIYlJO3/ylO3tN/LpUjr3LCf0gb5Such9ezici/tKslgf6FUNe7U0UOqfGf5tVX
-b1yrlcu11htuBxQxMvbzr1ygAAAZXKrom3ykatVG9usAR5WF3w==
+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
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns2_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_dns2_cert_info.h
index ffb48c5850f0f..1a9450d277fd2 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_dns2_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/san_dns2_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SAN_DNS2_CERT_HASH[] =
-    "7e8ea45159d415e916fd2b850173f4f1b0f175211482ad611e2333333769fbd1";
-constexpr char TEST_SAN_DNS2_CERT_SPKI[] = "GVpPP0KVIOpFzHQRBvC5/UwYDx5apRo7XHmBb084nJQ=";
-constexpr char TEST_SAN_DNS2_CERT_SERIAL[] = "b8b5ecc898f2124b";
-constexpr char TEST_SAN_DNS2_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT";
-constexpr char TEST_SAN_DNS2_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT";
+    "140fa3ea6f2f05d3103e15d4e9677ea91e50c3bd6967098c76370f97415aec95";
+constexpr char TEST_SAN_DNS2_CERT_SPKI[] = "dFTCmpN7aY9cWqR+0UJBowBbJPG0s3k/giRXy8Yp0tU=";
+constexpr char TEST_SAN_DNS2_CERT_SERIAL[] = "72e38282d32a1d89a7506c86024d52c0e30632fd";
+constexpr char TEST_SAN_DNS2_CERT_NOT_BEFORE[] = "Dec 22 17:32:28 2020 GMT";
+constexpr char TEST_SAN_DNS2_CERT_NOT_AFTER[] = "Dec 22 17:32:28 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns2_key.pem b/test/extensions/transport_sockets/tls/test_data/san_dns2_key.pem
index ed853fae3e792..6dbf2b87ba4bc 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_dns2_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_dns2_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/test/extensions/transport_sockets/tls/test_data/san_dns3_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_dns3_cert.pem
index 7fc0254042c12..25645e63a100e 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_dns3_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_dns3_cert.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEHzCCAwegAwIBAgIJAKi3O5rMMvJCMA0GCSqGSIb3DQEBCwUAMIGDMQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
-aXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEd
-MBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdGUgQ0EwHhcNMTgxMjE4MDE1MDM0WhcN
-MjAxMjE3MDE1MDM0WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5p
-YTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UE
-CwwQTHlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCysXZdqVqHKZEhCndcgnbRTHIl2au6
-SdT/jtkCO2ZaqhFZv42G+H2WsYi7DrQTuJA+Q7VvJ9oEiziPi4uqdU/1dKWDti7o
-8Qu2apd5TPYFsvqWMS0xAkkgNutwqhwnoel2/Yi1DHqCVQxKIfdAYMTdGDoenCGr
-ZigZovHnxm4a70Kze4wNCa/TJNTmirizHO0zixVqptkCE8Os1d+3A19OuLr2e1Xd
-A79Tj/LZ6lcS5JieKdCEuBRRgd6TpynzO+kCmbHJ/MB4KJYHDn+j1ljHD0akG+Kl
-ALLhMo0QUOzBc8eDqc27UNIDY4rUkmGP0VMSFKz+ee/7sq6/OF2smkaxAgMBAAGj
-gZ0wgZowDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwIGCCsGAQUFBwMBMB4GA1UdEQQXMBWCE3NlcnZlcjEuZXhhbXBsZS5jb20w
-HQYDVR0OBBYEFO8wWUDG1XNZtgAed7O0CCXAe939MB8GA1UdIwQYMBaAFG/TymYf
-ctZkFiEuB7srW8el7kVGMA0GCSqGSIb3DQEBCwUAA4IBAQAT4FicynBc4N4VQygj
-a+8BVL5H0ol0/SbOHU97E+jWoiem9FQ3UbvvegbySWJfvGDEb+ShM6HYqlW+UH5I
-zeaAWmAS7QcCYkM9imfDWTPFxEqHcyYAbqmD3vLp/Y+VTIecxuwfy324RnjHss2x
-q+ISbuH8CkHXujC0O7ciyFr7nDnkSMpR1sJvpbo14zpyrBsiohDZtk/Atl1ouWcc
-G43FRuQOMW3aSFk3hQTZxKmmgdF1Y8HFEg4Mass4gM8XVUyB42iRdt6xsBEdbOPM
-nrAjLZHAPr6etK8apfh/olSN0+QY8hHc+OxzGJuJ7IufYiTaU+W3l0u38r8wfllA
-SdIU
+MIIEKjCCAxKgAwIBAgIUZKm/KBNr5AQ0wvBRwCATY2LFnckwDQYJKoZIhvcNAQEL
+BQAwgYMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
+DA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVu
+Z2luZWVyaW5nMR0wGwYDVQQDDBRUZXN0IEludGVybWVkaWF0ZSBDQTAeFw0yMDEy
+MjIxNzMyMjhaFw0yMjEyMjIxNzMyMjhaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
+DApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARM
+eWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNl
+cnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPrYZBtMbNOa9xH
+EEyUah6vpaG8DJItAijTE05xc1H0SPoxwq5lVznC4VU8S1LoMnFUkQqtz7mYGj3k
+Gtt11WDuglopLYhNiHG5clNc6qMdYrRJoOB5ttoLofxXFE0jzXclsIGb2Pr3GYvt
+RmOfzoNAhU/QwD1LfeyX7RHnbU2jFH31+c7zVT1b6OEtbLcjMFvlTAygrS4kWjCW
+rnra8fGKSErTHa6ho9rZVuX8IxACAIBNgCe+bLH9nnt+4SFkOtp3z5J6d86MmDPf
+B+Xwl4uTkdHj5rJ0v9xZ4Q7VvfRzl+eqIl8ouZ1ytok8yinCa7IWK+6dMpK5yWVy
+ywA6gosCAwEAAaOBnTCBmjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcwFYITc2VydmVyMS5l
+eGFtcGxlLmNvbTAdBgNVHQ4EFgQURke26aLErWlYyeUH+4mgX4lnSd8wHwYDVR0j
+BBgwFoAU2D7pN9HUX23rYpyPbZBers74fMEwDQYJKoZIhvcNAQELBQADggEBACcI
+ekyyx5slWdo1FXduT7gYr8ikHodHa6KWFn3Heo2WCr/tMRogDxwTbLw+jsd93gLU
+yUKWCwLpRqozK146VFPg7INrRY0PYSGYaManQWp6yfTkc/8OvACgqKiqEpXlie9Z
+VEKyLOR7w9mIbPknU4JVTontaHPWprKRlNz0aBuEI92jzhY6b2mEhNtLwRxenW01
+qyf8SQ8Uk96tq9+S8MP1iixVfQO5Rm3gjneCMXB8iAZKNlh8n6DmUQr88pGiSgtw
+hSTdGkdwqWfW9IbxAWfShr/A8VKChkdke3i0sNbznJXG6pg74JTeH3lXhaSx2jJp
+KeDuHLTRP/0jhvxnmh0=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns3_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_dns3_cert_info.h
index 56587c693b86a..b7b9f90a0772d 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_dns3_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/san_dns3_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SAN_DNS3_CERT_HASH[] =
-    "e9cf5232115daae3f05c27e84c16cff35a8413ee79e46e5d6710ac5d3215f8b6";
-constexpr char TEST_SAN_DNS3_CERT_SPKI[] = "HPb90dH6E4le6VYRfixpcKWPobiR0SQ5r+rmEfrYLY8=";
-constexpr char TEST_SAN_DNS3_CERT_SERIAL[] = "a8b73b9acc32f242";
-constexpr char TEST_SAN_DNS3_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT";
-constexpr char TEST_SAN_DNS3_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT";
+    "643d406d2ace43edeace4a6b10fbcd490e2181655c3dbe0b91db797d9d3da3c1";
+constexpr char TEST_SAN_DNS3_CERT_SPKI[] = "jHrwYfdhQPZ38jivfjqtmNrkAfX4FJsRTH4fxj8GlcI=";
+constexpr char TEST_SAN_DNS3_CERT_SERIAL[] = "64a9bf28136be40434c2f051c020136362c59dc9";
+constexpr char TEST_SAN_DNS3_CERT_NOT_BEFORE[] = "Dec 22 17:32:28 2020 GMT";
+constexpr char TEST_SAN_DNS3_CERT_NOT_AFTER[] = "Dec 22 17:32:28 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns3_chain.pem b/test/extensions/transport_sockets/tls/test_data/san_dns3_chain.pem
index 286e1b8f63590..75963642dca1b 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_dns3_chain.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_dns3_chain.pem
@@ -1,50 +1,51 @@
 -----BEGIN CERTIFICATE-----
-MIIEHzCCAwegAwIBAgIJAKi3O5rMMvJCMA0GCSqGSIb3DQEBCwUAMIGDMQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j
-aXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQTHlmdCBFbmdpbmVlcmluZzEd
-MBsGA1UEAwwUVGVzdCBJbnRlcm1lZGlhdGUgQ0EwHhcNMTgxMjE4MDE1MDM0WhcN
-MjAxMjE3MDE1MDM0WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5p
-YTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UE
-CwwQTHlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCysXZdqVqHKZEhCndcgnbRTHIl2au6
-SdT/jtkCO2ZaqhFZv42G+H2WsYi7DrQTuJA+Q7VvJ9oEiziPi4uqdU/1dKWDti7o
-8Qu2apd5TPYFsvqWMS0xAkkgNutwqhwnoel2/Yi1DHqCVQxKIfdAYMTdGDoenCGr
-ZigZovHnxm4a70Kze4wNCa/TJNTmirizHO0zixVqptkCE8Os1d+3A19OuLr2e1Xd
-A79Tj/LZ6lcS5JieKdCEuBRRgd6TpynzO+kCmbHJ/MB4KJYHDn+j1ljHD0akG+Kl
-ALLhMo0QUOzBc8eDqc27UNIDY4rUkmGP0VMSFKz+ee/7sq6/OF2smkaxAgMBAAGj
-gZ0wgZowDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwIGCCsGAQUFBwMBMB4GA1UdEQQXMBWCE3NlcnZlcjEuZXhhbXBsZS5jb20w
-HQYDVR0OBBYEFO8wWUDG1XNZtgAed7O0CCXAe939MB8GA1UdIwQYMBaAFG/TymYf
-ctZkFiEuB7srW8el7kVGMA0GCSqGSIb3DQEBCwUAA4IBAQAT4FicynBc4N4VQygj
-a+8BVL5H0ol0/SbOHU97E+jWoiem9FQ3UbvvegbySWJfvGDEb+ShM6HYqlW+UH5I
-zeaAWmAS7QcCYkM9imfDWTPFxEqHcyYAbqmD3vLp/Y+VTIecxuwfy324RnjHss2x
-q+ISbuH8CkHXujC0O7ciyFr7nDnkSMpR1sJvpbo14zpyrBsiohDZtk/Atl1ouWcc
-G43FRuQOMW3aSFk3hQTZxKmmgdF1Y8HFEg4Mass4gM8XVUyB42iRdt6xsBEdbOPM
-nrAjLZHAPr6etK8apfh/olSN0+QY8hHc+OxzGJuJ7IufYiTaU+W3l0u38r8wfllA
-SdIU
+MIIEKjCCAxKgAwIBAgIUZKm/KBNr5AQ0wvBRwCATY2LFnckwDQYJKoZIhvcNAQEL
+BQAwgYMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
+DA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVu
+Z2luZWVyaW5nMR0wGwYDVQQDDBRUZXN0IEludGVybWVkaWF0ZSBDQTAeFw0yMDEy
+MjIxNzMyMjhaFw0yMjEyMjIxNzMyMjhaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQI
+DApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARM
+eWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNl
+cnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPrYZBtMbNOa9xH
+EEyUah6vpaG8DJItAijTE05xc1H0SPoxwq5lVznC4VU8S1LoMnFUkQqtz7mYGj3k
+Gtt11WDuglopLYhNiHG5clNc6qMdYrRJoOB5ttoLofxXFE0jzXclsIGb2Pr3GYvt
+RmOfzoNAhU/QwD1LfeyX7RHnbU2jFH31+c7zVT1b6OEtbLcjMFvlTAygrS4kWjCW
+rnra8fGKSErTHa6ho9rZVuX8IxACAIBNgCe+bLH9nnt+4SFkOtp3z5J6d86MmDPf
+B+Xwl4uTkdHj5rJ0v9xZ4Q7VvfRzl+eqIl8ouZ1ytok8yinCa7IWK+6dMpK5yWVy
+ywA6gosCAwEAAaOBnTCBmjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNV
+HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcwFYITc2VydmVyMS5l
+eGFtcGxlLmNvbTAdBgNVHQ4EFgQURke26aLErWlYyeUH+4mgX4lnSd8wHwYDVR0j
+BBgwFoAU2D7pN9HUX23rYpyPbZBers74fMEwDQYJKoZIhvcNAQELBQADggEBACcI
+ekyyx5slWdo1FXduT7gYr8ikHodHa6KWFn3Heo2WCr/tMRogDxwTbLw+jsd93gLU
+yUKWCwLpRqozK146VFPg7INrRY0PYSGYaManQWp6yfTkc/8OvACgqKiqEpXlie9Z
+VEKyLOR7w9mIbPknU4JVTontaHPWprKRlNz0aBuEI92jzhY6b2mEhNtLwRxenW01
+qyf8SQ8Uk96tq9+S8MP1iixVfQO5Rm3gjneCMXB8iAZKNlh8n6DmUQr88pGiSgtw
+hSTdGkdwqWfW9IbxAWfShr/A8VKChkdke3i0sNbznJXG6pg74JTeH3lXhaSx2jJp
+KeDuHLTRP/0jhvxnmh0=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-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
+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
+0R4moODTPSQ=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns3_key.pem b/test/extensions/transport_sockets/tls/test_data/san_dns3_key.pem
index 31e7ffdda6f4f..997f506ddaaac 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_dns3_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_dns3_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/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem
index 74c9d9191f5e4..5bb789bd6ef0f 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_dns_cert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEETCCAvmgAwIBAgIJALi17MiY8hJKMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow
-ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA9iZuZ4lJbCw6sDIypihrlIm/wYfa6BY4K/eJWUbCCcKT8jhP
-1XQSuoTfqbMVSuoyZxiLFujRz/Wmn1JAbM5myYhJLaVmAyAXUyLLDzzOrexl0n2m
-I133wfrPpcolemRuE0q2zB+ChDn4/o3VwOmXnOc5SL9hAb6TerVkAmAeUAmw15Xc
-WvNhQS0Wq0XA4cy2B7q/z8Ll+76pEuA0aN+MoTbrzHI8keaJyQqlMJO45u+BsJuE
-Gc+9HbV/rpr1CA3y06E38VGXUtzQ20wGEjIdPj0zc5uVtu/DTQRMKO3e8oURcrbQ
-oEGrCMTN7cxqbdR9DZxFGZ7JFwBGbyTwDAzJRwIDAQABo4GdMIGaMAwGA1UdEwEB
-/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAeBgNVHREEFzAVghNzZXJ2ZXIxLmV4YW1wbGUuY29tMB0GA1UdDgQWBBRsuFLO
-uLgl1XOmIFJBX2U0P7wNNTAfBgNVHSMEGDAWgBSLgpmApTtprdcKFiTUZxUkLNRh
-ZTANBgkqhkiG9w0BAQsFAAOCAQEAtbE2xVAwOIXY1zGEwpk/ZwJPByqq+dY5pYKN
-vpK1wRT91iDit0ktJwM0ddDBWj1P9IJgz2X4QLHMMLDbmCY1+o2E7aXpdcW2Eima
-EYvzcUD0RZKjb2tqK4CmRvevnr15G3Fw6AnuWP6SDUEVizpTzH6cL83I+nCeQlCB
-CH0Q1/pcdjlsedM7DWohzEGVpjEAs/DGtC2XYFSDPu0pnUHKtBb2B9Njdv9rAJ/y
-Pm5mVbwSEu1GzAzFp3laTn4xwJUejtjZjk41jd6CnmlP+/0hBw3nz86YGYOrb3H/
-yGGZAV+Zg36WH0e1/XkUs+2wyJh8rmoytlvOe+RRxfOyU+KjGA==
+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
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_dns_cert_info.h
index 8b2fd04ad9dc4..8bc55b49016c7 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_dns_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/san_dns_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SAN_DNS_CERT_HASH[] =
-    "0f55f8b1afa27f5a252ff861179dba1670bf0c93f3ea5acbed53e6f1246082f4";
-constexpr char TEST_SAN_DNS_CERT_SPKI[] = "MH1QY2vqNI94fwiacyfg1AxscjullSclXq2/eN6H8/Y=";
-constexpr char TEST_SAN_DNS_CERT_SERIAL[] = "b8b5ecc898f2124a";
-constexpr char TEST_SAN_DNS_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT";
-constexpr char TEST_SAN_DNS_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT";
+    "8225562533068cb4eca256f1af1a36da7ba67df7b9bb133640d180a9589b36cb";
+constexpr char TEST_SAN_DNS_CERT_SPKI[] = "p747+J1CtljXTST3iPJHmpfu2bVm1ieChYshZj5NBrs=";
+constexpr char TEST_SAN_DNS_CERT_SERIAL[] = "72e38282d32a1d89a7506c86024d52c0e30632fc";
+constexpr char TEST_SAN_DNS_CERT_NOT_BEFORE[] = "Dec 22 17:32:27 2020 GMT";
+constexpr char TEST_SAN_DNS_CERT_NOT_AFTER[] = "Dec 22 17:32:27 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/san_dns_key.pem b/test/extensions/transport_sockets/tls/test_data/san_dns_key.pem
index 3f7995b70db19..262474628af3f 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_dns_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_dns_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/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert.pem
index 63e36bc6cff88..2066e7d9b5391 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIJALi17MiY8hJMMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow
-ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAva/6bdcR7bEefLeLsee4o8mLw+KhMuW5N3oH8OlKuHh9q8Tu
-hSpk7RSfmERh9Ajx47pirZKuMTlsxNL3xV7bqn0GH/ozCSabgFKdWTNU9y7dSS0r
-vSUA/sRwugCfWc7b4G8hR41M1i3XnO1rUtemvbvzQ+Z5UD20Lx1/oVtu5MCe9QAY
-5P7G0FqjKXSxg49eFWi3Ew/xx9U+PTWZBjqEkmGVXVj53n10YLvAyp3iv3qJxQoP
-B6sAi5HMgSb9e4dOLmmHwHpdDNa01sk+ILhUHqXsnJ1A2VdIasbqrsr2AaKM75P8
-ak2ZqeBc7ytzdx/TcsJMqWrp2+2oyl2ykjqACQIDAQABo4GsMIGpMAwGA1UdEwEB
-/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAtBgNVHREEJjAkgg0qLmV4YW1wbGUuY29tghNzZXJ2ZXIyLmV4YW1wbGUuY29t
-MB0GA1UdDgQWBBSnCILo7vBSrb6gD0zRFk2piJ8zSDAfBgNVHSMEGDAWgBSLgpmA
-pTtprdcKFiTUZxUkLNRhZTANBgkqhkiG9w0BAQsFAAOCAQEAtILuO3Pin3Cq+1B2
-K4o0ZmTmXdw8VnnklXfRkXVHwY2u+KeOMDiX0yVjGVRpV0A7sRhJlTr+pxwJ6Mgx
-XMCzYhRR5BoIHobGKGmueTfuBJGzQWD37u6o0zOUnDdHSwdmBU/s8VHk9fhfbIIe
-8GLTOrBLHPQkZ0PXNhoLeOPYFSNlHNoAgMAPqPfiRfeWP83QqhOGVH7N0QDC16dC
-v3CmVzLr1K0HDA/EnK6KdiHz9LPfC8NP4qcCRiX0vPGdjrUD2feVIVZjkQCbJBSQ
-baNSQNeaCgLXS+tt3EGMDpu5OQDVFDCam6x5XvBUlnkKJeHR7Pds/CZKBHB6So5a
-yNB0Dw==
+MIIEKzCCAxOgAwIBAgIUcuOCgtMqHYmnUGyGAk1SwOMGMv4wDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTczMjI4WhcNMjIx
+MjIyMTczMjI4WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxvQ8q2MVNMOc6H5ls1I6KOT0CTI8q7j97
+J0RhyrXXoSVg+zr5Owt5ivujLs8kYKjwEZooaJTHHIQb2JDggpipEozcsFUwuqKm
+ppl0uHp8A7Gs1AuFV6Pg192QJxL4imhqcnJ96wNeK+44F0bkxZLmINO8q24Gc/xO
+0LWJ1On9SsRUK6N6m5B8hGG089ewEuX2aknMwLk4xCGMbIAkaeqNdY51facle2IB
+RgtDNsH6Epqcq6emeNI6WsQ7AphK7U3qv5+oBH4y2JFUdfJn0QNXODZShz9BarFz
+g4YWBY4Z8uoW+mjm/trg4MBwugm9pkQMkvJD+DtC0sawKqLmsb93AgMBAAGjgaww
+gakwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwIGCCsGAQUFBwMBMC0GA1UdEQQmMCSCDSouZXhhbXBsZS5jb22CE3NlcnZlcjIu
+ZXhhbXBsZS5jb20wHQYDVR0OBBYEFF7bPS70nXdXeWCoThDtmX5UWqu6MB8GA1Ud
+IwQYMBaAFBTk+6CsqpiX1nn22Ndi0sJyyUJnMA0GCSqGSIb3DQEBCwUAA4IBAQB4
+ChyfmfG1HFJUZlTPNH80e4YGPuohklakkAmWzAMoljX6lIe+xE3CI4hmxB1KD8Y/
+OJoaLGuWXmiclWb5T+5gy3qFt3hynuWgIs19Q/0ITqfFP3B7xsQRkrCkMywh1DJl
+yWZAqaLLWqzFWXgP+r/C40IhgYvIoBG7cyOuElKJOrKeEgy6Q6vC6p0pAwwtQv3Q
+XcgeNFhWYeqxkagLw7P67ws69Jp032ShLpLwTOQZHKRBlKOwM2jMmq8U3Aptws7F
+jSsR/9cmOn0RZ9yA4fyoGxabc3cXeDhnOZ6Ryzf4T3tw8hirX5vFZX7ttvIP9Otz
+P1573X2vcQ3iAWbjlukV
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert_info.h
index b0875c3191d46..b9308b8947158 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SAN_MULTIPLE_DNS_CERT_HASH[] =
-    "e37a8ced3878866ff394df0e81980c913653d079c568beaea50fb4993b6ba362";
-constexpr char TEST_SAN_MULTIPLE_DNS_CERT_SPKI[] = "aGwdbHvoWTPx52siXA5Y4V2Z6ofdj+lLR4Wm0s7RMWs=";
-constexpr char TEST_SAN_MULTIPLE_DNS_CERT_SERIAL[] = "b8b5ecc898f2124c";
-constexpr char TEST_SAN_MULTIPLE_DNS_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT";
-constexpr char TEST_SAN_MULTIPLE_DNS_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT";
+    "1704c688de926397c29fd9f861e1d6f56bb5f3f2b7f7c727f82b64aab4693ee0";
+constexpr char TEST_SAN_MULTIPLE_DNS_CERT_SPKI[] = "33fxwX6sJk382P8NuzAxb7HlnseL2qLPCsQJyjeeaoU=";
+constexpr char TEST_SAN_MULTIPLE_DNS_CERT_SERIAL[] = "72e38282d32a1d89a7506c86024d52c0e30632fe";
+constexpr char TEST_SAN_MULTIPLE_DNS_CERT_NOT_BEFORE[] = "Dec 22 17:32:28 2020 GMT";
+constexpr char TEST_SAN_MULTIPLE_DNS_CERT_NOT_AFTER[] = "Dec 22 17:32:28 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_key.pem b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_key.pem
index 2d34987924b4a..7ebf8cf7580c0 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_multiple_dns_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/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert.pem
index c70e5c2adce7f..6218b9f89cc67 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIJALi17MiY8hJNMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNFoXDTIwMTIxNzAxNTAzNFow
-ZDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6bDN9SPumxs8n
-wCWywmVN5R87oMwLwoSufsi35Jc/MAQxI4tOcJzDr3ToRkZEqEiZHZdORKTHhmfI
-GoQwmT4Z0ABcHyC3P4vb0IUgtSCsci5xzh8zVggm9wZGLzEt2MhcUsISFwrAtQvO
-efJNGj9EEicwGC9Esan1DoTosec2eDzokb0DvIQzXm6YJN+g2ccDWGjjA8k9bBLl
-EMp2EkwCT9zYx3LQWO6OuLxzQeaIIho3I6ySaYJigxwEG9fpoHe+svr03/0K8LKd
-J84JD9X6ztGA35Y7GhIZ0a20ve6M/PUOo/zP1OXowiVhK8HmroHO//UE+8a9kONc
-xERDKvCVAgMBAAGjgZ0wgZowDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB4GA1UdEQQXMBWCE3NlcnZlcjEu
-ZXhhbXBsZS5jb20wHQYDVR0OBBYEFKOTR160qm1NpkDE6dn6d3n0Qwp4MB8GA1Ud
-IwQYMBaAFIuCmYClO2mt1woWJNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQC4
-0tAXulJLKJsLj2r3hFvuqE7J9gbQDa3cEoCNwqjXiEQvJ7Qk7uWZ4zkiL2jHiCGV
-CfeEEXHdsfmHKFIjH5dtSqyQw0IHzDCNgjuM6AWSDwGROLCd8bQ8hl5tfNVxdRG6
-6BgN5ItWXp5W5aNIl5MjvngZtnO3n6j7qzA7N+CQkCm6mwBQKpdeTtUuduoyaxmg
-pBJtBD9qibzZ2GRcDlYr7rE0yo0BucMNSL4Uu1owwTd/3I354YN4ZI2RZj1trtTU
-xTny7gkblcAZRFf3xEMDk2g0kHqU6WQ/bNK9I59E0AWs8Tbjy5aPBJox0csJr5Bx
-yeXzjha6OvlkxaeYe2Ix
+MIIEBjCCAu6gAwIBAgIUcuOCgtMqHYmnUGyGAk1SwOMGMv8wDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTczMjI4WhcNMjIx
+MjIyMTczMjI4WjBkMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN7hOnODxtLwX5lBk9BZaM91gaiDsBvT4Bna0xyw7JX933CIQvE2dYwewl+SkYfc
+IhbApaWaDIRgsxIEqIhxT3wWE1QiJoZnqusZexkjN0rImn3bUc/Jbd4vDtuwhiz5
+A5MnXPIIM6MC+pyMueVZglrz8Gy/GMaryMq5QZFxKHT9loPBezX5AzflLGxfRL5R
+KY27KcVGLb/9HN3LGefrDOPiKXy4qO+bZjzY7hQDlx5PlT3ZGPvUACdRGPznC5cV
+doBAmTQE0hbIOzbnF7K20wwoV+jsdcQT0cUwomN99kt+oEPVcSTirXpgtPkN5ltp
+qMgdpnLMbvGXeyY2DX5B2qcCAwEAAaOBnTCBmjAMBgNVHRMBAf8EAjAAMAsGA1Ud
+DwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcw
+FYITc2VydmVyMS5leGFtcGxlLmNvbTAdBgNVHQ4EFgQUxyLnQySD6sHB0bsZukL+
+cF1KTNYwHwYDVR0jBBgwFoAUFOT7oKyqmJfWefbY12LSwnLJQmcwDQYJKoZIhvcN
+AQELBQADggEBAAZbwa7xE4ERVJS02WaIhDpTO/VSL2Jo5Sy+X67XpN2cMzhjCA1Y
+zabQkNn8atS6GjnVYB93O/xqz3aJWGjGs5MdjMYpN64uT1jP4+bvGDnICwh5jkxN
+VV6lzmQsql0eNXaSOugoSHsab6IRGQZJqsaWYLUkeAi0b9tRGorEo2ZtlMncltaV
+wnemcdMcsRieENGUjWVJs95n9/XFAPVJ5X2uo7dQOpAkb11i06vYGeZx2X9qcvpn
+K+QdJloFxPnpRddeVBnpizyqQlFxm+Ldwwo+xlkvfhmavDvhUczoY46Ep4aIvh42
+fX7fKaZsG6Nke/umyL0NQjSj80QdvXwMLmo=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert_info.h
index 7b4dea9cc927c..5226deb350828 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/san_only_dns_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SAN_ONLY_DNS_CERT_HASH[] =
-    "5c9069ccc9f127c4eaa4678fe230d6d5c0b5e65a22d31ff3d15177590b1f3cd8";
-constexpr char TEST_SAN_ONLY_DNS_CERT_SPKI[] = "D/5TEdqaOeNXddOK9rpecHD/iskyrCfr3uQlLW0fSis=";
-constexpr char TEST_SAN_ONLY_DNS_CERT_SERIAL[] = "b8b5ecc898f2124d";
-constexpr char TEST_SAN_ONLY_DNS_CERT_NOT_BEFORE[] = "Dec 18 01:50:34 2018 GMT";
-constexpr char TEST_SAN_ONLY_DNS_CERT_NOT_AFTER[] = "Dec 17 01:50:34 2020 GMT";
+    "298433f581fb762679b29470693d456a701010dac658e8ebc9896d2688dfdf6d";
+constexpr char TEST_SAN_ONLY_DNS_CERT_SPKI[] = "A16ZLYvDEcmffKzSgL/ICnuPtKVYSYRGAKOuDC+eJXc=";
+constexpr char TEST_SAN_ONLY_DNS_CERT_SERIAL[] = "72e38282d32a1d89a7506c86024d52c0e30632ff";
+constexpr char TEST_SAN_ONLY_DNS_CERT_NOT_BEFORE[] = "Dec 22 17:32:28 2020 GMT";
+constexpr char TEST_SAN_ONLY_DNS_CERT_NOT_AFTER[] = "Dec 22 17:32:28 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/san_only_dns_key.pem b/test/extensions/transport_sockets/tls/test_data/san_only_dns_key.pem
index 8a7697eb74708..29a9b57d0c1ab 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_only_dns_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_only_dns_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/test/extensions/transport_sockets/tls/test_data/san_uri_cert.pem b/test/extensions/transport_sockets/tls/test_data/san_uri_cert.pem
index dc74b06eedefd..c36f02a7f6b11 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_uri_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_uri_cert.pem
@@ -1,24 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEGTCCAwGgAwIBAgIJALi17MiY8hJOMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRAw
-DgYDVQQDDAdUZXN0IENBMB4XDTE4MTIxODAxNTAzNVoXDTIwMTIxNzAxNTAzNVow
-ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
-biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
-ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAxPcwdwZDoifEnOxeDizZd3ItLWA54kX7FgyfUJ71rfQM5SWA
-TolMCUg3MIABfMZEKJFVl5eG83VxKjjVzVFMLu3quRXV4ziJjoURMUjGFONwzwzw
-ys5ns/GBSvM9hYK8BKMvRG1O/hcA/Ir0BWkdXhZ92up46eEPY/WmIHYmLg9XOnrE
-SnuxjaUzg9hrAqJvKVOA7EeyFTOv8uWAj0b5coXUk/vRhWo8VFKrKeVEnzOifevv
-xDeRRotSTmuoNqty2NjWTK+jdhKUDWagIMfgfdBQ9ACiD9Mebk5bCvFR69oYsnSw
-AYth2kVAgjXu9Dvn6pnD90dAkYzgRQRzPj04gQIDAQABo4GlMIGiMAwGA1UdEwEB
-/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAmBgNVHREEHzAdhhtzcGlmZmU6Ly9seWZ0LmNvbS90ZXN0LXRlYW0wHQYDVR0O
-BBYEFPp6C7rKg3dMeOVdB/qSIkGTg237MB8GA1UdIwQYMBaAFIuCmYClO2mt1woW
-JNRnFSQs1GFlMA0GCSqGSIb3DQEBCwUAA4IBAQAjqIbD4KskjsvJkK0abycCpyAt
-6zJs8+dKft8jmyAAzE2k+dHAUkz5ixc7HpKHsgK3r1I9Kd1fZzvONO8jTDWroCcz
-Aa87MCR0CNUSSOuMuVP00W9ODdnN9e7LlT8YmSNcpkm+XYSIvp2OrDaGQcuZv8ZP
-v8ixpedNGNj7HLWBlVjlMWb/qHS/cT6sKodxpQVgYqBi85bwm49IkhdtTneTiWCm
-h5CWS5K6q3TpSEqMAsXAr5XA31hOzw250YoLckgWnOOQC39TvOu90FwcmkKgp35s
-+UhS2GmUTwm1wjVvK4XHQjxHalvdD+tlMnxAsJem19y374zT+mo8lIoUA82U
+MIIEJDCCAwygAwIBAgIUcuOCgtMqHYmnUGyGAk1SwOMGMwAwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAxMjIyMTczMjI5WhcNMjIx
+MjIyMTczMjI5WjB6MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEUMBIGA1UEAwwLVGVzdCBTZXJ2ZXIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxQUMpdGeb59PJ3z0o7L90YFOhRH9Gt9Cb
+p0aNzZXAevwtCUZoxCV5GDxBb8uMyDt6HIS77By2UrtdUXdJSkmuuFQN3dDq3l1k
+ctkFohCezKoj4QRJDyY/tXHPm0pj+benshdOmYYqdXequfgkvryWVBpHJ2XSBkBR
+qMUZ/C6h0YGaDon+5ijcrroB0CNDKMloUc9lFpoU2K7hQOspuZIkeRZ0qFGUTpjw
+D+3IOtatAZK+eOEkjaC7pV6tPv6B/pcy5lOCA9yFta428VJ9BGkkBur6P0L5Yf1m
+WwpF2txQWcgBzLynE7bRXk8Cf3ucoGu4iVR8aFhiurqM6sENl7sVAgMBAAGjgaUw
+gaIwDAYDVR0TAQH/BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwIGCCsGAQUFBwMBMCYGA1UdEQQfMB2GG3NwaWZmZTovL2x5ZnQuY29tL3Rlc3Qt
+dGVhbTAdBgNVHQ4EFgQULbLcv5mKTTxCN93DZ9to+K09McswHwYDVR0jBBgwFoAU
+FOT7oKyqmJfWefbY12LSwnLJQmcwDQYJKoZIhvcNAQELBQADggEBAKze8LJTsFeI
+7z2YZc9A03j8ZLOk/PUhmKNQ3M3xi7/CzAv6iGirXQfOydKWU3xe4yFv27SMXBnp
+q41Fi/ys2MySD9/AJX8h0bVPvaoBJaF3+5xrNzDgIUL3oAWO4VQcXcGwFu8PlaTU
+BnGaSt9ArNcoAkvfMZTReSHykKuL5KQwdkCQ3/GUqkod/N5+icQqPbUo+BrUk48t
+6bmLm7lWr08XT7Bwm3nSas43YgkDiNkW+UOgeWJYol4oPsIAROCaMCmXxT400/9U
+UVKadM6tg2RpQ3KQxSvUFMiqaP0qZ0WFTyJmcrFi9MXaeU9cRrp2o9isvTvCoX6S
+w1P98zAgrnQ=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/san_uri_cert_info.h b/test/extensions/transport_sockets/tls/test_data/san_uri_cert_info.h
index 385217300ecce..de6fbf903826f 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_uri_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/san_uri_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SAN_URI_CERT_HASH[] =
-    "d6d9d488d82f5bc97d30217e0dfede60c30755aba524ad1725a143abb13cb61d";
-constexpr char TEST_SAN_URI_CERT_SPKI[] = "2GHPukh/h5UhhiKCB7wjucRSbb13GEAYXDa+dgc9/Ww=";
-constexpr char TEST_SAN_URI_CERT_SERIAL[] = "b8b5ecc898f2124e";
-constexpr char TEST_SAN_URI_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT";
-constexpr char TEST_SAN_URI_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT";
+    "54b1da6373cc52fb89a6632765f00f7cef5988c4e11442a7f61de465bd413684";
+constexpr char TEST_SAN_URI_CERT_SPKI[] = "LydU1Hc+343w6qaddz8jBQ2kou04bkm+MfpFTSeYOko=";
+constexpr char TEST_SAN_URI_CERT_SERIAL[] = "72e38282d32a1d89a7506c86024d52c0e3063300";
+constexpr char TEST_SAN_URI_CERT_NOT_BEFORE[] = "Dec 22 17:32:29 2020 GMT";
+constexpr char TEST_SAN_URI_CERT_NOT_AFTER[] = "Dec 22 17:32:29 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/san_uri_key.pem b/test/extensions/transport_sockets/tls/test_data/san_uri_key.pem
index 7ef1e0f0d20ea..1d48f6eb63627 100644
--- a/test/extensions/transport_sockets/tls/test_data/san_uri_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/san_uri_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/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert.pem
index 5e22672221ba4..3db24e59d1e19 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert.pem
@@ -1,24 +1,25 @@
 -----BEGIN CERTIFICATE-----
-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
+MIIEIDCCAwigAwIBAgIUQuZmMET9VEMqp4iOjFLCXZtwm24wDQYJKoZIhvcNAQEL
+BQAwejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMjE3MzIyOVoX
+DTIyMTIyMjE3MzIyOVowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3Ju
+aWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNV
+BAsMEEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx/30mlSayH4EJlZN4Ly2aoXlzsDD
+q5aXyUTSWWhq+m9MdsYlQ23Swcy1RcfK/jwTo3yVPdgZ80rHnzGDCmk+cWI1jTVb
+1sAd68vUswGNBpr0qplV3alZKwbnSWodYsngMRPpyTxh6m+8e/ZCqDSDpD+RSs74
+Zohd0VV64P5YrHB0kQZzJ27p1nptKic+JpapUgN3walv+bD5uQjdi/Shkl/3TzxV
+udn8F6/h5vJYS6qa8z6G5sxHNxZQ+Kf82ACkn9+nx5yBJ93e85Ljr5iOhSdZLIyj
+CKjE3Goxb/DDcg0UcVj23TqUvhoyd/I7N2rB0Ycwi9pLGfuQOsOZJq6KGwIDAQAB
+o4GdMIGaMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
+AQUFBwMCBggrBgEFBQcDATAeBgNVHREEFzAVghNzZXJ2ZXIxLmV4YW1wbGUuY29t
+MB0GA1UdDgQWBBQZ2cCREzsNlgzE9nufOTkEmyFnMTAfBgNVHSMEGDAWgBQZ2cCR
+EzsNlgzE9nufOTkEmyFnMTANBgkqhkiG9w0BAQsFAAOCAQEATMA8fjh+EUag9ghV
+2g8zOtAWBOlX0VX8gkv778h03LhLtyQyXDQO1KeDAUUu0TkC9Py0m/2Z9nZBpS1N
+GviGMxsXuEpeRyoB8ucPGQ0P6H9OgYotK3q4yrhXUTuVEa0Uy1/PDZ0lSPalQKnk
+T8Gx0zI8Vd0n5ZCQWiqf7ar29PIRQd610fwDwbRsq1Gj7neP+2C710ZU91uR8zAw
+hu90UcVgyqZuZnRnYEhD8XE7Zg3LRHUr7qqD3di9/GTL/YZJXU4W2R2wDYWKxsEP
+JkMEWIyE5uezWhO39+6fuC4TQQbEsLCqtt4QF0llNmgAEEDuCUqG7cM8F+zdFw1h
+/V0q3A==
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert_info.h
index 0c0d5499b17ae..c6b3fe78a083c 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned2_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SELFSIGNED2_CERT_HASH[] =
-    "bcee619427eb4b994001ba0a9ce1747c1fd1379bbbc5782e91fa6441f9234796";
-constexpr char TEST_SELFSIGNED2_CERT_SPKI[] = "LyjfHYiUvRaKNfD3JqD+0CrsXFhjafaemvNOldi6XII=";
-constexpr char TEST_SELFSIGNED2_CERT_SERIAL[] = "8a4fff0a40245c05";
-constexpr char TEST_SELFSIGNED2_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT";
-constexpr char TEST_SELFSIGNED2_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT";
+    "b0235b2609fb61f6f39601d5cece325f02d0b58b77a6a2c2eb545b773b8b9e15";
+constexpr char TEST_SELFSIGNED2_CERT_SPKI[] = "IbN6Nu0+zJSW4PCpzK8eTMvnNJhyZVAYaR+bEwTI3sA=";
+constexpr char TEST_SELFSIGNED2_CERT_SERIAL[] = "42e6663044fd54432aa7888e8c52c25d9b709b6e";
+constexpr char TEST_SELFSIGNED2_CERT_NOT_BEFORE[] = "Dec 22 17:32:29 2020 GMT";
+constexpr char TEST_SELFSIGNED2_CERT_NOT_AFTER[] = "Dec 22 17:32:29 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert.pem
index 8133c03cff6f5..b8e84eb361e81 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICiDCCAi+gAwIBAgIJAIXg9sOB9Zv4MAoGCCqGSM49BAMCMHoxCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2Nv
-MQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYD
-VQQDDAtUZXN0IFNlcnZlcjAeFw0xODEyMTgwMTUwMzZaFw0yMDEyMTcwMTUwMzZa
-MHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
-YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu
-ZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABKEMoIMnpZUYKQIigecgxm14C/KJeOKTpuNIQNJd+5r6AeiRFfCIxIr/
-XGnOpQwgMAiulq8G06Jrlh0pNXbH+2+jgZ0wgZowDAYDVR0TAQH/BAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB4GA1UdEQQX
-MBWCE3NlcnZlcjEuZXhhbXBsZS5jb20wHQYDVR0OBBYEFNfjrPT7yWDJ9E3l0EAz
-WJricVe0MB8GA1UdIwQYMBaAFNfjrPT7yWDJ9E3l0EAzWJricVe0MAoGCCqGSM49
-BAMCA0cAMEQCIAImK7SCofz+8PS19HsM4K4oz5ZQgIVbPrizk+wT+e8FAiBbudFg
-Z4DloE7T/kA6iycL0GdXxeyH7FaTdEm37iUSyw==
+MIICkzCCAjqgAwIBAgIUDoB9JeWZBg1SGvRd1docIOujrrwwCgYIKoZIzj0EAwIw
+ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
+biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
+ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMjE3MzIzMFoXDTIy
+MTIyMjE3MzIzMFowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
+EEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMFkwEwYHKoZI
+zj0CAQYIKoZIzj0DAQcDQgAEFe6j7azN4AkVDguXu1Xrjc3ZaG0WrJRsgSAr6Jrr
+BvgvfmB2PtMbtclT2JafumW32N0rccdG5WJaO8IN6ASYr6OBnTCBmjAMBgNVHRMB
+Af8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxlLmNvbTAdBgNVHQ4EFgQU9GwQ
+hod8IEbiz52ygfScl0wD0jMwHwYDVR0jBBgwFoAU9GwQhod8IEbiz52ygfScl0wD
+0jMwCgYIKoZIzj0EAwIDRwAwRAIgMEUee56BLzr13ItREUBlSVz/xgRuOK3v16cz
++nBdEPQCIAaQ/iqRuzPtucrifRIDv2UB4qKPYF6UL01Y/RTXJeIX
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert_info.h
index 735d4c17366f8..86e55cf56ae1f 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned2_ecdsa_p256_cert_info.h
@@ -1,8 +1,9 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_HASH[] =
-    "07e98ccb2afb26402e8f050348d6b8b0d3a96f7e15c7b82e855b822f93a8b0b7";
+    "be1db45a4538f8996d7f56e6a3eb2f67ee8c3f49fe8597277d40d72ef4cb7b05";
 constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_SPKI[] =
-    "u9AYA7vPwRIEepCk5VZajz9z2kEUdfNspcuEbUyy8pI=";
-constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_SERIAL[] = "85e0f6c381f59bf8";
-constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_NOT_BEFORE[] = "Dec 18 01:50:36 2018 GMT";
-constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_NOT_AFTER[] = "Dec 17 01:50:36 2020 GMT";
+    "B02479BmscLQdqJ0NvG56Izjb2EZVrbVfpGqJwxnBSM=";
+constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_SERIAL[] =
+    "0e807d25e599060d521af45dd5da1c20eba3aebc";
+constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_NOT_BEFORE[] = "Dec 22 17:32:30 2020 GMT";
+constexpr char TEST_SELFSIGNED2_ECDSA_P256_CERT_NOT_AFTER[] = "Dec 22 17:32:30 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_cert.pem
index f39fe5f44bebc..064c77b490035 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_cert.pem
@@ -1,24 +1,25 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+2RLFUQ==
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_cert_info.h
index e835c01f127f8..0d6c53e0d78a1 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_cert_info.h
@@ -1,7 +1,7 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SELFSIGNED_CERT_HASH[] =
-    "e0ff0a1a75e557c6e328f9f08df438e8e3587f1258953f1cd5fa54087a5d259c";
-constexpr char TEST_SELFSIGNED_CERT_SPKI[] = "LyjfHYiUvRaKNfD3JqD+0CrsXFhjafaemvNOldi6XII=";
-constexpr char TEST_SELFSIGNED_CERT_SERIAL[] = "9cc68cf48fefddee";
-constexpr char TEST_SELFSIGNED_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT";
-constexpr char TEST_SELFSIGNED_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT";
+    "60643294bf3fbd83013d922cfd4da19e872ed13c5082f1b19df1cb81e0dcc8d6";
+constexpr char TEST_SELFSIGNED_CERT_SPKI[] = "IbN6Nu0+zJSW4PCpzK8eTMvnNJhyZVAYaR+bEwTI3sA=";
+constexpr char TEST_SELFSIGNED_CERT_SERIAL[] = "6de3b63628d2c1c266ebdbda94fe1f28de9160ef";
+constexpr char TEST_SELFSIGNED_CERT_NOT_BEFORE[] = "Dec 22 17:32:29 2020 GMT";
+constexpr char TEST_SELFSIGNED_CERT_NOT_AFTER[] = "Dec 22 17:32:29 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert.pem
index 75a3953868776..984b60b57fda7 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICiTCCAi+gAwIBAgIJANeLnxThk82eMAoGCCqGSM49BAMCMHoxCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2Nv
-MQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYD
-VQQDDAtUZXN0IFNlcnZlcjAeFw0xODEyMTgwMTUwMzZaFw0yMDEyMTcwMTUwMzZa
-MHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
-YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu
-ZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjBZMBMGByqGSM49AgEGCCqGSM49
-AwEHA0IABKEMoIMnpZUYKQIigecgxm14C/KJeOKTpuNIQNJd+5r6AeiRFfCIxIr/
-XGnOpQwgMAiulq8G06Jrlh0pNXbH+2+jgZ0wgZowDAYDVR0TAQH/BAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB4GA1UdEQQX
-MBWCE3NlcnZlcjEuZXhhbXBsZS5jb20wHQYDVR0OBBYEFNfjrPT7yWDJ9E3l0EAz
-WJricVe0MB8GA1UdIwQYMBaAFNfjrPT7yWDJ9E3l0EAzWJricVe0MAoGCCqGSM49
-BAMCA0gAMEUCIFvKRILBpYfNNgEFyFHROUh/q3d4eN5MCoSEDIgUALkzAiEAiGaL
-0+E0bqXdDlR1Zki5alAx79LOFlKmF7gUTPkYb1Q=
+MIIClDCCAjqgAwIBAgIUf+C79dPdsRQ3vPr7JCWs1X/Ch1MwCgYIKoZIzj0EAwIw
+ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
+biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
+ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMjE3MzIzMFoXDTIy
+MTIyMjE3MzIzMFowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
+EEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMFkwEwYHKoZI
+zj0CAQYIKoZIzj0DAQcDQgAEFe6j7azN4AkVDguXu1Xrjc3ZaG0WrJRsgSAr6Jrr
+BvgvfmB2PtMbtclT2JafumW32N0rccdG5WJaO8IN6ASYr6OBnTCBmjAMBgNVHRMB
+Af8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
+AwEwHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxlLmNvbTAdBgNVHQ4EFgQU9GwQ
+hod8IEbiz52ygfScl0wD0jMwHwYDVR0jBBgwFoAU9GwQhod8IEbiz52ygfScl0wD
+0jMwCgYIKoZIzj0EAwIDSAAwRQIhAP1spHjxlBmM+u/TcSkTLiJhJxkAnS1Tzqlz
+Rgp8B3GxAiA7fKyhAYgatSn3c7CEUwzx4lLOSJ8TUKx/7G/uI+pFoQ==
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert_info.h
index 4f377e369456e..65a7d8beb444c 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert_info.h
@@ -1,8 +1,9 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_HASH[] =
-    "b25a4cd1b5476248ecc7b082551d176ffa190d63deffbd2795ac032ce9be6cd9";
+    "dc4765f8d667f280572ffb9470cf3e966e2d1561d337d525666864936ee25839";
 constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_SPKI[] =
-    "u9AYA7vPwRIEepCk5VZajz9z2kEUdfNspcuEbUyy8pI=";
-constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_SERIAL[] = "d78b9f14e193cd9e";
-constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_NOT_BEFORE[] = "Dec 18 01:50:36 2018 GMT";
-constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_NOT_AFTER[] = "Dec 17 01:50:36 2020 GMT";
+    "B02479BmscLQdqJ0NvG56Izjb2EZVrbVfpGqJwxnBSM=";
+constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_SERIAL[] =
+    "7fe0bbf5d3ddb11437bcfafb2425acd57fc28753";
+constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_NOT_BEFORE[] = "Dec 22 17:32:30 2020 GMT";
+constexpr char TEST_SELFSIGNED_ECDSA_P256_CERT_NOT_AFTER[] = "Dec 22 17:32:30 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_key.pem
index 5383e2d583d3b..e4dbdf844a85f 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_key.pem
@@ -2,7 +2,7 @@
 BggqhkjOPQMBBw==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIEIpNzP8DDmhXdzmD94FJ0m3Skgri6AFFrTAfozY9slloAoGCCqGSM49
-AwEHoUQDQgAEoQyggyellRgpAiKB5yDGbXgL8ol44pOm40hA0l37mvoB6JEV8IjE
-iv9cac6lDCAwCK6WrwbTomuWHSk1dsf7bw==
+MHcCAQEEIByZFrLdOWqNWg9VWe1hnknKHVJn+0o/rJVs9Go/Y9WcoAoGCCqGSM49
+AwEHoUQDQgAEFe6j7azN4AkVDguXu1Xrjc3ZaG0WrJRsgSAr6JrrBvgvfmB2PtMb
+tclT2JafumW32N0rccdG5WJaO8IN6ASYrw==
 -----END EC PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert.pem
index f14f6939d5b29..a46afaa0e7797 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert.pem
@@ -1,17 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIICxjCCAkygAwIBAgIJAIRQJITMHUDvMAoGCCqGSM49BAMCMHoxCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2Nv
-MQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQwEgYD
-VQQDDAtUZXN0IFNlcnZlcjAeFw0xODEyMTgwMTUwMzdaFw0yMDEyMTcwMTUwMzda
-MHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
-YW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2lu
-ZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjB2MBAGByqGSM49AgEGBSuBBAAi
-A2IABF7JQIdlG6kokxHmDDl4ErPaGJrNtPqsuLjLa6PhyNY0lr7pTUvleKe2Z2ms
-ptT4ruvKHwmeT8YfqWChOtoOPGhiln+PGxr470EccUPyQO/5tfvZQM/rjCRgnq0k
-h3FbIqOBnTCBmjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxl
-LmNvbTAdBgNVHQ4EFgQUC65i7p82P66KQxdSourZrOZTngswHwYDVR0jBBgwFoAU
-C65i7p82P66KQxdSourZrOZTngswCgYIKoZIzj0EAwIDaAAwZQIwShjMqZ8g6ZJ0
-t2x0KuX3wy424jiPYAkUDwmjbuO1gjblH6VQwtkWfmDdlubL7+JuAjEAwWFHYzU2
-RM80NkEPqN/G5CS7b2JB6UM+bqsACYFWimH1XRu7OB9fHdBNn3gCGbdu
+MIIC0jCCAlegAwIBAgIUEkhAb0NzidmQP3FKwDbOutxf1vUwCgYIKoZIzj0EAwIw
+ejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNh
+biBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5naW5l
+ZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMjE3MzIzMFoXDTIy
+MTIyMjE3MzIzMFowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
+EEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMHYwEAYHKoZI
+zj0CAQYFK4EEACIDYgAEmH3BdoFiAHI5T8rmJ9WMROCgrUnbr0M5jqhlNGEpmS1E
+R0y2F7MM+OV0ftkf7/nZR41ZYGansOPLvqqjoArvEeKn+BRFPmubjMOHcLYdg/ff
+RKG8+ZzTuV9hoai8BT3po4GdMIGaMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXg
+MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAeBgNVHREEFzAVghNzZXJ2
+ZXIxLmV4YW1wbGUuY29tMB0GA1UdDgQWBBRbPoEvXs+bSOhen02hJJlAlxTkPDAf
+BgNVHSMEGDAWgBRbPoEvXs+bSOhen02hJJlAlxTkPDAKBggqhkjOPQQDAgNpADBm
+AjEAgOdHk2QfSwzmgYaK5UozkgmNevtOZvMPPq9Y4fzjGsRGBFFFkDTcbjc3q5oY
+JSb/AjEAv/QE+gE2lbltYygUg2b1kJbtthW5SqIRCHT4Nrn4iy6+L8AcGRfx7b0O
+cgyNhWgp
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert_info.h
index c5c21f2851b10..327885d6ea785 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_cert_info.h
@@ -1,8 +1,9 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_HASH[] =
-    "a3bd965bd9251877d405c422bf53de1be1201897577d739dbeb6af012b381127";
+    "c3127df78091253b819ed80586cf3036feb76ed99318918e3bff57b7e074cfe3";
 constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_SPKI[] =
-    "wAE46OF5e0PaMbCmGhno7LAJJ2vcYKw6pKDjEslHa/A=";
-constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_SERIAL[] = "84502484cc1d40ef";
-constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_NOT_BEFORE[] = "Dec 18 01:50:37 2018 GMT";
-constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_NOT_AFTER[] = "Dec 17 01:50:37 2020 GMT";
+    "+JIXnf10gCIJ290WDnAMuMXJsij94jH/f6WhUPCiX40=";
+constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_SERIAL[] =
+    "1248406f437389d9903f714ac036cebadc5fd6f5";
+constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_NOT_BEFORE[] = "Dec 22 17:32:30 2020 GMT";
+constexpr char TEST_SELFSIGNED_ECDSA_P384_CERT_NOT_AFTER[] = "Dec 22 17:32:30 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_key.pem
index d7919ed4d0706..1078d73df8206 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p384_key.pem
@@ -2,8 +2,8 @@
 BgUrgQQAIg==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDDZb76UDDZkUSbYbtzy1M4PNEhJP2E5lSZLejI45LFUtZLEZChGg3L1
-WvpvW9lREs2gBwYFK4EEACKhZANiAAReyUCHZRupKJMR5gw5eBKz2hiazbT6rLi4
-y2uj4cjWNJa+6U1L5XintmdprKbU+K7ryh8Jnk/GH6lgoTraDjxoYpZ/jxsa+O9B
-HHFD8kDv+bX72UDP64wkYJ6tJIdxWyI=
+MIGkAgEBBDApIBAhBqzIlKS6WhKViZ76+jR4El3B3lf4GOI+fvtMdeONy5Pjzg/J
+Pg3eScSg+UGgBwYFK4EEACKhZANiAASYfcF2gWIAcjlPyuYn1YxE4KCtSduvQzmO
+qGU0YSmZLURHTLYXswz45XR+2R/v+dlHjVlgZqew48u+qqOgCu8R4qf4FEU+a5uM
+w4dwth2D999Eobz5nNO5X2GhqLwFPek=
 -----END EC PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_key.pem
index ed0b4cf65fa7c..52179e17ade76 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_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/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert.pem
index 46ceda473748c..847ef4418a03f 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert.pem
@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDEDCCAnmgAwIBAgIJAPYfXPb9+5WKMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQw
-EgYDVQQDDAtUZXN0IFNlcnZlcjAeFw0xODEyMTgwMTUwMzVaFw0yMDEyMTcwMTUw
-MzVaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
-DA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVu
-Z2luZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEA6sA8rHOCLpm4nnUjl9PyLMVNYd4P49dUqyuV3WElTbqp8QC7
-YcjduD+zEOFEfqrCEIhcttqO3uUVbY1Ci2STE+6xQYsjDz7dp3+b4q5KKoduZ0u4
-5L2DkbSu/dNEnD/jkRTzCyNb0fJABZ0HXtxJp8/sXpzyNihOtOikVB65Oa8CAwEA
-AaOBnTCBmjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHgYDVR0RBBcwFYITc2VydmVyMS5leGFtcGxlLmNv
-bTAdBgNVHQ4EFgQUl3xcLGC06eau1tbBSbb5sV5oncAwHwYDVR0jBBgwFoAUl3xc
-LGC06eau1tbBSbb5sV5oncAwDQYJKoZIhvcNAQELBQADgYEAZ8wN/zKWSg6AUYKb
-BfySlcsI/sCmarK24maWZmGP/8pH5cr8kT4eSpnpZeh9/WFhGw1H6r6jDsci/Dh+
-UlIjIWgsXP2NLskQOJmcEMLacP3qDClO/XPAbQW8MVr1XtDU1OpK8I7k9Xi900Ab
-hYF9sN0Lmm+hDHJNMm8PWH3nD+c=
+MIIDGzCCAoSgAwIBAgIUbxy2RFB+O1AqLasq9qLJpcnZ2a4wDQYJKoZIhvcNAQEL
+BQAwejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMjE3MzIyOVoX
+DTIyMTIyMjE3MzIyOVowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3Ju
+aWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNV
+BAsMEEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMODwiNA8tL1yw/bvJTswn1mVdspg4tYFT
+2/y3P6LZEBKjAV/T5AwSJMNxp9T+LGlRDOstB1bVbrniSvUBewyAPVk2pUfJFsPB
+UfnzMXJMzB+PBNYaYtFdzXvzRQF2hJ1p6qB7gSr01VvX308NEgfoJyv/uFgM/xRb
+AVOLmc6eFwIDAQABo4GdMIGaMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgXgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAeBgNVHREEFzAVghNzZXJ2ZXIx
+LmV4YW1wbGUuY29tMB0GA1UdDgQWBBQwKvY342+WFeyKWcIjUwWPq3Q0VzAfBgNV
+HSMEGDAWgBQwKvY342+WFeyKWcIjUwWPq3Q0VzANBgkqhkiG9w0BAQsFAAOBgQCo
+KdsuLumVOwd+dOw2HOXvwIeXpS/Gl9f8UarDbWuRfTw9cqoN1pd38LLNrT3bOM/a
+7JhrIANsfKkIyAEanFVVnteGJsmkbpLOxbnCS74HA95JFuuMOJWPe9BF77ezkFzX
+4Lfs6tJqR9BEcPNHQ511gewW50A8VRxe4FZgC17ECQ==
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert_info.h
index d32aa9ddec76e..e00f7391fb0ec 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_cert_info.h
@@ -1,8 +1,8 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SELFSIGNED_RSA_1024_CERT_HASH[] =
-    "8e6062d7c3b26ff8918d2e80b68bba4cf1fdc33a07a642c63f689a72c0ae2e1b";
+    "6ff715e7ae7855942737eec0d0dc0af87c4f0f52e96899c7b5afc6a3d38f4d95";
 constexpr char TEST_SELFSIGNED_RSA_1024_CERT_SPKI[] =
-    "mNhxspYLv1WBrfZjUGoO32jg/FcurL6q9i1RXCzawoU=";
-constexpr char TEST_SELFSIGNED_RSA_1024_CERT_SERIAL[] = "f61f5cf6fdfb958a";
-constexpr char TEST_SELFSIGNED_RSA_1024_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT";
-constexpr char TEST_SELFSIGNED_RSA_1024_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT";
+    "zJz0e3SpojEitMjkld8zmryCLOsKFCOxdjhtjpNdePg=";
+constexpr char TEST_SELFSIGNED_RSA_1024_CERT_SERIAL[] = "6f1cb644507e3b502a2dab2af6a2c9a5c9d9d9ae";
+constexpr char TEST_SELFSIGNED_RSA_1024_CERT_NOT_BEFORE[] = "Dec 22 17:32:29 2020 GMT";
+constexpr char TEST_SELFSIGNED_RSA_1024_CERT_NOT_AFTER[] = "Dec 22 17:32:29 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_key.pem
index 7f6af1e238c22..cf9731038802e 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_1024_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDqwDysc4IumbiedSOX0/IsxU1h3g/j11SrK5XdYSVNuqnxALth
-yN24P7MQ4UR+qsIQiFy22o7e5RVtjUKLZJMT7rFBiyMPPt2nf5virkoqh25nS7jk
-vYORtK7900ScP+ORFPMLI1vR8kAFnQde3Emnz+xenPI2KE606KRUHrk5rwIDAQAB
-AoGAYNeFMC9GmSrZOqVgVZYd5dJPJfyR2ZBPYX3NiVI2LWbADKgcpS5UKVo96MzF
-kOuou2FFvjlTjyg6OsN3nEGVWm1oxqVqcwwmjPC0gAXfVQtrE7YGV0nnlPm5W3Fi
-YICw7vcHxPKugsvF9d2FXqTopCk4uijQh0Ejji3Iu2t/a4ECQQD4zA2PdffwNQaN
-ueSAXuio/k8PG40nXWY3DHgeI6RNrfFoBMWUb02l+x0lKyk3H7ED2J2kuxQC8Luz
-26GoLnHxAkEA8YwU543NMsRrPprRbRA75XtGsxHL8AAT631Hmo+VtMMNx5tmhksd
-mJS75MwSs9QXIAnfyRxa1GaT4HIaPVLFnwJACCWWZBY20jTKTCXEJ7fz4mTBbfs2
-+g0C5daQsFv2a1zAxOkzFxM19bNtVuQ860MsZrXXI6fElfwQCWmtt3Yd4QJBAOH3
-yH6u266IrkONFirPqxkN8KAJIB5QFFKTiu7/MHBAoZ2AtbMghnl9eyGaAE0XNuMU
-GbTMv/RAWkr4s692xcUCQQCrIWkSuClKp8g+FQo6RoAAuaHJp4eJhp7dzwJ/sdZe
-FRkEwXto4RKMmw3gJFtkP3GflBC18rG8A+cRmgWIoghF
+MIICXgIBAAKBgQDMODwiNA8tL1yw/bvJTswn1mVdspg4tYFT2/y3P6LZEBKjAV/T
+5AwSJMNxp9T+LGlRDOstB1bVbrniSvUBewyAPVk2pUfJFsPBUfnzMXJMzB+PBNYa
+YtFdzXvzRQF2hJ1p6qB7gSr01VvX308NEgfoJyv/uFgM/xRbAVOLmc6eFwIDAQAB
+AoGAMNEYfsyW/CQgMibVJs/xOWykmntAq/2nRpaFmIBbuyt+aPzBHXOb9xJWreqC
+naecHUXLSd5BQY/QW2mzm4EAgZGkLCPf8Jcaq07KlFk7FVGsEbyMa8YWDBjORJfB
+nqUmmGPHdqT9JNW51tysdydWGGPPvKHA0SJRtSUhdfsEhQECQQDzBkgrz//+gYlQ
+s3QYZUXHMg0r5IK+sXOM2ItQSKlluZxQhNshwGIT3Xowk2H6hc8vwIyW1nAdEcAl
+Y0mf263XAkEA1x+PAkZDqzXK9AIbShVilSG+O++HMZOKtVczb2hUvUfJHk9bA3wP
+pzTBhLb3BBMUlq2fwB9KRrkcfvKXugwJwQJBAJqGSQeKpyRlqzEkGdKVOkwROCzL
+jJLB9E3/Nn3i5csnvQu5njgUwogNEG+olukbggTD8uDKEtl4+usK+bpqjVsCQQDA
+t5XvDLFcdPFfTW/TG3tYbIU2vmuX3zxZHkiG2qlndCLZU3AOnBqNyXZABYUfElTU
+c7B0ddOdrgG4PG3ujxBBAkEAr4OFDql/6S74YS52qDJ8u1FvoKFoTOySvVCxoLMe
+HnouqANNJn9sKQEB8wp2ttxcBIi8htGCe3+t/3DfBkD7oQ==
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert.pem
index 6026042c40fe1..60c980579e9bb 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert.pem
@@ -1,30 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFFTCCA32gAwIBAgIJAJ3ABwLFAAOqMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVuZ2luZWVyaW5nMRQw
-EgYDVQQDDAtUZXN0IFNlcnZlcjAeFw0xODEyMTgwMTUwMzVaFw0yMDEyMTcwMTUw
-MzVaMHoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH
-DA1TYW4gRnJhbmNpc2NvMQ0wCwYDVQQKDARMeWZ0MRkwFwYDVQQLDBBMeWZ0IEVu
-Z2luZWVyaW5nMRQwEgYDVQQDDAtUZXN0IFNlcnZlcjCCAaIwDQYJKoZIhvcNAQEB
-BQADggGPADCCAYoCggGBAJSkbWbJlCMVxNeTC8k0q8J49rPFaiOq6uJqMzCmG8Wi
-XfZcCprERsybeOqJvrcCfMqJIFdflkzZctw4A7wefHYdCNSZ5PdZvH2gPQjgf10t
-Y5EaQjETBgvKX8SOdY9v6Y68ZLqWWOjVdLzGbs6GHW++OXZWJJTOSTHoyZUS8Qu1
-qz2E6yypRn2qGxLc/Gv9IQyI6+UFxi2riJ2vWS6o41eFLqHXvCmViFzeN9GkgfT1
-+9yLZQn3f2GdNOZUDT9aWnKbFKGGirGEpWd+yG6zzQZd9sRe+NkNRPMvwlxN76fP
-6aqcgDcDRFz6w4VUhojgYJnFfZpWNltwatoL1tz6l+T/ZR7FiSx4UIIjj3L1HB4C
-gin2frfTSECjOAjSIsBOcuUBvzoaXJDabclxR8jT6hm12Bw6yMqNuoDbol15IuOw
-gkc8qMzb8G7aKbz+tYLiybPFXIQ85otOQ26I6p0gi9uxNdrlon5/jD9U4xroiF23
-azzwKotN095RiafQk1BEvwIDAQABo4GdMIGaMAwGA1UdEwEB/wQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAeBgNVHREEFzAV
-ghNzZXJ2ZXIxLmV4YW1wbGUuY29tMB0GA1UdDgQWBBQtDdzQQZS+yFQfCa+aedlL
-qihYPjAfBgNVHSMEGDAWgBQtDdzQQZS+yFQfCa+aedlLqihYPjANBgkqhkiG9w0B
-AQsFAAOCAYEADHXcdfXIgp5CrrQ22TaNJ4xarPVuO0eEJNW/4I6fe3ppjhAztgv6
-X3zdMc39xYwrRz/f17gM5AhFt3fspL2lKHKi42J5Vsc6V07uqQi5ElRgkUSkrm0u
-4LEQpc121gefTIOirO0BGtt6niuw+AuhRxH58LDdTai+d8zwjqtgSRYXmwOxMHeg
-3rTpKzjbMRwTbRjxJENrCK9cOjNAkHkM2+Y2IANROujQpyDCFbfDBlrtEz98k4/y
-tU9v9w+tUYeuE6xSlbdGODhwlbSwHTAUtYetv+FXP+BasNp0E23FmvYxsBVGxcjT
-W5BkJYkhV5H1v7hmFUwnHgx/GARk+Yzj/T5p0r4kG0MdtxGTyDDzG1nYuijowyko
-JZ0iFc151RD2Co5gISQgkDQ30wf2vuvKuc/MF/JD7OMX2rK7F1oo+lYMxl5j4jCA
-rflDdeLg1N6ds2nCcSW2sjHONLsFJc19Zgtsda3pDZe7DjnGsg1mqFuJQ4wj2Bv/
-awGDvfaSWlSk
+MIIFIDCCA4igAwIBAgIUdggVonpxyJegbHVIKaQyvn4hhaEwDQYJKoZIhvcNAQEL
+BQAwejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMB4XDTIwMTIyMjE3MzIyOVoX
+DTIyMTIyMjE3MzIyOVowejELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3Ju
+aWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNV
+BAsMEEx5ZnQgRW5naW5lZXJpbmcxFDASBgNVBAMMC1Rlc3QgU2VydmVyMIIBojAN
+BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA78pSuZo4GexCx1jxmYuUhfZ6oyGa
+SZ0NMep0NWBPWjHDSCA2W8IRM1O+xttdk7d2JePogYX8SjEJAd+r0btd40tWI7JP
+qAkO2VHAJyaxCTugGWHLrjwDSolt0WVD5yz1vUidffmqcy6vZU1NLiSyMDIfwW9H
+47yc1zszNplgCwbdaVmeEYold/IM5xMn4zWOyMBveqgc+ris+JoqnL6gTOBdYQ8x
+uyIC+qEMeidMbxjvIzfQU1ggsZEHwKWjxhad35zxKmJ0ASs7sy80sjoacr4g5FId
+Bs9vW8+QVQnSanxjUP+NaAc1wgO+/Le9dpuyjLztMEEKku34Qnak+W+OEClsm2KA
+NoTkAn44K1iDErCVHaqHLpD0WIrDOI9N+KQaRJ50VbIs9MUv1AlYtFCfKxwwqmUZ
+x7FTye1WMYgnMBw79rH9Ew08HobNijoCsrq+tDq72cQ5Uk1dyJ0v4Y5z7d0lBho9
+9eut/ISvKeLi12w2lRw1Dm7ZYl4rL/dUzQonAgMBAAGjgZ0wgZowDAYDVR0TAQH/
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MB4GA1UdEQQXMBWCE3NlcnZlcjEuZXhhbXBsZS5jb20wHQYDVR0OBBYEFJ8pSKw0
+ZtE3UrfJO9eD/g1F1OACMB8GA1UdIwQYMBaAFJ8pSKw0ZtE3UrfJO9eD/g1F1OAC
+MA0GCSqGSIb3DQEBCwUAA4IBgQB9QCdSJSMFnABRfnRSCCZn78r2wZTgJ6Lc1MgE
++koSfpguzWLDfyKlGfmPRSwsqA9HpZ9EHpwrdphcIobmgk3QP5eGnuam7xQHoTtQ
+LEfCGQoyDNXfseazh94zRdP/haYwpaXIEAKO1RSYEyrqF+DdTqVn4E3oWezD9D1m
+PfNXXjdns6irryRrQb2dWJaUvKnpRSHrQ7TAFObDSy8yBgCOPV6gb1E5RqguqMYV
+j2taayvyNYB0muU1VpnekRf6HbnAmiKogwYSo8tD7JdiVsVCXIqM2WkN75OlrYHl
+9ny4qYm9VRBn6Am5MMJK2XVhdxsHhP8XTzzGRNcSFWXPOQQjGSpLADRUbyeWYPAF
+00MPABXZ5vxOhzOFfHobI8Sv8s84R30COVEaLkXc3+GvZRKehZVZv6cGTrsMbEV/
++zczXRkS5HO2HULLE27ER1Xb9Q/Y50U8iDe/7h3sNQiu/lacrKQk77da1XWaLTH1
+GS1dwxrcIq+2bFc+Fbvoduw6UNg=
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert_info.h
index dbe291d11f93b..62b2a122fbbed 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_cert_info.h
@@ -1,8 +1,8 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SELFSIGNED_RSA_3072_CERT_HASH[] =
-    "bfcd3b22aeb62b29eb9297c9ce32d5ebe2f9d1a8c0b99fea1be861591063e44d";
+    "24408133497594a73bb32e4eceffaa873496ac507b423b0a15c5e425a07dc62a";
 constexpr char TEST_SELFSIGNED_RSA_3072_CERT_SPKI[] =
-    "gvALM/Elunobd6QO9sLrXmgrRzyTDwEQ6t4CkxolWQk=";
-constexpr char TEST_SELFSIGNED_RSA_3072_CERT_SERIAL[] = "9dc00702c50003aa";
-constexpr char TEST_SELFSIGNED_RSA_3072_CERT_NOT_BEFORE[] = "Dec 18 01:50:35 2018 GMT";
-constexpr char TEST_SELFSIGNED_RSA_3072_CERT_NOT_AFTER[] = "Dec 17 01:50:35 2020 GMT";
+    "BeNY8hGFqhS4bOCn85FI6bzz4LV2Ft65TOuoaKYM+kU=";
+constexpr char TEST_SELFSIGNED_RSA_3072_CERT_SERIAL[] = "760815a27a71c897a06c754829a432be7e2185a1";
+constexpr char TEST_SELFSIGNED_RSA_3072_CERT_NOT_BEFORE[] = "Dec 22 17:32:29 2020 GMT";
+constexpr char TEST_SELFSIGNED_RSA_3072_CERT_NOT_AFTER[] = "Dec 22 17:32:29 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_key.pem
index 90c23a67e5761..43d77ac190f63 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_3072_key.pem
@@ -1,39 +1,39 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert.pem
index 75d36011535d7..8f97cf533e3de 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert.pem
@@ -1,35 +1,35 @@
 -----BEGIN CERTIFICATE-----
-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
-YZwiDzQDoFXvMi6Gn93GzKBq1waX7ZcPgA==
+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
 -----END CERTIFICATE-----
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert_info.h b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert_info.h
index c2d819fb555d0..eed50bcc633a1 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert_info.h
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_cert_info.h
@@ -1,8 +1,8 @@
 // NOLINT(namespace-envoy)
 constexpr char TEST_SELFSIGNED_RSA_4096_CERT_HASH[] =
-    "3476ca722220f05354124768a1d22e8a25c61cb6bc01762a3b5fe91118216105";
+    "5c6fb5a93cd11f7ba862b5a7070f9131f3e80fd4613b3349081b81833ec3f318";
 constexpr char TEST_SELFSIGNED_RSA_4096_CERT_SPKI[] =
-    "Qwf0JDO0wcgac+78OUh0qN1sfYkcxA6cNa5sJVPZ/Jw=";
-constexpr char TEST_SELFSIGNED_RSA_4096_CERT_SERIAL[] = "c027b7d133d39815";
-constexpr char TEST_SELFSIGNED_RSA_4096_CERT_NOT_BEFORE[] = "Dec 18 01:50:36 2018 GMT";
-constexpr char TEST_SELFSIGNED_RSA_4096_CERT_NOT_AFTER[] = "Dec 17 01:50:36 2020 GMT";
+    "JySkPc+4oLyaWNfCpUIHH7s7Dg/2c24ue4VovPGnLeU=";
+constexpr char TEST_SELFSIGNED_RSA_4096_CERT_SERIAL[] = "4c8f77b1fa75678f151c5e6eac40dc182513fd88";
+constexpr char TEST_SELFSIGNED_RSA_4096_CERT_NOT_BEFORE[] = "Dec 22 17:32:30 2020 GMT";
+constexpr char TEST_SELFSIGNED_RSA_4096_CERT_NOT_AFTER[] = "Dec 22 17:32:30 2022 GMT";
diff --git a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_key.pem b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_key.pem
index 0582ce92be07d..911083f96bf10 100644
--- a/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_key.pem
+++ b/test/extensions/transport_sockets/tls/test_data/selfsigned_rsa_4096_key.pem
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/test/extensions/transport_sockets/tls/test_data/ticket_key_a b/test/extensions/transport_sockets/tls/test_data/ticket_key_a
index 86c8213aecffd..d5a1b86910894 100644
Binary files a/test/extensions/transport_sockets/tls/test_data/ticket_key_a and b/test/extensions/transport_sockets/tls/test_data/ticket_key_a differ
diff --git a/test/extensions/transport_sockets/tls/test_data/ticket_key_b b/test/extensions/transport_sockets/tls/test_data/ticket_key_b
index 22182f25d0eca..e5eca833f21d4 100644
--- a/test/extensions/transport_sockets/tls/test_data/ticket_key_b
+++ b/test/extensions/transport_sockets/tls/test_data/ticket_key_b
@@ -1,2 +1,2 @@
-��
-�^�
�UI���_LEN��{������E��<t;����!	�7��,I#/�*��������:��i�`����>N�D�
\ No newline at end of file
+�#H��c|���l��
+�č �M�����Ê)*k<
yT��7`���U�UI�����;�32J__u�xr��@��=׿'h��,�
\ No newline at end of file
diff --git a/test/extensions/transport_sockets/tls/test_data/ticket_key_wrong_len b/test/extensions/transport_sockets/tls/test_data/ticket_key_wrong_len
index 84d6266d1fd18..a122b83e6f009 100644
--- a/test/extensions/transport_sockets/tls/test_data/ticket_key_wrong_len
+++ b/test/extensions/transport_sockets/tls/test_data/ticket_key_wrong_len
@@ -1,2 +1 @@
-�	g��jS����� k�Oh0��f�&�־�cr幒���
-CJ=���h���Ɏ�yV������[݈��AO�5CS��
\ No newline at end of file
+�h��֪x�֘�8��G�
�G���yb�'O�B��j`�wny��݄w�������).��֊=1��`�~��w��<k�
\ No newline at end of file