diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-12-08 15:06:13 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-12-14 11:19:02 +0100 |
| commit | b4451cf451fb8d025158809084503e2ae13b7f7f (patch) | |
| tree | 20d4a53d61056e46416a99bd9675b771d102567a /lib/ssl/src/tls_handshake.erl | |
| parent | 4c7d0f1c937ec37fbdac47de4f71f92feb0128c7 (diff) | |
| download | otp-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/tls_handshake.erl')
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index d59e817ffb..8817418fb0 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -67,14 +67,7 @@ client_hello(Host, Port, ConnectionStates, AvailableCipherSuites, SslOpts, ConnectionStates, Renegotiation), - CipherSuites = - case Fallback of - true -> - [?TLS_FALLBACK_SCSV | - ssl_handshake:cipher_suites(AvailableCipherSuites, Renegotiation)]; - false -> - ssl_handshake:cipher_suites(AvailableCipherSuites, Renegotiation) - end, + CipherSuites = ssl_handshake:cipher_suites(AvailableCipherSuites, Renegotiation, Fallback), Id = ssl_session:client_id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert), #client_hello{session_id = Id, client_version = Version, |