summaryrefslogtreecommitdiffstats
path: root/include/crypto
diff options
context:
space:
mode:
authorBehan Webster <behanw@converseincode.com>2014-09-08 00:05:09 -0500
committerBehan Webster <behanw@converseincode.com>2014-10-14 10:51:22 +0200
commita0a77af14117e388d43b2385d5ecc800e2d6eee9 (patch)
tree072e3741634bb9b33126d0031797c0919d120541 /include/crypto
parent2d65a9f48fcdf7866aab6457bc707ca233e0c791 (diff)
downloadlinux-a0a77af14117e388d43b2385d5ecc800e2d6eee9.tar.gz
linux-a0a77af14117e388d43b2385d5ecc800e2d6eee9.tar.bz2
linux-a0a77af14117e388d43b2385d5ecc800e2d6eee9.zip
crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code
Add a macro which replaces the use of a Variable Length Array In Struct (VLAIS) with a C99 compliant equivalent. This macro instead allocates the appropriate amount of memory using an char array. The new code can be compiled with both gcc and clang. struct shash_desc contains a flexible array member member ctx declared with CRYPTO_MINALIGN_ATTR, so sizeof(struct shash_desc) aligns the beginning of the array declared after struct shash_desc with long long. No trailing padding is required because it is not a struct type that can be used in an array. The CRYPTO_MINALIGN_ATTR is required so that desc is aligned with long long as would be the case for a struct containing a member with CRYPTO_MINALIGN_ATTR. If you want to get to the ctx at the end of the shash_desc as before you can do so using shash_desc_ctx(shash) 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: Michał Mirosław <mirqus@gmail.com>
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/hash.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/crypto/hash.h b/include/crypto/hash.h
index a39195539601..74b13ec1ebd4 100644
--- a/include/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -58,6 +58,11 @@ struct shash_desc {
void *__ctx[] CRYPTO_MINALIGN_ATTR;
};
+#define SHASH_DESC_ON_STACK(shash, ctx) \
+ char __##shash##_desc[sizeof(struct shash_desc) + \
+ crypto_shash_descsize(ctx)] CRYPTO_MINALIGN_ATTR; \
+ struct shash_desc *shash = (struct shash_desc *)__##shash##_desc
+
struct shash_alg {
int (*init)(struct shash_desc *desc);
int (*update)(struct shash_desc *desc, const u8 *data,