diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-01-30 13:25:42 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-01-30 13:25:42 +0100 |
| commit | 2c038d450e7ef5cf0149e33ace7464761c6cf8af (patch) | |
| tree | b382b931fe1ee01ff2642225d2ebc51409c4f7d8 | |
| parent | 32e01a883c4c29199174903112387f841fcab681 (diff) | |
| parent | aca06d62d1f82d8053136a0e9521669c05915514 (diff) | |
| download | otp-2c038d450e7ef5cf0149e33ace7464761c6cf8af.tar.gz otp-2c038d450e7ef5cf0149e33ace7464761c6cf8af.tar.bz2 otp-2c038d450e7ef5cf0149e33ace7464761c6cf8af.zip | |
Merge branch 'ia/ssl/openssl-1.0.1e'
* ia/ssl/openssl-1.0.1e:
ssl: Add workaround in test code for openssl s_client bug
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 68784a175e..a7361755e5 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -248,7 +248,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", + " -host localhost" ++ workaround_openssl_s_clinent(), ct:log("openssl cmd: ~p~n", [Cmd]), @@ -1383,3 +1383,20 @@ supports_sslv2(Port) -> true end. +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 + %% explicitly specified + case os:cmd("openssl version") of + "OpenSSL 1.0.1c" ++ _ -> + " -no_tls1_2 "; + "OpenSSL 1.0.1d" ++ _ -> + " -no_tls1_2 "; + "OpenSSL 1.0.1e" ++ _ -> + " -no_tls1_2 "; + "OpenSSL 1.0.1f" ++ _ -> + " -no_tls1_2 "; + _ -> + "" + end. |