diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-12-14 11:03:45 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-12-14 11:05:17 +0100 |
| commit | 96db55840b25fa8bde5bbbf93c9bd92782e3147c (patch) | |
| tree | 794e612875eac6b4fc76647352a873a1f453ff31 /lib/ssl/src/tls_connection_1_3.erl | |
| parent | d2602d435638a4db13d8cd6f454995c23ceaad65 (diff) | |
| parent | a2cdf319505b102c0b8bb192d36a08448d304559 (diff) | |
| download | otp-96db55840b25fa8bde5bbbf93c9bd92782e3147c.tar.gz otp-96db55840b25fa8bde5bbbf93c9bd92782e3147c.tar.bz2 otp-96db55840b25fa8bde5bbbf93c9bd92782e3147c.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/dtls_connection.erl
lib/ssl/src/ssl_connection.erl
lib/ssl/src/ssl_connection.hrl
lib/ssl/src/tls_connection.erl
lib/ssl/src/tls_record.erl
Diffstat (limited to 'lib/ssl/src/tls_connection_1_3.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection_1_3.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection_1_3.erl b/lib/ssl/src/tls_connection_1_3.erl index 04bcea1e1b..9ff84c703b 100644 --- a/lib/ssl/src/tls_connection_1_3.erl +++ b/lib/ssl/src/tls_connection_1_3.erl @@ -162,8 +162,8 @@ negotiated(internal, ssl_options = #ssl_options{} = SslOpts, key_share = KeyShare, tls_handshake_history = HHistory0, - transport_cb = Transport, - socket = Socket}, _Module) -> + static_env = #static_env{socket = Socket, + transport_cb = Transport}}, _Module) -> %% Create server_hello %% Extensions: supported_versions, key_share, (pre_shared_key) |