Commit d0ad1b24 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: seqiv - Copy AD along with plain/cipher text 



As the AD does not necessarily exist in the destination buffer
it must be copied along with the plain/cipher text.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9d03aee1

crypto/seqiv.c

+6 −27
Original line number Diff line number Diff line
@@ -315,19 +315,12 @@ static int seqiv_aead_encrypt_compat(struct aead_request *req) 
	data = req;



	if (req->src != req->dst) {

		struct scatterlist srcbuf[2];

		struct scatterlist dstbuf[2];

		struct blkcipher_desc desc = {

			.tfm = ctx->null,

		};



		err = crypto_blkcipher_encrypt(

			&desc,

			scatterwalk_ffwd(dstbuf, req->dst,

					 req->assoclen + ivsize),

			scatterwalk_ffwd(srcbuf, req->src,

					 req->assoclen + ivsize),

			req->cryptlen - ivsize);

		err = crypto_blkcipher_encrypt(&desc, req->dst, req->src,

					       req->assoclen + req->cryptlen);

		if (err)

			return err;

	}
@@ -373,19 +366,12 @@ static int seqiv_aead_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);

		err = crypto_blkcipher_encrypt(&desc, req->dst, req->src,

					       req->assoclen + req->cryptlen);

		if (err)

			return err;

	}
@@ -446,19 +432,12 @@ static int seqiv_aead_decrypt_compat(struct aead_request *req) 
	}



	if (req->src != req->dst) {

		struct scatterlist srcbuf[2];

		struct scatterlist dstbuf[2];

		struct blkcipher_desc desc = {

			.tfm = ctx->null,

		};



		err = crypto_blkcipher_encrypt(

			&desc,

			scatterwalk_ffwd(dstbuf, req->dst,

					 req->assoclen + ivsize),

			scatterwalk_ffwd(srcbuf, req->src,

					 req->assoclen + ivsize),

			req->cryptlen - ivsize);

		err = crypto_blkcipher_encrypt(&desc, req->dst, req->src,

					       req->assoclen + req->cryptlen);

		if (err)

			return err;

	}