Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c30fbe6 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: scatterwalk - remove 'chain' argument from scatterwalk_crypto_chain() 



All callers pass chain=0 to scatterwalk_crypto_chain().

Remove this unneeded parameter.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0567fc9e

crypto/lrw.c

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int post_crypt(struct skcipher_request *req) 
	if (rctx->dst != sg) {

		rctx->dst[0] = *sg;

		sg_unmark_end(rctx->dst);

		scatterwalk_crypto_chain(rctx->dst, sg_next(sg), 0, 2);

		scatterwalk_crypto_chain(rctx->dst, sg_next(sg), 2);

	}

	rctx->dst[0].length -= offset - sg->offset;

	rctx->dst[0].offset = offset;
@@ -265,7 +265,7 @@ static int pre_crypt(struct skcipher_request *req) 
	if (rctx->src != sg) {

		rctx->src[0] = *sg;

		sg_unmark_end(rctx->src);

		scatterwalk_crypto_chain(rctx->src, sg_next(sg), 0, 2);

		scatterwalk_crypto_chain(rctx->src, sg_next(sg), 2);

	}

	rctx->src[0].length -= offset - sg->offset;

	rctx->src[0].offset = offset;

crypto/scatterwalk.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ struct scatterlist *scatterwalk_ffwd(struct scatterlist dst[2], 


	sg_init_table(dst, 2);

	sg_set_page(dst, sg_page(src), src->length - len, src->offset + len);

	scatterwalk_crypto_chain(dst, sg_next(src), 0, 2);

	scatterwalk_crypto_chain(dst, sg_next(src), 2);



	return dst;

}

crypto/xts.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int post_crypt(struct skcipher_request *req) 
	if (rctx->dst != sg) {

		rctx->dst[0] = *sg;

		sg_unmark_end(rctx->dst);

		scatterwalk_crypto_chain(rctx->dst, sg_next(sg), 0, 2);

		scatterwalk_crypto_chain(rctx->dst, sg_next(sg), 2);

	}

	rctx->dst[0].length -= offset - sg->offset;

	rctx->dst[0].offset = offset;
@@ -204,7 +204,7 @@ static int pre_crypt(struct skcipher_request *req) 
	if (rctx->src != sg) {

		rctx->src[0] = *sg;

		sg_unmark_end(rctx->src);

		scatterwalk_crypto_chain(rctx->src, sg_next(sg), 0, 2);

		scatterwalk_crypto_chain(rctx->src, sg_next(sg), 2);

	}

	rctx->src[0].length -= offset - sg->offset;

	rctx->src[0].offset = offset;

include/crypto/scatterwalk.h

+1 −7
Original line number Diff line number Diff line
@@ -22,14 +22,8 @@ 
#include <linux/scatterlist.h>



static inline void scatterwalk_crypto_chain(struct scatterlist *head,

					    struct scatterlist *sg,

					    int chain, int num)

					    struct scatterlist *sg, int num)

{

	if (chain) {

		head->length += sg->length;

		sg = sg_next(sg);

	}



	if (sg)

		sg_chain(head, num, sg);

	else

net/tls/tls_device_fallback.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static void chain_to_walk(struct scatterlist *sg, struct scatter_walk *walk) 
	sg_set_page(sg, sg_page(src),

		    src->length - diff, walk->offset);



	scatterwalk_crypto_chain(sg, sg_next(src), 0, 2);

	scatterwalk_crypto_chain(sg, sg_next(src), 2);

}



static int tls_enc_record(struct aead_request *aead_req,