Merge branch 'master' into HEAD

1 files changed, 8 insertions, 2 deletions

diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc
index 8939c0434b..bf54383c54 100644
--- a/test/core/tsi/ssl_transport_security_test.cc
+++ b/test/core/tsi/ssl_transport_security_test.cc
@@ -667,9 +667,15 @@ int main(int argc, char** argv) {
   ssl_tsi_test_do_handshake_with_server_name_indication_wild_star_domain();
   ssl_tsi_test_do_handshake_with_bad_server_cert();
   ssl_tsi_test_do_handshake_with_bad_client_cert();
-  ssl_tsi_test_do_handshake_alpn_client_no_server();
+  // TODO: BoringSSL and OpenSSL have different behaviors on handling mismatched
+  // ALPN. Re-enable this test if we can detect in the runtime which SSL library
+  // is used.
+  // ssl_tsi_test_do_handshake_alpn_client_no_server();
   ssl_tsi_test_do_handshake_alpn_server_no_client();
-  ssl_tsi_test_do_handshake_alpn_client_server_mismatch();
+  // TODO: BoringSSL and OpenSSL have different behaviors on handling mismatched
+  // ALPN. Re-enable this test if we can detect in the runtime which SSL library
+  // is used.
+  // ssl_tsi_test_do_handshake_alpn_client_server_mismatch();
   ssl_tsi_test_do_handshake_alpn_client_server_ok();
   ssl_tsi_test_do_round_trip_for_all_configs();
   ssl_tsi_test_do_round_trip_odd_buffer_size();