diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-03-14 09:41:47 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-03-14 09:41:47 +0100 |
| commit | c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0 (patch) | |
| tree | b341037c365875680be3c5752e0fca748851b84b /lib/ssl/src/ssl_connection.erl | |
| parent | b9872a64b863c424c4d548d4454e6e1b3153ddc4 (diff) | |
| parent | 748d502138a941ddf79accd8dffc398ce84a21a7 (diff) | |
| download | otp-c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0.tar.gz otp-c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0.tar.bz2 otp-c5005dc4f7381bb569c8f27aa7d3d264c4e41ce0.zip | |
Merge branch 'ingela/ssl/no-sslv2-hello-support/OTP-14824'
* ingela/ssl/no-sslv2-hello-support/OTP-14824:
ssl: Remove interoperability option v2_hello_compatible
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 2031735a71..f493c93726 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1119,8 +1119,7 @@ handle_common_event(internal, {handshake, {#hello_request{}, _}}, StateName, #st when StateName =/= connection -> {keep_state_and_data}; handle_common_event(internal, {handshake, {Handshake, Raw}}, StateName, - #state{tls_handshake_history = Hs0, - ssl_options = #ssl_options{v2_hello_compatible = V2HComp}} = State0, + #state{tls_handshake_history = Hs0} = State0, Connection) -> PossibleSNI = Connection:select_sni_extension(Handshake), @@ -1128,7 +1127,7 @@ handle_common_event(internal, {handshake, {Handshake, Raw}}, StateName, %% a client_hello, which needs to be determined by the connection callback. %% In other cases this is a noop State = handle_sni_extension(PossibleSNI, State0), - HsHist = ssl_handshake:update_handshake_history(Hs0, iolist_to_binary(Raw), V2HComp), + HsHist = ssl_handshake:update_handshake_history(Hs0, iolist_to_binary(Raw)), {next_state, StateName, State#state{tls_handshake_history = HsHist}, [{next_event, internal, Handshake}]}; handle_common_event(internal, {protocol_record, TLSorDTLSRecord}, StateName, State, Connection) -> |