diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-13 01:41:41 +0300 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-13 01:41:41 +0300 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /crypto/sha512.c | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
| download | linux-c4366889dda8110247be59ca41fddb82951a8c26.tar.xz | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'crypto/sha512.c')
| -rw-r--r-- | crypto/sha512.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sha512.c b/crypto/sha512.c index 2dfe7f170b48..15eab9db9be4 100644 --- a/crypto/sha512.c +++ b/crypto/sha512.c @@ -24,7 +24,7 @@ #define SHA384_DIGEST_SIZE 48 #define SHA512_DIGEST_SIZE 64 -#define SHA384_HMAC_BLOCK_SIZE 96 +#define SHA384_HMAC_BLOCK_SIZE 128 #define SHA512_HMAC_BLOCK_SIZE 128 struct sha512_ctx { |