diff options
| author | Raimo Niskanen <[email protected]> | 2019-02-15 12:05:07 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-02-18 16:00:05 +0100 |
| commit | c4fb3492f48d00214d509de5ec9336e4adf51c58 (patch) | |
| tree | 2aa2e42ac7d6c2216cbc0d5e0bf94b7dbe4fd4fe | |
| parent | caaa87cfd3d8297c39db0a969660919ac6a36416 (diff) | |
| download | otp-c4fb3492f48d00214d509de5ec9336e4adf51c58.tar.gz otp-c4fb3492f48d00214d509de5ec9336e4adf51c58.tar.bz2 otp-c4fb3492f48d00214d509de5ec9336e4adf51c58.zip | |
Inline local function
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 5004cac8e8..3229004c9d 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -838,14 +838,19 @@ initialize_tls_sender(#state{static_env = #static_env{ negotiated_version => Version, renegotiate_at => RenegotiateAt}, tls_sender:initialize(Sender, Init). - -next_tls_record(Data, StateName, #state{protocol_buffers = - #protocol_buffers{tls_record_buffer = Buf0, - tls_cipher_texts = CT0} = Buffers} - = State0) -> - case tls_record:get_tls_records(Data, - acceptable_record_versions(StateName, State0), - Buf0) of + +next_tls_record(Data, StateName, + #state{protocol_buffers = + #protocol_buffers{tls_record_buffer = Buf0, + tls_cipher_texts = CT0} = Buffers} = State0) -> + Versions = + case StateName of + hello -> + [tls_record:protocol_version(Vsn) || Vsn <- ?ALL_AVAILABLE_VERSIONS]; + _ -> + State0#state.connection_env#connection_env.negotiated_version + end, + case tls_record:get_tls_records(Data, Versions, Buf0) of {Records, Buf1} -> CT1 = CT0 ++ Records, next_record(State0#state{protocol_buffers = @@ -856,11 +861,6 @@ next_tls_record(Data, StateName, #state{protocol_buffers = end. -acceptable_record_versions(StateName, #state{connection_env = #connection_env{negotiated_version = Version}}) when StateName =/= hello-> - Version; -acceptable_record_versions(hello, _) -> - [tls_record:protocol_version(Vsn) || Vsn <- ?ALL_AVAILABLE_VERSIONS]. - handle_record_alert(Alert, _) -> Alert. |