aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/allowedips.c2
-rw-r--r--src/crypto/zinc/blake2s/blake2s-x86_64-glue.c (renamed from src/crypto/zinc/blake2s/blake2s-x86_64-glue.h)2
-rw-r--r--src/crypto/zinc/blake2s/blake2s.c4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm-glue.c (renamed from src/crypto/zinc/chacha20/chacha20-arm-glue.h)2
-rw-r--r--src/crypto/zinc/chacha20/chacha20-mips-glue.c (renamed from src/crypto/zinc/chacha20/chacha20-mips-glue.h)2
-rw-r--r--src/crypto/zinc/chacha20/chacha20-x86_64-glue.c (renamed from src/crypto/zinc/chacha20/chacha20-x86_64-glue.h)2
-rw-r--r--src/crypto/zinc/chacha20/chacha20.c8
-rw-r--r--src/crypto/zinc/chacha20poly1305.c2
-rw-r--r--src/crypto/zinc/curve25519/curve25519-arm-glue.c (renamed from src/crypto/zinc/curve25519/curve25519-arm-glue.h)2
-rw-r--r--src/crypto/zinc/curve25519/curve25519-x86_64-glue.c (renamed from src/crypto/zinc/curve25519/curve25519-x86_64-glue.h)2
-rw-r--r--src/crypto/zinc/curve25519/curve25519.c6
-rw-r--r--src/crypto/zinc/poly1305/poly1305-arm-glue.c (renamed from src/crypto/zinc/poly1305/poly1305-arm-glue.h)2
-rw-r--r--src/crypto/zinc/poly1305/poly1305-mips-glue.c (renamed from src/crypto/zinc/poly1305/poly1305-mips-glue.h)2
-rw-r--r--src/crypto/zinc/poly1305/poly1305-x86_64-glue.c (renamed from src/crypto/zinc/poly1305/poly1305-x86_64-glue.h)2
-rw-r--r--src/crypto/zinc/poly1305/poly1305.c8
-rw-r--r--src/crypto/zinc/selftest/blake2s.c (renamed from src/crypto/zinc/selftest/blake2s.h)2
-rw-r--r--src/crypto/zinc/selftest/chacha20.c (renamed from src/crypto/zinc/selftest/chacha20.h)2
-rw-r--r--src/crypto/zinc/selftest/chacha20poly1305.c (renamed from src/crypto/zinc/selftest/chacha20poly1305.h)2
-rw-r--r--src/crypto/zinc/selftest/curve25519.c (renamed from src/crypto/zinc/selftest/curve25519.h)2
-rw-r--r--src/crypto/zinc/selftest/poly1305.c (renamed from src/crypto/zinc/selftest/poly1305.h)2
-rw-r--r--src/ratelimiter.c2
-rw-r--r--src/receive.c2
-rw-r--r--src/selftest/allowedips.c (renamed from src/selftest/allowedips.h)2
-rw-r--r--src/selftest/counter.c (renamed from src/selftest/counter.h)2
-rw-r--r--src/selftest/ratelimiter.c (renamed from src/selftest/ratelimiter.h)2
25 files changed, 34 insertions, 34 deletions
diff --git a/src/allowedips.c b/src/allowedips.c
index f212afe..60c7723 100644
--- a/src/allowedips.c
+++ b/src/allowedips.c
@@ -402,4 +402,4 @@ struct wireguard_peer *wg_allowedips_lookup_src(struct allowedips *table,
return NULL;
}
-#include "selftest/allowedips.h"
+#include "selftest/allowedips.c"
diff --git a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.c
index 2191e3f..7be9809 100644
--- a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h
+++ b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/blake2s/blake2s.c b/src/crypto/zinc/blake2s/blake2s.c
index 08d3947..fe4d4b4 100644
--- a/src/crypto/zinc/blake2s/blake2s.c
+++ b/src/crypto/zinc/blake2s/blake2s.c
@@ -110,7 +110,7 @@ void blake2s_init_key(struct blake2s_state *state, const size_t outlen,
EXPORT_SYMBOL(blake2s_init_key);
#if defined(CONFIG_ZINC_ARCH_X86_64)
-#include "blake2s-x86_64-glue.h"
+#include "blake2s-x86_64-glue.c"
#else
static void __init blake2s_fpu_init(void)
{
@@ -271,7 +271,7 @@ void blake2s_hmac(u8 *out, const u8 *in, const u8 *key, const size_t outlen,
}
EXPORT_SYMBOL(blake2s_hmac);
-#include "../selftest/blake2s.h"
+#include "../selftest/blake2s.c"
static bool nosimd __initdata = false;
diff --git a/src/crypto/zinc/chacha20/chacha20-arm-glue.h b/src/crypto/zinc/chacha20/chacha20-arm-glue.c
index 163815f..a397d84 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm-glue.h
+++ b/src/crypto/zinc/chacha20/chacha20-arm-glue.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/chacha20/chacha20-mips-glue.h b/src/crypto/zinc/chacha20/chacha20-mips-glue.c
index 9630cd0..04235ca 100644
--- a/src/crypto/zinc/chacha20/chacha20-mips-glue.h
+++ b/src/crypto/zinc/chacha20/chacha20-mips-glue.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h b/src/crypto/zinc/chacha20/chacha20-x86_64-glue.c
index b1fc4c8..b89d5e1 100644
--- a/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h
+++ b/src/crypto/zinc/chacha20/chacha20-x86_64-glue.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/chacha20/chacha20.c b/src/crypto/zinc/chacha20/chacha20.c
index 3f0392f..bc7e9be 100644
--- a/src/crypto/zinc/chacha20/chacha20.c
+++ b/src/crypto/zinc/chacha20/chacha20.c
@@ -16,11 +16,11 @@
#include <crypto/algapi.h> // For crypto_xor_cpy.
#if defined(CONFIG_ZINC_ARCH_X86_64)
-#include "chacha20-x86_64-glue.h"
+#include "chacha20-x86_64-glue.c"
#elif defined(CONFIG_ZINC_ARCH_ARM) || defined(CONFIG_ZINC_ARCH_ARM64)
-#include "chacha20-arm-glue.h"
+#include "chacha20-arm-glue.c"
#elif defined(CONFIG_ZINC_ARCH_MIPS)
-#include "chacha20-mips-glue.h"
+#include "chacha20-mips-glue.c"
#else
static void __init chacha20_fpu_init(void)
{
@@ -159,7 +159,7 @@ void hchacha20(u32 derived_key[CHACHA20_KEY_WORDS],
}
EXPORT_SYMBOL(hchacha20);
-#include "../selftest/chacha20.h"
+#include "../selftest/chacha20.c"
static bool nosimd __initdata = false;
diff --git a/src/crypto/zinc/chacha20poly1305.c b/src/crypto/zinc/chacha20poly1305.c
index 4c38dde..6c8ff3a 100644
--- a/src/crypto/zinc/chacha20poly1305.c
+++ b/src/crypto/zinc/chacha20poly1305.c
@@ -339,7 +339,7 @@ bool xchacha20poly1305_decrypt(u8 *dst, const u8 *src, const size_t src_len,
}
EXPORT_SYMBOL(xchacha20poly1305_decrypt);
-#include "selftest/chacha20poly1305.h"
+#include "selftest/chacha20poly1305.c"
#ifndef COMPAT_ZINC_IS_A_MODULE
int __init chacha20poly1305_mod_init(void)
diff --git a/src/crypto/zinc/curve25519/curve25519-arm-glue.h b/src/crypto/zinc/curve25519/curve25519-arm-glue.c
index 4f4c337..cea06f3 100644
--- a/src/crypto/zinc/curve25519/curve25519-arm-glue.h
+++ b/src/crypto/zinc/curve25519/curve25519-arm-glue.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h b/src/crypto/zinc/curve25519/curve25519-x86_64-glue.c
index 142e467..34ff1d8 100644
--- a/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h
+++ b/src/crypto/zinc/curve25519/curve25519-x86_64-glue.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/curve25519/curve25519.c b/src/crypto/zinc/curve25519/curve25519.c
index 1732521..5fd4040 100644
--- a/src/crypto/zinc/curve25519/curve25519.c
+++ b/src/crypto/zinc/curve25519/curve25519.c
@@ -20,9 +20,9 @@
#include <crypto/algapi.h> // For crypto_memneq.
#if defined(CONFIG_ZINC_ARCH_X86_64)
-#include "curve25519-x86_64-glue.h"
+#include "curve25519-x86_64-glue.c"
#elif defined(CONFIG_ZINC_ARCH_ARM)
-#include "curve25519-arm-glue.h"
+#include "curve25519-arm-glue.c"
#else
static void __init curve25519_fpu_init(void)
{
@@ -86,7 +86,7 @@ void curve25519_generate_secret(u8 secret[CURVE25519_KEY_SIZE])
}
EXPORT_SYMBOL(curve25519_generate_secret);
-#include "../selftest/curve25519.h"
+#include "../selftest/curve25519.c"
static bool nosimd __initdata = false;
diff --git a/src/crypto/zinc/poly1305/poly1305-arm-glue.h b/src/crypto/zinc/poly1305/poly1305-arm-glue.c
index 92aa226..f91066f 100644
--- a/src/crypto/zinc/poly1305/poly1305-arm-glue.h
+++ b/src/crypto/zinc/poly1305/poly1305-arm-glue.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/poly1305/poly1305-mips-glue.h b/src/crypto/zinc/poly1305/poly1305-mips-glue.c
index f71c3f6..3a72d61 100644
--- a/src/crypto/zinc/poly1305/poly1305-mips-glue.h
+++ b/src/crypto/zinc/poly1305/poly1305-mips-glue.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h b/src/crypto/zinc/poly1305/poly1305-x86_64-glue.c
index 585b579..3641dc8 100644
--- a/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h
+++ b/src/crypto/zinc/poly1305/poly1305-x86_64-glue.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/poly1305/poly1305.c b/src/crypto/zinc/poly1305/poly1305.c
index 4ab8116..88f94cd 100644
--- a/src/crypto/zinc/poly1305/poly1305.c
+++ b/src/crypto/zinc/poly1305/poly1305.c
@@ -16,11 +16,11 @@
#include <linux/init.h>
#if defined(CONFIG_ZINC_ARCH_X86_64)
-#include "poly1305-x86_64-glue.h"
+#include "poly1305-x86_64-glue.c"
#elif defined(CONFIG_ZINC_ARCH_ARM) || defined(CONFIG_ZINC_ARCH_ARM64)
-#include "poly1305-arm-glue.h"
+#include "poly1305-arm-glue.c"
#elif defined(CONFIG_ZINC_ARCH_MIPS) || defined(CONFIG_ZINC_ARCH_MIPS64)
-#include "poly1305-mips-glue.h"
+#include "poly1305-mips-glue.c"
#else
static inline bool poly1305_init_arch(void *ctx,
const u8 key[POLY1305_KEY_SIZE])
@@ -134,7 +134,7 @@ void poly1305_final(struct poly1305_ctx *ctx, u8 mac[POLY1305_MAC_SIZE],
}
EXPORT_SYMBOL(poly1305_final);
-#include "../selftest/poly1305.h"
+#include "../selftest/poly1305.c"
static bool nosimd __initdata = false;
diff --git a/src/crypto/zinc/selftest/blake2s.h b/src/crypto/zinc/selftest/blake2s.c
index e6f8b2a..80b8e19 100644
--- a/src/crypto/zinc/selftest/blake2s.h
+++ b/src/crypto/zinc/selftest/blake2s.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/selftest/chacha20.h b/src/crypto/zinc/selftest/chacha20.c
index 82aec32..a76600b 100644
--- a/src/crypto/zinc/selftest/chacha20.h
+++ b/src/crypto/zinc/selftest/chacha20.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/selftest/chacha20poly1305.h b/src/crypto/zinc/selftest/chacha20poly1305.c
index 9f42252..fceadb0 100644
--- a/src/crypto/zinc/selftest/chacha20poly1305.h
+++ b/src/crypto/zinc/selftest/chacha20poly1305.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/selftest/curve25519.h b/src/crypto/zinc/selftest/curve25519.c
index 8ea9f92..933d65e 100644
--- a/src/crypto/zinc/selftest/curve25519.h
+++ b/src/crypto/zinc/selftest/curve25519.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/selftest/poly1305.h b/src/crypto/zinc/selftest/poly1305.c
index 3acee63..be0dff6 100644
--- a/src/crypto/zinc/selftest/poly1305.h
+++ b/src/crypto/zinc/selftest/poly1305.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+// SPDX-License-Identifier: GPL-2.0 OR MIT
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/ratelimiter.c b/src/ratelimiter.c
index a5fa3a4..9c9bd8d 100644
--- a/src/ratelimiter.c
+++ b/src/ratelimiter.c
@@ -217,4 +217,4 @@ out:
mutex_unlock(&init_lock);
}
-#include "selftest/ratelimiter.h"
+#include "selftest/ratelimiter.c"
diff --git a/src/receive.c b/src/receive.c
index 8872a6b..c38a274 100644
--- a/src/receive.c
+++ b/src/receive.c
@@ -335,7 +335,7 @@ out:
spin_unlock_bh(&counter->receive.lock);
return ret;
}
-#include "selftest/counter.h"
+#include "selftest/counter.c"
static void packet_consume_data_done(struct wireguard_peer *peer,
struct sk_buff *skb,
diff --git a/src/selftest/allowedips.h b/src/selftest/allowedips.c
index e357bab..a9d2c3a 100644
--- a/src/selftest/allowedips.h
+++ b/src/selftest/allowedips.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/selftest/counter.h b/src/selftest/counter.c
index 1b78eb6..5cb41d1 100644
--- a/src/selftest/counter.h
+++ b/src/selftest/counter.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/selftest/ratelimiter.h b/src/selftest/ratelimiter.c
index 7f13ef1..2ea7489 100644
--- a/src/selftest/ratelimiter.h
+++ b/src/selftest/ratelimiter.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/