diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-30 15:23:50 +0000 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-12-09 22:29:28 +0100 |
| commit | d2e13a83823b6a4186bdcebe5c6abffa7d4ab268 (patch) | |
| tree | 3235a220fe20c8738c7838da17d774ad8f907068 /src | |
| parent | chacha20-arm: fix with clang -fno-integrated-as. (diff) | |
| download | wireguard-monolithic-historical-d2e13a83823b6a4186bdcebe5c6abffa7d4ab268.tar.xz wireguard-monolithic-historical-d2e13a83823b6a4186bdcebe5c6abffa7d4ab268.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>
Diffstat (limited to 'src')
84 files changed, 312 insertions, 352 deletions
@@ -1,3 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. + ccflags-y := -O3 -fvisibility=hidden ccflags-$(CONFIG_WIREGUARD_DEBUG) += -DDEBUG -g ccflags-y += -Wframe-larger-than=8192 diff --git a/src/Makefile b/src/Makefile index 86411fa..026c21f 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. + KERNELDIR ?= /lib/modules/$(shell uname -r)/build PREFIX ?= /usr DESTDIR ?= diff --git a/src/allowedips.c b/src/allowedips.c index 8ad3291..a0f199f 100644 --- a/src/allowedips.c +++ b/src/allowedips.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 "allowedips.h" #include "peer.h" diff --git a/src/allowedips.h b/src/allowedips.h index 53e674b..7b43382 100644 --- a/src/allowedips.h +++ b/src/allowedips.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 _WG_ALLOWEDIPS_H #define _WG_ALLOWEDIPS_H diff --git a/src/compat/Kbuild.include b/src/compat/Kbuild.include index 2bbe9e9..b7930b6 100644 --- a/src/compat/Kbuild.include +++ b/src/compat/Kbuild.include @@ -1,3 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. + ifeq ($(wildcard $(src)/compat/compat.h),) ccflags-y += -include $(srctree)/$(src)/compat/compat.h asflags-y += -include $(srctree)/$(src)/compat/compat-asm.h diff --git a/src/compat/checksum/checksum_partial_compat.h b/src/compat/checksum/checksum_partial_compat.h index 147b0a6..115cf07 100644 --- a/src/compat/checksum/checksum_partial_compat.h +++ b/src/compat/checksum/checksum_partial_compat.h @@ -1,3 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. + */ + #include <net/route.h> #include <net/esp.h> #include <net/ip.h> diff --git a/src/compat/compat-asm.h b/src/compat/compat-asm.h index 548841d..418c566 100644 --- a/src/compat/compat-asm.h +++ b/src/compat/compat-asm.h @@ -1,4 +1,7 @@ -/* 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. + */ #ifndef _WG_COMPATASM_H #define _WG_COMPATASM_H diff --git a/src/compat/compat.h b/src/compat/compat.h index 042e987..f4716d1 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.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 _WG_COMPAT_H #define _WG_COMPAT_H diff --git a/src/compat/udp_tunnel/udp_tunnel_partial_compat.h b/src/compat/udp_tunnel/udp_tunnel_partial_compat.h index e16ab52..230b3cd 100644 --- a/src/compat/udp_tunnel/udp_tunnel_partial_compat.h +++ b/src/compat/udp_tunnel/udp_tunnel_partial_compat.h @@ -1,3 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 + * + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. + */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) #define udp_sock_create4 udp_sock_create #define udp_sock_create6 udp_sock_create diff --git a/src/cookie.c b/src/cookie.c index 7dffb86..fdecb71 100644 --- a/src/cookie.c +++ b/src/cookie.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 "cookie.h" #include "peer.h" diff --git a/src/cookie.h b/src/cookie.h index e264e35..352e9c9 100644 --- a/src/cookie.h +++ b/src/cookie.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 _WG_COOKIE_H #define _WG_COOKIE_H diff --git a/src/crypto/blake2s-x86_64.S b/src/crypto/blake2s-x86_64.S index d1e0c03..3827d2e 100644 --- a/src/crypto/blake2s-x86_64.S +++ b/src/crypto/blake2s-x86_64.S @@ -1,6 +1,7 @@ -/* - * Copyright (C) 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. - * Based on algorithms from Samuel Neves <sneves@dei.uc.pt> +/* SPDX-License-Identifier: GPL-2.0 + * + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. + * Copyright (C) 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved. */ #include <linux/linkage.h> diff --git a/src/crypto/blake2s.c b/src/crypto/blake2s.c index d0a121a..1f4052d 100644 --- a/src/crypto/blake2s.c +++ b/src/crypto/blake2s.c @@ -1,6 +1,8 @@ -/* Original author: Samuel Neves <sneves@dei.uc.pt> +/* SPDX-License-Identifier: GPL-2.0 * * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. + * + * Original author: Samuel Neves <sneves@dei.uc.pt> */ #include "blake2s.h" diff --git a/src/crypto/blake2s.h b/src/crypto/blake2s.h index 9ed53ea..ac60cfe 100644 --- a/src/crypto/blake2s.h +++ b/src/crypto/blake2s.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 _WG_BLAKE2S_H #define _WG_BLAKE2S_H diff --git a/src/crypto/chacha20-arm.S b/src/crypto/chacha20-arm.S index 5cd4357..ac7a9ea 100644 --- a/src/crypto/chacha20-arm.S +++ b/src/crypto/chacha20-arm.S @@ -1,33 +1,7 @@ -/* Copyright 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. +/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) + * + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - Redistributions of source code must retain copyright notices, - * 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 the CRYPTOGAMS nor the names of its - * copyright holder and contributors may be used to endorse or - * promote products derived from this software without specific - * prior written permission. - * ALTERNATIVELY, provided that this notice is retained in full, this - * product may be distributed under the terms of the GNU General Public - * License (GPL), in which case the provisions of the GPL apply INSTEAD OF - * those given above. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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. */ #include <linux/linkage.h> diff --git a/src/crypto/chacha20-arm64.S b/src/crypto/chacha20-arm64.S index 6347adb..8acef8e 100644 --- a/src/crypto/chacha20-arm64.S +++ b/src/crypto/chacha20-arm64.S @@ -1,33 +1,7 @@ -/* Copyright 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. +/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) + * + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - Redistributions of source code must retain copyright notices, - * 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 the CRYPTOGAMS nor the names of its - * copyright holder and contributors may be used to endorse or - * promote products derived from this software without specific - * prior written permission. - * ALTERNATIVELY, provided that this notice is retained in full, this - * product may be distributed under the terms of the GNU General Public - * License (GPL), in which case the provisions of the GPL apply INSTEAD OF - * those given above. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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. */ #include <linux/linkage.h> diff --git a/src/crypto/chacha20-x86_64.S b/src/crypto/chacha20-x86_64.S index 4a01761..d69625f 100644 --- a/src/crypto/chacha20-x86_64.S +++ b/src/crypto/chacha20-x86_64.S @@ -1,34 +1,8 @@ -/* Copyright 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved. - * Copyright 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. +/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) + * + * Copyright (C) 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved. + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - Redistributions of source code must retain copyright notices, - * 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 the CRYPTOGAMS nor the names of its - * copyright holder and contributors may be used to endorse or - * promote products derived from this software without specific - * prior written permission. - * ALTERNATIVELY, provided that this notice is retained in full, this - * product may be distributed under the terms of the GNU General Public - * License (GPL), in which case the provisions of the GPL apply INSTEAD OF - * those given above. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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. */ #include <linux/linkage.h> diff --git a/src/crypto/chacha20poly1305.c b/src/crypto/chacha20poly1305.c index 2fa94c7..a4184d3 100644 --- a/src/crypto/chacha20poly1305.c +++ b/src/crypto/chacha20poly1305.c @@ -1,34 +1,8 @@ -/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. +/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) + * + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright 2015 Martin Willi. * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - Redistributions of source code must retain copyright notices, - * 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 the CRYPTOGAMS nor the names of its - * copyright holder and contributors may be used to endorse or - * promote products derived from this software without specific - * prior written permission. - * ALTERNATIVELY, provided that this notice is retained in full, this - * product may be distributed under the terms of the GNU General Public - * License (GPL), in which case the provisions of the GPL apply INSTEAD OF - * those given above. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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. */ #include "chacha20poly1305.h" diff --git a/src/crypto/chacha20poly1305.h b/src/crypto/chacha20poly1305.h index 991755d..1e54594 100644 --- a/src/crypto/chacha20poly1305.h +++ b/src/crypto/chacha20poly1305.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 _WG_CHACHA20POLY1305_H #define _WG_CHACHA20POLY1305_H diff --git a/src/crypto/curve25519-arm.S b/src/crypto/curve25519-arm.S index 165675a..0696926 100644 --- a/src/crypto/curve25519-arm.S +++ b/src/crypto/curve25519-arm.S @@ -1,5 +1,7 @@ -/* - * 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. + * * Based on algorithms from Daniel J. Bernstein and Peter Schwabe. */ diff --git a/src/crypto/curve25519-x86_64.S b/src/crypto/curve25519-x86_64.S index 2407ff4..4d26926 100644 --- a/src/crypto/curve25519-x86_64.S +++ b/src/crypto/curve25519-x86_64.S @@ -1,5 +1,7 @@ -/* - * 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. + * * Based on algorithms from Tung Chou <blueprint@crypto.tw> */ diff --git a/src/crypto/curve25519.c b/src/crypto/curve25519.c index 6dbd74b..adf6a0b 100644 --- a/src/crypto/curve25519.c +++ b/src/crypto/curve25519.c @@ -1,7 +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. + * + * Original author: Adam Langley <agl@imperialviolet.org> */ #include "curve25519.h" diff --git a/src/crypto/curve25519.h b/src/crypto/curve25519.h index 800cefa..40f50ae 100644 --- a/src/crypto/curve25519.h +++ b/src/crypto/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 _WG_CURVE25519_H #define _WG_CURVE25519_H diff --git a/src/crypto/poly1305-arm.S b/src/crypto/poly1305-arm.S index ca22481..75e7cab 100644 --- a/src/crypto/poly1305-arm.S +++ b/src/crypto/poly1305-arm.S @@ -1,33 +1,7 @@ -/* Copyright 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. +/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) + * + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - Redistributions of source code must retain copyright notices, - * 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 the CRYPTOGAMS nor the names of its - * copyright holder and contributors may be used to endorse or - * promote products derived from this software without specific - * prior written permission. - * ALTERNATIVELY, provided that this notice is retained in full, this - * product may be distributed under the terms of the GNU General Public - * License (GPL), in which case the provisions of the GPL apply INSTEAD OF - * those given above. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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. */ #include <linux/linkage.h> diff --git a/src/crypto/poly1305-arm64.S b/src/crypto/poly1305-arm64.S index 13c7a6b..ef54afd 100644 --- a/src/crypto/poly1305-arm64.S +++ b/src/crypto/poly1305-arm64.S @@ -1,33 +1,7 @@ -/* Copyright 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. +/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) + * + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - Redistributions of source code must retain copyright notices, - * 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 the CRYPTOGAMS nor the names of its - * copyright holder and contributors may be used to endorse or - * promote products derived from this software without specific - * prior written permission. - * ALTERNATIVELY, provided that this notice is retained in full, this - * product may be distributed under the terms of the GNU General Public - * License (GPL), in which case the provisions of the GPL apply INSTEAD OF - * those given above. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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. */ #include <linux/linkage.h> diff --git a/src/crypto/poly1305-mips64.S b/src/crypto/poly1305-mips64.S index 5275a8c..26a9a6a 100644 --- a/src/crypto/poly1305-mips64.S +++ b/src/crypto/poly1305-mips64.S @@ -1,33 +1,7 @@ -/* Copyright 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. +/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) + * + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - Redistributions of source code must retain copyright notices, - * 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 the CRYPTOGAMS nor the names of its - * copyright holder and contributors may be used to endorse or - * promote products derived from this software without specific - * prior written permission. - * ALTERNATIVELY, provided that this notice is retained in full, this - * product may be distributed under the terms of the GNU General Public - * License (GPL), in which case the provisions of the GPL apply INSTEAD OF - * those given above. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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. */ #if !defined(CONFIG_64BIT) diff --git a/src/crypto/poly1305-x86_64.S b/src/crypto/poly1305-x86_64.S index ebe5af3..3450ed7 100644 --- a/src/crypto/poly1305-x86_64.S +++ b/src/crypto/poly1305-x86_64.S @@ -1,34 +1,8 @@ -/* Copyright 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved. - * Copyright 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. +/* SPDX-License-Identifier: OpenSSL OR (BSD-3-Clause OR GPL-2.0) + * + * Copyright (C) 2017 Samuel Neves <sneves@dei.uc.pt>. All Rights Reserved. + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - Redistributions of source code must retain copyright notices, - * 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 the CRYPTOGAMS nor the names of its - * copyright holder and contributors may be used to endorse or - * promote products derived from this software without specific - * prior written permission. - * ALTERNATIVELY, provided that this notice is retained in full, this - * product may be distributed under the terms of the GNU General Public - * License (GPL), in which case the provisions of the GPL apply INSTEAD OF - * those given above. - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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. */ #include <linux/linkage.h> diff --git a/src/device.c b/src/device.c index d5dc93c..31417ea 100644 --- a/src/device.c +++ b/src/device.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 "queueing.h" #include "socket.h" diff --git a/src/device.h b/src/device.h index 7b305a3..08803e8 100644 --- a/src/device.h +++ b/src/device.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 _WG_DEVICE_H #define _WG_DEVICE_H diff --git a/src/hashtables.c b/src/hashtables.c index 8d61f4c..accb2c8 100644 --- a/src/hashtables.c +++ b/src/hashtables.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 "hashtables.h" #include "peer.h" diff --git a/src/hashtables.h b/src/hashtables.h index 55f608a..aef1493 100644 --- a/src/hashtables.h +++ b/src/hashtables.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 _WG_HASHTABLES_H #define _WG_HASHTABLES_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. + */ #include "version.h" #include "device.h" diff --git a/src/messages.h b/src/messages.h index 927b487..6a183d2 100644 --- a/src/messages.h +++ b/src/messages.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * diff --git a/src/netlink.c b/src/netlink.c index 7faaa1a..6abdab0 100644 --- a/src/netlink.c +++ b/src/netlink.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 "netlink.h" #include "device.h" diff --git a/src/netlink.h b/src/netlink.h index 750b874..e3982bb 100644 --- a/src/netlink.h +++ b/src/netlink.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 _WG_NETLINK_H #define _WG_NETLINK_H diff --git a/src/noise.c b/src/noise.c index 9d99bfa..fa0902b 100644 --- a/src/noise.c +++ b/src/noise.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 "noise.h" #include "device.h" diff --git a/src/noise.h b/src/noise.h index 01026a4..2ce40db 100644 --- a/src/noise.h +++ b/src/noise.h @@ -1,4 +1,5 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * * See doc/protocol.md and https://github.com/trevp/noise/blob/master/noise.md for more info @@ -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 "peer.h" #include "device.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 _WG_PEER_H #define _WG_PEER_H diff --git a/src/queueing.c b/src/queueing.c index bce406a..e38262a 100644 --- a/src/queueing.c +++ b/src/queueing.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 "queueing.h" diff --git a/src/queueing.h b/src/queueing.h index a385d67..967753f 100644 --- a/src/queueing.h +++ b/src/queueing.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 _WG_QUEUEING_H #define _WG_QUEUEING_H diff --git a/src/ratelimiter.c b/src/ratelimiter.c index 8a73dd1..3f89e94 100644 --- a/src/ratelimiter.c +++ b/src/ratelimiter.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 "ratelimiter.h" #include <linux/siphash.h> diff --git a/src/ratelimiter.h b/src/ratelimiter.h index d2fcb64..7833eb3 100644 --- a/src/ratelimiter.h +++ b/src/ratelimiter.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 _WG_RATELIMITER_H #define _WG_RATELIMITER_H diff --git a/src/receive.c b/src/receive.c index 080f6ba..683c856 100644 --- a/src/receive.c +++ b/src/receive.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 "queueing.h" #include "device.h" diff --git a/src/selftest/allowedips.h b/src/selftest/allowedips.h index 8a568c8..24122b4 100644 --- a/src/selftest/allowedips.h +++ b/src/selftest/allowedips.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. + */ #ifdef DEBUG diff --git a/src/selftest/blake2s.h b/src/selftest/blake2s.h index 94dda27..601f016 100644 --- a/src/selftest/blake2s.h +++ b/src/selftest/blake2s.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. + */ #ifdef DEBUG static const u8 blake2s_testvecs[][BLAKE2S_OUTBYTES] __initconst = { diff --git a/src/selftest/chacha20poly1305.h b/src/selftest/chacha20poly1305.h index a9ccd66..71f178e 100644 --- a/src/selftest/chacha20poly1305.h +++ b/src/selftest/chacha20poly1305.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. + */ #ifdef DEBUG struct chacha20poly1305_testvec { diff --git a/src/selftest/counter.h b/src/selftest/counter.h index 56d6006..f066974 100644 --- a/src/selftest/counter.h +++ b/src/selftest/counter.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. + */ #ifdef DEBUG bool __init packet_counter_selftest(void) diff --git a/src/selftest/curve25519.h b/src/selftest/curve25519.h index 17ff57a..e62e2fc 100644 --- a/src/selftest/curve25519.h +++ b/src/selftest/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. + */ #ifdef DEBUG struct curve25519_test_vector { diff --git a/src/selftest/ratelimiter.h b/src/selftest/ratelimiter.h index 202c573..aa5db38 100644 --- a/src/selftest/ratelimiter.h +++ b/src/selftest/ratelimiter.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. + */ #ifdef DEBUG @@ -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 "queueing.h" #include "timers.h" diff --git a/src/socket.c b/src/socket.c index 5bf5a92..5170dc8 100644 --- a/src/socket.c +++ b/src/socket.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 "device.h" #include "peer.h" diff --git a/src/socket.h b/src/socket.h index 161bd0b..a0d3204 100644 --- a/src/socket.h +++ b/src/socket.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 _WG_SOCKET_H #define _WG_SOCKET_H diff --git a/src/tests/netns.sh b/src/tests/netns.sh index 8118b02..20b7ece 100755 --- a/src/tests/netns.sh +++ b/src/tests/netns.sh @@ -1,7 +1,8 @@ #!/bin/bash - +# SPDX-License-Identifier: GPL-2.0 +# # Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. - +# # This script tests the below topology: # # ┌─────────────────────┐ ┌──────────────────────────────────┐ ┌─────────────────────┐ diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile index 0594088..1d4109b 100644 --- a/src/tests/qemu/Makefile +++ b/src/tests/qemu/Makefile @@ -1,3 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. + PWD := $(shell pwd) CHOST := $(shell gcc -dumpmachine) diff --git a/src/tests/qemu/init.c b/src/tests/qemu/init.c index 8bccf3c..c310699 100644 --- a/src/tests/qemu/init.c +++ b/src/tests/qemu/init.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. + */ #define _GNU_SOURCE #include <unistd.h> diff --git a/src/timers.c b/src/timers.c index 5f2570f..833d77b 100644 --- a/src/timers.c +++ b/src/timers.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 "timers.h" #include "device.h" diff --git a/src/timers.h b/src/timers.h index 105193e..65bac3f 100644 --- a/src/timers.h +++ b/src/timers.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 _WG_TIMERS_H #define _WG_TIMERS_H diff --git a/src/tools/Makefile b/src/tools/Makefile index bd727d4..e277b2f 100644 --- a/src/tools/Makefile +++ b/src/tools/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/tools/completion/wg-quick.bash-completion b/src/tools/completion/wg-quick.bash-completion index b931323..f7df346 100644 --- a/src/tools/completion/wg-quick.bash-completion +++ b/src/tools/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/tools/completion/wg.bash-completion b/src/tools/completion/wg.bash-completion index 5401bc3..9d0a9a5 100644 --- a/src/tools/completion/wg.bash-completion +++ b/src/tools/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/tools/config.c b/src/tools/config.c index 6ff0376..1fddb64 100644 --- a/src/tools/config.c +++ b/src/tools/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/tools/config.h b/src/tools/config.h index 63a272c..8f29b4f 100644 --- a/src/tools/config.h +++ b/src/tools/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/tools/containers.h b/src/tools/containers.h index 31eabea..a22c42d 100644 --- a/src/tools/containers.h +++ b/src/tools/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/tools/curve25519.c b/src/tools/curve25519.c index 71bd095..f83f76f 100644 --- a/src/tools/curve25519.c +++ b/src/tools/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/tools/curve25519.h b/src/tools/curve25519.h index 6e651e9..1108cd8 100644 --- a/src/tools/curve25519.h +++ b/src/tools/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/tools/encoding.c b/src/tools/encoding.c index da5ccef..5d5f6d0 100644 --- a/src/tools/encoding.c +++ b/src/tools/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/tools/encoding.h b/src/tools/encoding.h index 1f79a2a..0b0a53e 100644 --- a/src/tools/encoding.h +++ b/src/tools/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/tools/genkey.c b/src/tools/genkey.c index 9a62060..8f3433b 100644 --- a/src/tools/genkey.c +++ b/src/tools/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/tools/ipc.c b/src/tools/ipc.c index a88672f..221cd4e 100644 --- a/src/tools/ipc.c +++ b/src/tools/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/tools/ipc.h b/src/tools/ipc.h index cb660bb..31ff53f 100644 --- a/src/tools/ipc.h +++ b/src/tools/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/tools/mnlg.c b/src/tools/mnlg.c index 8a2b4cc..f0fdfd6 100644 --- a/src/tools/mnlg.c +++ b/src/tools/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/tools/mnlg.h b/src/tools/mnlg.h index b27a18c..70c2b03 100644 --- a/src/tools/mnlg.h +++ b/src/tools/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/tools/pubkey.c b/src/tools/pubkey.c index 6cced49..39461c2 100644 --- a/src/tools/pubkey.c +++ b/src/tools/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/tools/set.c b/src/tools/set.c index 57a6428..9ecf94b 100644 --- a/src/tools/set.c +++ b/src/tools/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/tools/setconf.c b/src/tools/setconf.c index 1857ff6..b87a13f 100644 --- a/src/tools/setconf.c +++ b/src/tools/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/tools/show.c b/src/tools/show.c index ebfdf5b..c5be788 100644 --- a/src/tools/show.c +++ b/src/tools/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/tools/showconf.c b/src/tools/showconf.c index e780d78..2e3fbd4 100644 --- a/src/tools/showconf.c +++ b/src/tools/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/tools/subcommands.h b/src/tools/subcommands.h index 7bbf70a..1d977ce 100644 --- a/src/tools/subcommands.h +++ b/src/tools/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/tools/terminal.c b/src/tools/terminal.c index 703c75f..c9e4eb5 100644 --- a/src/tools/terminal.c +++ b/src/tools/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/tools/terminal.h b/src/tools/terminal.h index 2c1fb37..68bd9a3 100644 --- a/src/tools/terminal.h +++ b/src/tools/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/tools/wg-quick.bash b/src/tools/wg-quick.bash index 42bf265..b2acbff 100755 --- a/src/tools/wg-quick.bash +++ b/src/tools/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/tools/wg.c b/src/tools/wg.c index 97910ee..94f0857 100644 --- a/src/tools/wg.c +++ b/src/tools/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> diff --git a/src/uapi/wireguard.h b/src/uapi/wireguard.h index 411d5a4..2c9fcb5 100644 --- a/src/uapi/wireguard.h +++ b/src/uapi/wireguard.h @@ -1,23 +1,6 @@ -/* Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR MIT) * - * The following MIT license applies only to this file: - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this file, to deal in this file without restriction, including without - * limitation the rights to use, copy, modify, merge, publish, distribute, - * sublicense, and/or sell copies of this file, and to permit persons to - * whom this file is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of this file. - * - * THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN THIS - * FILE. + * Copyright (C) 2015-2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * * Documentation * ============= |