diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-05 10:47:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-05 10:47:57 -0800 |
| commit | 586fac13f8685bf9dfb32e1ee98bfb14f0dd0061 (patch) | |
| tree | 6fe7df764a4298a15967139b8f2c69f88d5e22fc /crypto/ahash.c | |
| parent | 1f63b9c15b17d5af360c180f5c71537e954d5d3b (diff) | |
| parent | 74781387822cd7a549123ae2b35862bf802689be (diff) | |
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:
padata: Allocate the cpumask for the padata instance
crypto: authenc - Move saved IV in front of the ablkcipher request
crypto: hash - Fix handling of unaligned buffers
crypto: authenc - Use correct ahash complete functions
crypto: md5 - Set statesize
Diffstat (limited to 'crypto/ahash.c')
| -rw-r--r-- | crypto/ahash.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c index 33a4ff45f842..b8c59b889c6e 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c @@ -78,7 +78,6 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err) walk->data -= walk->offset; if (nbytes && walk->offset & alignmask && !err) { - walk->offset += alignmask - 1; walk->offset = ALIGN(walk->offset, alignmask + 1); walk->data += walk->offset; |