File 0490-ssl-Extend-check-for-undelivered-data-at-c... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0490-ssl-Extend-check-for-undelivered-data-at-closing.patch of Package erlang

From 6cc0aebffc1d1dee434806f718f32e54cfd7d148 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 2 Nov 2018 11:17:31 +0100
Subject: [PATCH] ssl: Extend check for undelivered data at closing

This is a timing related bug that alas is hard to test
---
 lib/ssl/src/tls_connection.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index 914ee9f22f..d3b3902fea 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -676,6 +676,7 @@ handle_info({CloseTag, Socket}, StateName,
             #state{socket = Socket, close_tag = CloseTag,
                    socket_options = #socket_options{active = Active},
                    protocol_buffers = #protocol_buffers{tls_cipher_texts = CTs},
+                   user_data_buffer = Buffer,
 		   negotiated_version = Version} = State) ->
 
     %% Note that as of TLS 1.1,
@@ -683,7 +684,7 @@ handle_info({CloseTag, Socket}, StateName,
     %% session not be resumed.  This is a change from TLS 1.0 to conform
     %% with widespread implementation practice.
 
-    case (Active == false) andalso (CTs =/= []) of
+    case (Active == false) andalso ((CTs =/= []) or (Buffer =/= <<>>)) of
         false ->
             case Version of
                 {1, N} when N >= 1 ->
-- 
2.16.4

Places

File 0490-ssl-Extend-check-for-undelivered-data-at-closing.patch of Package erlang

Places