aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/dtls_connection.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-04-25 16:57:42 +0200
committerIngela Anderton Andin <[email protected]>2017-04-25 16:57:42 +0200
commit504bb40f3530d5890849f1c51f7ce1aba6766784 (patch)
tree0b5a9df92c015d62e7153d865738751a3e8a207a /lib/ssl/src/dtls_connection.erl
parent61a20e55ccf6ff89a4863c1ed8754b8909646e88 (diff)
parentedab501fe7bffe3f19871157ebd1851e6dad1bc5 (diff)
downloadotp-504bb40f3530d5890849f1c51f7ce1aba6766784.tar.gz
otp-504bb40f3530d5890849f1c51f7ce1aba6766784.tar.bz2
otp-504bb40f3530d5890849f1c51f7ce1aba6766784.zip
Merge branch 'ingela/available_hash_signature_algs/OTP-13820'
* ingela/available_hash_signature_algs/OTP-13820: ssl: TLS-1.2 clients will now always send hello messages on its own format.
Diffstat (limited to 'lib/ssl/src/dtls_connection.erl')
-rw-r--r--lib/ssl/src/dtls_connection.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl
index 440607e99d..14d802085f 100644
--- a/lib/ssl/src/dtls_connection.erl
+++ b/lib/ssl/src/dtls_connection.erl
@@ -250,7 +250,7 @@ init({call, From}, {start, Timeout},
Cache, CacheCb, Renegotiation, Cert),
Version = Hello#client_hello.client_version,
- HelloVersion = dtls_record:lowest_protocol_version(SslOpts#ssl_options.versions),
+ HelloVersion = dtls_record:hello_version(Version, SslOpts#ssl_options.versions),
State1 = prepare_flight(State0#state{negotiated_version = Version}),
{State2, Actions} = send_handshake(Hello, State1#state{negotiated_version = HelloVersion}),
State3 = State2#state{negotiated_version = Version, %% Requested version