diff options
| author | Jan-Simon Möller <dl9pf@gmx.de> | 2012-07-02 13:48:30 +0200 |
|---|---|---|
| committer | Behan Webster <behanw@converseincode.com> | 2014-10-14 10:51:24 +0200 |
| commit | 4c5c30249452aaebf258751ea4222eba3dd3da4c (patch) | |
| tree | 5b6c4924932fa8e31751d84b87bb40daf0a0067e /crypto/testmgr.c | |
| parent | security, crypto: LLVMLinux: Remove VLAIS from ima_crypto.c (diff) | |
| download | linux-4c5c30249452aaebf258751ea4222eba3dd3da4c.tar.xz linux-4c5c30249452aaebf258751ea4222eba3dd3da4c.zip | |
crypto: LLVMLinux: Remove VLAIS usage from crypto/testmgr.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: 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
Diffstat (limited to 'crypto/testmgr.c')
| -rw-r--r-- | crypto/testmgr.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 9459dfd7357f..29a0cbdd0d19 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -1678,16 +1678,14 @@ static int alg_test_crc32c(const struct alg_test_desc *desc, } do { - struct { - struct shash_desc shash; - char ctx[crypto_shash_descsize(tfm)]; - } sdesc; + SHASH_DESC_ON_STACK(shash, tfm); + u32 *ctx = (u32 *)shash_desc_ctx(shash); - sdesc.shash.tfm = tfm; - sdesc.shash.flags = 0; + shash->tfm = tfm; + shash->flags = 0; - *(u32 *)sdesc.ctx = le32_to_cpu(420553207); - err = crypto_shash_final(&sdesc.shash, (u8 *)&val); + *ctx = le32_to_cpu(420553207); + err = crypto_shash_final(shash, (u8 *)&val); if (err) { printk(KERN_ERR "alg: crc32c: Operation failed for " "%s: %d\n", driver, err); |