Merge branch 'ingela/ssl/openssl-cuddle' into maint

* ingela/ssl/openssl-cuddle:
  ssl: Remove warnings
  ssl: Remove error prone OpenSSL server up verification

2 files changed, 4 insertions, 27 deletions

diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index aa5e32467a..a2411e6aa2 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -465,24 +465,10 @@ init_openssl_server(Options) ->
             end,
     Args = maybe_force_ipv4(Args0),
     SslPort = ssl_test_lib:portable_open_port(Exe, Args),
+    wait_for_openssl_server(Port, proplists:get_value(protocol, Options, tls)),
     Pid ! {started, SslPort},
     Pid ! {self(), {port, Port}},
-    case openssl_server_started(SslPort) of
-        true ->
-            openssl_server_loop(Pid, SslPort, Args);
-        false ->
-            {error, openssl_server}
-    end.
-
-openssl_server_started(_Port) ->
-    receive
-        {Port, {data, Data}} ->
-            ct:log("~p:~p~n Openssl~n ~s~n",[?MODULE,?LINE, Data]),
-            verify_openssl_server_started(Port, Data)
-    after
-        5000 ->
-            false
-    end.
+    openssl_server_loop(Pid, SslPort, Args).
 
 openssl_server_loop(Pid, SslPort, Args) ->
     receive
@@ -551,15 +537,6 @@ init_openssl_client(Options) ->
     SslPort = start_client(openssl, Port, Options, [{version, Version}]),
     openssl_client_loop(Pid, SslPort, []).
 
-
-verify_openssl_server_started(Port, Data) ->
-    case re:run(Data, ".*CIPHER is.*") of
-        nomatch ->
-            openssl_server_started(Port);
-        {match, _} ->
-            true
-    end.
-
 openssl_client_loop(Pid, SslPort, Args) ->
     Pid ! {connected, SslPort},
     openssl_client_loop_core(Pid, SslPort, Args).
diff --git a/lib/ssl/test/tls_1_3_record_SUITE.erl b/lib/ssl/test/tls_1_3_record_SUITE.erl
index 8bf1097e55..be30ced4e7 100644
--- a/lib/ssl/test/tls_1_3_record_SUITE.erl
+++ b/lib/ssl/test/tls_1_3_record_SUITE.erl
@@ -250,7 +250,7 @@ encode_decode(_Config) ->
     %%       e2 10 ad f3 00 aa 1f 26 60 e1 b2 2e 10 f1 70 f9 2a
     HKDFAlgo = sha256,
     Salt = binary:copy(<<?BYTE(0)>>, 32),
-    IKM = binary:copy(<<?BYTE(0)>>, 32),
+    _IKM = binary:copy(<<?BYTE(0)>>, 32),
     EarlySecret =
         hexstr2bin("33 ad 0a 1c 60 7e c0 3b 09 e6 cd 98 93 68 0c
           e2 10 ad f3 00 aa 1f 26 60 e1 b2 2e 10 f1 70 f9 2a"),
@@ -279,7 +279,7 @@ encode_decode(_Config) ->
         hexstr2bin("b1 58 0e ea df 6d d5 89 b8 ef 4f 2d 56
          52 57 8c c8 10 e9 98 01 91 ec 8d 05 83 08 ce a2 16 a2 1e"),
 
-    SPublicKey =
+    _SPublicKey =
         hexstr2bin("c9 82 88 76 11 20 95 fe 66 76 2b db f7 c6
          72 e1 56 d6 cc 25 3b 83 3d f1 dd 69 b1 b0 4e 75 1f 0f"),