From b27269618782a033862df2f135cbff7073b30d69 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Fri, 24 Nov 2017 10:50:23 +0100 Subject: ssl: Fix incorrect merge conflict resolution When handling merging of back ported Counter measurements for Bleichenbacher attack a line from DTLS was accidentally lost. --- lib/ssl/src/dtls_connection.erl | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/ssl') diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl index 0a5720d9ee..15eb39e716 100644 --- a/lib/ssl/src/dtls_connection.erl +++ b/lib/ssl/src/dtls_connection.erl @@ -807,6 +807,7 @@ handle_client_hello(#client_hello{client_version = ClientVersion} = Hello, State = prepare_flight(State0#state{connection_states = ConnectionStates, negotiated_version = Version, hashsign_algorithm = HashSign, + client_hello_version = ClientVersion, session = Session, negotiated_protocol = Protocol}), -- cgit v1.2.3