diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-27 07:46:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-27 07:46:29 -0800 |
| commit | ff2bad5f899421850f7e9bc956450e4c61b0b95d (patch) | |
| tree | 739acb3863f185a21a870dda6f50bfdc1c241044 /crypto/blkcipher.c | |
| parent | 78d70d48132ce4c678a95b771ffa1af4fb5a03ec (diff) | |
| parent | 516280e735b034216de97eb7ba080ec6acbfc58f (diff) | |
| download | kernel-crypto-ff2bad5f899421850f7e9bc956450e4c61b0b95d.tar.gz kernel-crypto-ff2bad5f899421850f7e9bc956450e4c61b0b95d.tar.xz kernel-crypto-ff2bad5f899421850f7e9bc956450e4c61b0b95d.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: ccm - Fix handling of null assoc data
crypto: blkcipher - Fix WARN_ON handling in walk_done
crypto: authenc - Fix zero-length IV crash
Diffstat (limited to 'crypto/blkcipher.c')
| -rw-r--r-- | crypto/blkcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 4a7e65c4df4..d70a41c002d 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -124,6 +124,7 @@ int blkcipher_walk_done(struct blkcipher_desc *desc, scatterwalk_done(&walk->in, 0, nbytes); scatterwalk_done(&walk->out, 1, nbytes); +err: walk->total = nbytes; walk->nbytes = nbytes; @@ -132,7 +133,6 @@ int blkcipher_walk_done(struct blkcipher_desc *desc, return blkcipher_walk_next(desc, walk); } -err: if (walk->iv != desc->info) memcpy(desc->info, walk->iv, crypto_blkcipher_ivsize(tfm)); if (walk->buffer != walk->page) |