From 62a6217ff9dff0418ae436c68b65a8b64461790a Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 16 Mar 2018 15:50:41 +0100
Subject: ssl: Handle EXIT messages from test code correctly

---
 lib/ssl/test/ssl_test_lib.erl         | 10 +++++++++-
 lib/ssl/test/ssl_to_openssl_SUITE.erl |  8 +-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 26ef311615..e531494f0b 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -1467,7 +1467,9 @@ 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, "")
+            Bool = do_supports_ssl_tls_version(Port, ""),
+            consume_port_exit(Port),
+            Bool
     end;
 
 supports_ssl_tls_version(Version) ->
@@ -1585,6 +1587,12 @@ tls_version('dtlsv1.2' = Atom) ->
 tls_version(Atom) ->
     tls_record:protocol_version(Atom).
 
+consume_port_exit(OpenSSLPort) ->
+    receive    	
+        {'EXIT', OpenSSLPort, _} ->
+            ok
+    end.
+
 hardcode_rsa_key(1) ->
     #'RSAPrivateKey'{
        version = 'two-prime',
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index e8cbf857ef..9c60a6315e 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1139,7 +1139,7 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
     OpenSslPort = ssl_test_lib:portable_open_port(Exe, Args),  
 
     ct:log("Ports ~p~n", [[erlang:port_info(P) || P <- erlang:ports()]]), 
-    consume_port_exit(OpenSslPort),
+    ssl_test_lib:consume_port_exit(OpenSslPort),
     ssl_test_lib:check_result(Server, {error, {tls_alert, "bad record mac"}}),
     process_flag(trap_exit, false).
 
@@ -1955,12 +1955,6 @@ openssl_client_args(true, Hostname, Port, ServerName) ->
     ["s_client",  "-no_ssl2", "-connect", Hostname ++ ":" ++ 
 	 integer_to_list(Port), "-servername", ServerName].
 
-consume_port_exit(OpenSSLPort) ->
-    receive    	
-        {'EXIT', OpenSSLPort, _} ->
-            ok
-    end.
-
 hostname_format(Hostname) ->
     case lists:member($., Hostname) of
         true ->  
-- 
cgit v1.2.3