aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-10-04 15:16:55 +0200
committerRaimo Niskanen <[email protected]>2016-10-04 15:22:00 +0200
commit634d26929bb5852958870a7b18f67b4b8702bfa2 (patch)
tree96834c61a09b55a5bc36b48d4d6ae7b074fbfcf3 /lib/ssl/src
parent0456461c18e17cdc42b0a3a10d8a2203ee0abfcf (diff)
parent946253795a026ba1f438554f786d01debd5cf8a7 (diff)
downloadotp-634d26929bb5852958870a7b18f67b4b8702bfa2.tar.gz
otp-634d26929bb5852958870a7b18f67b4b8702bfa2.tar.bz2
otp-634d26929bb5852958870a7b18f67b4b8702bfa2.zip
Merge branch 'RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896' into maint
* RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896: disable RC4 in SSL when crypto doesn't support it Fix compilation when OpenSSL doesn't support RC4 Conflicts: lib/crypto/c_src/crypto.c
Diffstat (limited to 'lib/ssl/src')
-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 19e1517194..02873ce522 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -1464,6 +1464,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.