aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-08-11 10:00:05 +0200
committerIngela Anderton Andin <[email protected]>2017-08-11 10:00:05 +0200
commitb617f9cee7f3ae62b367f5c18902c2facc2fc6b0 (patch)
treeeee0db1734a1ec336eb52cfb18610c7d49792355 /lib/ssl/src
parente16195c1d675c0d929af1ad75e7f3a7838429fd8 (diff)
parent99f0de1edcf0d49117fe5699230edf5f2d45c39a (diff)
downloadotp-b617f9cee7f3ae62b367f5c18902c2facc2fc6b0.tar.gz
otp-b617f9cee7f3ae62b367f5c18902c2facc2fc6b0.tar.bz2
otp-b617f9cee7f3ae62b367f5c18902c2facc2fc6b0.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl_cipher.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index bd60197c88..50c5f0d755 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -335,7 +335,9 @@ all_suites(Version) ->
anonymous_suites({3, N}) ->
anonymous_suites(N);
-
+anonymous_suites({254, _} = Version) ->
+ anonymous_suites(dtls_v1:corresponding_tls_version(Version))
+ -- [?TLS_DH_anon_WITH_RC4_128_MD5];
anonymous_suites(N)
when N >= 3 ->
[?TLS_DH_anon_WITH_AES_128_GCM_SHA256,