aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-09 09:16:27 +0100
committerIngela Anderton Andin <[email protected]>2018-01-09 09:16:27 +0100
commit18c08d11a954f1e8cd1d01d6a85bc7497a866fbf (patch)
tree6f69b2b9e6e798caf194711aa6cfe342f016f25c /lib/ssl/src
parent19b7ccfe076d88a96b62f3222f38be31bb087df2 (diff)
parent39fb981193c137ba6e3621bae49c07eb0b4d92cf (diff)
downloadotp-18c08d11a954f1e8cd1d01d6a85bc7497a866fbf.tar.gz
otp-18c08d11a954f1e8cd1d01d6a85bc7497a866fbf.tar.bz2
otp-18c08d11a954f1e8cd1d01d6a85bc7497a866fbf.zip
Merge branch 'ingela/dtls/test-cuddle' into maint
* ingela/dtls/test-cuddle: dtls: Filter out rc4 for DTLS psk suites dtls: We do not need to wait for DTLS over UDP server
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl_cipher.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 18271f325a..7efc39e659 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -2148,7 +2148,7 @@ calc_mac_hash(Type, Version,
MacSecret, SeqNo, Type,
Length, PlainFragment).
-is_stream_ciphersuite({_, rc4_128, _, _}) ->
+is_stream_ciphersuite(#{cipher := rc4_128}) ->
true;
is_stream_ciphersuite(_) ->
false.