Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ssl: Correct connection state handling in TLS sender #10201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2025
Merged

ssl: Correct connection state handling in TLS sender #10201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/ssl/src/tls_gen_connection.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,9 @@ queue_change_cipher(Msg, #state{connection_env = #connection_env{negotiated_vers

reinit(#state{protocol_specific = #{sender := Sender},
connection_env = #connection_env{negotiated_version = Version},
connection_states = #{current_write := Write}} = State0) ->
tls_sender:update_connection_state(Sender, Write, Version),
connection_states = #{current_write := Write} = ConnectionStates} = State0) ->
MaxFragLength = maps:get(max_fragment_length, ConnectionStates, undefined),
tls_sender:update_connection_state(Sender, Write, Version, MaxFragLength),
State = reinit_handshake_data(State0),
garbage_collect(),
State.
Expand Down
2 changes: 1 addition & 1 deletion lib/ssl/src/tls_record.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
is_higher/2, supported_protocol_versions/0, sufficient_crypto_support/1,
is_acceptable_version/1, is_acceptable_version/2, hello_version/1]).

-export_type([tls_version/0, tls_atom_version/0]).
-export_type([tls_version/0, tls_atom_version/0, tls_max_frag_len/0]).

-type tls_version() :: ssl_record:ssl_version().
-type tls_atom_version() :: sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2' | 'tlsv1.3'.
Expand Down
42 changes: 25 additions & 17 deletions lib/ssl/src/tls_sender.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
renegotiate/1,
peer_renegotiate/1,
downgrade/2,
update_connection_state/3,
update_connection_state/4,
dist_handshake_complete/3]).

%% gen_statem callbacks
Expand Down Expand Up @@ -170,12 +170,14 @@ peer_renegotiate(Pid) ->
gen_statem:call(Pid, renegotiate, ?DEFAULT_TIMEOUT).

%%--------------------------------------------------------------------
-spec update_connection_state(pid(), WriteState::map(), tls_record:tls_version()) -> ok.
-spec update_connection_state(pid(), WriteState::map(),
tls_record:tls_version(),
MaxFragLen :: tls_record:tls_max_frag_len()) -> ok.
%% Description: So TLS connection process can synchronize the
%% encryption state to be used when sending application data.
%%--------------------------------------------------------------------
update_connection_state(Pid, NewState, Version) ->
gen_statem:cast(Pid, {new_write, NewState, Version}).
update_connection_state(Pid, NewState, Version, MaxFragLen) ->
gen_statem:cast(Pid, {new_write, NewState, Version, MaxFragLen}).

%%--------------------------------------------------------------------
-spec downgrade(pid(), integer()) -> {ok, ssl_record:connection_state()}
Expand Down Expand Up @@ -339,13 +341,13 @@ connection(cast, #alert{} = Alert, #data{buff = Buff} = StateData0) ->
Async ->
{next_state, async_wait, StateData0#data{buff = Async#async{low = 0}}, [postpone]}
end;
connection(cast, {new_write, WritesState, Version},
#data{connection_states = ConnectionStates, env = Env} = StateData) ->
CW = maps:remove(aead_handle, WritesState),
connection(cast, {new_write, WritesState, Version, MaxFragLen},
#data{connection_states = ConnectionStates0, env = Env} = StateData) ->
ConnectionStates = handle_new_write_state(ConnectionStates0, WritesState, MaxFragLen),
hibernate_after(connection,
StateData#data{connection_states = ConnectionStates#{current_write => CW},
env = Env#env{negotiated_version = Version}}, []);
%%
StateData#data{connection_states = ConnectionStates,
env = Env#env{negotiated_version = Version}},
[]);
connection(info, dist_data,
#data{env = #env{dist_handle = DHandle}} = StateData) ->
case dist_data(DHandle) of
Expand Down Expand Up @@ -409,15 +411,14 @@ handshake({call, _}, _, _) ->
{keep_state_and_data, [postpone]};
handshake(internal, {application_packets,_,_}, _) ->
{keep_state_and_data, [postpone]};
handshake(cast, {new_write, WriteState0, Version},
handshake(cast, {new_write, WriteState, Version, MaxFragLen},
#data{connection_states = ConnectionStates0,
env = #env{key_update_at = KeyUpdateAt0,
role = Role,
num_key_updates = N,
keylog_fun = Fun} = Env} = StateData) ->
WriteState = maps:remove(aead_handle, WriteState0),
ConnectionStates = ConnectionStates0#{current_write => WriteState},
role = Role,
num_key_updates = N,
keylog_fun = Fun} = Env} = StateData) ->
KeyUpdateAt = key_update_at(Version, WriteState, KeyUpdateAt0),
ConnectionStates = handle_new_write_state(ConnectionStates0, WriteState, MaxFragLen),
case Version of
?TLS_1_3 ->
maybe_traffic_keylog_1_3(Fun, Role, ConnectionStates, N);
Expand All @@ -427,7 +428,7 @@ handshake(cast, {new_write, WriteState0, Version},
{next_state, connection,
StateData#data{connection_states = ConnectionStates,
env = Env#env{negotiated_version = Version,
key_update_at = KeyUpdateAt}}};
key_update_at = KeyUpdateAt}}};
handshake(info, dist_data, _) ->
{keep_state_and_data, [postpone]};
handshake(info, tick, _) ->
Expand Down Expand Up @@ -489,6 +490,13 @@ code_change(_OldVsn, State, Data, _Extra) ->
%%%===================================================================
%%% Internal functions
%%%===================================================================
handle_new_write_state(ConnectionStates, WriteState0, undefined) ->
WriteState = maps:remove(aead_handle, WriteState0),
maps:without([max_fragment_length], ConnectionStates#{current_write => WriteState});
handle_new_write_state(ConnectionStates, WriteState0, MaxFragLen) ->
WriteState = maps:remove(aead_handle, WriteState0),
ConnectionStates#{max_fragment_length => MaxFragLen, current_write => WriteState}.

handle_common(StateName, {call, From}, get_application_traffic_secret,
#data{env = #env{num_key_updates = N}} = Data) ->
CurrentWrite = maps:get(current_write, Data#data.connection_states),
Expand Down
Loading