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 | 1906c279fbe3420e31a5a48a19b6daac5fbf1904 (patch) | |
| tree | 7eed52ac4d5c9abc0fa67392d11f681c50cf46e6 /src/crypto/zinc/curve25519 | |
| parent | poly1305-x86_64: don't activate simd for small blocks (diff) | |
| download | wireguard-linux-compat-1906c279fbe3420e31a5a48a19b6daac5fbf1904.tar.xz wireguard-linux-compat-1906c279fbe3420e31a5a48a19b6daac5fbf1904.zip | |
crypto: do not use -include trick
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/crypto/zinc/curve25519')
| -rw-r--r-- | src/crypto/zinc/curve25519/curve25519-arm-glue.h | 3 | ||||
| -rw-r--r-- | src/crypto/zinc/curve25519/curve25519-x86_64-glue.h | 3 | ||||
| -rw-r--r-- | src/crypto/zinc/curve25519/curve25519.c | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/crypto/zinc/curve25519/curve25519-arm-glue.h b/src/crypto/zinc/curve25519/curve25519-arm-glue.h index 494fd3e..1b39920 100644 --- a/src/crypto/zinc/curve25519/curve25519-arm-glue.h +++ b/src/crypto/zinc/curve25519/curve25519-arm-glue.h @@ -3,7 +3,6 @@ * Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */ -#include <zinc/curve25519.h> #include <asm/hwcap.h> #include <asm/neon.h> #include <asm/simd.h> @@ -42,5 +41,3 @@ static inline bool curve25519_base_arch(u8 pub[CURVE25519_POINT_SIZE], { return false; } - -#define HAVE_CURVE25519_ARCH_IMPLEMENTATION diff --git a/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h b/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h index 3996b48..9159460 100644 --- a/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h +++ b/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h @@ -3,7 +3,6 @@ * Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */ -#include <zinc/curve25519.h> #include <asm/cpufeature.h> #include <asm/processor.h> @@ -45,5 +44,3 @@ static inline bool curve25519_base_arch(u8 pub[CURVE25519_POINT_SIZE], } return false; } - -#define HAVE_CURVE25519_ARCH_IMPLEMENTATION diff --git a/src/crypto/zinc/curve25519/curve25519.c b/src/crypto/zinc/curve25519/curve25519.c index a20b295..7d19fb9 100644 --- a/src/crypto/zinc/curve25519/curve25519.c +++ b/src/crypto/zinc/curve25519/curve25519.c @@ -17,7 +17,11 @@ #include <linux/random.h> #include <crypto/algapi.h> -#ifndef HAVE_CURVE25519_ARCH_IMPLEMENTATION +#if defined(CONFIG_ZINC_ARCH_X86_64) +#include "curve25519-x86_64-glue.h" +#elif defined(CONFIG_ZINC_ARCH_ARM) +#include "curve25519-arm-glue.h" +#else void __init curve25519_fpu_init(void) { } |