diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 11:19:47 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 11:19:47 +0800 |
| commit | 8322c8407e49034b534abd03d7daa9e267139b4e (patch) | |
| tree | cad5cc216e7ef7a5e25e135c94f511cd3e59088c /crypto/blkcipher.c | |
| parent | 9900fc24982726c6957b008d35ef281ecada85fb (diff) | |
| parent | 06b68744d85e6d6fb2e54bdb1aae6ec6599790d6 (diff) | |
| download | linux-crypto-8322c8407e49034b534abd03d7daa9e267139b4e.tar.gz linux-crypto-8322c8407e49034b534abd03d7daa9e267139b4e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in vmx ghash fix.
Diffstat (limited to 'crypto/blkcipher.c')
| -rw-r--r-- | crypto/blkcipher.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 36999953..a8324268 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -233,6 +233,8 @@ static int blkcipher_walk_next(struct blkcipher_desc *desc, return blkcipher_walk_done(desc, walk, -EINVAL); } + bsize = min(walk->walk_blocksize, n); + walk->flags &= ~(BLKCIPHER_WALK_SLOW | BLKCIPHER_WALK_COPY | BLKCIPHER_WALK_DIFF); if (!scatterwalk_aligned(&walk->in, walk->alignmask) || @@ -245,7 +247,6 @@ static int blkcipher_walk_next(struct blkcipher_desc *desc, } } - bsize = min(walk->walk_blocksize, n); n = scatterwalk_clamp(&walk->in, n); n = scatterwalk_clamp(&walk->out, n); |