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>

diff --git a/contrib/embeddable-wg-library/test.c b/contrib/embeddable-wg-library/test.c
index 8d4aae3dc70b6b294049644ea1ceabb8722ee06e..6a3e7c720214bc3888286368f701d7ec53f402e5 100644 (file)
--- 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 a65dbce5cab313f361b768d62fe484668d61c1b6..6d4ddd8cce588e400b147b4efd3e67c45c3dd792 100644 (file)
--- 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 53d9d5d7259526cf8d539014b36abe2b4c327c61..e9210a41a28c3b025634fc9b974f881365b17058 100644 (file)
--- 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 d0bc69cb6000979acc2148304282c86dc9783286..bd5824a3ad1c15deb22a02b34321357bdcf564d4 100644 (file)
--- 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 4ec6a76b9de346e83fc3bf415bc79bf8798308c6..1dad1ced3e3320530ac1dede73ceb5b18b6b216c 100644 (file)
--- 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 fc757a25cbe7aaf3cdc2f8fee5ce96ceed4df6fa..f918a2afb8507cc3afdbd9ef90049db4075b77f4 100644 (file)
--- 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 ae7bda686b0db357aaf9f84f93d4cb3b9bfc21db..c280b89ece5514c3c72b29ee6ceb6b04f3ed2439 100644 (file)
--- 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 0133c3cf467b84f45e0ea30dfa6c57073db6f311..09af278124d8c3cd835b149231278f3202c7000e 100644 (file)
--- 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 29e065e6ab42d8027da18577d38a17c5f429f3eb..2f49aa8e96da7603f67b3ebd95e90dfc69bb0d93 100644 (file)
--- 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 879b29676b664a29c340abb174534e521a89575a..a26e29bd7ce7b9060f6a021f9011dd1c08f84105 100644 (file)
--- 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 93525fbb004f303f5b4efbb5427b21b7c223276a..1daa5ea3b7540d304243332f32f4adad78ac20a7 100644 (file)
--- 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 9dec2489ff02e9646f1b1147c9ef3c07a0a85790..44f715af58058f623321fc8e54a6a0d2800c8ea4 100644 (file)
--- 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 455d998650219ec9de0c357b74c30e43e08ae561..619094ec743e8915ab191be7a02d3e8079b40990 100644 (file)
--- 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 8197c17d8694506ba408e9686d2168f2a7e8f935..e76588b51be26962987c7b5ffcbe6d3770e2eb86 100644 (file)
--- 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 6028bb5d01be0bdc46b37c2faac6063a669b4228..09ca6b98639fbdebd669d1df5254c53d52fe962b 100644 (file)
--- 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 2e2d915758505c8a9a25400705d67db53f22a822..d64b86edd1a5310b962ade98cc34814c9c130bc6 100644 (file)
--- 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 0e361fff431f32d3873eab1353287198494d1c61..8815c3388bd95b0dc7cf802b2f5ca70e54738792 100644 (file)
--- 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 d2d4c5319cf894e4e60bed305e31eb3338d9e41d..e50d64ba43f124ee3f1a01ddb30ec0d2ad0721f6 100644 (file)
--- 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 e3ef789c3fa608363cf0b10f5089c1979128078c..bc89f02ad6a60905424d2865e3cbc8ce2d29f829 100644 (file)
--- 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 89e26cc1742b0e68e52e4e09b5af349c605d9710..e75be209e9002ab6e2fd9a3c1eadef795995f128 100644 (file)
--- 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 c68ead10bae2f2667cb36dea42237b7f41b790c4..082f1a33d9cf941a2743ab40f9545a25e553b453 100644 (file)
--- 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 fab3afda70f7f2fadb8a734eabf1017201434e36..1bc46c7f13f789c6205d4b3552951b6e6cd59801 100644 (file)
--- 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 385145b270f2dfabe044779ea4eba5d1295db051..cf8e256346f1a2d026cf8fba71674be56be30451 100644 (file)
--- 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 d44fed902bfb7b5efe2fad8df2c9d24b69a72752..9d84ccd17e3d31cee6908affdba0889576b0a09b 100644 (file)
--- 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 012c245867ae52e8f32cb9f87c9c4133f0194f36..7135e85ab8c2bbb6dd86df5811718a0dd13cecb9 100644 (file)
--- 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 9f98286a513f728200e5fc2242d189a3ccd1a398..b50af2ac9510432c0e8817bd6da8c08d37ec5e4e 100644 (file)
--- 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 313ad233e169ea6ea71cc4df016270604d236ae6..777e022be55c1cbefafea882865bbc5e798ea661 100644 (file)
--- 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 c4aa4c6b4a47985275bb64aa05a0b30f9da770d4..2a7e36e3b3725c2a35dee04e75afa1be3515317e 100644 (file)
--- 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 e3f6039896a55b3eecd24035bf215878c2c9a9bf..bee3a4412bd336f86dca1725daf094d32205d108 100644 (file)
--- 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 8c2ffa611981b4d7c6f6f74a83d268a2ad5c4884..099489523cafa737c163b125ff09085d857f8a15 100644 (file)
--- 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 796607d0c418061527d426d0bac8ac8775c52500..e3976644a12afb5fce49dfedd7ab2af04b272f8a 100644 (file)
--- 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 18a148046d7c5274d619f43fb2fa51005b39cac3..4c24ff0c8ce6592cd0c50a04a88d708c436713ee 100644 (file)
--- 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.
  */