aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-03-13 11:03:03 +0100
committerIngela Anderton Andin <[email protected]>2013-03-13 11:03:03 +0100
commit03bc63bed74af4c392d160005b77aca43d4cd4aa (patch)
tree4e6ceb8fd21b19469b4f5aa2e7f47185f968a082
parent4955bf98ead49b0c7122ab30e462f9b817bd5c6e (diff)
parente4b753fe32946d7c998d7af6a19c40e01f69ce75 (diff)
downloadotp-03bc63bed74af4c392d160005b77aca43d4cd4aa.tar.gz
otp-03bc63bed74af4c392d160005b77aca43d4cd4aa.tar.bz2
otp-03bc63bed74af4c392d160005b77aca43d4cd4aa.zip
Merge branch 'ia/ssl/test-maint' into maint
* ia/ssl/test-maint: ssl: Add missing configuration in test case
-rw-r--r--lib/ssl/test/ssl_to_openssl_SUITE.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 4f53132d5d..a3d382f837 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1202,8 +1202,8 @@ start_erlang_server_and_openssl_client_with_opts(Config, ErlangServerOpts, OpenS
{mfa, {?MODULE, erlang_ssl_receive, [Data]}},
{options, ServerOpts}]),
Port = ssl_test_lib:inet_port(Server),
-
- Cmd = "openssl s_client " ++ OpenSSLClientOpts ++ " -msg -port " ++ integer_to_list(Port) ++
+ Version = ssl_record:protocol_version(ssl_record:highest_protocol_version([])),
+ Cmd = "openssl s_client " ++ OpenSSLClientOpts ++ " -msg -port " ++ integer_to_list(Port) ++ version_flag(Version) ++
" -host localhost",
ct:print("openssl cmd: ~p~n", [Cmd]),