aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorAndreas Schultz <[email protected]>2016-09-14 15:08:23 +0200
committerAndreas Schultz <[email protected]>2016-09-22 11:11:25 +0200
commit946253795a026ba1f438554f786d01debd5cf8a7 (patch)
treeee652592ce334465ac332fd5cf470f0586c30fbb /lib/ssl
parent25c665f745bce31cc89e9f48980c7a9683259259 (diff)
downloadotp-946253795a026ba1f438554f786d01debd5cf8a7.tar.gz
otp-946253795a026ba1f438554f786d01debd5cf8a7.tar.bz2
otp-946253795a026ba1f438554f786d01debd5cf8a7.zip
disable RC4 in SSL when crypto doesn't support it
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/ssl_cipher.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index e935c033c7..7ed109341d 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -1458,6 +1458,9 @@ is_acceptable_cipher(Cipher, Algos)
is_acceptable_cipher(Cipher, Algos)
when Cipher == chacha20_poly1305 ->
proplists:get_bool(Cipher, Algos);
+is_acceptable_cipher(Cipher, Algos)
+ when Cipher == rc4_128 ->
+ proplists:get_bool(rc4, Algos);
is_acceptable_cipher(_, _) ->
true.