aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-09-20 01:49:47 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-09-20 19:41:22 +0200
commit197a30ce3eb65790d5c46b23394a1dd1387b9ede (patch)
tree2664296cb741e7fc6754a8858e2127ce147a1f9c /src
parentratelimiter: disable selftest with KASAN (diff)
downloadwireguard-monolithic-historical-197a30ce3eb65790d5c46b23394a1dd1387b9ede.tar.xz
wireguard-monolithic-historical-197a30ce3eb65790d5c46b23394a1dd1387b9ede.zip
global: put SPDX identifier on its own line
The kernel has very specific rules correlating file type with comment type, and also SPDX identifiers can't be merged with other comments.
Diffstat (limited to 'src')
-rw-r--r--src/allowedips.c4
-rw-r--r--src/allowedips.h4
-rw-r--r--src/compat/checksum/checksum_partial_compat.h4
-rw-r--r--src/compat/compat-asm.h4
-rw-r--r--src/compat/compat.h4
-rw-r--r--src/compat/simd/include/linux/simd.h4
-rw-r--r--src/compat/udp_tunnel/udp_tunnel_partial_compat.h4
-rw-r--r--src/cookie.c4
-rw-r--r--src/cookie.h4
-rw-r--r--src/crypto/include/zinc/blake2s.h4
-rw-r--r--src/crypto/include/zinc/chacha20.h4
-rw-r--r--src/crypto/include/zinc/chacha20poly1305.h4
-rw-r--r--src/crypto/include/zinc/curve25519.h4
-rw-r--r--src/crypto/include/zinc/poly1305.h4
-rw-r--r--src/crypto/zinc.h4
-rw-r--r--src/crypto/zinc/blake2s/blake2s-x86_64-glue.h4
-rw-r--r--src/crypto/zinc/blake2s/blake2s-x86_64.S4
-rw-r--r--src/crypto/zinc/blake2s/blake2s.c4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm-glue.h4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm.S4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm64.S4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-mips-glue.h4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-mips.S4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-x86_64-glue.h4
-rw-r--r--src/crypto/zinc/chacha20/chacha20-x86_64.S4
-rw-r--r--src/crypto/zinc/chacha20/chacha20.c4
-rw-r--r--src/crypto/zinc/chacha20poly1305.c4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-arm-glue.h4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-arm.S4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-fiat32.h4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-hacl64.h4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-x86_64-glue.h4
-rw-r--r--src/crypto/zinc/curve25519/curve25519-x86_64.h4
-rw-r--r--src/crypto/zinc/curve25519/curve25519.c4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-arm-glue.h4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-arm.S4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-arm64.S4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-donna32.h4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-donna64.h4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-mips-glue.h4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-mips.S4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-mips64.S4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-x86_64-glue.h4
-rw-r--r--src/crypto/zinc/poly1305/poly1305-x86_64.S4
-rw-r--r--src/crypto/zinc/poly1305/poly1305.c4
-rw-r--r--src/crypto/zinc/selftest/blake2s.h4
-rw-r--r--src/crypto/zinc/selftest/chacha20.h4
-rw-r--r--src/crypto/zinc/selftest/chacha20poly1305.h4
-rw-r--r--src/crypto/zinc/selftest/curve25519.h4
-rw-r--r--src/crypto/zinc/selftest/poly1305.h4
-rw-r--r--src/device.c4
-rw-r--r--src/device.h4
-rw-r--r--src/hashtables.c4
-rw-r--r--src/hashtables.h4
-rw-r--r--src/main.c4
-rw-r--r--src/netlink.c4
-rw-r--r--src/netlink.h4
-rw-r--r--src/noise.c4
-rw-r--r--src/noise.h4
-rw-r--r--src/peer.c4
-rw-r--r--src/peer.h4
-rw-r--r--src/queueing.c4
-rw-r--r--src/queueing.h4
-rw-r--r--src/ratelimiter.c4
-rw-r--r--src/ratelimiter.h4
-rw-r--r--src/receive.c4
-rw-r--r--src/selftest/allowedips.h4
-rw-r--r--src/selftest/counter.h4
-rw-r--r--src/selftest/ratelimiter.h4
-rw-r--r--src/send.c4
-rw-r--r--src/socket.c4
-rw-r--r--src/socket.h4
-rw-r--r--src/tests/qemu/init.c4
-rw-r--r--src/timers.c4
-rw-r--r--src/timers.h4
-rw-r--r--src/tools/config.c4
-rw-r--r--src/tools/config.h4
-rw-r--r--src/tools/containers.h4
-rw-r--r--src/tools/curve25519.c4
-rw-r--r--src/tools/curve25519.h4
-rw-r--r--src/tools/encoding.c4
-rw-r--r--src/tools/encoding.h4
-rw-r--r--src/tools/genkey.c4
-rw-r--r--src/tools/ipc.c4
-rw-r--r--src/tools/ipc.h4
-rw-r--r--src/tools/mnlg.c4
-rw-r--r--src/tools/mnlg.h4
-rw-r--r--src/tools/pubkey.c4
-rw-r--r--src/tools/set.c4
-rw-r--r--src/tools/setconf.c4
-rw-r--r--src/tools/show.c4
-rw-r--r--src/tools/showconf.c4
-rw-r--r--src/tools/subcommands.h4
-rw-r--r--src/tools/terminal.c4
-rw-r--r--src/tools/terminal.h4
-rw-r--r--src/tools/wg-quick/android.c4
-rw-r--r--src/tools/wg.c4
-rw-r--r--src/uapi/wireguard.h4
98 files changed, 196 insertions, 196 deletions
diff --git a/src/allowedips.c b/src/allowedips.c
index 7202469..f8f026c 100644
--- a/src/allowedips.c
+++ b/src/allowedips.c
@@ -1,5 +1,5 @@
-/* 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/allowedips.h b/src/allowedips.h
index d5ba1be..ace1542 100644
--- a/src/allowedips.h
+++ b/src/allowedips.h
@@ -1,5 +1,5 @@
-/* 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/compat/checksum/checksum_partial_compat.h b/src/compat/checksum/checksum_partial_compat.h
index 0aee99c..aa6a3a4 100644
--- a/src/compat/checksum/checksum_partial_compat.h
+++ b/src/compat/checksum/checksum_partial_compat.h
@@ -1,5 +1,5 @@
-/* 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/compat/compat-asm.h b/src/compat/compat-asm.h
index 73bbfbc..c49f766 100644
--- a/src/compat/compat-asm.h
+++ b/src/compat/compat-asm.h
@@ -1,5 +1,5 @@
-/* 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/compat/compat.h b/src/compat/compat.h
index 58d16b1..472c540 100644
--- a/src/compat/compat.h
+++ b/src/compat/compat.h
@@ -1,5 +1,5 @@
-/* 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/compat/simd/include/linux/simd.h b/src/compat/simd/include/linux/simd.h
index 1a0ecae..863a665 100644
--- a/src/compat/simd/include/linux/simd.h
+++ b/src/compat/simd/include/linux/simd.h
@@ -1,5 +1,5 @@
-/* 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/compat/udp_tunnel/udp_tunnel_partial_compat.h b/src/compat/udp_tunnel/udp_tunnel_partial_compat.h
index 3498e50..83327d8 100644
--- a/src/compat/udp_tunnel/udp_tunnel_partial_compat.h
+++ b/src/compat/udp_tunnel/udp_tunnel_partial_compat.h
@@ -1,5 +1,5 @@
-/* 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/cookie.c b/src/cookie.c
index d073962..afd82a0 100644
--- a/src/cookie.c
+++ b/src/cookie.c
@@ -1,5 +1,5 @@
-/* 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/cookie.h b/src/cookie.h
index 7802f61..41122ff 100644
--- a/src/cookie.h
+++ b/src/cookie.h
@@ -1,5 +1,5 @@
-/* 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/crypto/include/zinc/blake2s.h b/src/crypto/include/zinc/blake2s.h
index c553c55..f14230e 100644
--- a/src/crypto/include/zinc/blake2s.h
+++ b/src/crypto/include/zinc/blake2s.h
@@ -1,5 +1,5 @@
-/* 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/include/zinc/chacha20.h b/src/crypto/include/zinc/chacha20.h
index c3e4303..455c431 100644
--- a/src/crypto/include/zinc/chacha20.h
+++ b/src/crypto/include/zinc/chacha20.h
@@ -1,5 +1,5 @@
-/* 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/include/zinc/chacha20poly1305.h b/src/crypto/include/zinc/chacha20poly1305.h
index 89e144c..50b2be9 100644
--- a/src/crypto/include/zinc/chacha20poly1305.h
+++ b/src/crypto/include/zinc/chacha20poly1305.h
@@ -1,5 +1,5 @@
-/* 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/include/zinc/curve25519.h b/src/crypto/include/zinc/curve25519.h
index 65afebc..ac5979c 100644
--- a/src/crypto/include/zinc/curve25519.h
+++ b/src/crypto/include/zinc/curve25519.h
@@ -1,5 +1,5 @@
-/* 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/include/zinc/poly1305.h b/src/crypto/include/zinc/poly1305.h
index 6d8b94a..13fe0e5 100644
--- a/src/crypto/include/zinc/poly1305.h
+++ b/src/crypto/include/zinc/poly1305.h
@@ -1,5 +1,5 @@
-/* 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.h b/src/crypto/zinc.h
index 6862e7f..319b71d 100644
--- a/src/crypto/zinc.h
+++ b/src/crypto/zinc.h
@@ -1,5 +1,5 @@
-/* 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-x86_64-glue.h b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h
index 506d1df..ffbdc1b 100644
--- a/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h
+++ b/src/crypto/zinc/blake2s/blake2s-x86_64-glue.h
@@ -1,5 +1,5 @@
-/* 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-x86_64.S b/src/crypto/zinc/blake2s/blake2s-x86_64.S
index c199e67..1407a5f 100644
--- a/src/crypto/zinc/blake2s/blake2s-x86_64.S
+++ b/src/crypto/zinc/blake2s/blake2s-x86_64.S
@@ -1,5 +1,5 @@
-/* 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.
* Copyright (C) 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/blake2s/blake2s.c b/src/crypto/zinc/blake2s/blake2s.c
index 4b1cd46..a797524 100644
--- a/src/crypto/zinc/blake2s/blake2s.c
+++ b/src/crypto/zinc/blake2s/blake2s.c
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT
- *
+// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
* Copyright (C) 2012 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved.
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/chacha20/chacha20-arm-glue.h b/src/crypto/zinc/chacha20/chacha20-arm-glue.h
index d5327bf..9ec2cd8 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm-glue.h
+++ b/src/crypto/zinc/chacha20/chacha20-arm-glue.h
@@ -1,5 +1,5 @@
-/* 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-arm.S b/src/crypto/zinc/chacha20/chacha20-arm.S
index 9280d71..3f9cfe0 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm.S
+++ b/src/crypto/zinc/chacha20/chacha20-arm.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/chacha20/chacha20-arm64.S b/src/crypto/zinc/chacha20/chacha20-arm64.S
index 1be1d90..ba82286 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm64.S
+++ b/src/crypto/zinc/chacha20/chacha20-arm64.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/chacha20/chacha20-mips-glue.h b/src/crypto/zinc/chacha20/chacha20-mips-glue.h
index c4bee4b..2458e41 100644
--- a/src/crypto/zinc/chacha20/chacha20-mips-glue.h
+++ b/src/crypto/zinc/chacha20/chacha20-mips-glue.h
@@ -1,5 +1,5 @@
-/* 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.S b/src/crypto/zinc/chacha20/chacha20-mips.S
index b52e9a6..2ff4e55 100644
--- a/src/crypto/zinc/chacha20/chacha20-mips.S
+++ b/src/crypto/zinc/chacha20/chacha20-mips.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT
- *
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
* Copyright (C) 2016-2018 René van Dorst <opensource@vdorst.com>. All Rights Reserved.
* 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.h
index a14d73f..46fe24c 100644
--- a/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h
+++ b/src/crypto/zinc/chacha20/chacha20-x86_64-glue.h
@@ -1,5 +1,5 @@
-/* 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.S b/src/crypto/zinc/chacha20/chacha20-x86_64.S
index 637f5c9..3d10c7f 100644
--- a/src/crypto/zinc/chacha20/chacha20-x86_64.S
+++ b/src/crypto/zinc/chacha20/chacha20-x86_64.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved.
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
diff --git a/src/crypto/zinc/chacha20/chacha20.c b/src/crypto/zinc/chacha20/chacha20.c
index 03e8cad..b843a73 100644
--- a/src/crypto/zinc/chacha20/chacha20.c
+++ b/src/crypto/zinc/chacha20/chacha20.c
@@ -1,5 +1,5 @@
-/* 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.
*
* Implementation of the ChaCha20 stream cipher.
diff --git a/src/crypto/zinc/chacha20poly1305.c b/src/crypto/zinc/chacha20poly1305.c
index 3ac6cf9..2003cb1 100644
--- a/src/crypto/zinc/chacha20poly1305.c
+++ b/src/crypto/zinc/chacha20poly1305.c
@@ -1,5 +1,5 @@
-/* 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.
*
* This is an implementation of the ChaCha20Poly1305 AEAD construction.
diff --git a/src/crypto/zinc/curve25519/curve25519-arm-glue.h b/src/crypto/zinc/curve25519/curve25519-arm-glue.h
index 4682aa0..27d387e 100644
--- a/src/crypto/zinc/curve25519/curve25519-arm-glue.h
+++ b/src/crypto/zinc/curve25519/curve25519-arm-glue.h
@@ -1,5 +1,5 @@
-/* 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-arm.S b/src/crypto/zinc/curve25519/curve25519-arm.S
index 7e25d50..01cb4ad 100644
--- a/src/crypto/zinc/curve25519/curve25519-arm.S
+++ b/src/crypto/zinc/curve25519/curve25519-arm.S
@@ -1,5 +1,5 @@
-/* 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.
*
* Based on public domain code from Daniel J. Bernstein and Peter Schwabe. This
diff --git a/src/crypto/zinc/curve25519/curve25519-fiat32.h b/src/crypto/zinc/curve25519/curve25519-fiat32.h
index 4bf36f1..c57f6f2 100644
--- a/src/crypto/zinc/curve25519/curve25519-fiat32.h
+++ b/src/crypto/zinc/curve25519/curve25519-fiat32.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT
- *
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
* Copyright (C) 2015-2016 The fiat-crypto Authors.
* Copyright (C) 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/curve25519/curve25519-hacl64.h b/src/crypto/zinc/curve25519/curve25519-hacl64.h
index d234865..3e34de7 100644
--- a/src/crypto/zinc/curve25519/curve25519-hacl64.h
+++ b/src/crypto/zinc/curve25519/curve25519-hacl64.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT
- *
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
* Copyright (C) 2016-2017 INRIA and Microsoft Corporation.
* Copyright (C) 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.h
index cd32593..00dbfde 100644
--- a/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h
+++ b/src/crypto/zinc/curve25519/curve25519-x86_64-glue.h
@@ -1,5 +1,5 @@
-/* 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.h b/src/crypto/zinc/curve25519/curve25519-x86_64.h
index 6fd04d6..6c895f7 100644
--- a/src/crypto/zinc/curve25519/curve25519-x86_64.h
+++ b/src/crypto/zinc/curve25519/curve25519-x86_64.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR LGPL-2.1
- *
+/* SPDX-License-Identifier: GPL-2.0 OR LGPL-2.1 */
+/*
* Copyright (c) 2017 Armando Faz <armfazh@ic.unicamp.br>. All Rights Reserved.
* Copyright (C) 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2018 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved.
diff --git a/src/crypto/zinc/curve25519/curve25519.c b/src/crypto/zinc/curve25519/curve25519.c
index ba9cd92..fd46b36 100644
--- a/src/crypto/zinc/curve25519/curve25519.c
+++ b/src/crypto/zinc/curve25519/curve25519.c
@@ -1,5 +1,5 @@
-/* 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.
*
* This is an implementation of the Curve25519 ECDH algorithm, using either
diff --git a/src/crypto/zinc/poly1305/poly1305-arm-glue.h b/src/crypto/zinc/poly1305/poly1305-arm-glue.h
index 8a1f87c..1dfd549 100644
--- a/src/crypto/zinc/poly1305/poly1305-arm-glue.h
+++ b/src/crypto/zinc/poly1305/poly1305-arm-glue.h
@@ -1,5 +1,5 @@
-/* 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-arm.S b/src/crypto/zinc/poly1305/poly1305-arm.S
index 41cd176..84c96c3 100644
--- a/src/crypto/zinc/poly1305/poly1305-arm.S
+++ b/src/crypto/zinc/poly1305/poly1305-arm.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/poly1305/poly1305-arm64.S b/src/crypto/zinc/poly1305/poly1305-arm64.S
index 2494cca..4ccd3d5 100644
--- a/src/crypto/zinc/poly1305/poly1305-arm64.S
+++ b/src/crypto/zinc/poly1305/poly1305-arm64.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/poly1305/poly1305-donna32.h b/src/crypto/zinc/poly1305/poly1305-donna32.h
index f449b28..2e7565d 100644
--- a/src/crypto/zinc/poly1305/poly1305-donna32.h
+++ b/src/crypto/zinc/poly1305/poly1305-donna32.h
@@ -1,5 +1,5 @@
-/* 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.
*
* This is based in part on Andrew Moon's poly1305-donna, which is in the
diff --git a/src/crypto/zinc/poly1305/poly1305-donna64.h b/src/crypto/zinc/poly1305/poly1305-donna64.h
index bea0a2e..7850e0a 100644
--- a/src/crypto/zinc/poly1305/poly1305-donna64.h
+++ b/src/crypto/zinc/poly1305/poly1305-donna64.h
@@ -1,5 +1,5 @@
-/* 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.
*
* This is based in part on Andrew Moon's poly1305-donna, which is in the
diff --git a/src/crypto/zinc/poly1305/poly1305-mips-glue.h b/src/crypto/zinc/poly1305/poly1305-mips-glue.h
index 866b022..eb38cd5 100644
--- a/src/crypto/zinc/poly1305/poly1305-mips-glue.h
+++ b/src/crypto/zinc/poly1305/poly1305-mips-glue.h
@@ -1,5 +1,5 @@
-/* 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.S b/src/crypto/zinc/poly1305/poly1305-mips.S
index 26c0f1f..128b60c 100644
--- a/src/crypto/zinc/poly1305/poly1305-mips.S
+++ b/src/crypto/zinc/poly1305/poly1305-mips.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR MIT
- *
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
* Copyright (C) 2016-2018 René van Dorst <opensource@vdorst.com> All Rights Reserved.
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/crypto/zinc/poly1305/poly1305-mips64.S b/src/crypto/zinc/poly1305/poly1305-mips64.S
index 6f8166f..5662b1b 100644
--- a/src/crypto/zinc/poly1305/poly1305-mips64.S
+++ b/src/crypto/zinc/poly1305/poly1305-mips64.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
*
diff --git a/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h b/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h
index 2359e5b..4926d27 100644
--- a/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h
+++ b/src/crypto/zinc/poly1305/poly1305-x86_64-glue.h
@@ -1,5 +1,5 @@
-/* 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.S b/src/crypto/zinc/poly1305/poly1305-x86_64.S
index e4951c5..3c3f2b4 100644
--- a/src/crypto/zinc/poly1305/poly1305-x86_64.S
+++ b/src/crypto/zinc/poly1305/poly1305-x86_64.S
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
- *
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/*
* Copyright (C) 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved.
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2006-2017 CRYPTOGAMS by <appro@openssl.org>. All Rights Reserved.
diff --git a/src/crypto/zinc/poly1305/poly1305.c b/src/crypto/zinc/poly1305/poly1305.c
index a261751..f64b501 100644
--- a/src/crypto/zinc/poly1305/poly1305.c
+++ b/src/crypto/zinc/poly1305/poly1305.c
@@ -1,5 +1,5 @@
-/* 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.
*
* Implementation of the Poly1305 message authenticator.
diff --git a/src/crypto/zinc/selftest/blake2s.h b/src/crypto/zinc/selftest/blake2s.h
index 3b6f330..dea18f4 100644
--- a/src/crypto/zinc/selftest/blake2s.h
+++ b/src/crypto/zinc/selftest/blake2s.h
@@ -1,5 +1,5 @@
-/* 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.h
index 15f4a4b..4a0e9b8 100644
--- a/src/crypto/zinc/selftest/chacha20.h
+++ b/src/crypto/zinc/selftest/chacha20.h
@@ -1,5 +1,5 @@
-/* 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.h
index 4d0fe61..100344a 100644
--- a/src/crypto/zinc/selftest/chacha20poly1305.h
+++ b/src/crypto/zinc/selftest/chacha20poly1305.h
@@ -1,5 +1,5 @@
-/* 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.h
index 68052e5..5d3f268 100644
--- a/src/crypto/zinc/selftest/curve25519.h
+++ b/src/crypto/zinc/selftest/curve25519.h
@@ -1,5 +1,5 @@
-/* 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.h
index c195df1..e806ab2 100644
--- a/src/crypto/zinc/selftest/poly1305.h
+++ b/src/crypto/zinc/selftest/poly1305.h
@@ -1,5 +1,5 @@
-/* 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/device.c b/src/device.c
index 255ad49..75b817e 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1,5 +1,5 @@
-/* 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/device.h b/src/device.h
index 2499782..6589c9d 100644
--- a/src/device.h
+++ b/src/device.h
@@ -1,5 +1,5 @@
-/* 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/hashtables.c b/src/hashtables.c
index 5aaebb6..afe17e9 100644
--- a/src/hashtables.c
+++ b/src/hashtables.c
@@ -1,5 +1,5 @@
-/* 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/hashtables.h b/src/hashtables.h
index 62858c5..263a2a5 100644
--- a/src/hashtables.h
+++ b/src/hashtables.h
@@ -1,5 +1,5 @@
-/* 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/main.c b/src/main.c
index ea5e904..2b2e5b6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
-/* 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/netlink.c b/src/netlink.c
index d0fdf55..3d9099e 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -1,5 +1,5 @@
-/* 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/netlink.h b/src/netlink.h
index c1cd9b0..657fe1a 100644
--- a/src/netlink.h
+++ b/src/netlink.h
@@ -1,5 +1,5 @@
-/* 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/noise.c b/src/noise.c
index 9bd2d7e..1d5d48b 100644
--- a/src/noise.c
+++ b/src/noise.c
@@ -1,5 +1,5 @@
-/* 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/noise.h b/src/noise.h
index 6a563ce..1fc25ef 100644
--- a/src/noise.h
+++ b/src/noise.h
@@ -1,5 +1,5 @@
-/* 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.
*/
#ifndef _WG_NOISE_H
diff --git a/src/peer.c b/src/peer.c
index ca7981c..d9ac366 100644
--- a/src/peer.c
+++ b/src/peer.c
@@ -1,5 +1,5 @@
-/* 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/peer.h b/src/peer.h
index 5613ccc..b95c3ed 100644
--- a/src/peer.h
+++ b/src/peer.h
@@ -1,5 +1,5 @@
-/* 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/queueing.c b/src/queueing.c
index 9ec6588..09eb93e 100644
--- a/src/queueing.c
+++ b/src/queueing.c
@@ -1,5 +1,5 @@
-/* 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/queueing.h b/src/queueing.h
index 66b7134..758a57d 100644
--- a/src/queueing.h
+++ b/src/queueing.h
@@ -1,5 +1,5 @@
-/* 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/ratelimiter.c b/src/ratelimiter.c
index 52381ee..6e43d6e 100644
--- a/src/ratelimiter.c
+++ b/src/ratelimiter.c
@@ -1,5 +1,5 @@
-/* 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/ratelimiter.h b/src/ratelimiter.h
index 8931c06..83e4203 100644
--- a/src/ratelimiter.h
+++ b/src/ratelimiter.h
@@ -1,5 +1,5 @@
-/* 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/receive.c b/src/receive.c
index aa1f216..6a27bdd 100644
--- a/src/receive.c
+++ b/src/receive.c
@@ -1,5 +1,5 @@
-/* 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/allowedips.h b/src/selftest/allowedips.h
index dc04543..36d9bec 100644
--- a/src/selftest/allowedips.h
+++ b/src/selftest/allowedips.h
@@ -1,5 +1,5 @@
-/* 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.h
index 1c2a3b4..2a0e5a5 100644
--- a/src/selftest/counter.h
+++ b/src/selftest/counter.h
@@ -1,5 +1,5 @@
-/* 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.h
index 43a68f8..e0c65ea 100644
--- a/src/selftest/ratelimiter.h
+++ b/src/selftest/ratelimiter.h
@@ -1,5 +1,5 @@
-/* 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/send.c b/src/send.c
index a0c8dd2..5dde5a3 100644
--- a/src/send.c
+++ b/src/send.c
@@ -1,5 +1,5 @@
-/* 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/socket.c b/src/socket.c
index da6aaa7..e87fc4c 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1,5 +1,5 @@
-/* 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/socket.h b/src/socket.h
index d873ffa..4978499 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -1,5 +1,5 @@
-/* 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/tests/qemu/init.c b/src/tests/qemu/init.c
index 7db1d4b..c021cc1 100644
--- a/src/tests/qemu/init.c
+++ b/src/tests/qemu/init.c
@@ -1,5 +1,5 @@
-/* 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/timers.c b/src/timers.c
index fead499..fdc8c38 100644
--- a/src/timers.c
+++ b/src/timers.c
@@ -1,5 +1,5 @@
-/* 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/timers.h b/src/timers.h
index 483529c..50014d2 100644
--- a/src/timers.h
+++ b/src/timers.h
@@ -1,5 +1,5 @@
-/* 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/tools/config.c b/src/tools/config.c
index 93525fb..1daa5ea 100644
--- a/src/tools/config.c
+++ b/src/tools/config.c
@@ -1,5 +1,5 @@
-/* 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/tools/config.h b/src/tools/config.h
index 9dec248..44f715a 100644
--- a/src/tools/config.h
+++ b/src/tools/config.h
@@ -1,5 +1,5 @@
-/* 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/tools/containers.h b/src/tools/containers.h
index 455d998..619094e 100644
--- a/src/tools/containers.h
+++ b/src/tools/containers.h
@@ -1,5 +1,5 @@
-/* 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/tools/curve25519.c b/src/tools/curve25519.c
index 8197c17..e76588b 100644
--- a/src/tools/curve25519.c
+++ b/src/tools/curve25519.c
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: GPL-2.0
- *
+// SPDX-License-Identifier: GPL-2.0
+/*
* Copyright (C) 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/src/tools/curve25519.h b/src/tools/curve25519.h
index 6028bb5..09ca6b9 100644
--- a/src/tools/curve25519.h
+++ b/src/tools/curve25519.h
@@ -1,5 +1,5 @@
-/* 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/tools/encoding.c b/src/tools/encoding.c
index 2e2d915..d64b86e 100644
--- a/src/tools/encoding.c
+++ b/src/tools/encoding.c
@@ -1,5 +1,5 @@
-/* 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.
*
* This is a specialized constant-time base64/hex implementation that resists side-channel attacks.
diff --git a/src/tools/encoding.h b/src/tools/encoding.h
index 0e361ff..8815c33 100644
--- a/src/tools/encoding.h
+++ b/src/tools/encoding.h
@@ -1,5 +1,5 @@
-/* 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/tools/genkey.c b/src/tools/genkey.c
index d2d4c53..e50d64b 100644
--- a/src/tools/genkey.c
+++ b/src/tools/genkey.c
@@ -1,5 +1,5 @@
-/* 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/tools/ipc.c b/src/tools/ipc.c
index e3ef789..bc89f02 100644
--- a/src/tools/ipc.c
+++ b/src/tools/ipc.c
@@ -1,5 +1,5 @@
-/* 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/tools/ipc.h b/src/tools/ipc.h
index 89e26cc..e75be20 100644
--- a/src/tools/ipc.h
+++ b/src/tools/ipc.h
@@ -1,5 +1,5 @@
-/* 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/tools/mnlg.c b/src/tools/mnlg.c
index c68ead1..082f1a3 100644
--- a/src/tools/mnlg.c
+++ b/src/tools/mnlg.c
@@ -1,5 +1,5 @@
-/* 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.
*
* Original author: Jiri Pirko <jiri@mellanox.com>
diff --git a/src/tools/mnlg.h b/src/tools/mnlg.h
index fab3afd..1bc46c7 100644
--- a/src/tools/mnlg.h
+++ b/src/tools/mnlg.h
@@ -1,5 +1,5 @@
-/* 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.
*
* Original author: Jiri Pirko <jiri@mellanox.com>
diff --git a/src/tools/pubkey.c b/src/tools/pubkey.c
index 385145b..cf8e256 100644
--- a/src/tools/pubkey.c
+++ b/src/tools/pubkey.c
@@ -1,5 +1,5 @@
-/* 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/tools/set.c b/src/tools/set.c
index d44fed9..9d84ccd 100644
--- a/src/tools/set.c
+++ b/src/tools/set.c
@@ -1,5 +1,5 @@
-/* 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/tools/setconf.c b/src/tools/setconf.c
index 012c245..7135e85 100644
--- a/src/tools/setconf.c
+++ b/src/tools/setconf.c
@@ -1,5 +1,5 @@
-/* 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/tools/show.c b/src/tools/show.c
index 9f98286..b50af2a 100644
--- a/src/tools/show.c
+++ b/src/tools/show.c
@@ -1,5 +1,5 @@
-/* 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/tools/showconf.c b/src/tools/showconf.c
index 313ad23..777e022 100644
--- a/src/tools/showconf.c
+++ b/src/tools/showconf.c
@@ -1,5 +1,5 @@
-/* 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/tools/subcommands.h b/src/tools/subcommands.h
index c4aa4c6..2a7e36e 100644
--- a/src/tools/subcommands.h
+++ b/src/tools/subcommands.h
@@ -1,5 +1,5 @@
-/* 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/tools/terminal.c b/src/tools/terminal.c
index e3f6039..bee3a44 100644
--- a/src/tools/terminal.c
+++ b/src/tools/terminal.c
@@ -1,5 +1,5 @@
-/* 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/tools/terminal.h b/src/tools/terminal.h
index 8c2ffa6..0994895 100644
--- a/src/tools/terminal.h
+++ b/src/tools/terminal.h
@@ -1,5 +1,5 @@
-/* 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/tools/wg-quick/android.c b/src/tools/wg-quick/android.c
index 796607d..e397664 100644
--- a/src/tools/wg-quick/android.c
+++ b/src/tools/wg-quick/android.c
@@ -1,5 +1,5 @@
-/* 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.
*
* This is a shell script written in C. It very intentionally still functions like
diff --git a/src/tools/wg.c b/src/tools/wg.c
index 18a1480..4c24ff0 100644
--- a/src/tools/wg.c
+++ b/src/tools/wg.c
@@ -1,5 +1,5 @@
-/* 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/uapi/wireguard.h b/src/uapi/wireguard.h
index 3d73ad7..ab72766 100644
--- a/src/uapi/wireguard.h
+++ b/src/uapi/wireguard.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR MIT)
- *
+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*
* Documentation