File 4147-Finishing-touches.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 4147-Finishing-touches.patch of Package erlang (Revision 3960e820eabd23c72bd43033ebfdf3ef)

Currently displaying revision 3960e820eabd23c72bd43033ebfdf3ef , Show latest

From 01c099a3548c7e6e88b52511c5e8b279a0474360 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Wed, 26 Oct 2022 09:26:25 +0200
Subject: [PATCH 27/27] Finishing touches

---
 lib/ssl/test/inet_crypto_dist.erl | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/ssl/test/inet_crypto_dist.erl b/lib/ssl/test/inet_crypto_dist.erl
index f28da210f7..902bb5c252 100644
--- a/lib/ssl/test/inet_crypto_dist.erl
+++ b/lib/ssl/test/inet_crypto_dist.erl
@@ -83,14 +83,6 @@ params(Socket) ->
 
 -record(key_pair,
         {type = ecdh,
-         %% The curve choice greatly affects setup time,
-         %% we really want an Edwards curve but that would
-         %% require a very new openssl version.
-         %% Twisted brainpool curves (*t1) are faster than
-         %% non-twisted (*r1), 256 is much faster than 384,
-         %% and so on...
-%%%         params = brainpoolP384t1,
-%%%         params = brainpoolP256t1,
          params = ?CURVE,
          public,
          private,
@@ -1407,7 +1399,9 @@ output_handler_chunk(Params, Seq, Front, Size, Rear, Acc, DataSize) ->
 %% Entry function
 input_handler(#params{socket = Socket} = Params, Seq, DistHandle) ->
     try
-        ok = inet:setopts(Socket, [{active, ?TCP_ACTIVE}, nodelay()]),
+        ok =
+            inet:setopts(
+              Socket, [{active, ?TCP_ACTIVE}, nodelay()]),
         input_handler(
           Params#params{dist_handle = DistHandle},
           Seq)
@@ -1687,12 +1681,25 @@ block_decrypt(
 
 %% -------------------------------------------------------------------------
 
+%% Wait for getting killed by process link,
+%% and if that does not happen - drop dead
+
 death_row(Reason) ->
     error_logger:info_report(
       [?FUNCTION_NAME,
        {reason, Reason},
        {pid, self()}]),
-    receive after 5000 -> exit(Reason) end.
+    receive
+    after 5000 ->
+            death_row_timeout(Reason)
+    end.
+
+death_row_timeout(Reason) ->
+    error_logger:error_report(
+      [?FUNCTION_NAME,
+       {reason, Reason},
+       {pid, self()}]),
+    exit(Reason).
 
 %% -------------------------------------------------------------------------
 
-- 
2.35.3

Places

File 4147-Finishing-touches.patch of Package erlang (Revision 3960e820eabd23c72bd43033ebfdf3ef)

Places