aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-06-11 11:11:56 +0200
committerIngela Anderton Andin <[email protected]>2014-06-11 11:11:56 +0200
commitfed8c2586a80c79951f994f24ba69c30bd8d262c (patch)
treee3961c7006b691a1e528437f573d4de381c3f164
parenteeec3b6df919b95752052b605732be0541f018ca (diff)
parent3a6527c25bf7bfaf36fdb4ec0fe38f98b8ef22d5 (diff)
downloadotp-fed8c2586a80c79951f994f24ba69c30bd8d262c.tar.gz
otp-fed8c2586a80c79951f994f24ba69c30bd8d262c.tar.bz2
otp-fed8c2586a80c79951f994f24ba69c30bd8d262c.zip
Merge branch 'ia/ssl/version-argument' into maint
* ia/ssl/version-argument: ssl: Version argument to ssl_cipher:anonymous_suites should not be added yet!
-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]).