diff options
author | Ingela Anderton Andin <[email protected]> | 2018-09-03 12:07:17 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-09-04 17:53:15 +0200 |
commit | f90d75a081f6d5a9a3cfe6f8d387abd7a1489aca (patch) | |
tree | 2bdffc3f9e857167f7bbea9f0a4791913932e038 /lib/ssl/src/ssl.erl | |
parent | f4dd73f0363f3ccf894f17274d5b0d6cdb89fced (diff) | |
download | otp-f90d75a081f6d5a9a3cfe6f8d387abd7a1489aca.tar.gz otp-f90d75a081f6d5a9a3cfe6f8d387abd7a1489aca.tar.bz2 otp-f90d75a081f6d5a9a3cfe6f8d387abd7a1489aca.zip |
ssl: Initial cipher suites adoption for TLS-1.3
This commit filters out cipher suites not to be used in TLS-1.3
We still need to add new cipher suites for TLS-1.3 and possible
add new information to the suite data structure.
Diffstat (limited to 'lib/ssl/src/ssl.erl')
-rw-r--r-- | lib/ssl/src/ssl.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 6460a57b11..166ffac1c0 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -488,9 +488,9 @@ cipher_suites(Base, Version) -> [ssl_cipher_format:suite_definition(Suite) || Suite <- supported_suites(Base, Version)]. %%-------------------------------------------------------------------- --spec filter_cipher_suites([ssl_cipher_format:erl_cipher_suite()], +-spec filter_cipher_suites([ssl_cipher_format:erl_cipher_suite()] | [ssl_cipher_format:cipher_suite()], [{key_exchange | cipher | mac | prf, fun()}] | []) -> - [ssl_cipher_format:erl_cipher_suite()]. + [ssl_cipher_format:erl_cipher_suite() ] | [ssl_cipher_format:cipher_suite()]. %% Description: Removes cipher suites if any of the filter functions returns false %% for any part of the cipher suite. This function also calls default filter functions %% to make sure the cipher suite are supported by crypto. |