aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/tls_connection_1_3.erl
diff options
context:
space:
mode:
authorPéter Dimitrov <[email protected]>2019-05-21 13:43:57 +0200
committerPéter Dimitrov <[email protected]>2019-05-21 13:43:57 +0200
commite69cc5de116420ee861dab9dca1481a2f32909d1 (patch)
tree5c30e6de3e739e534e7e830795d11045e0b9d3c3 /lib/ssl/src/tls_connection_1_3.erl
parent39f7c8557ce813c1e908bdaeba5d9913b88d8277 (diff)
downloadotp-e69cc5de116420ee861dab9dca1481a2f32909d1.tar.gz
otp-e69cc5de116420ee861dab9dca1481a2f32909d1.tar.bz2
otp-e69cc5de116420ee861dab9dca1481a2f32909d1.zip
ssl: Remove calls to tls_connection:next_record/1
Diffstat (limited to 'lib/ssl/src/tls_connection_1_3.erl')
-rw-r--r--lib/ssl/src/tls_connection_1_3.erl27
1 files changed, 10 insertions, 17 deletions
diff --git a/lib/ssl/src/tls_connection_1_3.erl b/lib/ssl/src/tls_connection_1_3.erl
index 41e1b671de..d1b004975c 100644
--- a/lib/ssl/src/tls_connection_1_3.erl
+++ b/lib/ssl/src/tls_connection_1_3.erl
@@ -188,9 +188,8 @@ wait_finished(Type, Msg, State, Connection) ->
ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
-wait_sh(internal, #change_cipher_spec{}, State0, _Module) ->
- {Record, State} = tls_connection:next_record(State0),
- tls_connection:next_event(?FUNCTION_NAME, Record, State);
+wait_sh(internal, #change_cipher_spec{}, State, _Module) ->
+ tls_connection:next_event(?FUNCTION_NAME, no_record, State);
wait_sh(internal, #server_hello{} = Hello, State0, _Module) ->
case tls_handshake_1_3:do_wait_sh(Hello, State0) of
#alert{} = Alert ->
@@ -199,46 +198,40 @@ wait_sh(internal, #server_hello{} = Hello, State0, _Module) ->
%% TODO: Implement hello_retry_request
{next_state, start, State1, []};
{State1, wait_ee} ->
- {Record, State} = tls_connection:next_record(State1),
- tls_connection:next_event(wait_ee, Record, State)
+ tls_connection:next_event(wait_ee, no_record, State1)
end;
wait_sh(Type, Msg, State, Connection) ->
ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
-wait_ee(internal, #change_cipher_spec{}, State0, _Module) ->
- {Record, State} = tls_connection:next_record(State0),
- tls_connection:next_event(?FUNCTION_NAME, Record, State);
+wait_ee(internal, #change_cipher_spec{}, State, _Module) ->
+ tls_connection:next_event(?FUNCTION_NAME, no_record, State);
wait_ee(internal, #encrypted_extensions{} = EE, State0, _Module) ->
case tls_handshake_1_3:do_wait_ee(EE, State0) of
#alert{} = Alert ->
ssl_connection:handle_own_alert(Alert, {3,4}, wait_ee, State0);
{State1, NextState} ->
- {Record, State} = tls_connection:next_record(State1),
- tls_connection:next_event(NextState, Record, State)
+ tls_connection:next_event(NextState, no_record, State1)
end;
wait_ee(Type, Msg, State, Connection) ->
ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).
-wait_cert_cr(internal, #change_cipher_spec{}, State0, _Module) ->
- {Record, State} = tls_connection:next_record(State0),
- tls_connection:next_event(?FUNCTION_NAME, Record, State);
+wait_cert_cr(internal, #change_cipher_spec{}, State, _Module) ->
+ tls_connection:next_event(?FUNCTION_NAME, no_record, State);
wait_cert_cr(internal, #certificate_1_3{} = Certificate, State0, _Module) ->
case tls_handshake_1_3:do_wait_cert_cr(Certificate, State0) of
#alert{} = Alert ->
ssl_connection:handle_own_alert(Alert, {3,4}, wait_cert_cr, State0);
{State1, NextState} ->
- {Record, State} = tls_connection:next_record(State1),
- tls_connection:next_event(NextState, Record, State)
+ tls_connection:next_event(NextState, no_record, State1)
end;
wait_cert_cr(internal, #certificate_request_1_3{} = CertificateRequest, State0, _Module) ->
case tls_handshake_1_3:do_wait_cert_cr(CertificateRequest, State0) of
#alert{} = Alert ->
ssl_connection:handle_own_alert(Alert, {3,4}, wait_cert_cr, State0);
{State1, NextState} ->
- {Record, State} = tls_connection:next_record(State1),
- tls_connection:next_event(NextState, Record, State)
+ tls_connection:next_event(NextState, no_record, State1)
end;
wait_cert_cr(Type, Msg, State, Connection) ->
ssl_connection:handle_common_event(Type, Msg, ?FUNCTION_NAME, State, Connection).