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

Commit 61ded524 authored by Jan-Simon Möller's avatar Jan-Simon Möller Committed by Behan Webster
Browse files

crypto: LLVMLinux: Remove VLAIS from crypto/ccp/ccp-crypto-sha.c 



Replaced the use of a Variable Length Array In Struct (VLAIS) with a C99
compliant equivalent. This patch allocates the appropriate amount of memory
using a char array using the SHASH_DESC_ON_STACK macro.

The new code can be compiled with both gcc and clang.

Signed-off-by: default avatarJan-Simon Möller <dl9pf@gmx.de>
Signed-off-by: default avatarBehan Webster <behanw@converseincode.com>
Reviewed-by: default avatarMark Charlebois <charlebm@gmail.com>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0458a953

drivers/crypto/ccp/ccp-crypto-sha.c

+6 −7
Original line number Diff line number Diff line
@@ -198,10 +198,9 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key, 
{

	struct ccp_ctx *ctx = crypto_tfm_ctx(crypto_ahash_tfm(tfm));

	struct crypto_shash *shash = ctx->u.sha.hmac_tfm;

	struct {

		struct shash_desc sdesc;

		char ctx[crypto_shash_descsize(shash)];

	} desc;



	SHASH_DESC_ON_STACK(sdesc, shash);



	unsigned int block_size = crypto_shash_blocksize(shash);

	unsigned int digest_size = crypto_shash_digestsize(shash);

	int i, ret;
@@ -216,11 +215,11 @@ static int ccp_sha_setkey(struct crypto_ahash *tfm, const u8 *key, 


	if (key_len > block_size) {

		/* Must hash the input key */

		desc.sdesc.tfm = shash;

		desc.sdesc.flags = crypto_ahash_get_flags(tfm) &

		sdesc->tfm = shash;

		sdesc->flags = crypto_ahash_get_flags(tfm) &

			CRYPTO_TFM_REQ_MAY_SLEEP;



		ret = crypto_shash_digest(&desc.sdesc, key, key_len,

		ret = crypto_shash_digest(sdesc, key, key_len,

					  ctx->u.sha.key);

		if (ret) {

			crypto_ahash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);