summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-05-27 14:37:31 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2015-05-28 11:23:18 +0800
commit838c9d561aaae4bc3f4b44046ea08b048ecaffe7 (patch)
tree3479da9f199d9d64433f8fdda887431e315c2f00
parent6350449fbf269aa78281b08852e64d5a4845df96 (diff)
downloadlinux-stable-838c9d561aaae4bc3f4b44046ea08b048ecaffe7.tar.gz
linux-stable-838c9d561aaae4bc3f4b44046ea08b048ecaffe7.tar.bz2
linux-stable-838c9d561aaae4bc3f4b44046ea08b048ecaffe7.zip
crypto: echainiv - Copy AD along with plain text
As the AD does not necessarily exist in the destination buffer it must be copied along with the plain text. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/echainiv.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/crypto/echainiv.c b/crypto/echainiv.c
index bd85dcc4fa3d..02d054300a9a 100644
--- a/crypto/echainiv.c
+++ b/crypto/echainiv.c
@@ -228,19 +228,13 @@ static int echainiv_encrypt(struct aead_request *req)
info = req->iv;
if (req->src != req->dst) {
- struct scatterlist src[2];
- struct scatterlist dst[2];
struct blkcipher_desc desc = {
.tfm = ctx->null,
};
err = crypto_blkcipher_encrypt(
- &desc,
- scatterwalk_ffwd(dst, req->dst,
- req->assoclen + ivsize),
- scatterwalk_ffwd(src, req->src,
- req->assoclen + ivsize),
- req->cryptlen - ivsize);
+ &desc, req->dst, req->src,
+ req->assoclen + req->cryptlen);
if (err)
return err;
}