diff options
| author | Siri Hansen <[email protected]> | 2014-06-12 09:17:24 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-06-12 09:17:24 +0200 |
| commit | 227793da80034f76e546b5cba240a31b26287d2b (patch) | |
| tree | 4738c18009a008a62c6809bdf546e883fe2148e7 /lib/ssl | |
| parent | da42410cb15c0749ea6cf9b6196b81320d8391b6 (diff) | |
| parent | 7274a9db9b17cc14fde15a3aa0574136c58e8551 (diff) | |
| download | otp-227793da80034f76e546b5cba240a31b26287d2b.tar.gz otp-227793da80034f76e546b5cba240a31b26287d2b.tar.bz2 otp-227793da80034f76e546b5cba240a31b26287d2b.zip | |
Merge branch 'maint'
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]). |