diff options
author | Ingela Anderton Andin <[email protected]> | 2011-02-22 17:49:16 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-02-22 17:49:16 +0100 |
commit | dcace32ba232f613429b67462ce3f51b1b270ae3 (patch) | |
tree | 2c373f632e9cead34caa5bdcd03a8aed5b43d62a /lib/ssl/src/ssl_connection.erl | |
parent | 7bc880298b2f0994f2902cb0290e4fd035b01865 (diff) | |
parent | afdb6f011baedffb7290dd7b689a88af015e8b37 (diff) | |
download | otp-dcace32ba232f613429b67462ce3f51b1b270ae3.tar.gz otp-dcace32ba232f613429b67462ce3f51b1b270ae3.tar.bz2 otp-dcace32ba232f613429b67462ce3f51b1b270ae3.zip |
Merge branch 'ia/ssl/dialyzer' into dev
* ia/ssl/dialyzer:
Dialyzer does not like old fun syntax
Corrected dialyzer specs
Modernized some dialyzer specs
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
-rw-r--r-- | lib/ssl/src/ssl_connection.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 489895cf29..85245f4342 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1086,13 +1086,13 @@ init_private_key({rsa, PrivateKey}, _, _,_) -> init_private_key({dsa, PrivateKey},_,_,_) -> public_key:der_decode('DSAPrivateKey', PrivateKey). --spec(handle_file_error/6 :: (_,_,_,_,_,_) -> no_return()). +-spec(handle_file_error(_,_,_,_,_,_) -> no_return()). handle_file_error(Line, Error, {badmatch, Reason}, File, Throw, Stack) -> file_error(Line, Error, Reason, File, Throw, Stack); handle_file_error(Line, Error, Reason, File, Throw, Stack) -> file_error(Line, Error, Reason, File, Throw, Stack). --spec(file_error/6 :: (_,_,_,_,_,_) -> no_return()). +-spec(file_error(_,_,_,_,_,_) -> no_return()). file_error(Line, Error, Reason, File, Throw, Stack) -> Report = io_lib:format("SSL: ~p: ~p:~p ~s~n ~p~n", [Line, Error, Reason, File, Stack]), @@ -1412,8 +1412,6 @@ key_exchange(#state{role = client, State#state{connection_states = ConnectionStates1, tls_handshake_hashes = Hashes1}. --spec(rsa_key_exchange/2 :: (_,_) -> no_return()). - rsa_key_exchange(PremasterSecret, PublicKeyInfo = {Algorithm, _, _}) when Algorithm == ?rsaEncryption; Algorithm == ?md2WithRSAEncryption; |