diff options
author | Jiangtao Li <jiangtao@google.com> | 2018-02-20 14:58:58 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-20 14:58:58 -0800 |
commit | 085a3afcae15ab76395289e70d05e5b1bf057ec4 (patch) | |
tree | 21ab46be14451ffb2206e27461700716a5e85240 /test/core/tsi | |
parent | af322323379ae13be2e0c35cbc68ccd1abda6d15 (diff) | |
parent | 19eddbef5e7ed7673658a87d6a7471ec20afc445 (diff) |
Merge pull request #14466 from jiangtaoli2016/ssl_test
Re-enable mismatched ALPN SSL tests for boringSSL.
Diffstat (limited to 'test/core/tsi')
-rw-r--r-- | test/core/tsi/ssl_transport_security_test.cc | 13 |
1 files changed, 5 insertions, 8 deletions
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(); |