X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=crypto%2Fblkcipher.c;h=d70a41c002df192e49f77871cd0837732fbad861;hb=9e6e70f8d8b6698e0017c56b86525aabe9c7cd4c;hp=4a7e65c4df4dc3ac6af007efa1d136e1232be053;hpb=3d6eadcb5008beca1b289983ffd7771d1e947bac;p=linux-2.6-omap-h63xx.git 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)