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

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

crypto: LLVMLinux: Remove VLAIS usage from crypto/hmac.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>
Cc: pageexec@freemail.hu
parent b6106265

crypto/hmac.c

+11 −14
Original line number Diff line number Diff line
@@ -52,20 +52,17 @@ static int hmac_setkey(struct crypto_shash *parent, 
	struct hmac_ctx *ctx = align_ptr(opad + ss,

					 crypto_tfm_ctx_alignment());

	struct crypto_shash *hash = ctx->hash;

	struct {

		struct shash_desc shash;

		char ctx[crypto_shash_descsize(hash)];

	} desc;

	SHASH_DESC_ON_STACK(shash, hash);

	unsigned int i;



	desc.shash.tfm = hash;

	desc.shash.flags = crypto_shash_get_flags(parent) &

			    CRYPTO_TFM_REQ_MAY_SLEEP;

	shash->tfm = hash;

	shash->flags = crypto_shash_get_flags(parent)

		& CRYPTO_TFM_REQ_MAY_SLEEP;



	if (keylen > bs) {

		int err;



		err = crypto_shash_digest(&desc.shash, inkey, keylen, ipad);

		err = crypto_shash_digest(shash, inkey, keylen, ipad);

		if (err)

			return err;
@@ -81,12 +78,12 @@ static int hmac_setkey(struct crypto_shash *parent, 
		opad[i] ^= 0x5c;

	}



	return crypto_shash_init(&desc.shash) ?:

	       crypto_shash_update(&desc.shash, ipad, bs) ?:

	       crypto_shash_export(&desc.shash, ipad) ?:

	       crypto_shash_init(&desc.shash) ?:

	       crypto_shash_update(&desc.shash, opad, bs) ?:

	       crypto_shash_export(&desc.shash, opad);

	return crypto_shash_init(shash) ?:

	       crypto_shash_update(shash, ipad, bs) ?:

	       crypto_shash_export(shash, ipad) ?:

	       crypto_shash_init(shash) ?:

	       crypto_shash_update(shash, opad, bs) ?:

	       crypto_shash_export(shash, opad);

}



static int hmac_export(struct shash_desc *pdesc, void *out)