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

Commit eccc5140 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "crypto: ccm - Remove VLA usage"

parents b3d06167 8a4085c2

crypto/ccm.c

+6 −3
Original line number Diff line number Diff line
@@ -50,8 +50,11 @@ struct crypto_ccm_req_priv_ctx { 
	u32 flags;

	struct scatterlist src[3];

	struct scatterlist dst[3];

	union {

		struct ahash_request ahreq;

		struct skcipher_request skreq;

	};

};



struct cbcmac_tfm_ctx {

	struct crypto_cipher *child;
@@ -181,7 +184,7 @@ static int crypto_ccm_auth(struct aead_request *req, struct scatterlist *plain, 
	struct crypto_ccm_req_priv_ctx *pctx = crypto_ccm_reqctx(req);

	struct crypto_aead *aead = crypto_aead_reqtfm(req);

	struct crypto_ccm_ctx *ctx = crypto_aead_ctx(aead);

	AHASH_REQUEST_ON_STACK(ahreq, ctx->mac);

	struct ahash_request *ahreq = &pctx->ahreq;

	unsigned int assoclen = req->assoclen;

	struct scatterlist sg[3];

	u8 *odata = pctx->odata;
@@ -427,7 +430,7 @@ static int crypto_ccm_init_tfm(struct crypto_aead *tfm) 
	crypto_aead_set_reqsize(

		tfm,

		align + sizeof(struct crypto_ccm_req_priv_ctx) +

		crypto_skcipher_reqsize(ctr));

		max(crypto_ahash_reqsize(mac), crypto_skcipher_reqsize(ctr)));



	return 0;