diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-31 12:06:03 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-08-19 16:51:52 +0200 |
| commit | 477d94eac263ad903dea019c8a9db27e8a1592a8 (patch) | |
| tree | b468ebad5a027ba0fdf75a3f9ce0639fcac26727 | |
| parent | a536cb2201d7d0d35408799a0f126afd7064a1c3 (diff) | |
| download | otp-477d94eac263ad903dea019c8a9db27e8a1592a8.tar.gz otp-477d94eac263ad903dea019c8a9db27e8a1592a8.tar.bz2 otp-477d94eac263ad903dea019c8a9db27e8a1592a8.zip | |
ssl: Fix missing OpenSSL conf
| -rw-r--r-- | lib/ssl/test/openssl_session_SUITE.erl | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/ssl/test/openssl_session_SUITE.erl b/lib/ssl/test/openssl_session_SUITE.erl index 24dcaa7817..97d83b98c3 100644 --- a/lib/ssl/test/openssl_session_SUITE.erl +++ b/lib/ssl/test/openssl_session_SUITE.erl @@ -56,8 +56,8 @@ groups() -> {'tlsv1.1', [], tests()}, {'tlsv1', [], tests()}, {'sslv3', [], tests()}, - {'dtlsv1.2', [], dtls_tests()}, - {'dtlsv1', [], dtls_tests()} + {'dtlsv1.2', [], tests()}, + {'dtlsv1', [], tests()} ]; false -> [{'tlsv1.2', [], tests()}, @@ -73,11 +73,6 @@ tests() -> reuse_session_erlang_client ]. -dtls_tests() -> - [ - reuse_session_erlang_server - ]. - init_per_suite(Config0) -> case os:find_executable("openssl") of @@ -193,19 +188,20 @@ reuse_session_erlang_client(Config) when is_list(Config) -> ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config), ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config), {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config), - + + Version = ssl_test_lib:protocol_version(Config), Port = ssl_test_lib:inet_port(node()), CertFile = proplists:get_value(certfile, ServerOpts), CACertFile = proplists:get_value(cacertfile, ServerOpts), KeyFile = proplists:get_value(keyfile, ServerOpts), Exe = "openssl", - Args = ["s_server", "-accept", integer_to_list(Port), + Args = ["s_server", "-accept", integer_to_list(Port), ssl_test_lib:version_flag(Version), "-cert", CertFile,"-key", KeyFile, "-CAfile", CACertFile], OpensslPort = ssl_test_lib:portable_open_port(Exe, Args), - ssl_test_lib:wait_for_openssl_server(Port, tls), + ssl_test_lib:wait_for_openssl_server(Port, proplists:get_value(protocol, Config)), Client0 = ssl_test_lib:start_client([{node, ClientNode}, |