From 75f0a9fbd21eb28b896f34f28a72c3a1230a72ed Mon Sep 17 00:00:00 2001 From: Yihua Zhang Date: Tue, 20 Feb 2018 10:09:47 -0800 Subject: place security_connector in its own subdirectory --- test/core/tsi/fake_transport_security_test.cc | 2 +- test/core/tsi/ssl_transport_security_test.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test/core/tsi') diff --git a/test/core/tsi/fake_transport_security_test.cc b/test/core/tsi/fake_transport_security_test.cc index ea392d347d..bec81ed42f 100644 --- a/test/core/tsi/fake_transport_security_test.cc +++ b/test/core/tsi/fake_transport_security_test.cc @@ -20,7 +20,7 @@ #include #include -#include "src/core/lib/security/transport/security_connector.h" +#include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/fake_transport_security.h" #include "test/core/tsi/transport_security_test_lib.h" #include "test/core/util/test_config.h" diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc index d7a4d747e1..8a9a92ff71 100644 --- a/test/core/tsi/ssl_transport_security_test.cc +++ b/test/core/tsi/ssl_transport_security_test.cc @@ -21,7 +21,7 @@ #include #include "src/core/lib/iomgr/load_file.h" -#include "src/core/lib/security/transport/security_connector.h" +#include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/tsi/ssl_transport_security.h" #include "src/core/tsi/transport_security.h" #include "src/core/tsi/transport_security_adapter.h" -- cgit v1.2.3 From 19eddbef5e7ed7673658a87d6a7471ec20afc445 Mon Sep 17 00:00:00 2001 From: jiangtaoli2016 Date: Tue, 20 Feb 2018 11:31:14 -0800 Subject: Re-enable mismatched ALPN SSL tests for boringSSL. --- test/core/tsi/ssl_transport_security_test.cc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'test/core/tsi') diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc index d7a4d747e1..8082d836e8 100644 --- a/test/core/tsi/ssl_transport_security_test.cc +++ b/test/core/tsi/ssl_transport_security_test.cc @@ -681,15 +681,12 @@ 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(); - // 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(); +#ifdef OPENSSL_IS_BORINGSSL + // BoringSSL and OpenSSL have different behaviors on mismatched ALPN. + ssl_tsi_test_do_handshake_alpn_client_no_server(); + ssl_tsi_test_do_handshake_alpn_client_server_mismatch(); +#endif ssl_tsi_test_do_handshake_alpn_server_no_client(); - // 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(); -- cgit v1.2.3