aboutsummaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-16 09:04:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-16 09:04:41 -0800
commit0d6e82e7e0b6a192ec9c875d9ed08ad9e43c7c2f (patch)
treed7c31c802dc81f802d9bb8170c6d4901dd1d277c /arch/s390
parent3abb17e82f08628b59e20d8cbcb55e2204180f69 (diff)
parent9d20b571f5bda7273656e1b86ef91eddc94adacc (diff)
downloadlinux-linaro-android-0d6e82e7e0b6a192ec9c875d9ed08ad9e43c7c2f.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: sha-s390 - Reset index after processing partial block
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/crypto/sha_common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/crypto/sha_common.c b/arch/s390/crypto/sha_common.c
index f42dbabc0d3..48884f89ab9 100644
--- a/arch/s390/crypto/sha_common.c
+++ b/arch/s390/crypto/sha_common.c
@@ -38,6 +38,7 @@ int s390_sha_update(struct shash_desc *desc, const u8 *data, unsigned int len)
BUG_ON(ret != bsize);
data += bsize - index;
len -= bsize - index;
+ index = 0;
}
/* process as many blocks as possible */