diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-10-14 12:17:25 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-10-14 12:17:25 +0200 |
| commit | f13b2362c665ef2d98858a4601b1fecf31a21bb5 (patch) | |
| tree | 7070f02f170b0f8fa2b19819fc77df125a863e4a /lib/ssl/src/ssl_cipher.erl | |
| parent | a0217458309211c35423738df5044fe8abf055ea (diff) | |
| parent | bcff09db98ba696b757139a3fd16050a255182e2 (diff) | |
| download | otp-f13b2362c665ef2d98858a4601b1fecf31a21bb5.tar.gz otp-f13b2362c665ef2d98858a4601b1fecf31a21bb5.tar.bz2 otp-f13b2362c665ef2d98858a4601b1fecf31a21bb5.zip | |
Merge branch 'ia/ssl/ecc-gnutls/OTP-11370' into maint
* ia/ssl/ecc-gnutls/OTP-11370:
ssl: Fix dialyzer spec
ssl: Honor TLS client ECC extension
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 6513042e98..e6ed0d8626 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -34,7 +34,7 @@ -export([security_parameters/2, security_parameters/3, suite_definition/1, decipher/5, cipher/5, - suite/1, suites/1, anonymous_suites/0, psk_suites/1, srp_suites/0, + suite/1, 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]). |