diff options
author | Ingela Anderton Andin <[email protected]> | 2019-05-08 10:39:20 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2019-05-08 11:35:32 +0200 |
commit | 5110947bcdc18036d4dc7ac666489ed936964ee4 (patch) | |
tree | 457f0863c9cd2085e865c0989f2c50d4c5a390bc /lib/ssl/src/ssl_connection.erl | |
parent | d39b235197c521fd1afef4425effef83be82fc27 (diff) | |
download | otp-5110947bcdc18036d4dc7ac666489ed936964ee4.tar.gz otp-5110947bcdc18036d4dc7ac666489ed936964ee4.tar.bz2 otp-5110947bcdc18036d4dc7ac666489ed936964ee4.zip |
ssl: Remove legacy calls to next_record
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
-rw-r--r-- | lib/ssl/src/ssl_connection.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index fbbe0a49c8..12038a8527 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -442,8 +442,7 @@ handle_alert(#alert{level = ?WARNING} = Alert, StateName, passive_receive(State0 = #state{user_data_buffer = {_,BufferSize,_}}, StateName, Connection, StartTimerAction) -> case BufferSize of 0 -> - {Record, State} = Connection:next_record(State0), - Connection:next_event(StateName, Record, State, StartTimerAction); + Connection:next_event(StateName, no_record, State0, StartTimerAction); _ -> case read_application_data(<<>>, State0) of {stop, _, _} = ShutdownError -> @@ -1188,10 +1187,8 @@ cipher(internal, #finished{verify_data = Data} = Finished, cipher(internal, #next_protocol{selected_protocol = SelectedProtocol}, #state{static_env = #static_env{role = server}, handshake_env = #handshake_env{expecting_finished = true, - expecting_next_protocol_negotiation = true} = HsEnv} = State0, Connection) -> - {Record, State} = - Connection:next_record(State0), - Connection:next_event(?FUNCTION_NAME, Record, + expecting_next_protocol_negotiation = true} = HsEnv} = State, Connection) -> + Connection:next_event(?FUNCTION_NAME, no_record, State#state{handshake_env = HsEnv#handshake_env{negotiated_protocol = SelectedProtocol, expecting_next_protocol_negotiation = false}}); cipher(internal, #change_cipher_spec{type = <<1>>}, #state{handshake_env = HsEnv, connection_states = ConnectionStates0} = |