aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-05-07 22:16:42 +0200
committerIngela Anderton Andin <[email protected]>2019-05-07 22:16:42 +0200
commitd39b235197c521fd1afef4425effef83be82fc27 (patch)
tree4626459784772998aa5ebcc0bb69b6139c84181d
parent7fe7fa3dde556b5b92522f8279d465bb52baf1f6 (diff)
downloadotp-d39b235197c521fd1afef4425effef83be82fc27.tar.gz
otp-d39b235197c521fd1afef4425effef83be82fc27.tar.bz2
otp-d39b235197c521fd1afef4425effef83be82fc27.zip
Revert "ssl: Add check when to toggle internal active N"
This reverts commit 6e190b012dd5a304fc42a5f3bb58ff173a23eb66.
-rw-r--r--lib/ssl/src/tls_connection.erl16
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index 52e5db731a..167a99b418 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -152,21 +152,19 @@ next_record(#state{protocol_buffers =
connection_states = ConnectionStates,
ssl_options = #ssl_options{padding_check = Check}} = State) ->
next_record(State, CipherTexts, ConnectionStates, Check);
-next_record(#state{user_data_buffer = {_,0,_},
- protocol_buffers = #protocol_buffers{tls_cipher_texts = []},
- protocol_specific = #{active_n_toggle := true,
- active_n := N} = ProtocolSpec,
+next_record(#state{protocol_buffers = #protocol_buffers{tls_cipher_texts = []},
+ protocol_specific = #{active_n_toggle := true, active_n := N} = ProtocolSpec,
static_env = #static_env{socket = Socket,
close_tag = CloseTag,
transport_cb = Transport}
- } = State) ->
+ } = State) ->
case tls_socket:setopts(Transport, Socket, [{active, N}]) of
ok ->
- {no_record, State#state{protocol_specific = ProtocolSpec#{active_n_toggle => false}}};
+ {no_record, State#state{protocol_specific = ProtocolSpec#{active_n_toggle => false}}};
_ ->
- self() ! {CloseTag, Socket},
- {no_record, State}
- end;
+ self() ! {CloseTag, Socket},
+ {no_record, State}
+ end;
next_record(State) ->
{no_record, State}.