aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/dtls_handshake.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-12-08 15:06:13 +0100
committerIngela Anderton Andin <[email protected]>2017-12-14 11:19:02 +0100
commitb4451cf451fb8d025158809084503e2ae13b7f7f (patch)
tree20d4a53d61056e46416a99bd9675b771d102567a /lib/ssl/src/dtls_handshake.erl
parent4c7d0f1c937ec37fbdac47de4f71f92feb0128c7 (diff)
downloadotp-b4451cf451fb8d025158809084503e2ae13b7f7f.tar.gz
otp-b4451cf451fb8d025158809084503e2ae13b7f7f.tar.bz2
otp-b4451cf451fb8d025158809084503e2ae13b7f7f.zip
ssl: Align (with DTLS) and correct TLS_FALLBACK_SCSV handling
Diffstat (limited to 'lib/ssl/src/dtls_handshake.erl')
-rw-r--r--lib/ssl/src/dtls_handshake.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssl/src/dtls_handshake.erl b/lib/ssl/src/dtls_handshake.erl
index 5e8f5c2ca0..6071eece13 100644
--- a/lib/ssl/src/dtls_handshake.erl
+++ b/lib/ssl/src/dtls_handshake.erl
@@ -67,7 +67,8 @@ client_hello(Host, Port, ConnectionStates, SslOpts,
%%--------------------------------------------------------------------
client_hello(Host, Port, Cookie, ConnectionStates,
#ssl_options{versions = Versions,
- ciphers = UserSuites
+ ciphers = UserSuites,
+ fallback = Fallback
} = SslOpts,
Cache, CacheCb, Renegotiation, OwnCert) ->
Version = dtls_record:highest_protocol_version(Versions),
@@ -83,7 +84,9 @@ client_hello(Host, Port, Cookie, ConnectionStates,
#client_hello{session_id = Id,
client_version = Version,
- cipher_suites = ssl_handshake:cipher_suites(CipherSuites, Renegotiation),
+ cipher_suites =
+ ssl_handshake:cipher_suites(CipherSuites,
+ Renegotiation, Fallback),
compression_methods = ssl_record:compressions(),
random = SecParams#security_parameters.client_random,
cookie = Cookie,