diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-09-17 18:55:12 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-09-17 23:40:54 +0200 |
commit | 903833a3cf9c7c357730cde99937b7eb81abc5c9 (patch) | |
tree | c6f2ec8692ba68c3f0640b0849c59a2ab8bf7726 /src/crypto/zinc/blake2s | |
parent | poly1305-x86_64: don't activate simd for small blocks (diff) | |
download | wireguard-monolithic-historical-903833a3cf9c7c357730cde99937b7eb81abc5c9.tar.xz wireguard-monolithic-historical-903833a3cf9c7c357730cde99937b7eb81abc5c9.zip |
crypto: do not use -include trick
Diffstat (limited to 'src/crypto/zinc/blake2s')
-rw-r--r-- | src/crypto/zinc/blake2s/blake2s-x86_64-glue.h | 3 | ||||
-rw-r--r-- | src/crypto/zinc/blake2s/blake2s.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h index f0b43e8..e7cbef7 100644 --- a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h +++ b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h @@ -3,7 +3,6 @@ * Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */ -#include <zinc/blake2s.h> #include <asm/cpufeature.h> #include <asm/processor.h> #include <asm/fpu/api.h> @@ -60,5 +59,3 @@ static inline bool blake2s_arch(struct blake2s_state *state, const u8 *block, #endif return false; } - -#define HAVE_BLAKE2S_ARCH_IMPLEMENTATION diff --git a/src/crypto/zinc/blake2s/blake2s.c b/src/crypto/zinc/blake2s/blake2s.c index d0b9bb9..bedff1e 100644 --- a/src/crypto/zinc/blake2s/blake2s.c +++ b/src/crypto/zinc/blake2s/blake2s.c @@ -111,7 +111,9 @@ void blake2s_init_key(struct blake2s_state *state, const size_t outlen, } EXPORT_SYMBOL(blake2s_init_key); -#ifndef HAVE_BLAKE2S_ARCH_IMPLEMENTATION +#if defined(CONFIG_ZINC_ARCH_X86_64) +#include "blake2s-x86_64-glue.h" +#else void __init blake2s_fpu_init(void) { } |