diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-29 12:07:17 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-07-29 12:07:17 +0200 |
| commit | 95305983f417cdcd15129d0c5fe786aeb2f9e42a (patch) | |
| tree | 14a912f4c2ef22c5ab728bad71cffadfad166e40 | |
| parent | ef430bda70af685ecc1436590f1df5d3f912a7f5 (diff) | |
| parent | 5a9bbc0fea6b519f86057e5c1a0e301d327ae7ce (diff) | |
| download | otp-95305983f417cdcd15129d0c5fe786aeb2f9e42a.tar.gz otp-95305983f417cdcd15129d0c5fe786aeb2f9e42a.tar.bz2 otp-95305983f417cdcd15129d0c5fe786aeb2f9e42a.zip | |
Merge branch 'ingela/ssl/test-enhancment' into maint
* ingela/ssl/test-enhancment:
ssl: Remove NPN test from DTLS interop tests
| -rw-r--r-- | lib/ssl/test/openssl_alpn_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/test/openssl_npn_SUITE.erl | 40 |
2 files changed, 11 insertions, 33 deletions
diff --git a/lib/ssl/test/openssl_alpn_SUITE.erl b/lib/ssl/test/openssl_alpn_SUITE.erl index fa095b4bdb..1e8912be7d 100644 --- a/lib/ssl/test/openssl_alpn_SUITE.erl +++ b/lib/ssl/test/openssl_alpn_SUITE.erl @@ -59,8 +59,8 @@ groups() -> {'tlsv1.2', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()}, {'tlsv1.1', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()}, {'tlsv1', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()}, - {'dtlsv1.2', [], alpn_tests() ++ alpn_npn_coexist()}, - {'dtlsv1', [], alpn_tests() ++ alpn_npn_coexist()} + {'dtlsv1.2', [], alpn_tests()}, + {'dtlsv1', [], alpn_tests()} ]; false -> [ 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, |