aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-06-12 14:56:11 +0200
committerIngela Anderton Andin <[email protected]>2014-06-12 15:00:27 +0200
commit8508cc2a00012bfadb9dd8f894d187965191b0ca (patch)
tree62288b47b81ecbd2a03068209bedb636dfa14970 /lib/ssl/src/ssl.erl
parentdc7a9868aa1259f729f8437d92a7948ba1098401 (diff)
downloadotp-8508cc2a00012bfadb9dd8f894d187965191b0ca.tar.gz
otp-8508cc2a00012bfadb9dd8f894d187965191b0ca.tar.bz2
otp-8508cc2a00012bfadb9dd8f894d187965191b0ca.zip
ssl: Fix dialyzer specs to reflect reality
Diffstat (limited to 'lib/ssl/src/ssl.erl')
-rw-r--r--lib/ssl/src/ssl.erl11
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()}.