diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-01-22 10:41:58 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-01-22 10:41:58 +0100 |
| commit | bb64f19a947568a56f719d609fa5915f703a32fb (patch) | |
| tree | 38af53107ac5896a46cfce5de8dc65e73b2ab0e0 /lib/ssl/src/ssl_cipher.erl | |
| parent | e6432a0c60a488c7750fcdab3a4f2821c0f35ec8 (diff) | |
| parent | 22236da53c12d11eee7c103e3484aaa5ea8030b5 (diff) | |
| download | otp-bb64f19a947568a56f719d609fa5915f703a32fb.tar.gz otp-bb64f19a947568a56f719d609fa5915f703a32fb.tar.bz2 otp-bb64f19a947568a56f719d609fa5915f703a32fb.zip | |
Merge branch 'ingela/ssl/remove-3des-from-default/OTP-14768'
* ingela/ssl/remove-3des-from-default/OTP-14768:
ssl: Remove 3DES cipher suites from default
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index dba8e5a311..d72e1d5ecb 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -457,7 +457,14 @@ rc4_suites(N) when N =< 3 -> %%-------------------------------------------------------------------- des_suites(_)-> [?TLS_DHE_RSA_WITH_DES_CBC_SHA, - ?TLS_RSA_WITH_DES_CBC_SHA]. + ?TLS_RSA_WITH_DES_CBC_SHA, + ?TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, + ?TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, + ?TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA, + ?TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA, + ?TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA, + ?TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA + ]. %%-------------------------------------------------------------------- -spec rsa_suites(Version::ssl_record:ssl_version() | integer()) -> [cipher_suite()]. |