diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-29 12:08:09 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-07-29 12:08:09 +0200 |
| commit | f657d903027bb5fe2edfde2ba804e3579f4b87be (patch) | |
| tree | 29f5f1222f00ec4debe930a5d94ce4cf1d6ae3a4 /lib/ssl/test/openssl_npn_SUITE.erl | |
| parent | 2c6cb235988654e5dc2924829b1fa8bbf539ed0c (diff) | |
| parent | 95305983f417cdcd15129d0c5fe786aeb2f9e42a (diff) | |
| download | otp-f657d903027bb5fe2edfde2ba804e3579f4b87be.tar.gz otp-f657d903027bb5fe2edfde2ba804e3579f4b87be.tar.bz2 otp-f657d903027bb5fe2edfde2ba804e3579f4b87be.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/openssl_npn_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/openssl_npn_SUITE.erl | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/lib/ssl/test/openssl_npn_SUITE.erl b/lib/ssl/test/openssl_npn_SUITE.erl index 9bd11f05d6..f249ba47c2 100644 --- a/lib/ssl/test/openssl_npn_SUITE.erl +++ b/lib/ssl/test/openssl_npn_SUITE.erl @@ -33,40 +33,18 @@ %%-------------------------------------------------------------------- %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- - all() -> - %% Note: NPN not supported in sslv3 - case ssl_test_lib:openssl_sane_dtls() of - true -> - [{group, 'tlsv1.2'}, - {group, 'tlsv1.1'}, - {group, 'tlsv1'}, - {group, 'dtlsv1.2'}, - {group, 'dtlsv1'}]; - false -> - [{group, 'tlsv1.2'}, - {group, 'tlsv1.1'}, - {group, 'tlsv1'}] - end. + %% NPN is not supported in TLS-1.3 (replaced by ALPN and deprecated in TLS 1.2) + %% OpenSSL DTLS support for NPN is either not there or broken. + [{group, 'tlsv1.2'}, + {group, 'tlsv1.1'}, + {group, 'tlsv1'}]. groups() -> - case ssl_test_lib:openssl_sane_dtls() of - true -> - [{'tlsv1.2', [], npn_tests()}, - {'tlsv1.1', [], npn_tests()}, - {'tlsv1', [], npn_tests()}, - {'dtlsv1.2', [], npn_tests() -- [erlang_server_openssl_client_npn_renegotiate, - erlang_client_openssl_server_npn_renegotiate]}, - {'dtlsv1', [], npn_tests() -- [erlang_server_openssl_client_npn_renegotiate, - erlang_client_openssl_server_npn_renegotiate] - } - ]; - false -> - [{'tlsv1.2', [], npn_tests()}, - {'tlsv1.1', [], npn_tests()}, - {'tlsv1', [], npn_tests()} - ] - end. + [{'tlsv1.2', [], npn_tests()}, + {'tlsv1.1', [], npn_tests()}, + {'tlsv1', [], npn_tests()} + ]. npn_tests() -> [erlang_client_openssl_server_npn, |