diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:23:29 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:23:29 +0200 |
| commit | ed70ed1cbcfb01a8fee4ceac83c47afd78777387 (patch) | |
| tree | ae904a247a79e13b2a89b46bbf6e4583c43a97e3 /lib/ssl/test/ssl_basic_SUITE.erl | |
| parent | 710f9437498a8a9df62a6c7cecd6eb632561754b (diff) | |
| parent | 56f6f1829e1f3fd3752914b302276bc9bf490bbb (diff) | |
| download | otp-ed70ed1cbcfb01a8fee4ceac83c47afd78777387.tar.gz otp-ed70ed1cbcfb01a8fee4ceac83c47afd78777387.tar.bz2 otp-ed70ed1cbcfb01a8fee4ceac83c47afd78777387.zip | |
Merge branch 'ingela/ssl/tls-vs-dtls-version' into maint
* ingela/ssl/tls-vs-dtls-version:
ssl: DTLS packet support
ssl: Enable dtls tests
ssl: Adjust ALPN and next protocol to work with DTLS
ssl: Enable more DTLS tests
ssl: negotiated_hashsign/4 expects TLS version to function correctly
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index aeb4897d7e..8e1a6a8892 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -53,8 +53,7 @@ all() -> {group, options_tls}, {group, session}, {group, 'dtlsv1.2'}, - %% {group, 'dtlsv1'}, Breaks dtls in cert_verify_SUITE enable later when - %% problem is identified and fixed + {group, 'dtlsv1'}, {group, 'tlsv1.2'}, {group, 'tlsv1.1'}, {group, 'tlsv1'}, @@ -277,6 +276,13 @@ end_per_suite(_Config) -> application:stop(crypto). %%-------------------------------------------------------------------- +init_per_group(GroupName, Config) when GroupName == basic; + GroupName == basic_tls; + GroupName == options; + GroupName == options_tls; + GroupName == session -> + ssl_test_lib:init_tls_version_default(Config); + init_per_group(GroupName, Config) -> case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of true -> |