aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorAndreas Schultz <[email protected]>2012-10-12 14:58:11 +0200
committerIngela Anderton Andin <[email protected]>2013-03-28 11:29:37 +0100
commitb5d0475fa744da644ed6f9e4232a0aaf660a5f35 (patch)
tree83feb30dc3ac50ab2d647b969a7e12f0ba9dd522 /lib/ssl/src
parent24c10d72c72f9404467df9f3447055e565094999 (diff)
downloadotp-b5d0475fa744da644ed6f9e4232a0aaf660a5f35.tar.gz
otp-b5d0475fa744da644ed6f9e4232a0aaf660a5f35.tar.bz2
otp-b5d0475fa744da644ed6f9e4232a0aaf660a5f35.zip
SSL: enable hash_size values for sha224, sha384 and sha512
Some of the PSK and SRP ciphers default to sha384, this enables hash_size for that cipher. It also adds sha512 and sha224 to be prepared for further cipher enhancements.
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl_cipher.erl14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index be629dcdd1..173c53709b 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -852,14 +852,14 @@ hash_size(md5) ->
16;
hash_size(sha) ->
20;
+hash_size(sha224) ->
+ 28;
hash_size(sha256) ->
- 32.
-%% Currently no supported cipher suites defaults to sha384 or sha512
-%% so these clauses are not needed at the moment.
-%% hash_size(sha384) ->
-%% 48;
-%% hash_size(sha512) ->
-%% 64.
+ 32;
+hash_size(sha384) ->
+ 48;
+hash_size(sha512) ->
+ 64.
%% RFC 5246: 6.2.3.2. CBC Block Cipher
%%