diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-05-27 10:45:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-27 10:45:08 +0200 |
| commit | 48085e18c31bd303f07d9d75cff282361e38ca8b (patch) | |
| tree | f2215cb4831350ea20ffaae5b603a6142a892614 /lib/ssl/src/dtls_connection.erl | |
| parent | f0510a55fdc2591ea71107f77e36d6fc7b001874 (diff) | |
| parent | df0c5663dd944a3dd06936105d0696a704c20e4e (diff) | |
| download | otp-48085e18c31bd303f07d9d75cff282361e38ca8b.tar.gz otp-48085e18c31bd303f07d9d75cff282361e38ca8b.tar.bz2 otp-48085e18c31bd303f07d9d75cff282361e38ca8b.zip | |
Merge branch 'kennethlakin/beast-mitigation-options/PR-1041/OTP-13629'
* kennethlakin/beast-mitigation-options/PR-1041/OTP-13629:
ssl: Add BEAST mitigation selection option
Diffstat (limited to 'lib/ssl/src/dtls_connection.erl')
| -rw-r--r-- | lib/ssl/src/dtls_connection.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl index 82d6faee42..60a61bc901 100644 --- a/lib/ssl/src/dtls_connection.erl +++ b/lib/ssl/src/dtls_connection.erl @@ -416,7 +416,8 @@ encode_change_cipher(#change_cipher_spec{}, Version, ConnectionStates) -> initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions}, User, {CbModule, DataTag, CloseTag, ErrorTag}) -> - ConnectionStates = ssl_record:init_connection_states(Role), + #ssl_options{beast_mitigation = BeastMitigation} = SSLOptions, + ConnectionStates = ssl_record:init_connection_states(Role, BeastMitigation), SessionCacheCb = case application:get_env(ssl, session_cb) of {ok, Cb} when is_atom(Cb) -> |