diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-12-14 11:22:19 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-12-14 11:22:19 +0100 |
| commit | 64ada689858df2f03388b1c15e96abcf6e5a55c0 (patch) | |
| tree | 4859967d3b6474da12a685f865a874e014e797ae /lib/ssl/src/ssl_handshake.erl | |
| parent | ebe6e8a7fa591b31c1378106173a4ebb8a2b16de (diff) | |
| parent | ca00af6271665772c97bb2e146b0f5cbb760a97c (diff) | |
| download | otp-64ada689858df2f03388b1c15e96abcf6e5a55c0.tar.gz otp-64ada689858df2f03388b1c15e96abcf6e5a55c0.tar.bz2 otp-64ada689858df2f03388b1c15e96abcf6e5a55c0.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 61d61b53dd..1ef298083a 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -67,7 +67,7 @@ %% Cipher suites handling -export([available_suites/2, available_signature_algs/2, available_signature_algs/4, - cipher_suites/2, prf/6, select_session/11, supported_ecc/1, + cipher_suites/3, prf/6, select_session/11, supported_ecc/1, premaster_secret/2, premaster_secret/3, premaster_secret/4]). %% Extensions handling @@ -801,6 +801,11 @@ available_signature_algs(#hash_sign_algos{hash_sign_algos = ClientHashSigns}, Su available_signature_algs(_, _, _, _) -> undefined. +cipher_suites(Suites, Renegotiation, true) -> + %% TLS_FALLBACK_SCSV should be placed last -RFC7507 + cipher_suites(Suites, Renegotiation) ++ [?TLS_FALLBACK_SCSV]; +cipher_suites(Suites, Renegotiation, false) -> + cipher_suites(Suites, Renegotiation). cipher_suites(Suites, false) -> [?TLS_EMPTY_RENEGOTIATION_INFO_SCSV | Suites]; cipher_suites(Suites, true) -> |