aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-11-02 11:17:31 +0100
committerIngela Anderton Andin <[email protected]>2018-11-02 11:35:51 +0100
commit6cc0aebffc1d1dee434806f718f32e54cfd7d148 (patch)
tree40d94306e4c9df36808fe0b0c021307b709fcbd8 /lib/ssl
parent1da4135c98d9160d2d890724eb423db1fd1e39a2 (diff)
downloadotp-6cc0aebffc1d1dee434806f718f32e54cfd7d148.tar.gz
otp-6cc0aebffc1d1dee434806f718f32e54cfd7d148.tar.bz2
otp-6cc0aebffc1d1dee434806f718f32e54cfd7d148.zip
ssl: Extend check for undelivered data at closing
This is a timing related bug that alas is hard to test
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/tls_connection.erl3
1 files changed, 2 insertions, 1 deletions
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 ->