diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-10 09:53:18 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 09:53:18 +0200 |
| commit | 867e19e98095275ee4d3e102de269f60c52fdb45 (patch) | |
| tree | 7f2488d1f75191824fc9affd18389951b42e1482 /lib/ssl/src/ssl_cipher.erl | |
| parent | 24a7d69e1272184a849a2a01bcfc476fc880b356 (diff) | |
| parent | f7c480076d34ff6666e9f15c992792817aab5078 (diff) | |
| download | otp-867e19e98095275ee4d3e102de269f60c52fdb45.tar.gz otp-867e19e98095275ee4d3e102de269f60c52fdb45.tar.bz2 otp-867e19e98095275ee4d3e102de269f60c52fdb45.zip | |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 12 |
1 files changed, 7 insertions, 5 deletions
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 %% |