From d7745eb8439e20f6bd36c6654fc5d3c65ae99e8e Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Mon, 8 May 2017 15:37:24 +0200 Subject: ssl: Try to workaround OpenSSL windows obscurities --- lib/ssl/test/ssl_test_lib.erl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index f44d1d5523..a59da1b65a 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1403,6 +1403,8 @@ supports_ssl_tls_version(Version) -> do_supports_ssl_tls_version(Port) -> receive + {Port, {data, "u"}} -> + false; {Port, {data, "unknown option" ++ _}} -> false; {Port, {data, Data}} -> -- cgit v1.2.3 From d12052519312e9f4e3bb189e57322e3097497105 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Tue, 9 May 2017 16:29:49 +0200 Subject: ssl: Only run sslv2 reject tests on old OpenSSL version --- lib/ssl/test/ssl_test_lib.erl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index a59da1b65a..3e89851c91 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1394,6 +1394,18 @@ portable_open_port(Exe, Args) -> open_port({spawn_executable, AbsPath}, [{args, Args}, stderr_to_stdout]). +supports_ssl_tls_version(sslv2 = Version) -> + case os:cmd("openssl version") of + "OpenSSL 1" ++ _ -> + false; + _ -> + VersionFlag = version_flag(Version), + Exe = "openssl", + Args = ["s_client", VersionFlag], + Port = ssl_test_lib:portable_open_port(Exe, Args), + do_supports_ssl_tls_version(Port) + end; + supports_ssl_tls_version(Version) -> VersionFlag = version_flag(Version), Exe = "openssl", -- cgit v1.2.3