aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Yoder <key@linux.vnet.ibm.com>2012-04-05 20:34:20 +0800
committerPaul Gortmaker <paul.gortmaker@windriver.com>2014-02-10 16:11:38 -0500
commit9407270c29e59a669c77b8e31fb901561b7d7682 (patch)
tree3a788c6c83cc32539c6ab6f38778ea47d9f5e922
parentf126b9e7d62a13fea31fdfeab2e471935326ee09 (diff)
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: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--crypto/sha512_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c
index 9ed9f60316e5..899b2fa24e50 100644
--- a/crypto/sha512_generic.c
+++ b/crypto/sha512_generic.c
@@ -177,7 +177,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;