diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:24:10 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-08-24 10:24:10 +0200 |
| commit | 7dca6bf8cc7f291a6c1cb4928255da88afa131b1 (patch) | |
| tree | 69bd94455d96e3be7758503e80790e568223a5d7 /lib/ssl/test/ssl_to_openssl_SUITE.erl | |
| parent | fbf740d68600b59dc5fa7bd76d0aa0d019e81a75 (diff) | |
| parent | ed70ed1cbcfb01a8fee4ceac83c47afd78777387 (diff) | |
| download | otp-7dca6bf8cc7f291a6c1cb4928255da88afa131b1.tar.gz otp-7dca6bf8cc7f291a6c1cb4928255da88afa131b1.tar.bz2 otp-7dca6bf8cc7f291a6c1cb4928255da88afa131b1.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_to_openssl_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index c9a1b8c735..43a4a0b6d1 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -85,19 +85,19 @@ all_versions_tests() -> ]. dtls_all_versions_tests() -> [ - %%erlang_client_openssl_server, + erlang_client_openssl_server, erlang_server_openssl_client, - %%erlang_client_openssl_server_dsa_cert, + erlang_client_openssl_server_dsa_cert, erlang_server_openssl_client_dsa_cert, - erlang_server_openssl_client_reuse_session + 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_no_server_ca_cert, - %%erlang_client_openssl_server_client_cert, - %%erlang_server_openssl_client_client_cert - %%ciphers_rsa_signed_certs, - %%ciphers_dsa_signed_certs, + erlang_client_openssl_server_no_server_ca_cert, + erlang_client_openssl_server_client_cert, + erlang_server_openssl_client_client_cert, + ciphers_rsa_signed_certs, + ciphers_dsa_signed_certs %%erlang_client_bad_openssl_server, %%expired_session ]. @@ -875,7 +875,8 @@ ciphers_dsa_signed_certs() -> [{doc,"Test cipher suites that uses dsa certs"}]. ciphers_dsa_signed_certs(Config) when is_list(Config) -> Version = ssl_test_lib:protocol_version(Config), - Ciphers = ssl_test_lib:dsa_suites(tls_record:protocol_version(Version)), + NVersion = ssl_test_lib:protocol_version(Config, tuple), + Ciphers = ssl_test_lib:dsa_suites(NVersion), run_suites(Ciphers, Version, Config, dsa). %%-------------------------------------------------------------------- |