diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-01-21 11:57:19 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-01-21 11:57:19 +0100 |
| commit | 1ef4e7a3466cb538cd2b11744c8825cb21425c44 (patch) | |
| tree | 35d600a881d2167063580b7480ec44ada42872bd | |
| parent | a11ddd5862fa06a3242e548fbd232a4c294ca7a8 (diff) | |
| parent | d4e1ffe0d687737445e54dd99f4e2d42a1ef7cdf (diff) | |
| download | otp-1ef4e7a3466cb538cd2b11744c8825cb21425c44.tar.gz otp-1ef4e7a3466cb538cd2b11744c8825cb21425c44.tar.bz2 otp-1ef4e7a3466cb538cd2b11744c8825cb21425c44.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 4b975d753b..d08b2cc7ad 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -614,7 +614,7 @@ is_acceptable_cipher(rc4_128, Algos) -> is_acceptable_cipher(des_cbc, Algos) -> proplists:get_bool(des_cbc, Algos); is_acceptable_cipher('3des_ede_cbc', Algos) -> - proplists:get_bool(des3_cbc, Algos); + proplists:get_bool(des_ede3, Algos); is_acceptable_cipher(aes_128_cbc, Algos) -> proplists:get_bool(aes_cbc128, Algos); is_acceptable_cipher(aes_256_cbc, Algos) -> |