diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-01-21 11:56:50 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-01-21 11:56:50 +0100 |
| commit | d4e1ffe0d687737445e54dd99f4e2d42a1ef7cdf (patch) | |
| tree | 52c36aca88f80e4b9ad0a369c94433ce9c974d66 | |
| parent | 208cb776d07b4f6d3f7fedc6a18bf6ae379078ad (diff) | |
| parent | c411bd4deca66a2d5e79745f47b233ff39a127f7 (diff) | |
| download | otp-d4e1ffe0d687737445e54dd99f4e2d42a1ef7cdf.tar.gz otp-d4e1ffe0d687737445e54dd99f4e2d42a1ef7cdf.tar.bz2 otp-d4e1ffe0d687737445e54dd99f4e2d42a1ef7cdf.zip | |
Merge branch 'ingela/ssl/DES-EDE/OTP-15539' into maint
* ingela/ssl/DES-EDE/OTP-15539:
ssl: Correct 3des_ede_cbc check
| -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 66a00c60f1..0416e5c463 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -593,7 +593,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) -> |