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_ECC_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_ECC_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_ECC_SUITE.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl index 0fbb0bb79a..c48ccfb83b 100644 --- a/lib/ssl/test/ssl_ECC_SUITE.erl +++ b/lib/ssl/test/ssl_ECC_SUITE.erl @@ -36,7 +36,9 @@ all() -> [ {group, 'tlsv1.2'}, {group, 'tlsv1.1'}, - {group, 'tlsv1'} + {group, 'tlsv1'}, + {group, 'dtlsv1.2'}, + {group, 'dtlsv1'} ]. groups() -> @@ -44,6 +46,8 @@ groups() -> {'tlsv1.2', [], all_versions_groups()}, {'tlsv1.1', [], all_versions_groups()}, {'tlsv1', [], all_versions_groups()}, + {'dtlsv1.2', [], all_versions_groups()}, + {'dtlsv1', [], all_versions_groups()}, {'erlang_server', [], openssl_key_cert_combinations()}, %%{'erlang_client', [], openssl_key_cert_combinations()}, {'erlang', [], key_cert_combinations() ++ misc() @@ -197,7 +201,7 @@ common_init_per_group(GroupName, Config) -> end. end_per_group(_GroupName, Config) -> - Config. + proplists:delete(tls_version, Config). %%-------------------------------------------------------------------- |