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
mariux64 · Feb 16, 2011 · 0d6e82e · 0d6e82e
2 parents 3abb17e + 9d20b57
commit 0d6e82e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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 */