Merge branch 'ingela/ssl/windows-cuddle'

* ingela/ssl/windows-cuddle:
  ssl: Only run sslv2 reject tests on old OpenSSL version
  ssl: Try to workaround OpenSSL windows obscurities

1 files changed, 14 insertions, 0 deletions

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index be9849b9e6..68a99c28dd 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",
@@ -1403,6 +1415,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}} ->