diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-07-16 10:33:27 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-07-16 10:33:27 +0800 |
commit | e9b25f16cda88b33fe15b30c009912e6c471edda (patch) | |
tree | 088b467b09f050bf7d6cc867d0ce8190d9e2ee4b | |
parent | cbc86b9161b40f95caee0e56381b68956fc28cc4 (diff) | |
download | kernel_samsung_tuna-e9b25f16cda88b33fe15b30c009912e6c471edda.zip kernel_samsung_tuna-e9b25f16cda88b33fe15b30c009912e6c471edda.tar.gz kernel_samsung_tuna-e9b25f16cda88b33fe15b30c009912e6c471edda.tar.bz2 |
crypto: padlock - Fix hashing of partial blocks
When we encounter partial blocks in finup, we'll invoke the xsha
instruction with a bogus count that is not a multiple of the block
size. This patch fixes it.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | drivers/crypto/padlock-sha.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c index a936ba4..76cb6b3 100644 --- a/drivers/crypto/padlock-sha.c +++ b/drivers/crypto/padlock-sha.c @@ -94,6 +94,7 @@ static int padlock_sha1_finup(struct shash_desc *desc, const u8 *in, memcpy(state.buffer + leftover, in, count); in = state.buffer; count += leftover; + state.count &= ~(SHA1_BLOCK_SIZE - 1); } } @@ -157,6 +158,7 @@ static int padlock_sha256_finup(struct shash_desc *desc, const u8 *in, memcpy(state.buf + leftover, in, count); in = state.buf; count += leftover; + state.count &= ~(SHA1_BLOCK_SIZE - 1); } } |