aboutsummaryrefslogtreecommitdiffstatshomepage
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
commitcef7ac9ef9b9a5ecf75e8e63e32dd745f3c370aa (patch)
treed8e687fa2d61d6abd6df2b45fb6b5402c5626f78
parentglobal: prefer sizeof(*pointer) when possible (diff)
downloadwireguard-tools-cef7ac9ef9b9a5ecf75e8e63e32dd745f3c370aa.tar.xz
wireguard-tools-cef7ac9ef9b9a5ecf75e8e63e32dd745f3c370aa.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. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--contrib/embeddable-wg-library/test.c4
-rw-r--r--contrib/embeddable-wg-library/wireguard.c4
-rw-r--r--contrib/embeddable-wg-library/wireguard.h4
-rw-r--r--contrib/extract-handshakes/offset-finder.c4
-rw-r--r--contrib/extract-keys/config.c4
-rw-r--r--contrib/extract-keys/extract-keys.c4
-rw-r--r--contrib/keygen-html/src/curve25519_generate.c4
-rw-r--r--contrib/nat-hole-punching/nat-punch-client.c4
-rw-r--r--contrib/nat-hole-punching/nat-punch-server.c4
-rw-r--r--contrib/sticky-sockets/sticky-sockets.c4
-rw-r--r--src/config.c4
-rw-r--r--src/config.h4
-rw-r--r--src/containers.h4
-rw-r--r--src/curve25519.c4
-rw-r--r--src/curve25519.h4
-rw-r--r--src/encoding.c4
-rw-r--r--src/encoding.h4
-rw-r--r--src/genkey.c4
-rw-r--r--src/ipc.c4
-rw-r--r--src/ipc.h4
-rw-r--r--src/mnlg.c4
-rw-r--r--src/mnlg.h4
-rw-r--r--src/pubkey.c4
-rw-r--r--src/set.c4
-rw-r--r--src/setconf.c4
-rw-r--r--src/show.c4
-rw-r--r--src/showconf.c4
-rw-r--r--src/subcommands.h4
-rw-r--r--src/terminal.c4
-rw-r--r--src/terminal.h4
-rw-r--r--src/wg-quick/android.c4
-rw-r--r--src/wg.c4
32 files changed, 64 insertions, 64 deletions
diff --git a/contrib/embeddable-wg-library/test.c b/contrib/embeddable-wg-library/test.c
index 8d4aae3..6a3e7c7 100644
--- a/contrib/embeddable-wg-library/test.c
+++ b/contrib/embeddable-wg-library/test.c
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: LGPL-2.1+
- *
+// SPDX-License-Identifier: LGPL-2.1+
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/contrib/embeddable-wg-library/wireguard.c b/contrib/embeddable-wg-library/wireguard.c
index a65dbce..6d4ddd8 100644
--- a/contrib/embeddable-wg-library/wireguard.c
+++ b/contrib/embeddable-wg-library/wireguard.c
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: LGPL-2.1+
- *
+// SPDX-License-Identifier: LGPL-2.1+
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
* Copyright (C) 2008-2012 Pablo Neira Ayuso <pablo@netfilter.org>.
*/
diff --git a/contrib/embeddable-wg-library/wireguard.h b/contrib/embeddable-wg-library/wireguard.h
index 53d9d5d..e9210a4 100644
--- a/contrib/embeddable-wg-library/wireguard.h
+++ b/contrib/embeddable-wg-library/wireguard.h
@@ -1,5 +1,5 @@
-/* SPDX-License-Identifier: LGPL-2.1+
- *
+/* SPDX-License-Identifier: LGPL-2.1+ */
+/*
* Copyright (C) 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*/
diff --git a/contrib/extract-handshakes/offset-finder.c b/contrib/extract-handshakes/offset-finder.c
index d0bc69c..bd5824a 100644
--- a/contrib/extract-handshakes/offset-finder.c
+++ b/contrib/extract-handshakes/offset-finder.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/contrib/extract-keys/config.c b/contrib/extract-keys/config.c
index 4ec6a76..1dad1ce 100644
--- a/contrib/extract-keys/config.c
+++ b/contrib/extract-keys/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/contrib/extract-keys/extract-keys.c b/contrib/extract-keys/extract-keys.c
index fc757a2..f918a2a 100644
--- a/contrib/extract-keys/extract-keys.c
+++ b/contrib/extract-keys/extract-keys.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/contrib/keygen-html/src/curve25519_generate.c b/contrib/keygen-html/src/curve25519_generate.c
index ae7bda6..c280b89 100644
--- a/contrib/keygen-html/src/curve25519_generate.c
+++ b/contrib/keygen-html/src/curve25519_generate.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/contrib/nat-hole-punching/nat-punch-client.c b/contrib/nat-hole-punching/nat-punch-client.c
index 0133c3c..09af278 100644
--- a/contrib/nat-hole-punching/nat-punch-client.c
+++ b/contrib/nat-hole-punching/nat-punch-client.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.
*
* Example only. Do not run in production.
diff --git a/contrib/nat-hole-punching/nat-punch-server.c b/contrib/nat-hole-punching/nat-punch-server.c
index 29e065e..2f49aa8 100644
--- a/contrib/nat-hole-punching/nat-punch-server.c
+++ b/contrib/nat-hole-punching/nat-punch-server.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.
*
* Example only. Do not run in production.
diff --git a/contrib/sticky-sockets/sticky-sockets.c b/contrib/sticky-sockets/sticky-sockets.c
index 879b296..a26e29b 100644
--- a/contrib/sticky-sockets/sticky-sockets.c
+++ b/contrib/sticky-sockets/sticky-sockets.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 implements userspace semantics of "sticky sockets", modeled after
diff --git a/src/config.c b/src/config.c
index 93525fb..1daa5ea 100644
--- a/src/config.c
+++ b/src/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/config.h b/src/config.h
index 9dec248..44f715a 100644
--- a/src/config.h
+++ b/src/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/containers.h b/src/containers.h
index 455d998..619094e 100644
--- a/src/containers.h
+++ b/src/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/curve25519.c b/src/curve25519.c
index 8197c17..e76588b 100644
--- a/src/curve25519.c
+++ b/src/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/curve25519.h b/src/curve25519.h
index 6028bb5..09ca6b9 100644
--- a/src/curve25519.h
+++ b/src/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/encoding.c b/src/encoding.c
index 2e2d915..d64b86e 100644
--- a/src/encoding.c
+++ b/src/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/encoding.h b/src/encoding.h
index 0e361ff..8815c33 100644
--- a/src/encoding.h
+++ b/src/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/genkey.c b/src/genkey.c
index d2d4c53..e50d64b 100644
--- a/src/genkey.c
+++ b/src/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/ipc.c b/src/ipc.c
index e3ef789..bc89f02 100644
--- a/src/ipc.c
+++ b/src/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/ipc.h b/src/ipc.h
index 89e26cc..e75be20 100644
--- a/src/ipc.h
+++ b/src/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/mnlg.c b/src/mnlg.c
index c68ead1..082f1a3 100644
--- a/src/mnlg.c
+++ b/src/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/mnlg.h b/src/mnlg.h
index fab3afd..1bc46c7 100644
--- a/src/mnlg.h
+++ b/src/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/pubkey.c b/src/pubkey.c
index 385145b..cf8e256 100644
--- a/src/pubkey.c
+++ b/src/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/set.c b/src/set.c
index d44fed9..9d84ccd 100644
--- a/src/set.c
+++ b/src/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/setconf.c b/src/setconf.c
index 012c245..7135e85 100644
--- a/src/setconf.c
+++ b/src/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/show.c b/src/show.c
index 9f98286..b50af2a 100644
--- a/src/show.c
+++ b/src/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/showconf.c b/src/showconf.c
index 313ad23..777e022 100644
--- a/src/showconf.c
+++ b/src/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/subcommands.h b/src/subcommands.h
index c4aa4c6..2a7e36e 100644
--- a/src/subcommands.h
+++ b/src/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/terminal.c b/src/terminal.c
index e3f6039..bee3a44 100644
--- a/src/terminal.c
+++ b/src/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/terminal.h b/src/terminal.h
index 8c2ffa6..0994895 100644
--- a/src/terminal.h
+++ b/src/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/wg-quick/android.c b/src/wg-quick/android.c
index 796607d..e397664 100644
--- a/src/wg-quick/android.c
+++ b/src/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/wg.c b/src/wg.c
index 18a1480..4c24ff0 100644
--- a/src/wg.c
+++ b/src/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.
*/