aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-30 15:23:50 +0000
committerJason A. Donenfeld <Jason@zx2c4.com>2017-12-09 22:29:28 +0100
commit01d00bc03566d17585f640aafe5c76d34bcf5884 (patch)
tree175205acda7599fcc756812a444b0d6b33db6fe9 /src
parentwg: no need to put this on the stack (diff)
downloadwireguard-tools-01d00bc03566d17585f640aafe5c76d34bcf5884.tar.xz
wireguard-tools-01d00bc03566d17585f640aafe5c76d34bcf5884.zip
global: add SPDX tags to all files
It's good to have SPDX identifiers in all files as the Linux kernel developers are working to add these identifiers to all files. Update all files with the correct SPDX license identifier based on the license text of the project or based on the license in the file itself. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Modified-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile4
-rw-r--r--src/completion/wg-quick.bash-completion3
-rw-r--r--src/completion/wg.bash-completion3
-rw-r--r--src/config.c5
-rw-r--r--src/config.h5
-rw-r--r--src/containers.h6
-rw-r--r--src/curve25519.c30
-rw-r--r--src/curve25519.h5
-rw-r--r--src/encoding.c4
-rw-r--r--src/encoding.h5
-rw-r--r--src/genkey.c5
-rw-r--r--src/ipc.c5
-rw-r--r--src/ipc.h5
-rw-r--r--src/mnlg.c4
-rw-r--r--src/mnlg.h4
-rw-r--r--src/pubkey.c5
-rw-r--r--src/set.c5
-rw-r--r--src/setconf.c5
-rw-r--r--src/show.c5
-rw-r--r--src/showconf.c5
-rw-r--r--src/subcommands.h5
-rw-r--r--src/terminal.c5
-rw-r--r--src/terminal.h5
-rwxr-xr-xsrc/wg-quick.bash1
-rw-r--r--src/wg.c5
25 files changed, 89 insertions, 50 deletions
diff --git a/src/Makefile b/src/Makefile
index bd727d4..e277b2f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+
PKG_CONFIG ?= pkg-config
PREFIX ?= /usr
DESTDIR ?=
diff --git a/src/completion/wg-quick.bash-completion b/src/completion/wg-quick.bash-completion
index b931323..f7df346 100644
--- a/src/completion/wg-quick.bash-completion
+++ b/src/completion/wg-quick.bash-completion
@@ -1,4 +1,5 @@
-# Copyright (C) 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
_wg_quick_completion() {
local i a
diff --git a/src/completion/wg.bash-completion b/src/completion/wg.bash-completion
index 5401bc3..9d0a9a5 100644
--- a/src/completion/wg.bash-completion
+++ b/src/completion/wg.bash-completion
@@ -1,4 +1,5 @@
-# Copyright (C) 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
_wg_completion() {
local a
diff --git a/src/config.c b/src/config.c
index 6ff0376..1fddb64 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#include <arpa/inet.h>
#include <limits.h>
diff --git a/src/config.h b/src/config.h
index 63a272c..8f29b4f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#ifndef CONFIG_H
#define CONFIG_H
diff --git a/src/containers.h b/src/containers.h
index 31eabea..a22c42d 100644
--- a/src/containers.h
+++ b/src/containers.h
@@ -1,5 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
-
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#ifndef CONTAINERS_H
#define CONTAINERS_H
diff --git a/src/curve25519.c b/src/curve25519.c
index 71bd095..f83f76f 100644
--- a/src/curve25519.c
+++ b/src/curve25519.c
@@ -1,33 +1,9 @@
-/* Original author: Adam Langley <agl@imperialviolet.org>
+/* SPDX-License-Identifier: GPL-2.0
*
- * Copyright 2008 Google Inc. All Rights Reserved.
+ * Copyright (C) 2008 Google Inc. All Rights Reserved.
* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
*
- * Redistribution and use in source and binary forms of this file, with or
- * without modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Original author: Adam Langley <agl@imperialviolet.org>
*/
#include "curve25519.h"
diff --git a/src/curve25519.h b/src/curve25519.h
index 6e651e9..1108cd8 100644
--- a/src/curve25519.h
+++ b/src/curve25519.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#ifndef CURVE25519_H
#define CURVE25519_H
diff --git a/src/encoding.c b/src/encoding.c
index da5ccef..5d5f6d0 100644
--- a/src/encoding.c
+++ b/src/encoding.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 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 1f79a2a..0b0a53e 100644
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#ifndef ENCODING_H
#define ENCODING_H
diff --git a/src/genkey.c b/src/genkey.c
index 9a62060..8f3433b 100644
--- a/src/genkey.c
+++ b/src/genkey.c
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#include <errno.h>
#include <stdio.h>
diff --git a/src/ipc.c b/src/ipc.c
index a88672f..221cd4e 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#ifdef __linux__
#include <libmnl/libmnl.h>
diff --git a/src/ipc.h b/src/ipc.h
index cb660bb..31ff53f 100644
--- a/src/ipc.h
+++ b/src/ipc.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#ifndef IPC_H
#define IPC_H
diff --git a/src/mnlg.c b/src/mnlg.c
index 8a2b4cc..f0fdfd6 100644
--- a/src/mnlg.c
+++ b/src/mnlg.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 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 b27a18c..70c2b03 100644
--- a/src/mnlg.h
+++ b/src/mnlg.h
@@ -1,4 +1,6 @@
-/* Copyright (C) 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 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 6cced49..39461c2 100644
--- a/src/pubkey.c
+++ b/src/pubkey.c
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#include <errno.h>
#include <stdio.h>
diff --git a/src/set.c b/src/set.c
index 57a6428..9ecf94b 100644
--- a/src/set.c
+++ b/src/set.c
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/setconf.c b/src/setconf.c
index 1857ff6..b87a13f 100644
--- a/src/setconf.c
+++ b/src/setconf.c
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#include <stddef.h>
#include <stdio.h>
diff --git a/src/show.c b/src/show.c
index ebfdf5b..c5be788 100644
--- a/src/show.c
+++ b/src/show.c
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#include <arpa/inet.h>
#include <inttypes.h>
diff --git a/src/showconf.c b/src/showconf.c
index e780d78..2e3fbd4 100644
--- a/src/showconf.c
+++ b/src/showconf.c
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#include <arpa/inet.h>
#include <netinet/in.h>
diff --git a/src/subcommands.h b/src/subcommands.h
index 7bbf70a..1d977ce 100644
--- a/src/subcommands.h
+++ b/src/subcommands.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#ifndef SUBCOMMANDS_H
#define SUBCOMMANDS_H
diff --git a/src/terminal.c b/src/terminal.c
index 703c75f..c9e4eb5 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#include <ctype.h>
#include <stdarg.h>
diff --git a/src/terminal.h b/src/terminal.h
index 2c1fb37..68bd9a3 100644
--- a/src/terminal.h
+++ b/src/terminal.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#ifndef TERMINAL_H
#define TERMINAL_H
diff --git a/src/wg-quick.bash b/src/wg-quick.bash
index 42bf265..b2acbff 100755
--- a/src/wg-quick.bash
+++ b/src/wg-quick.bash
@@ -1,4 +1,5 @@
#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
#
# Copyright (C) 2016-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
#
diff --git a/src/wg.c b/src/wg.c
index 97910ee..94f0857 100644
--- a/src/wg.c
+++ b/src/wg.c
@@ -1,4 +1,7 @@
-/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. */
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ */
#include <stddef.h>
#include <stdio.h>