diff options
| author | Raimo Niskanen <[email protected]> | 2016-10-04 15:22:17 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2016-10-04 15:22:17 +0200 |
| commit | eaa61ca7e0100bdad0a53b79b010e6363a5a3cb9 (patch) | |
| tree | 3322f7a0e6568e86f13277cb581ee23e0814eaf3 /lib/ssl/src | |
| parent | 43319147e3aa0145303dcb5bd9799b4766618afa (diff) | |
| parent | 634d26929bb5852958870a7b18f67b4b8702bfa2 (diff) | |
| download | otp-eaa61ca7e0100bdad0a53b79b010e6363a5a3cb9.tar.gz otp-eaa61ca7e0100bdad0a53b79b010e6363a5a3cb9.tar.bz2 otp-eaa61ca7e0100bdad0a53b79b010e6363a5a3cb9.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 3 |
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. |