diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-10-02 10:47:19 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-10-02 10:47:19 +0200 |
| commit | b05a53e38ec670b0d7cfe3b350d4f3858c36acd0 (patch) | |
| tree | 3b9cb6546dccd0c48531afaae3d55cc1df88de4a /lib/ssl/src/tls_connection.erl | |
| parent | d8fc2c8c1b0424ee42b1ddc8aef63056bc9e85fb (diff) | |
| parent | 52dda64b51b30a90a093d3e928e3e75d817e9cc6 (diff) | |
| download | otp-b05a53e38ec670b0d7cfe3b350d4f3858c36acd0.tar.gz otp-b05a53e38ec670b0d7cfe3b350d4f3858c36acd0.tar.bz2 otp-b05a53e38ec670b0d7cfe3b350d4f3858c36acd0.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 16b30a92c6..9272aebbf4 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -53,7 +53,7 @@ %% Handshake handling -export([renegotiate/2, send_handshake/2, queue_handshake/2, queue_change_cipher/2, - reinit_handshake_data/1, select_sni_extension/1]). + reinit_handshake_data/1, select_sni_extension/1, empty_connection_state/2]). %% Alert and close handling -export([send_alert/2, close/5, protocol_name/0]). @@ -152,6 +152,9 @@ select_sni_extension(#client_hello{extensions = HelloExtensions}) -> select_sni_extension(_) -> undefined. +empty_connection_state(ConnectionEnd, BeastMitigation) -> + ssl_record:empty_connection_state(ConnectionEnd, BeastMitigation). + encode_data(Data, Version, ConnectionStates0)-> tls_record:encode_data(Data, Version, ConnectionStates0). |