From 838c9d561aaae4bc3f4b44046ea08b048ecaffe7 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 27 May 2015 14:37:31 +0800 Subject: [PATCH] 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 --- crypto/echainiv.c | 10 ++-------- 1 file 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; } -- 2.20.1