ssl: Handle OpenSSL output correctly

Adjust to handle output from OpenSSL in a more general way, so that
"unknown option" should be caught for all cases and the test case
skipped if that is the case and other data form OpenSSL should be
ignored.

1 files changed, 18 insertions, 15 deletions

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 33497798c5..aa1cb57e5c 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1429,7 +1429,7 @@ supports_ssl_tls_version(sslv2 = Version) ->
             Exe = "openssl",
             Args = ["s_client", VersionFlag],
             Port = ssl_test_lib:portable_open_port(Exe, Args),
-            do_supports_ssl_tls_version(Port)
+            do_supports_ssl_tls_version(Port, "")
     end;
 
 supports_ssl_tls_version(Version) ->
@@ -1437,23 +1437,26 @@ supports_ssl_tls_version(Version) ->
     Exe = "openssl",
     Args = ["s_client", VersionFlag],
     Port = ssl_test_lib:portable_open_port(Exe, Args),
-    do_supports_ssl_tls_version(Port).
+    do_supports_ssl_tls_version(Port, "").
 
-do_supports_ssl_tls_version(Port) ->
+do_supports_ssl_tls_version(Port, Acc) ->
     receive 
-        {Port, {data, "u"}} -> 
-	    false;
-	{Port, {data, "unknown option"  ++ _}} -> 
-	    false;
-	{Port, {data, Data}} ->
-	    case lists:member("error", string:tokens(Data, ":")) of
-		true ->
-		    false;
-		false ->
-		    do_supports_ssl_tls_version(Port)
-	    end
+        {Port, {data, Data}} -> 
+            case Acc ++ Data of
+                "unknown option"  ++ _ ->
+                    false;
+                Error when length(Error) >= 11 ->
+                    case lists:member("error", string:tokens(Data, ":")) of
+                        true ->
+                            false;
+                        false ->
+                            do_supports_ssl_tls_version(Port, Error)
+                    end;
+                _ ->
+                    do_supports_ssl_tls_version(Port, Acc ++ Data)
+            end
     after 1000 ->
-	    true
+            true                        
     end.
 
 ssl_options(Option, Config) when is_atom(Option) ->