diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-03-13 11:03:53 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-03-13 11:03:53 +0100 |
| commit | dc2463d1ffcc34ff009ae555f984f10d9e0e920b (patch) | |
| tree | 80bcb886491b800b35c96340a15e2e7a444ffa40 /lib | |
| parent | ae8521d9d3f0f129a102a75bb729fe96612f6735 (diff) | |
| parent | 03bc63bed74af4c392d160005b77aca43d4cd4aa (diff) | |
| download | otp-dc2463d1ffcc34ff009ae555f984f10d9e0e920b.tar.gz otp-dc2463d1ffcc34ff009ae555f984f10d9e0e920b.tar.bz2 otp-dc2463d1ffcc34ff009ae555f984f10d9e0e920b.zip | |
Merge remote branch 'upstream/maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 4 |
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]), |