Fixes grpc tests on Windows

test/common/grpc/BUILD

@@ -163,8 +163,6 @@ envoy_cc_test_library(
 envoy_cc_test(
     name = "grpc_client_integration_test",
     srcs = ["grpc_client_integration_test.cc"],
-    # Fails on windows; Connection is terminated early testing BasicStream/IPv4_EnvoyGrpc
-    tags = ["fails_on_windows"],
     deps = [
         ":grpc_client_integration_test_harness_lib",
         "//source/common/grpc:async_client_lib",

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==
+MIID3TCCAsWgAwIBAgIUI4H0bTbm5hcHaXfaE6CHEQXUSJcwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAwODAxMTYzODI3WhcNMjIw
+ODAxMTYzODI3WjB2MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEW
+MBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwETHlmdDEZMBcGA1UECwwQ
+THlmdCBFbmdpbmVlcmluZzEQMA4GA1UEAwwHVGVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKakQXyJijvdF+Su5EE+ABo8BbTMq7fhGstghZjj
+/MPPLdR0pnat2xpUEMf6zrYMJWJNwgz7TGNqhUCZqUKBbOZ+C7VymL3OgG2GsmTW
+273wbi+cS6isVzRQ23EBGMO0xRZjy7GaKbIwdbutAp0zSaKNt+nnRciuhLJ75Nxw
+bwRVudmous21l0FHQg5omWb52gU/DKlTU2rzT0A/z9RoyhUH7z9oa6DB7ZJpewxH
+J/8CjHoC4rbVnB6jDtEKgfpiVPKlqHHTrTbWAfp0DcTMvSNts8o0QAR2DSJ81nkQ
+uvb3A9Dw5GT4IqN0SBuNEwGU7Avarwg+11MlqFAgi3OVgisCAwEAAaNjMGEwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFKco985YMDUX
+9CtobJU4RcOou8DMMB8GA1UdIwQYMBaAFKco985YMDUX9CtobJU4RcOou8DMMA0G
+CSqGSIb3DQEBCwUAA4IBAQCX9SPhq4g4Yno02sKpcdfFi6F3jVWl62MtW55nifdw
+eIuQrLgusRebZPkrA0GTeOwvUW7HroaCvj80JzFhZS40AEEWs/tkXLg2Ql54GVYs
+NfvMgSHXtC319oKOmzW8r5XUgj73Udqh/pBXmDJ7lpb+l3qQEdbrqkHNHI5tEJgr
+gcv1aVKfYM21A6lKj7CPujI+cDlAXJ5IsvHbhq4q9cor/Kxz3J2hgbe/nKbJzfvt
+AiOTPM8SdvWw34JcorFAzCcTUhja9WNtQndOPzaEiwCGroS3dYGBH9jgtkrgFTDY
+r7WS1BZb8EO/nznvLB5fMf6fnIET2HL8Cyjk1ru8fArt
 -----END CERTIFICATE-----

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-----

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==
+MIIDpDCCAoygAwIBAgIUX2tyG9Y9qo7PLe4EvxS+AAZDo6AwDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAwODAxMTYzODI5WhcNMjIw
+ODAxMTYzODI5WjCBqDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
+EEx5ZnQgRW5naW5lZXJpbmcxGzAZBgNVBAMMElRlc3QgRnJvbnRlbmQgVGVhbTEl
+MCMGCSqGSIb3DQEJARYWZnJvbnRlbmQtdGVhbUBseWZ0LmNvbTBZMBMGByqGSM49
+AgEGCCqGSM49AwEHA0IABE0E27XIQxxbDmyeAFTLLpqDQJwKeE6ZFij9EArXE3ZO
++/o76IMaQlq276HHn3rxvoTSoEiv9tn+GCc+O8ZoTvWjgcEwgb4wDAYDVR0TAQH/
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MEIGA1UdEQQ7MDmGH3NwaWZmZTovL2x5ZnQuY29tL2Zyb250ZW5kLXRlYW2CCGx5
+ZnQuY29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFHQikscEyUh4kKJR/kKQZaJt
+JM1nMB8GA1UdIwQYMBaAFKco985YMDUX9CtobJU4RcOou8DMMA0GCSqGSIb3DQEB
+CwUAA4IBAQCVc5N9YaSGe1Ut1Mj4VxS/MHVMH0EZbhvBjx1rJSkVgrq9P8aq24n+
+xgCqmS7F0fBP44qRrZkn+Dtyp6K9HyZ5jKyhPphsw2THSlvHVxTFH9LmNMM4QwTc
+O6Zuiqzg+62fLmvPi55YE9EBowZIBJipq7kLAKOw0ewDMtGv6oCXJkvXU+M0eHUx
+z0G8OPC0/7sf2s8+ySL39tE/4MxlkqLvpLYoj9SwWRB/KR0uWqAiB52BYkYhPlfM
+KirDUSjXpzluBHLaw+Zxtm37vGSOHadgnE/p/uGquezqljzZCgp8oG0hndeYB5ER
+pIW1A/hSy6CFWtQjDM5YRiNgCHkscYBg
 -----END CERTIFICATE-----

test/config/integration/certs/client_ecdsacert_hash.h

@@ -1,3 +1,2 @@
 // 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[] = "9F:47:DE:D5:66:77:23:6A:C1:CE:26:16:5E:ED:BD:27:9A:21:04:65:54:25:B4:C5:A8:9C:5B:37:8C:7B:8F:82";

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==
+MHcCAQEEIEkHDq+jSlyC9Xa5atjpJJxyVHQCPMgOb6OqWxGEWGPGoAoGCCqGSM49
+AwEHoUQDQgAETQTbtchDHFsObJ4AVMsumoNAnAp4TpkWKP0QCtcTdk77+jvogxpC
+WrbvocefevG+hNKgSK/22f4YJz47xmhO9Q==
 -----END EC PRIVATE KEY-----

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
+MIIEbzCCA1egAwIBAgIUX2tyG9Y9qo7PLe4EvxS+AAZDo58wDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAwODAxMTYzODI4WhcNMjIw
+ODAxMTYzODI4WjCBqDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
+EEx5ZnQgRW5naW5lZXJpbmcxGzAZBgNVBAMMElRlc3QgRnJvbnRlbmQgVGVhbTEl
+MCMGCSqGSIb3DQEJARYWZnJvbnRlbmQtdGVhbUBseWZ0LmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALJ+gXofpvNLvoAT3Nb+eWKS9mqjt3GsHXTD
+CSyKqBGAbsAuLAx0SM7uL9I8P6GClRr5ZCM76hcTiGzPASYI0QtQ1Vg35485qUNq
+nn4Qf9CTbsphXomr7X9fz93LqrVMpOkQI2mt7BmIsoDmqKx0Z+pI529zFnreFDXQ
+OeKH1ZA6B/w77KHs90q/uf5jNySL0WKF/u4/5eqzYZ0JnBxeeFrL/WXHBaiDV0TJ
++KgvBpnuR6mCXtyhfi+mDI0tnl1HfB1WvENoMB73IBUcUoyH0LE28jyZG49od2AF
+jEPncLef/DAjQzyXAcTOFY+O36a6ewEIxpAOLlQTHDd6k+KvYYUCAwEAAaOBwTCB
+vjAMBgNVHRMBAf8EAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
+AgYIKwYBBQUHAwEwQgYDVR0RBDswOYYfc3BpZmZlOi8vbHlmdC5jb20vZnJvbnRl
+bmQtdGVhbYIIbHlmdC5jb22CDHd3dy5seWZ0LmNvbTAdBgNVHQ4EFgQUEQs6ou2o
+mfvRpZJmKWp/LewPpwMwHwYDVR0jBBgwFoAUpyj3zlgwNRf0K2hslThFw6i7wMww
+DQYJKoZIhvcNAQELBQADggEBAHF/pBj0rPplN9IbW9LRDT4V7ZTAbHYhDFxt6iHq
+wKhirk2jbABkY6ViZRs05L6BzXM1KRm+eJheilqq9dzxcVal0cvDyXsAwP9+6bKe
+EUhN7S1BBeOlWB5SepVxz65Usz4y9Aaa7AwOGRKnHeOThrw9Mt/1ypsRR2okOriN
++HiLEJUtQb2UXGkBXvnSO4RFQAIwSGxkTOiJRFapQlq4lI1Vsbrga+VScEK2hAHG
+4j792+xygObfEXYelv5CkydkiGr73NLm1gML+xruXfdKzuJZ++Kjo40yUY01itYJ
+lniluKiiETYfaSW7G8JdX5guLsx9a/NR8BYLQ4sdKsVTtts=
 -----END CERTIFICATE-----

test/config/integration/certs/clientcert_hash.h

@@ -1,3 +1,2 @@
 // 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[] = "11:ED:3B:74:D0:BF:7A:AA:C4:AA:13:E8:24:5D:1B:4B:D4:85:90:A7:52:24:E0:3B:B9:90:15:E0:50:72:B1:F0";

test/config/integration/certs/clientkey.pem

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAqLi5RmzH6TleUof821DaOhh84aQdUP1Ksc5HZoHReLc5t8PN
-0KpGtv0OEeP14t4Jm1JbM38NgMfKLiGz5ceZv9f8rb1FTnMr5LLvmnvdlj+tp7pC
-90Sy7eHLb0ogNIvRXhazZrjPkf3EnTH/bZdtIXi9v24ApiJTa+ovijLGUJVptxkZ
-2q34fEVsMs6lQyy07zjvofY8R3ympzdQcCJtEWB0YMX8noXpeGr+rfcbMpROHbRr
-5OAzu2jvfCHzbZ+qx8riGNoPFqeDMG7PWfrl0gnPPzUwjpvRkrxtoSUjCHanZxEy
-3+Xk4kVAdxReHpd51zYTkxa9IgMnS+2yGKpKawIDAQABAoIBAA1Ivg21cugCBFMr
-MdVywDviwbJiYYyG5OKrAyQnBH8krf6yA/px7a9qrTjrYejC4q7ABT5AuqdxE5Ie
-RTPKS2i3cMWdKV/L4aDYFdVr+z5hNSMHn04oso3YQVQ52d9JQurNjsJ/upgcCub1
-kM7oJUeFYis4VgS+nyLYBXY0GTku6aheM/+Z0xTEvIc3Cfzb94aCqnGwHe+TvxN0
-zCKhm4bUO4HE5UQzHXO9oxMlOlI7hDAUTSfhT0FpOtxnmisl+XFRSGSvJmNbK4jJ
-8dlqIuXsSh4X9NPEnhPz1ieg4+hcUelg5SvSNLNAVQPmm1nNluwYhT41iU+seiiJ
-A3uUJEECgYEA2fAS32IQox/8+OpKPipvR13tHek04AsJSGuNiio8qXlQorlXBRYE
-esOEEYJyKiNWZ7NXTCAjyDiRp48aM62Fy1ykDR4IbDb8JRAdZpJBCjy5U5BKfZTY
-jR3rZOA+8Bivozmtdv+0RGxhffSIGPpB1/4Dgmkw375YLAB4cVffg30CgYEAxjA1
-o8ImIW+9eKTRV2yWUHiUZ4iae5s54nCnz24YqJVLooWtU/TXFKrTiYJs20HBWiG0
-+dsJ27LXd0Y13DDQN/ZT/luvWbhMkFYGQ7Ou7XDXB6ujgl6A5MZ7mKfxIv+kX5QM
-F1NTVl3TeUU+6XAYeUf1xmlDjot3sNNv5NdvGgcCgYBRzUnYLP/fqscSSyaY1Oa1
-2+x/mKQvIBVY6H3VCWuBlTaODZE7KHt/9NkilVrytBbfj7JJsZqcsZcCVLVaBly8
-60XsYoR40d6srrLKaEUfaZGKaxN6tZ7ewQc08vLMvgdW9fRFQU9Ri3jAhUN8VJrY
-TtDUZ1Vf9hs0UOzkZj5QJQKBgCfS7iRe0eysGGWSsOIhVr8Ky79WKrylv2bp/j5n
-QBs4DL+2ntKdA08K2IDsLVWNi/3Bgi0mv39fG37DI/V/9YcZP12ALOcZaoEiWBXo
-mEDsCLlo2u1KchoGbDWLoZ/HwM7X3+ob+0YCioj2yiJ8PN66AAADjOiqy71Db1uL
-kq6nAoGAN8dAwrJFQ2mQYKFQrbWt3/x+YHCAvkqIFdVWn9+3/fWZ8Rcwctl/mau/
-7dL5tU/s3wO8KkOH2PTjvtUORZR+e/FGq7hmXVV1lnl7GBENW6THN08xq9e/4Clm
-koYsIpn/e+t2AVR1UENvv9sKwAsDV1yqHwRfUSFtg/qtj7103YY=
+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
 -----END RSA PRIVATE KEY-----

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==
+MIIDoTCCAomgAwIBAgIUX2tyG9Y9qo7PLe4EvxS+AAZDo54wDQYJKoZIhvcNAQEL
+BQAwdjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM
+DVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsMEEx5ZnQgRW5n
+aW5lZXJpbmcxEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjAwODAxMTYzODI4WhcNMjIw
+ODAxMTYzODI4WjCBpjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+FjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBEx5ZnQxGTAXBgNVBAsM
+EEx5ZnQgRW5naW5lZXJpbmcxGjAYBgNVBAMMEVRlc3QgQmFja2VuZCBUZWFtMSQw
+IgYJKoZIhvcNAQkBFhViYWNrZW5kLXRlYW1AbHlmdC5jb20wWTATBgcqhkjOPQIB
+BggqhkjOPQMBBwNCAAQ+SopWsD0t8CyMRix0FNahWyBtGdbVDUT0FTLCPHeeGxHq
+xj1ufIwkLUmfdwh/3EBMxN1LTaCAOyxcyj06s6KPo4HAMIG9MAwGA1UdEwEB/wQC
+MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATBB
+BgNVHREEOjA4hh5zcGlmZmU6Ly9seWZ0LmNvbS9iYWNrZW5kLXRlYW2CCGx5ZnQu
+Y29tggx3d3cubHlmdC5jb20wHQYDVR0OBBYEFHJtmXVFJM41FvgfyjzKCbw4jz/U
+MB8GA1UdIwQYMBaAFKco985YMDUX9CtobJU4RcOou8DMMA0GCSqGSIb3DQEBCwUA
+A4IBAQCKNsVZk5apxvEIZpjiTPTnyHGaNyo2Os3Y6+QpJ3IYCg9+ZrZrHSeWM1I+
+UU807t6xC6WLNAHYjrWBU7JC5BbUS7ofKwz6wUN4W0ORsGKzzFuDWh4HyhmIoLUA
+LcjC7zzh2INDBHR4FCHJQqWFzynrcPGOTbJ7Vreg4RvpFl9fMTtk4j3fB6OQ68pv
+ORmdbahVETEF3NPU6GkaNQgzHG3YAHPVsc5EFxBDYmw5DUCwn5SfbRchOkYct6nI
+2nhFlQWD0Wb35TwEcU4zwkBJOFTxsYuvRWDOSBzrBNLQsGO7qat7yOKOHc6Q9S50
+eWIk36cfp7WE06hzcF3NFvacqpl3
 -----END CERTIFICATE-----

test/config/integration/certs/server_ecdsacert_hash.h

@@ -1,3 +1,2 @@
 // 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[] = "61:DC:9D:24:70:52:48:09:E8:D3:28:AF:4E:4D:4F:88:C0:49:BB:B5:AF:B6:27:B8:86:63:3C:FB:85:45:24:DF";

test/config/integration/certs/server_ecdsakey.pem

@@ -2,7 +2,7 @@
 BggqhkjOPQMBBw==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEICqemTBghfUmDlTHDq5GCz5CV51QLvQEkUGOxhtOR6hboAoGCCqGSM49
-AwEHoUQDQgAEgVE4DzGyifdO4yefn1bEhFfkTrUjfV3Lay9NQz6D1SosrCnk7KZt
-l6Nbc/U6KiGlN+9GpD0ulKEljgjn7TTtTw==
+MHcCAQEEIF7oxTJwiHAAFQ3N40SBnTUIt0IlOxApq3dDXkEuAK7woAoGCCqGSM49
+AwEHoUQDQgAEPkqKVrA9LfAsjEYsdBTWoVsgbRnW1Q1E9BUywjx3nhsR6sY9bnyM
+JC1Jn3cIf9xATMTdS02ggDssXMo9OrOijw==
 -----END EC PRIVATE KEY-----