[PATCH 5/11] crypto: echainiv - Copy AD along with plain text

[Herbert Xu]

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 <herb...@gondor.apana.org.au>
---

 crypto/echainiv.c |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/crypto/echainiv.c b/crypto/echainiv.c
index bd85dcc..02d0543 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;
        }
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html