diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-04-22 09:21:24 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-04-22 09:21:24 +0200 |
| commit | 2b5f4b793f9ee8a8176429dea86e0a6b4915dcf9 (patch) | |
| tree | e498b8bc745f582ee0546503e44a5c2b5e7beb64 /lib/ssl/src/ssl_cipher.erl | |
| parent | 5e97d7cdb359b500fa0268679b343f0258707f28 (diff) | |
| parent | 7f0e683bc483b70f05fa806539bd5c540943dfd0 (diff) | |
| download | otp-2b5f4b793f9ee8a8176429dea86e0a6b4915dcf9.tar.gz otp-2b5f4b793f9ee8a8176429dea86e0a6b4915dcf9.tar.bz2 otp-2b5f4b793f9ee8a8176429dea86e0a6b4915dcf9.zip | |
Merge branch 'ia/ssl/suites-match-negotiated-version/OTP-11875' into maint
* ia/ssl/suites-match-negotiated-version/OTP-11875:
ssl: Select supported cipher suites for the negotiated SSL/TLS-version
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 78a328ace8..a3ec419c2a 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -34,7 +34,8 @@ -export([security_parameters/2, security_parameters/3, suite_definition/1, decipher/5, cipher/5, - suite/1, suites/1, ec_keyed_suites/0, anonymous_suites/0, psk_suites/1, srp_suites/0, + suite/1, suites/1, all_suites/1, + ec_keyed_suites/0, anonymous_suites/0, psk_suites/1, srp_suites/0, openssl_suite/1, openssl_suite_name/1, filter/2, filter_suites/1, hash_algorithm/1, sign_algorithm/1, is_acceptable_hash/2]). @@ -224,6 +225,11 @@ suites({3, 0}) -> suites({3, N}) -> tls_v1:suites(N). +all_suites(Version) -> + suites(Version) + ++ ssl_cipher:anonymous_suites() + ++ ssl_cipher:psk_suites(Version) + ++ ssl_cipher:srp_suites(). %%-------------------------------------------------------------------- -spec anonymous_suites() -> [cipher_suite()]. %% |