Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some socket issues #9460

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix some socket issues #9460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcbcc9e
Fix some socket issues
dgud Feb 18, 2025
a6b91f7
Reduce the bufers
dgud Feb 18, 2025
5314810
fixup! Fix some socket issues
dgud Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions lib/ssl/test/ssl_api_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,7 +1141,7 @@
{ok, _Ext} = ssl:handshake(ASocket, [{handshake, hello}, {versions, [Version]}]),
ssl:handshake_continue(ASocket, ServerOpts, 5000)
end),
{ok, Client} = ssl:connect(Host, Port, [{versions, [Version]} | ClientOpts]),

Check warning on line 1144 in lib/ssl/test/ssl_api_SUITE.erl

View workflow job for this annotation

GitHub Actions / CT Test Results

2 out of 7 runs failed: ipv6 

artifacts/Unit Test Results/ssl_junit.xml [took 0s]
Raw output 
Test ipv6 in ssl_api_SUITE failed!
{{badmatch,
     {error,
         {tls_alert,
             {insufficient_security,
                 "TLS client: In state hello received SERVER ALERT: Fatal - Insufficient Security\n"}}}},
 [{ssl_api_SUITE,handshake_hello_postpone_opts_verify,1,
      [{file,"ssl_api_SUITE.erl"},{line,1144}]},
  {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1794}]},
  {test_server,run_test_case_eval1,6,[{file,"test_server.erl"},{line,1303}]},
  {test_server,run_test_case_eval,9,[{file,"test_server.erl"},{line,1235}]}]}
ssl:close(Client).

%%--------------------------------------------------------------------
Expand Down Expand Up @@ -1474,19 +1474,23 @@

{ok, _} = ssl:sockname(ListenSocket),

{error, _enotconn} = ssl:send(ListenSocket, <<"data">>),
{error, enotconn} = ssl:recv(ListenSocket, 0),
{error, enotconn} = ssl:connection_information(ListenSocket),
{error, enotconn} = ssl:peername(ListenSocket),
{error, enotconn} = ssl:peercert(ListenSocket),
{error, enotconn} = ssl:renegotiate(ListenSocket),
{error, enotconn} = ssl:export_key_materials(ListenSocket, [<<"Label">>], [<<"Context">>], 256),
Check = fun({error, enotconn}) -> ok;

Check warning on line 1477 in lib/ssl/test/ssl_api_SUITE.erl

View workflow job for this annotation

GitHub Actions / CT Test Results

1 out of 7 runs failed: export_key_materials 

artifacts/Unit Test Results/ssl_junit.xml [took 0s]
Raw output 
Test export_key_materials in ssl_api_SUITE failed!
{function_clause,[{ssl_api_SUITE,'-listen_socket/1-fun-0-',
                                 [{error,epipe}],
                                 [{file,"ssl_api_SUITE.erl"},{line,1477}]},
                  {ssl_api_SUITE,listen_socket,1,
                                 [{file,"ssl_api_SUITE.erl"},{line,1481}]},
                  {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1794}]},
                  {test_server,run_test_case_eval1,6,
                               [{file,"test_server.erl"},{line,1303}]},
                  {test_server,run_test_case_eval,9,
                               [{file,"test_server.erl"},{line,1235}]}]}
({error, #{info := enotconn}}) -> ok %% socket error msgs
end,

Check(ssl:send(ListenSocket, <<"data">>)),
Check(ssl:recv(ListenSocket, 0)),
Check(ssl:connection_information(ListenSocket)),
Check(ssl:peername(ListenSocket)),
Check(ssl:peercert(ListenSocket)),
Check(ssl:renegotiate(ListenSocket)),
Check(ssl:export_key_materials(ListenSocket, [<<"Label">>], [<<"Context">>], 256)),
%% Legacy test
{error, enotconn} = ssl:prf(ListenSocket, master_secret,
<<"Label">>, [client_random, server_random], 256),
Check(ssl:prf(ListenSocket, master_secret,
<<"Label">>, [client_random, server_random], 256)),
case Protocol of
tls ->
{error, enotconn} = ssl:shutdown(ListenSocket, read_write);
Check(ssl:shutdown(ListenSocket, read_write));
dtls ->
{error, notsup} = ssl:shutdown(ListenSocket, read_write)
end,
Expand Down
3 changes: 2 additions & 1 deletion lib/ssl/test/ssl_test_lib.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4301,7 +4301,8 @@ assert_mfl(Socket, MFL) ->
?CT_LOG("Connection MFL ~p, Expecting: ~p ~n", [InfoMFL, MFL]),
{ok, [{max_fragment_length, ConnMFL}]} = InfoMFL,
ConnMFL = MFL.
-define(BIG_BUF, 10000000).

-define(BIG_BUF, 64_000).
%% Workaround data delivery issues on solaris | openbsd when kernel buffers are small
bigger_buffers() ->
case os:type() of
Expand Down
4 changes: 4 additions & 0 deletions lib/ssl/test/tls_api_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,6 +1460,10 @@ tls_downgrade_result(Socket, Pid) ->
ok = socket:send(TCPSocket, <<"Downgraded">>),
{ok, <<"Downgraded">>} = socket:recv(TCPSocket, length("Downgraded")),
ok;
{ok, {'$socket', _} = TCPSocket, Bin} ->
ok = socket:send(TCPSocket, <<"Downgraded">>),
<<"Downgraded">> = Bin,
ok;
{ok, TCPSocket} ->
inet:setopts(TCPSocket, [{active, true}]),
gen_tcp:send(TCPSocket, "Downgraded"),
Expand Down
Loading