aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-03-20 10:52:26 +0100
committerIngela Anderton Andin <[email protected]>2015-03-20 10:52:26 +0100
commit54e1779b5a94bc2662e38fff18ad621228aa75c0 (patch)
treee38f160a3005e8aea5ad5c815b969d7baf502692
parent67274e223333b8c59892085f7ca7c413ba908b20 (diff)
parenta3cf4eb4cdd2ce178d81b62faa9f47485fd82331 (diff)
downloadotp-54e1779b5a94bc2662e38fff18ad621228aa75c0.tar.gz
otp-54e1779b5a94bc2662e38fff18ad621228aa75c0.tar.bz2
otp-54e1779b5a94bc2662e38fff18ad621228aa75c0.zip
Merge branch 'ia/ssl/cuddle-openssl'
* ia/ssl/cuddle-openssl: Add workaround for problems with s_client defaults
-rw-r--r--lib/ssl/test/ssl_to_openssl_SUITE.erl10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 94426a3061..27ee07ffc6 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2015. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -291,7 +291,7 @@ basic_erlang_server_openssl_client(Config) when is_list(Config) ->
Port = ssl_test_lib:inet_port(Server),
Cmd = "openssl s_client -port " ++ integer_to_list(Port) ++
- " -host localhost" ++ workaround_openssl_s_clinent(),
+ " -host localhost" ++ workaround_openssl_s_client(),
ct:log("openssl cmd: ~p~n", [Cmd]),
@@ -1658,7 +1658,7 @@ supports_sslv2(Port) ->
true
end.
-workaround_openssl_s_clinent() ->
+workaround_openssl_s_client() ->
%% http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683159
%% https://bugs.archlinux.org/task/33919
%% Bug seems to manifests it self if TLS version is not
@@ -1672,6 +1672,8 @@ workaround_openssl_s_clinent() ->
" -no_tls1_2 ";
"OpenSSL 1.0.1f" ++ _ ->
" -no_tls1_2 ";
- _ ->
+ "OpenSSL 1.0.1l" ++ _ ->
+ " -cipher AES256-SHA";
+ _ ->
""
end.