diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-06-11 11:11:56 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-06-11 11:11:56 +0200 |
| commit | fed8c2586a80c79951f994f24ba69c30bd8d262c (patch) | |
| tree | e3961c7006b691a1e528437f573d4de381c3f164 /lib/ssl | |
| parent | eeec3b6df919b95752052b605732be0541f018ca (diff) | |
| parent | 3a6527c25bf7bfaf36fdb4ec0fe38f98b8ef22d5 (diff) | |
| download | otp-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!
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 2 |
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]). |