diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-01-29 16:55:56 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-01-29 16:55:56 -0600 |
| commit | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (patch) | |
| tree | 356ea7846023503e92e1d5faca68debf1b77a23e /crypto/blkcipher.c | |
| parent | aaca4ff0917f62433f222f9fb0d04c1d61ad68cf (diff) | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 4a7e65c4df4d..d70a41c002df 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) |