diff --git a/[refs] b/[refs] index 5a8528258926..c606d66102a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29b37f42127f7da511560a40ea74f5047da40c13 +refs/heads/master: bac1b5c4696f217afeac5b29874a337bc39da717 diff --git a/trunk/crypto/blkcipher.c b/trunk/crypto/blkcipher.c index 4a7e65c4df4d..d70a41c002df 100644 --- a/trunk/crypto/blkcipher.c +++ b/trunk/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)