diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-16 18:04:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-16 18:04:41 +0100 |
| commit | 0d6e82e7e0b6a192ec9c875d9ed08ad9e43c7c2f (patch) | |
| tree | d7c31c802dc81f802d9bb8170c6d4901dd1d277c /arch/s390 | |
| parent | vfs: fix BUG_ON() in fs/namei.c:1461 (diff) | |
| parent | crypto: sha-s390 - Reset index after processing partial block (diff) | |
| download | linux-0d6e82e7e0b6a192ec9c875d9ed08ad9e43c7c2f.tar.xz linux-0d6e82e7e0b6a192ec9c875d9ed08ad9e43c7c2f.zip | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/crypto/sha_common.c b/arch/s390/crypto/sha_common.c index f42dbabc0d30..48884f89ab92 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 */ |