| Date | Tue, 02 Oct 2012 00:53:11 +0200 | From | Willy Tarreau <> | Subject | [ 074/180] crypto: sha512 - Fix byte counter overflow in SHA-512 |
| |
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Kent Yoder <key@linux.vnet.ibm.com>
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> --- 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 107f6f7..dd30f40 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; -- 1.7.2.1.45.g54fbc
|