aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-03-15 10:30:35 +0100
committerIngela Anderton Andin <[email protected]>2018-03-15 10:30:35 +0100
commit26cea5abd6f19d22dcc1c8a9bdb281670ca85851 (patch)
tree23a4d6162f37882a1dde0db67105b0c9881103b4 /lib/ssl
parenta113f6117fd696ea6f84ed754055b4ec97a7ccb2 (diff)
downloadotp-26cea5abd6f19d22dcc1c8a9bdb281670ca85851.tar.gz
otp-26cea5abd6f19d22dcc1c8a9bdb281670ca85851.tar.bz2
otp-26cea5abd6f19d22dcc1c8a9bdb281670ca85851.zip
ssl: Fix filter function to not discard AEAD cipher suites
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/ssl_cipher.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 62a172ca7c..59cf05fd42 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -2175,6 +2175,8 @@ is_acceptable_cipher(Cipher, Algos) ->
is_acceptable_hash(null, _Algos) ->
true;
+is_acceptable_hash(aead, _Algos) ->
+ true;
is_acceptable_hash(Hash, Algos) ->
proplists:get_bool(Hash, Algos).