diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-06-07 10:17:40 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-06-07 10:17:40 +0200 |
| commit | 58beb31dc61edb16fb669317097242f9865149ca (patch) | |
| tree | 762c43af5cf79a400a014d6178ff6d6f0eef69c6 /lib/ssl/src/tls_connection.erl | |
| parent | ac18b8705c78be8bec5bdc14c412af2ced740916 (diff) | |
| parent | 33afe108de9cf24be47b9ebd740a8f5e19daca79 (diff) | |
| download | otp-58beb31dc61edb16fb669317097242f9865149ca.tar.gz otp-58beb31dc61edb16fb669317097242f9865149ca.tar.bz2 otp-58beb31dc61edb16fb669317097242f9865149ca.zip | |
Merge branch 'ingela/ssl/phase-out-sslv2-hello/OTP-13465'
* ingela/ssl/phase-out-sslv2-hello/OTP-13465:
ssl: Add option to phase out support for sslv2 client hello
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 56e516bce2..eaf2dd002d 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -399,9 +399,10 @@ handle_common_event(internal, #alert{} = Alert, StateName, handle_common_event(internal, #ssl_tls{type = ?HANDSHAKE, fragment = Data}, StateName, #state{protocol_buffers = #protocol_buffers{tls_handshake_buffer = Buf0} = Buffers, - negotiated_version = Version} = State0) -> - try - {Packets, Buf} = tls_handshake:get_tls_handshake(Version,Data,Buf0), + negotiated_version = Version, + ssl_options = Options} = State0) -> + try + {Packets, Buf} = tls_handshake:get_tls_handshake(Version,Data,Buf0, Options), State = State0#state{protocol_buffers = Buffers#protocol_buffers{tls_handshake_buffer = Buf}}, |