diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-10-02 10:45:13 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-10-02 10:45:13 +0200 |
| commit | 52dda64b51b30a90a093d3e928e3e75d817e9cc6 (patch) | |
| tree | aa3cd50a7f8fa4715c21d5256b78172509202db3 /lib/ssl/test | |
| parent | 0717a2194e863f3a78595184ccc5637697f03353 (diff) | |
| parent | d9031e33817960578219f4c616449ae7f9efb3ea (diff) | |
| download | otp-52dda64b51b30a90a093d3e928e3e75d817e9cc6.tar.gz otp-52dda64b51b30a90a093d3e928e3e75d817e9cc6.tar.bz2 otp-52dda64b51b30a90a093d3e928e3e75d817e9cc6.zip | |
Merge branch 'ingela/dtls/renegotiate/OTP-14563' into maint
* ingela/dtls/renegotiate/OTP-14563:
dtls: Compleate DTLS renegotiate implementation
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 3 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 9efde4752f..3b4ca40058 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -83,13 +83,14 @@ groups() -> ]. tls_versions_groups ()-> - [{group, renegotiate}, %% Should be in all_versions_groups not fixed for DTLS yet + [ {group, api_tls}, {group, tls_ciphers}, {group, error_handling_tests_tls}]. all_versions_groups ()-> [{group, api}, + {group, renegotiate}, {group, ciphers}, {group, ciphers_ec}, {group, error_handling_tests}]. diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 2e1a0b94ea..9118e4b7e3 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -90,9 +90,9 @@ dtls_all_versions_tests() -> erlang_client_openssl_server_dsa_cert, erlang_server_openssl_client_dsa_cert, erlang_server_openssl_client_reuse_session, - %%erlang_client_openssl_server_renegotiate, - %%erlang_client_openssl_server_nowrap_seqnum, - %%erlang_server_openssl_client_nowrap_seqnum, + erlang_client_openssl_server_renegotiate, + erlang_client_openssl_server_nowrap_seqnum, + erlang_server_openssl_client_nowrap_seqnum, erlang_client_openssl_server_no_server_ca_cert, erlang_client_openssl_server_client_cert, erlang_server_openssl_client_client_cert, |