diff options
| author | Kent Yoder <key@linux.vnet.ibm.com> | 2012-04-05 20:34:20 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-27 09:51:05 -0700 |
| commit | ee6c90f9e96bc7d334f626b6076817d57cf861a1 (patch) | |
| tree | d7121eecb279cdec47a88a4ba137ae48bcc9dab2 /crypto/sha512_generic.c | |
| parent | 26cf838583142c2f5c79f2edbad3331011438137 (diff) | |
| download | kernel_samsung_smdk4412-ee6c90f9e96bc7d334f626b6076817d57cf861a1.zip kernel_samsung_smdk4412-ee6c90f9e96bc7d334f626b6076817d57cf861a1.tar.gz kernel_samsung_smdk4412-ee6c90f9e96bc7d334f626b6076817d57cf861a1.tar.bz2 | |
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>
Diffstat (limited to 'crypto/sha512_generic.c')
| -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 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; |