File 4883-ssl-Test-case-fixes.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 4883-ssl-Test-case-fixes.patch of Package erlang

From b67338711c6db83854de46b6d09df43fa1523345 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 2 Jun 2023 12:33:10 +0200
Subject: [PATCH 3/3] ssl: Test case fixes

DTLS will not support ssl:shutdown with default transports as it is handling a TCP feature.
Disable DTLS max fragment lengt test for OpenSSL version with internal error problem
---
 lib/ssl/test/ssl_api_SUITE.erl | 10 +++++++---
 lib/ssl/test/ssl_test_lib.erl  |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/ssl/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl
index c686fac6d6..4c73837187 100644
--- a/lib/ssl/test/ssl_api_SUITE.erl
+++ b/lib/ssl/test/ssl_api_SUITE.erl
@@ -1210,7 +1210,7 @@ listen_socket() ->
 listen_socket(Config) ->
     ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
     {ok, ListenSocket} = ssl:listen(0, ServerOpts),
-
+    Protocol = proplists:get_value(protocol, ServerOpts, tls),
     %% This can be a valid thing to do as
     %% options are inherited by the accept socket
     ok = ssl:controlling_process(ListenSocket, self()),
@@ -1224,8 +1224,12 @@ listen_socket(Config) ->
     {error, enotconn} = ssl:peercert(ListenSocket),
     {error, enotconn} = ssl:renegotiate(ListenSocket),
     {error, enotconn} = ssl:prf(ListenSocket, 'master_secret', <<"Label">>, [client_random], 256),
-    {error, enotconn} = ssl:shutdown(ListenSocket, read_write),
-
+    case Protocol of
+        tls ->
+            {error, enotconn} = ssl:shutdown(ListenSocket, read_write);
+        dtls ->
+            {error, notsup} = ssl:shutdown(ListenSocket, read_write)
+    end,
     ok = ssl:close(ListenSocket).
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 0e9e4d7490..37ef04f83e 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -3970,6 +3970,8 @@ openssl_maxfraglen_support() ->
             false;
 	"OpenSSL 1.1.1" ++ _ ->
             true;
+        "OpenSSL 3.0" ++ _ ->
+            false; %% OpenSSL sends internal error alert
         "OpenSSL" ++ _ ->
             true;
         _  ->
-- 
2.35.3

Places

File 4883-ssl-Test-case-fixes.patch of Package erlang

Places