diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-02-22 15:56:09 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-02-22 15:56:09 +0100 |
| commit | c6ccce9bb9d8bd5b26f27cd09a3611f60a317073 (patch) | |
| tree | e9653886d502f04a2a6944a59af9fce65ffbafd5 /lib | |
| parent | 833de830b9805666f3a6a3752d5339aa0a577a3e (diff) | |
| parent | 0b049a4ed566fde7ec4b60ab36229959aa5c9401 (diff) | |
| download | otp-c6ccce9bb9d8bd5b26f27cd09a3611f60a317073.tar.gz otp-c6ccce9bb9d8bd5b26f27cd09a3611f60a317073.tar.bz2 otp-c6ccce9bb9d8bd5b26f27cd09a3611f60a317073.zip | |
Merge branch 'ingela/ssl/default-ciphers-suites/OTP-14235' into maint
* ingela/ssl/default-ciphers-suites/OTP-14235:
ssl: Always prefer AES over 3DES
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index 7f24ce5192..32bcdf71c3 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -204,21 +204,21 @@ suites(Minor) when Minor == 1; Minor == 2 -> ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA, ?TLS_RSA_WITH_AES_256_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, - ?TLS_RSA_WITH_3DES_EDE_CBC_SHA, - ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA, ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA, ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA, ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, - ?TLS_RSA_WITH_AES_128_CBC_SHA + ?TLS_RSA_WITH_AES_128_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, + ?TLS_RSA_WITH_3DES_EDE_CBC_SHA ]; suites(3) -> [ |