File 4731-ssl-Remove-is_port-guards-for-sockets.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 4731-ssl-Remove-is_port-guards-for-sockets.patch of Package erlang (Revision 1d8c27ee7c6a6523d300eb9c976f0ca2)

Currently displaying revision 1d8c27ee7c6a6523d300eb9c976f0ca2 , Show latest

From eb288918354de215c2c1b3f38feedb763cd97447 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 26 Apr 2022 11:39:05 +0200
Subject: [PATCH] ssl: Remove is_port guards for sockets

Sockets may have other types then port, remove these checks as it
violates socket abstraction and breaks the code for gen_tcp sockets
with new inet_backend.

Closes #5930
---
 lib/ssl/src/ssl.erl             | 48 +++++++++++++++------------------
 lib/ssl/test/dtls_api_SUITE.erl |  2 +-
 lib/ssl/test/tls_api_SUITE.erl  | 14 +++++-----
 3 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/lib/ssl/test/dtls_api_SUITE.erl b/lib/ssl/test/dtls_api_SUITE.erl
index 755072d069..f6dab82bd0 100644
--- a/lib/ssl/test/dtls_api_SUITE.erl
+++ b/lib/ssl/test/dtls_api_SUITE.erl
@@ -373,7 +373,7 @@ client_restarts(Config) ->
         fun({sslsocket, {gen_udp,_,dtls_gen_connection}, [Pid]} = Socket, ssl) ->
                 ct:log("~p Client Socket: ~p ~n", [self(), Socket]),
                 {ok, {{Address,CPort},UDPSocket}=IntSocket} = gen_statem:call(Pid, {downgrade, self()}),
-                true = is_port(UDPSocket),
+
                 ct:log("Info: ~p~n", [inet:info(UDPSocket)]),
 
                 {ok, #config{transport_info = CbInfo, connection_cb = ConnectionCb,
diff --git a/lib/ssl/test/tls_api_SUITE.erl b/lib/ssl/test/tls_api_SUITE.erl
index 9bc1529a4a..4dd32ab0dc 100644
--- a/lib/ssl/test/tls_api_SUITE.erl
+++ b/lib/ssl/test/tls_api_SUITE.erl
@@ -1091,18 +1091,16 @@ tls_password_correct(Config) when is_list(Config) ->
                 {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
                 Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
                                                     {from, self()},
-                                                    {mfa, {?MODULE, tls_shutdown_result, [server]}},
-                                                    {options, [{exit_on_close, false},
-                                                               {active, false} | ServerOpts]}]),
+                                                    {mfa, {ssl_test_lib, send_recv_result, []}},
+                                                    {options, [{active, false} | ServerOpts]}]),
                 Port = ssl_test_lib:inet_port(Server),
                 Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
                                                     {host, Hostname},
                                                     {from, self()},
                                                     {mfa,
-                                                     {?MODULE, tls_shutdown_result, [client]}},
+                                                     {ssl_test_lib, send_recv_result, []}},
                                                     {options,
-                                                     [{exit_on_close, false},
-                                                      {verify, verify_none},
+                                                     [{verify, verify_none},
                                                       {active, false},
                                                       {password, P} | ProtectedClientOpts]}]),
                 ssl_test_lib:check_result(Server, ok, Client, ok),
-- 
2.34.1

Places

File 4731-ssl-Remove-is_port-guards-for-sockets.patch of Package erlang (Revision 1d8c27ee7c6a6523d300eb9c976f0ca2)

Places