From 012cb5bdafddf3e2b4279f001d4b2b5e0e96e367 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 14 Sep 2018 16:14:21 +0200
Subject: ssl: Improve interop checks

---
 lib/ssl/test/ssl_test_lib.erl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/ssl/test/ssl_test_lib.erl')

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index a391b52c1a..f3235f5614 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1644,6 +1644,8 @@ openssl_dsa_support() ->
             true;
         "LibreSSL"  ++ _ ->
             false;
+        "OpenSSL 1.1" ++ Rest ->
+            false;
         "OpenSSL 1.0.1" ++ Rest ->
             hd(Rest) >= s;
         _ ->
@@ -1854,13 +1856,11 @@ do_supports_ssl_tls_version(Port, Acc) ->
             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;
+                "s_client: Option unknown" ++ _->
+                    false;
+                Info when length(Info) >= 24 ->
+                    ct:pal("~p", [Info]),
+                    true;
                 _ ->
                     do_supports_ssl_tls_version(Port, Acc ++ Data)
             end
-- 
cgit v1.2.3