diff options
| author | Erlang/OTP <[email protected]> | 2017-11-22 12:23:40 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-11-22 12:23:40 +0100 |
| commit | 6e2147433a74aba2c49447494291050ae381c7b9 (patch) | |
| tree | 79caf53be6d3edd437112199877c1b0df156c352 /lib/ssl/src/tls_connection.erl | |
| parent | f021a71ad8ffd2d1f5548927944d2b08935511d1 (diff) | |
| parent | 90b1b43eb3be556d47cecbe766d6bff3761be31e (diff) | |
| download | otp-6e2147433a74aba2c49447494291050ae381c7b9.tar.gz otp-6e2147433a74aba2c49447494291050ae381c7b9.tar.bz2 otp-6e2147433a74aba2c49447494291050ae381c7b9.zip | |
Merge branch 'ingela/maint-20/ssl/Bleichenbacher/OTP-14748' into maint-20
* ingela/maint-20/ssl/Bleichenbacher/OTP-14748:
ssl: Prepare for release
ssl: Countermeasurements for Bleichenbacher attack
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index e3ffbea3d3..7861287a22 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -286,6 +286,7 @@ hello(internal, #client_hello{client_version = ClientVersion} = Hello, gen_handshake(ssl_connection, hello, internal, {common_client_hello, Type, ServerHelloExt}, State#state{connection_states = ConnectionStates, negotiated_version = Version, + client_hello_version = ClientVersion, hashsign_algorithm = HashSign, session = Session, negotiated_protocol = Protocol}) |