iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: LLVMLinux: Remove VLAIS usage from crypto/hmac.c

Browse Source 
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: Jan-Simon Möller <dl9pf@gmx.de>
Signed-off-by: Behan Webster <behanw@converseincode.com>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Cc: pageexec@freemail.hu
This commit is contained in:
Jan-Simon Möller 2012-07-02 13:47:40 +02:00 committed by Behan Webster
parent b610626523
commit ffb32e973e
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crypto/hmac.c
View File

@ -52,20 +52,17 @@ static int hmac_setkey(struct crypto_shash *parent,
struct hmac_ctx *ctx = align_ptr(opad + ss, struct hmac_ctx *ctx = align_ptr(opad + ss,
crypto_tfm_ctx_alignment()); crypto_tfm_ctx_alignment());
struct crypto_shash *hash = ctx->hash; struct crypto_shash *hash = ctx->hash;
struct { SHASH_DESC_ON_STACK(shash, hash);
struct shash_desc shash;
char ctx[crypto_shash_descsize(hash)];
} desc;
unsigned int i; unsigned int i;
desc.shash.tfm = hash; shash->tfm = hash;
desc.shash.flags = crypto_shash_get_flags(parent) & shash->flags = crypto_shash_get_flags(parent)
CRYPTO_TFM_REQ_MAY_SLEEP; & CRYPTO_TFM_REQ_MAY_SLEEP;
if (keylen > bs) { if (keylen > bs) {
int err; int err;
err = crypto_shash_digest(&desc.shash, inkey, keylen, ipad); err = crypto_shash_digest(shash, inkey, keylen, ipad);
if (err) if (err)
return err; return err;
@ -81,12 +78,12 @@ static int hmac_setkey(struct crypto_shash *parent,
opad[i] ^= 0x5c; opad[i] ^= 0x5c;
} }
return crypto_shash_init(&desc.shash) ?: return crypto_shash_init(shash) ?:
crypto_shash_update(&desc.shash, ipad, bs) ?: crypto_shash_update(shash, ipad, bs) ?:
crypto_shash_export(&desc.shash, ipad) ?: crypto_shash_export(shash, ipad) ?:
crypto_shash_init(&desc.shash) ?: crypto_shash_init(shash) ?:
crypto_shash_update(&desc.shash, opad, bs) ?: crypto_shash_update(shash, opad, bs) ?:
crypto_shash_export(&desc.shash, opad); crypto_shash_export(shash, opad);
} }
static int hmac_export(struct shash_desc *pdesc, void *out) static int hmac_export(struct shash_desc *pdesc, void *out)