File 0888-ssl-Correct-tests.patch of Package erlang
From bddcdb1788507d3d1ee26717dfa10e7d5b529572 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 7 Nov 2019 12:00:56 +0100
Subject: [PATCH 1/4] ssl: Correct tests
Receiving code that takes beast mitigation into account has
never been correct as you can not make such a assumptions about
the streamed data, and in the packet context it is even more wrong.
---
lib/ssl/test/ssl_packet_SUITE.erl | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index b7060fa136..1815d0561c 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_SUITE.erl
@@ -2108,18 +2108,10 @@ active_once_packet(Socket,_, 0) ->
end;
active_once_packet(Socket, Data, N) ->
receive
- {ssl, Socket, Byte} when length(Byte) == 1 ->
- ssl:setopts(Socket, [{active, once}]),
- receive
- {ssl, Socket, _} ->
- ssl:setopts(Socket, [{active, once}]),
- active_once_packet(Socket, Data, N-1)
- end;
{ssl, Socket, Data} ->
- ok
- end,
- ssl:setopts(Socket, [{active, once}]),
- active_once_packet(Socket, Data, N-1).
+ ssl:setopts(Socket, [{active, once}]),
+ active_once_packet(Socket, Data, N-1)
+ end.
active_raw(Socket, Data, N) ->
active_raw(Socket, (length(Data) * N)).
@@ -2140,11 +2132,6 @@ active_packet(Socket, _, 0) ->
end;
active_packet(Socket, Data, N) ->
receive
- {ssl, Socket, Byte} when length(Byte) == 1 ->
- receive
- {ssl, Socket, _} ->
- active_packet(Socket, Data, N -1)
- end;
{ssl, Socket, Data} ->
active_packet(Socket, Data, N -1);
Other ->
--
2.16.4