diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2020-06-10 08:53:19 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2020-06-10 08:53:19 +0200 |
| commit | de8eee29e6b699c8da115fbbeaafced9223b1b9a (patch) | |
| tree | 65d48b72711eb1cb743a333921ba72195f8ee4af | |
| parent | 60ffa72fd1632ad04251087644d1e653cc011f31 (diff) | |
| parent | d046db8e61b73e364e23cbdceb4d0af7310ce337 (diff) | |
| download | erlang-de8eee29e6b699c8da115fbbeaafced9223b1b9a.tar.gz | |
Merge branch 'ingela/ssl/cuddle-openssl' into maint
* ingela/ssl/cuddle-openssl:
ssl: Avoid to interop test DTLS with very old OpenSSL
| -rw-r--r-- | lib/ssl/test/openssl_client_cert_SUITE.erl | 22 | ||||
| -rw-r--r-- | lib/ssl/test/openssl_server_cert_SUITE.erl | 22 |
2 files changed, 30 insertions, 14 deletions
diff --git a/lib/ssl/test/openssl_client_cert_SUITE.erl b/lib/ssl/test/openssl_client_cert_SUITE.erl index d9068cff7e..a1aa22e8e8 100644 --- a/lib/ssl/test/openssl_client_cert_SUITE.erl +++ b/lib/ssl/test/openssl_client_cert_SUITE.erl @@ -54,13 +54,21 @@ groups() -> ]. protocol_groups() -> - [{group, 'tlsv1.3'}, - {group, 'tlsv1.2'}, - {group, 'tlsv1.1'}, - {group, 'tlsv1'}, - {group, 'dtlsv1.2'}, - {group, 'dtlsv1'} - ]. + case ssl_test_lib:openssl_sane_dtls() of + true -> + [{group, 'tlsv1.3'}, + {group, 'tlsv1.2'}, + {group, 'tlsv1.1'}, + {group, 'tlsv1'}, + {group, 'dtlsv1.2'}, + {group, 'dtlsv1'}]; + false -> + [{group, 'tlsv1.3'}, + {group, 'tlsv1.2'}, + {group, 'tlsv1.1'}, + {group, 'tlsv1'} + ] + end. ssl_protocol_groups() -> [{group, rsa}, diff --git a/lib/ssl/test/openssl_server_cert_SUITE.erl b/lib/ssl/test/openssl_server_cert_SUITE.erl index de8c74fee5..c7b9d5a1f1 100644 --- a/lib/ssl/test/openssl_server_cert_SUITE.erl +++ b/lib/ssl/test/openssl_server_cert_SUITE.erl @@ -55,13 +55,21 @@ groups() -> ]. protocol_groups() -> - [{group, 'tlsv1.3'}, - {group, 'tlsv1.2'}, - {group, 'tlsv1.1'}, - {group, 'tlsv1'}, - {group, 'dtlsv1.2'}, - {group, 'dtlsv1'} - ]. + case ssl_test_lib:openssl_sane_dtls() of + true -> + [{group, 'tlsv1.3'}, + {group, 'tlsv1.2'}, + {group, 'tlsv1.1'}, + {group, 'tlsv1'}, + {group, 'dtlsv1.2'}, + {group, 'dtlsv1'}]; + false -> + [{group, 'tlsv1.3'}, + {group, 'tlsv1.2'}, + {group, 'tlsv1.1'}, + {group, 'tlsv1'} + ] + end. ssl_protocol_groups() -> [{group, rsa}, |