diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-11-20 10:51:12 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-11-20 10:51:12 +0100 |
| commit | 0bb72a96b95e856b4d4e12f6fb7ae73118259aba (patch) | |
| tree | b30c868d837a8ff8961b69e409f08bf865865d8e /lib/ssl/src/tls_connection.erl | |
| parent | 94ea0c1218cfb8480d37775f0c2a82452c897360 (diff) | |
| parent | 71390889787b571aa3f13e683d9e2349415f5808 (diff) | |
| download | otp-0bb72a96b95e856b4d4e12f6fb7ae73118259aba.tar.gz otp-0bb72a96b95e856b4d4e12f6fb7ae73118259aba.tar.bz2 otp-0bb72a96b95e856b4d4e12f6fb7ae73118259aba.zip | |
Merge branch 'ia/ssl/tls-client-hello-version/OTP-13114' into maint
* ia/ssl/tls-client-hello-version/OTP-13114:
ssl: Client should send the hello message in the lowest version it is willing to support
Diffstat (limited to 'lib/ssl/src/tls_connection.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 3093508f61..a468c131ce 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -168,9 +168,10 @@ hello(start, #state{host = Host, port = Port, role = client, Cache, CacheCb, Renegotiation, Cert), Version = Hello#client_hello.client_version, + HelloVersion = tls_record:lowest_protocol_version(SslOpts#ssl_options.versions), Handshake0 = ssl_handshake:init_handshake_history(), {BinMsg, ConnectionStates, Handshake} = - encode_handshake(Hello, Version, ConnectionStates0, Handshake0), + encode_handshake(Hello, HelloVersion, ConnectionStates0, Handshake0), Transport:send(Socket, BinMsg), State1 = State0#state{connection_states = ConnectionStates, negotiated_version = Version, %% Requested version |