diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-01-26 08:38:18 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-01-26 08:38:18 +0100 |
| commit | fe0e490c6c32ba68b12abe7d139b38f501560415 (patch) | |
| tree | 8ae9249d5d1abc01024f3cd2307ec19ecb8751af /lib/ssl/src/tls_v1.erl | |
| parent | 251b52eee5a36dcefc30a83c9b37ca62eedc2e71 (diff) | |
| parent | 75ffa2a78cd44dbd4cd01a2ede537f27a4c09aa8 (diff) | |
| download | otp-fe0e490c6c32ba68b12abe7d139b38f501560415.tar.gz otp-fe0e490c6c32ba68b12abe7d139b38f501560415.tar.bz2 otp-fe0e490c6c32ba68b12abe7d139b38f501560415.zip | |
Merge branch 'ia/ssl/poddle/OTP-12390'
* ia/ssl/poddle/OTP-12390:
ssl: Remove default support for RC4 ciphers
ssl: Reenable padding check for TLS-1.0 and provide backwards compatible disable option
ssl: Remove sslv3 from the default supported protocol versions
Diffstat (limited to 'lib/ssl/src/tls_v1.erl')
| -rw-r--r-- | lib/ssl/src/tls_v1.erl | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/ssl/src/tls_v1.erl b/lib/ssl/src/tls_v1.erl index c4114278a4..559fc1d6a8 100644 --- a/lib/ssl/src/tls_v1.erl +++ b/lib/ssl/src/tls_v1.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2014. All Rights Reserved. +%% Copyright Ericsson AB 2007-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -208,15 +208,7 @@ suites(Minor) when Minor == 1; Minor == 2 -> ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA, ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA, ?TLS_RSA_WITH_AES_128_CBC_SHA, - - ?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA, - ?TLS_ECDHE_RSA_WITH_RC4_128_SHA, - ?TLS_RSA_WITH_RC4_128_SHA, - ?TLS_RSA_WITH_RC4_128_MD5, ?TLS_DHE_RSA_WITH_DES_CBC_SHA, - ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA, - ?TLS_ECDH_RSA_WITH_RC4_128_SHA, - ?TLS_RSA_WITH_DES_CBC_SHA ]; suites(3) -> |