diff options
author | Kent Yoder <key@linux.vnet.ibm.com> | 2012-04-05 20:34:20 +0800 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2012-10-07 23:37:43 +0200 |
commit | 21f5d063fca7488c7bd3d6adec5aa0c2e5bc4ae0 (patch) | |
tree | 4fac44acb40aa06798ef8a5ac5d54836b99371a8 | |
parent | 79c23081de12a2d61529174f153400b7586c2cf9 (diff) | |
download | lwn-21f5d063fca7488c7bd3d6adec5aa0c2e5bc4ae0.tar.gz lwn-21f5d063fca7488c7bd3d6adec5aa0c2e5bc4ae0.zip |
crypto: sha512 - Fix byte counter overflow in SHA-512
commit 25c3d30c918207556ae1d6e663150ebdf902186b upstream.
The current code only increments the upper 64 bits of the SHA-512 byte
counter when the number of bytes hashed happens to hit 2^64 exactly.
This patch increments the upper 64 bits whenever the lower 64 bits
overflows.
Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r-- | crypto/sha512_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c index 107f6f7be5e1..dd30f40af9f5 100644 --- a/crypto/sha512_generic.c +++ b/crypto/sha512_generic.c @@ -174,7 +174,7 @@ sha512_update(struct shash_desc *desc, const u8 *data, unsigned int len) index = sctx->count[0] & 0x7f; /* Update number of bytes */ - if (!(sctx->count[0] += len)) + if ((sctx->count[0] += len) < len) sctx->count[1]++; part_len = 128 - index; |