aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-06-05 11:11:04 +0200
committerIngela Anderton Andin <[email protected]>2014-06-05 11:11:04 +0200
commit3a6527c25bf7bfaf36fdb4ec0fe38f98b8ef22d5 (patch)
tree76c30bfc4d56b7301bc46ae1287308a80bb54d6c /lib/ssl/src
parentdd764d2a8070111f026aef0d21be1e2a19ad988f (diff)
downloadotp-3a6527c25bf7bfaf36fdb4ec0fe38f98b8ef22d5.tar.gz
otp-3a6527c25bf7bfaf36fdb4ec0fe38f98b8ef22d5.tar.bz2
otp-3a6527c25bf7bfaf36fdb4ec0fe38f98b8ef22d5.zip
ssl: Version argument to ssl_cipher:anonymous_suites should not be added yet!
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index be1041ca13..7f224f6433 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -358,7 +358,7 @@ cipher_suites(openssl) ->
cipher_suites(all) ->
Version = tls_record:highest_protocol_version([]),
Supported = ssl_cipher:all_suites(Version)
- ++ ssl_cipher:anonymous_suites(Version)
+ ++ ssl_cipher:anonymous_suites()
++ ssl_cipher:psk_suites(Version)
++ ssl_cipher:srp_suites(),
ssl_cipher:filter_suites([suite_definition(S) || S <- Supported]).