diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-05 03:13:30 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-06 02:19:47 +0200 |
| commit | 97e9a61fd5631985232923cff83b2ddc0ca476c0 (patch) | |
| tree | b05245f7be911d091cc0f4e4b6bc3d04db385e9e /src/crypto/zinc/blake2s | |
| parent | global: rename include'd C files to be .c (diff) | |
| download | wireguard-monolithic-historical-97e9a61fd5631985232923cff83b2ddc0ca476c0.tar.xz wireguard-monolithic-historical-97e9a61fd5631985232923cff83b2ddc0ca476c0.zip | |
crypto: test all SIMD combinations
Diffstat (limited to 'src/crypto/zinc/blake2s')
| -rw-r--r-- | src/crypto/zinc/blake2s/blake2s-x86_64-glue.c | 1 | ||||
| -rw-r--r-- | src/crypto/zinc/blake2s/blake2s.c | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.c b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.c index 7be9809..1319480 100644 --- a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.c +++ b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.c @@ -17,6 +17,7 @@ asmlinkage void blake2s_compress_avx512(struct blake2s_state *state, static bool blake2s_use_avx __ro_after_init; static bool blake2s_use_avx512 __ro_after_init; +static bool *const blake2s_nobs[] __initconst = { &blake2s_use_avx512 }; static void __init blake2s_fpu_init(void) { diff --git a/src/crypto/zinc/blake2s/blake2s.c b/src/crypto/zinc/blake2s/blake2s.c index fe4d4b4..311c3fd 100644 --- a/src/crypto/zinc/blake2s/blake2s.c +++ b/src/crypto/zinc/blake2s/blake2s.c @@ -10,6 +10,7 @@ */ #include <zinc/blake2s.h> +#include "../selftest/run.h" #include <linux/types.h> #include <linux/string.h> @@ -112,6 +113,7 @@ EXPORT_SYMBOL(blake2s_init_key); #if defined(CONFIG_ZINC_ARCH_X86_64) #include "blake2s-x86_64-glue.c" #else +static bool *const blake2s_nobs[] __initconst = { }; static void __init blake2s_fpu_init(void) { } @@ -283,10 +285,9 @@ static int __init mod_init(void) { if (!nosimd) blake2s_fpu_init(); -#ifdef CONFIG_ZINC_SELFTEST - if (WARN_ON(!blake2s_selftest())) + if (!selftest_run("blake2s", blake2s_selftest, blake2s_nobs, + ARRAY_SIZE(blake2s_nobs))) return -ENOTRECOVERABLE; -#endif return 0; } |