aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-05-09 11:25:30 +0200
committerIngela Anderton Andin <[email protected]>2019-05-09 11:25:30 +0200
commit61ebe71042fce734a06382054690d240ab027409 (patch)
tree1ee929110ff6fbd771f2d5fee0b8069ef2d55c30
parent601316f55895a683e51680c40b9d6f661999e528 (diff)
parentd5782e4fad73ed834c206f2839f12608c8eb841c (diff)
downloadotp-61ebe71042fce734a06382054690d240ab027409.tar.gz
otp-61ebe71042fce734a06382054690d240ab027409.tar.bz2
otp-61ebe71042fce734a06382054690d240ab027409.zip
Merge branch 'ingela/ssl/revert-ctrl-flow'
* ingela/ssl/revert-ctrl-flow: Revert "ssl: Add check when to toggle internal active N"
-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 872a557e67..a05858221a 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -171,21 +171,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}.