diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-04-25 08:59:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-25 08:59:16 +0200 |
| commit | 0a38ece1b90a5596572e58edd1c7ed448c45ea56 (patch) | |
| tree | 1ab9c9edabc9cd5ac70d0832b2ca536be3e0bafc /crypto/sha512_generic.c | |
| parent | bd16e5ce9078e45389711673d0dd5f117d9f04a0 (diff) | |
| parent | acdc6cb9a4bec57e322dacb623758765d85e7324 (diff) | |
| download | linux-crypto-0a38ece1b90a5596572e58edd1c7ed448c45ea56.tar.gz linux-crypto-0a38ece1b90a5596572e58edd1c7ed448c45ea56.zip | |
Merge tag 'v3.4-rc4' into perf/core
Merge v3.4-rc4 - we were on -rc2 before.
Signed-off-by: Ingo Molnar <mingo@kernel.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 107f6f7b..dd30f40a 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; |