diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-06-13 15:03:14 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-06-13 15:03:14 +0200 |
| commit | 8d081115b4d57bb3a52a6ebe87c119cb762bc153 (patch) | |
| tree | f84436268ac9aff09817afcbfc6560e39172744a /lib/ssl/src/ssl.erl | |
| parent | d284f024154cd8b1f8da219d716ad5aa6e8f539c (diff) | |
| parent | 8508cc2a00012bfadb9dd8f894d187965191b0ca (diff) | |
| download | otp-8d081115b4d57bb3a52a6ebe87c119cb762bc153.tar.gz otp-8d081115b4d57bb3a52a6ebe87c119cb762bc153.tar.bz2 otp-8d081115b4d57bb3a52a6ebe87c119cb762bc153.zip | |
Merge branch 'ia/ssl/dialyzer-specs' into maint
* ia/ssl/dialyzer-specs:
ssl: Fix dialyzer specs to reflect reality
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 7f224f6433..d741fa63fb 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -339,14 +339,10 @@ negotiated_next_protocol(#sslsocket{pid = Pid}) -> ssl_connection:negotiated_next_protocol(Pid). %%-------------------------------------------------------------------- --spec cipher_suites() -> [ssl_cipher:erl_cipher_suite()]. --spec cipher_suites(erlang | openssl | all) -> [ssl_cipher:erl_cipher_suite()] | [string()]. - +-spec cipher_suites(erlang | openssl | all) -> [ssl_cipher:erl_cipher_suite()] | + [string()]. %% Description: Returns all supported cipher suites. %%-------------------------------------------------------------------- -cipher_suites() -> - cipher_suites(erlang). - cipher_suites(erlang) -> Version = tls_record:highest_protocol_version([]), ssl_cipher:filter_suites([suite_definition(S) @@ -363,6 +359,9 @@ cipher_suites(all) -> ++ ssl_cipher:srp_suites(), ssl_cipher:filter_suites([suite_definition(S) || S <- Supported]). +cipher_suites() -> + cipher_suites(erlang). + %%-------------------------------------------------------------------- -spec getopts(#sslsocket{}, [gen_tcp:option_name()]) -> {ok, [gen_tcp:option()]} | {error, reason()}. |