aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-06-10 09:48:07 +0200
committerIngela Anderton Andin <[email protected]>2013-06-10 09:48:07 +0200
commit82c0b47317b4b71412d7ff7bd632b1f574d056c6 (patch)
tree7ada0bff9292d822d29cdf5338fa57334f0d39a4
parenta33dbb822acb67cf071e606cd28d15090075202f (diff)
parent6607299aa3c0887a108f1fd792b79448dff576a4 (diff)
downloadotp-82c0b47317b4b71412d7ff7bd632b1f574d056c6.tar.gz
otp-82c0b47317b4b71412d7ff7bd632b1f574d056c6.tar.bz2
otp-82c0b47317b4b71412d7ff7bd632b1f574d056c6.zip
Merge branch 'ia/ssl/dialyzer' into maint
* ia/ssl/dialyzer: ssl: Fix dialyzer warnings
-rw-r--r--lib/ssl/src/ssl.erl4
-rw-r--r--lib/ssl/src/ssl_cipher.erl12
2 files changed, 9 insertions, 7 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 75c17b14db..0c1e47311d 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -214,8 +214,8 @@ prf(Socket, Secret, Label, Seed, WantedLength) ->
clear_pem_cache() ->
tls:clear_pem_cache().
-format_error(Reason) when is_list(Reason) ->
- tls:format_error(Reason).
+format_error(Error) ->
+ tls:format_error(Error).
random_bytes(N) ->
tls:random_bytes(N).
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index 898b421dff..ec5d793d65 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -1190,14 +1190,16 @@ hash_size(md5) ->
16;
hash_size(sha) ->
20;
-hash_size(sha224) ->
- 28;
+%% Uncomment when adding cipher suite that needs it
+%% hash_size(sha224) ->
+%% 28;
hash_size(sha256) ->
32;
hash_size(sha384) ->
- 48;
-hash_size(sha512) ->
- 64.
+ 48.
+%% Uncomment when adding cipher suite that needs it
+%% hash_size(sha512) ->
+%% 64.
%% RFC 5246: 6.2.3.2. CBC Block Cipher
%%