diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-04-20 12:30:00 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-04-22 09:28:30 +0200 |
| commit | 5edda23ee854038c9d4bcddd0d676ee0ffd20da5 (patch) | |
| tree | 4dda5f71fb2f146c09733c88c1822e7e21a1e746 /lib/ssl | |
| parent | 02af25544e717c9074cdce9f43fb49c14cb2f1a4 (diff) | |
| download | otp-5edda23ee854038c9d4bcddd0d676ee0ffd20da5.tar.gz otp-5edda23ee854038c9d4bcddd0d676ee0ffd20da5.tar.bz2 otp-5edda23ee854038c9d4bcddd0d676ee0ffd20da5.zip | |
Revert "Add workaround for problems with s_client defaults"
This reverts commit a3cf4eb4cdd2ce178d81b62faa9f47485fd82331.
This workaround is no longer needed as the, TLS-1.2 extension,
signature_algorithm is now correctly ignored by previous TLS versions.
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 27ee07ffc6..94426a3061 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-2015. All Rights Reserved. +%% Copyright Ericsson AB 2008-2014. 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_client(), + " -host localhost" ++ workaround_openssl_s_clinent(), ct:log("openssl cmd: ~p~n", [Cmd]), @@ -1658,7 +1658,7 @@ supports_sslv2(Port) -> true end. -workaround_openssl_s_client() -> +workaround_openssl_s_clinent() -> %% 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,8 +1672,6 @@ workaround_openssl_s_client() -> " -no_tls1_2 "; "OpenSSL 1.0.1f" ++ _ -> " -no_tls1_2 "; - "OpenSSL 1.0.1l" ++ _ -> - " -cipher AES256-SHA"; - _ -> + _ -> "" end. |