diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-29 15:11:53 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-07-31 09:44:49 +0200 |
| commit | ad8c607df66aac55ca6133281635513a34ef5a88 (patch) | |
| tree | cab49ef28b6635d096c3063381ad83b4fc67de37 /lib/ssl/test/openssl_alpn_SUITE.erl | |
| parent | b3244adc38777adbb4474a1e34e098eecda370af (diff) | |
| download | otp-ad8c607df66aac55ca6133281635513a34ef5a88.tar.gz otp-ad8c607df66aac55ca6133281635513a34ef5a88.tar.bz2 otp-ad8c607df66aac55ca6133281635513a34ef5a88.zip | |
ssl: Avoid broken ALPN/NPN renegotiation in OpenSSL
All these test work fine with current OpenSSL master
Diffstat (limited to 'lib/ssl/test/openssl_alpn_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/openssl_alpn_SUITE.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/ssl/test/openssl_alpn_SUITE.erl b/lib/ssl/test/openssl_alpn_SUITE.erl index 1e8912be7d..5008dba922 100644 --- a/lib/ssl/test/openssl_alpn_SUITE.erl +++ b/lib/ssl/test/openssl_alpn_SUITE.erl @@ -36,7 +36,7 @@ all() -> %% Note: ALPN not supported in sslv3 - case ssl_test_lib:openssl_sane_dtls() of + case ssl_test_lib:openssl_sane_dtls_alpn() of true -> [ {group, 'tlsv1.3'}, @@ -52,7 +52,7 @@ all() -> end. groups() -> - case ssl_test_lib:openssl_sane_dtls() of + case ssl_test_lib:openssl_sane_dtls_alpn() of true -> [ {'tlsv1.3', [], alpn_tests()}, @@ -85,9 +85,13 @@ alpn_npn_coexist() -> erlang_server_alpn_npn_openssl_client_alpn_npn ]. rengotiation_tests() -> - [erlang_client_alpn_openssl_server_alpn_renegotiate, - erlang_server_alpn_openssl_client_alpn_renegotiate]. - + case ssl_test_lib:sane_openssl_alpn_npn_renegotiate() of + true -> + [erlang_client_alpn_openssl_server_alpn_renegotiate, + erlang_server_alpn_openssl_client_alpn_renegotiate]; + false -> + [] + end. init_per_suite(Config0) -> case os:find_executable("openssl") of false -> |