diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-02-19 09:43:55 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-02-19 09:43:55 +0100 |
| commit | bd9d965ad204f3eecd6022d1f7565235ffa0c227 (patch) | |
| tree | 3b4088244c0686a6671788abfcb348fb5dbdffb1 /lib/ssl/src/tls_v1.erl | |
| parent | 48411ad12f4d730412895e90c188c2d8f7813ce5 (diff) | |
| parent | 3db7370a556d0dd064f005fd745bdbf50840eda1 (diff) | |
| download | otp-bd9d965ad204f3eecd6022d1f7565235ffa0c227.tar.gz otp-bd9d965ad204f3eecd6022d1f7565235ffa0c227.tar.bz2 otp-bd9d965ad204f3eecd6022d1f7565235ffa0c227.zip | |
Merge branch 'ia/ssl/remove-default-DES/OTP-13195'
* ia/ssl/remove-default-DES/OTP-13195:
ssl: Remove DES ciphers from default configuration
Diffstat (limited to 'lib/ssl/src/tls_v1.erl')
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index 71e5f349dd..09e378cfeb 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -208,9 +208,7 @@ suites(Minor) when Minor == 1; Minor == 2 -> ?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_DHE_RSA_WITH_DES_CBC_SHA, - ?TLS_RSA_WITH_DES_CBC_SHA + ?TLS_RSA_WITH_AES_128_CBC_SHA ]; suites(3) -> [ |