commit: 6a34e6a35e0db9ae314fe7a3fb51061601b35b24 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Tue Sep 8 22:26:08 2020 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Tue Sep 8 22:26:08 2020 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=6a34e6a3
Update wireguard patchset to v1.0.20200908 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 2 +- ... => 2400_wireguard-backport-v1.0.20200908.patch | 840 ++++++++++----------- 2 files changed, 421 insertions(+), 421 deletions(-) diff --git a/0000_README b/0000_README index ddaf543..85c6dae 100644 --- a/0000_README +++ b/0000_README @@ -307,7 +307,7 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/[email protected]/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 -Patch: 2400_wireguard-backport-v5.4.54.patch +Patch: 2400_wireguard-backport-v1.0.20200908.patch From: https://git.zx2c4.com/wireguard-linux/ Desc: Extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography diff --git a/2400_wireguard-backport-v5.4.54.patch b/2400_wireguard-backport-v1.0.20200908.patch similarity index 97% rename from 2400_wireguard-backport-v5.4.54.patch rename to 2400_wireguard-backport-v1.0.20200908.patch index 99c359a..d11ac0c 100644 --- a/2400_wireguard-backport-v5.4.54.patch +++ b/2400_wireguard-backport-v1.0.20200908.patch @@ -1,6 +1,6 @@ -diff -Nru linux-5.4.55/arch/arm/crypto/chacha-glue.c linux-5.4.55-modified/arch/arm/crypto/chacha-glue.c ---- linux-5.4.55/arch/arm/crypto/chacha-glue.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/arm/crypto/chacha-glue.c 2020-08-01 15:38:51.348407940 -0400 +diff -Nru linux-5.4.63/arch/arm/crypto/chacha-glue.c linux-5.4.63-modified/arch/arm/crypto/chacha-glue.c +--- linux-5.4.63/arch/arm/crypto/chacha-glue.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/arm/crypto/chacha-glue.c 2020-09-08 18:16:45.721318134 -0400 @@ -0,0 +1,357 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -359,9 +359,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/chacha-glue.c linux-5.4.55-modified/arch/ +MODULE_ALIAS_CRYPTO("xchacha20-neon"); +MODULE_ALIAS_CRYPTO("xchacha12-neon"); +#endif -diff -Nru linux-5.4.55/arch/arm/crypto/chacha-neon-glue.c linux-5.4.55-modified/arch/arm/crypto/chacha-neon-glue.c ---- linux-5.4.55/arch/arm/crypto/chacha-neon-glue.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/arm/crypto/chacha-neon-glue.c 1969-12-31 19:00:00.000000000 -0500 +diff -Nru linux-5.4.63/arch/arm/crypto/chacha-neon-glue.c linux-5.4.63-modified/arch/arm/crypto/chacha-neon-glue.c +--- linux-5.4.63/arch/arm/crypto/chacha-neon-glue.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/arm/crypto/chacha-neon-glue.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,202 +0,0 @@ -/* - * ARM NEON accelerated ChaCha and XChaCha stream ciphers, @@ -565,9 +565,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/chacha-neon-glue.c linux-5.4.55-modified/ -MODULE_ALIAS_CRYPTO("xchacha20-neon"); -MODULE_ALIAS_CRYPTO("xchacha12"); -MODULE_ALIAS_CRYPTO("xchacha12-neon"); -diff -Nru linux-5.4.55/arch/arm/crypto/chacha-scalar-core.S linux-5.4.55-modified/arch/arm/crypto/chacha-scalar-core.S ---- linux-5.4.55/arch/arm/crypto/chacha-scalar-core.S 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/arm/crypto/chacha-scalar-core.S 2020-08-01 15:38:51.322407775 -0400 +diff -Nru linux-5.4.63/arch/arm/crypto/chacha-scalar-core.S linux-5.4.63-modified/arch/arm/crypto/chacha-scalar-core.S +--- linux-5.4.63/arch/arm/crypto/chacha-scalar-core.S 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/arm/crypto/chacha-scalar-core.S 2020-09-08 18:16:45.696317830 -0400 @@ -0,0 +1,460 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -1029,9 +1029,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/chacha-scalar-core.S linux-5.4.55-modifie +1: _chacha_permute 12 + b 0b +ENDPROC(hchacha_block_arm) -diff -Nru linux-5.4.55/arch/arm/crypto/curve25519-core.S linux-5.4.55-modified/arch/arm/crypto/curve25519-core.S ---- linux-5.4.55/arch/arm/crypto/curve25519-core.S 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/arm/crypto/curve25519-core.S 2020-08-01 15:38:51.336407864 -0400 +diff -Nru linux-5.4.63/arch/arm/crypto/curve25519-core.S linux-5.4.63-modified/arch/arm/crypto/curve25519-core.S +--- linux-5.4.63/arch/arm/crypto/curve25519-core.S 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/arm/crypto/curve25519-core.S 2020-09-08 18:16:45.710318000 -0400 @@ -0,0 +1,2062 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* @@ -3095,10 +3095,10 @@ diff -Nru linux-5.4.55/arch/arm/crypto/curve25519-core.S linux-5.4.55-modified/a + mov sp, ip + pop {r4-r11, pc} +ENDPROC(curve25519_neon) -diff -Nru linux-5.4.55/arch/arm/crypto/curve25519-glue.c linux-5.4.55-modified/arch/arm/crypto/curve25519-glue.c ---- linux-5.4.55/arch/arm/crypto/curve25519-glue.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/arm/crypto/curve25519-glue.c 2020-08-01 15:38:51.340407890 -0400 -@@ -0,0 +1,135 @@ +diff -Nru linux-5.4.63/arch/arm/crypto/curve25519-glue.c linux-5.4.63-modified/arch/arm/crypto/curve25519-glue.c +--- linux-5.4.63/arch/arm/crypto/curve25519-glue.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/arm/crypto/curve25519-glue.c 2020-09-08 18:16:45.722318146 -0400 +@@ -0,0 +1,136 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2015-2019 Jason A. Donenfeld <[email protected]>. All Rights Reserved. @@ -3117,6 +3117,7 @@ diff -Nru linux-5.4.55/arch/arm/crypto/curve25519-glue.c linux-5.4.55-modified/a +#include <linux/module.h> +#include <linux/init.h> +#include <linux/jump_label.h> ++#include <linux/scatterlist.h> +#include <crypto/curve25519.h> + +asmlinkage void curve25519_neon(u8 mypublic[CURVE25519_KEY_SIZE], @@ -3234,17 +3235,17 @@ diff -Nru linux-5.4.55/arch/arm/crypto/curve25519-glue.c linux-5.4.55-modified/a +MODULE_ALIAS_CRYPTO("curve25519"); +MODULE_ALIAS_CRYPTO("curve25519-neon"); +MODULE_LICENSE("GPL v2"); -diff -Nru linux-5.4.55/arch/arm/crypto/.gitignore linux-5.4.55-modified/arch/arm/crypto/.gitignore ---- linux-5.4.55/arch/arm/crypto/.gitignore 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/arm/crypto/.gitignore 2020-08-01 15:38:51.348407940 -0400 +diff -Nru linux-5.4.63/arch/arm/crypto/.gitignore linux-5.4.63-modified/arch/arm/crypto/.gitignore +--- linux-5.4.63/arch/arm/crypto/.gitignore 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/arm/crypto/.gitignore 2020-09-08 18:16:45.721318134 -0400 @@ -1,3 +1,4 @@ aesbs-core.S sha256-core.S sha512-core.S +poly1305-core.S -diff -Nru linux-5.4.55/arch/arm/crypto/Kconfig linux-5.4.55-modified/arch/arm/crypto/Kconfig ---- linux-5.4.55/arch/arm/crypto/Kconfig 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/arm/crypto/Kconfig 2020-08-01 15:38:51.336407864 -0400 +diff -Nru linux-5.4.63/arch/arm/crypto/Kconfig linux-5.4.63-modified/arch/arm/crypto/Kconfig +--- linux-5.4.63/arch/arm/crypto/Kconfig 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/arm/crypto/Kconfig 2020-09-08 18:16:45.710318000 -0400 @@ -127,14 +127,24 @@ select CRYPTO_HASH @@ -3273,9 +3274,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/Kconfig linux-5.4.55-modified/arch/arm/cr + select CRYPTO_ARCH_HAVE_LIB_CURVE25519 + endif -diff -Nru linux-5.4.55/arch/arm/crypto/Makefile linux-5.4.55-modified/arch/arm/crypto/Makefile ---- linux-5.4.55/arch/arm/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/arm/crypto/Makefile 2020-08-01 15:38:51.336407864 -0400 +diff -Nru linux-5.4.63/arch/arm/crypto/Makefile linux-5.4.63-modified/arch/arm/crypto/Makefile +--- linux-5.4.63/arch/arm/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/arm/crypto/Makefile 2020-09-08 18:16:45.710318000 -0400 @@ -10,7 +10,9 @@ obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o @@ -3318,9 +3319,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/Makefile linux-5.4.55-modified/arch/arm/c +poly1305-aflags-$(CONFIG_CPU_V7) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=5 +poly1305-aflags-$(CONFIG_KERNEL_MODE_NEON) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=7 +AFLAGS_poly1305-core.o += $(poly1305-aflags-y) -diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-armv4.pl linux-5.4.55-modified/arch/arm/crypto/poly1305-armv4.pl ---- linux-5.4.55/arch/arm/crypto/poly1305-armv4.pl 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/arm/crypto/poly1305-armv4.pl 2020-08-01 15:38:51.326407801 -0400 +diff -Nru linux-5.4.63/arch/arm/crypto/poly1305-armv4.pl linux-5.4.63-modified/arch/arm/crypto/poly1305-armv4.pl +--- linux-5.4.63/arch/arm/crypto/poly1305-armv4.pl 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/arm/crypto/poly1305-armv4.pl 2020-09-08 18:16:45.700317878 -0400 @@ -0,0 +1,1236 @@ +#!/usr/bin/env perl +# SPDX-License-Identifier: GPL-1.0+ OR BSD-3-Clause @@ -4558,9 +4559,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-armv4.pl linux-5.4.55-modified/a + print $_,"\n"; +} +close STDOUT; # enforce flush -diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-core.S_shipped linux-5.4.55-modified/arch/arm/crypto/poly1305-core.S_shipped ---- linux-5.4.55/arch/arm/crypto/poly1305-core.S_shipped 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/arm/crypto/poly1305-core.S_shipped 2020-08-01 15:38:51.326407801 -0400 +diff -Nru linux-5.4.63/arch/arm/crypto/poly1305-core.S_shipped linux-5.4.63-modified/arch/arm/crypto/poly1305-core.S_shipped +--- linux-5.4.63/arch/arm/crypto/poly1305-core.S_shipped 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/arm/crypto/poly1305-core.S_shipped 2020-09-08 18:16:45.700317878 -0400 @@ -0,0 +1,1158 @@ +#ifndef __KERNEL__ +# include "arm_arch.h" @@ -5720,10 +5721,10 @@ diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-core.S_shipped linux-5.4.55-modi +#endif +.asciz "Poly1305 for ARMv4/NEON, CRYPTOGAMS by @dot-asm" +.align 2 -diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-glue.c linux-5.4.55-modified/arch/arm/crypto/poly1305-glue.c ---- linux-5.4.55/arch/arm/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/arm/crypto/poly1305-glue.c 2020-08-01 15:38:51.348407940 -0400 -@@ -0,0 +1,272 @@ +diff -Nru linux-5.4.63/arch/arm/crypto/poly1305-glue.c linux-5.4.63-modified/arch/arm/crypto/poly1305-glue.c +--- linux-5.4.63/arch/arm/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/arm/crypto/poly1305-glue.c 2020-09-08 18:16:45.722318146 -0400 +@@ -0,0 +1,273 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * OpenSSL/Cryptogams accelerated Poly1305 transform for ARM @@ -5746,6 +5747,7 @@ diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-glue.c linux-5.4.55-modified/arc + +void poly1305_init_arm(void *state, const u8 *key); +void poly1305_blocks_arm(void *state, const u8 *src, u32 len, u32 hibit); ++void poly1305_blocks_neon(void *state, const u8 *src, u32 len, u32 hibit); +void poly1305_emit_arm(void *state, u8 *digest, const u32 *nonce); + +void __weak poly1305_blocks_neon(void *state, const u8 *src, u32 len, u32 hibit) @@ -5996,9 +5998,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-glue.c linux-5.4.55-modified/arc +MODULE_ALIAS_CRYPTO("poly1305"); +MODULE_ALIAS_CRYPTO("poly1305-arm"); +MODULE_ALIAS_CRYPTO("poly1305-neon"); -diff -Nru linux-5.4.55/arch/arm64/crypto/chacha-neon-glue.c linux-5.4.55-modified/arch/arm64/crypto/chacha-neon-glue.c ---- linux-5.4.55/arch/arm64/crypto/chacha-neon-glue.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/arm64/crypto/chacha-neon-glue.c 2020-08-01 15:38:51.348407940 -0400 +diff -Nru linux-5.4.63/arch/arm64/crypto/chacha-neon-glue.c linux-5.4.63-modified/arch/arm64/crypto/chacha-neon-glue.c +--- linux-5.4.63/arch/arm64/crypto/chacha-neon-glue.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/arm64/crypto/chacha-neon-glue.c 2020-09-08 18:16:45.721318134 -0400 @@ -1,5 +1,5 @@ /* - * ARM NEON accelerated ChaCha and XChaCha stream ciphers, @@ -6190,16 +6192,16 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/chacha-neon-glue.c linux-5.4.55-modifie } module_init(chacha_simd_mod_init); -diff -Nru linux-5.4.55/arch/arm64/crypto/.gitignore linux-5.4.55-modified/arch/arm64/crypto/.gitignore ---- linux-5.4.55/arch/arm64/crypto/.gitignore 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/arm64/crypto/.gitignore 2020-08-01 15:38:51.348407940 -0400 +diff -Nru linux-5.4.63/arch/arm64/crypto/.gitignore linux-5.4.63-modified/arch/arm64/crypto/.gitignore +--- linux-5.4.63/arch/arm64/crypto/.gitignore 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/arm64/crypto/.gitignore 2020-09-08 18:16:45.721318134 -0400 @@ -1,2 +1,3 @@ sha256-core.S sha512-core.S +poly1305-core.S -diff -Nru linux-5.4.55/arch/arm64/crypto/Kconfig linux-5.4.55-modified/arch/arm64/crypto/Kconfig ---- linux-5.4.55/arch/arm64/crypto/Kconfig 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/arm64/crypto/Kconfig 2020-08-01 15:38:51.325407794 -0400 +diff -Nru linux-5.4.63/arch/arm64/crypto/Kconfig linux-5.4.63-modified/arch/arm64/crypto/Kconfig +--- linux-5.4.63/arch/arm64/crypto/Kconfig 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/arm64/crypto/Kconfig 2020-09-08 18:16:45.699317866 -0400 @@ -103,7 +103,14 @@ tristate "ChaCha20, XChaCha20, and XChaCha12 stream ciphers using NEON instructions" depends on KERNEL_MODE_NEON @@ -6216,9 +6218,9 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/Kconfig linux-5.4.55-modified/arch/arm6 config CRYPTO_NHPOLY1305_NEON tristate "NHPoly1305 hash function using NEON instructions (for Adiantum)" -diff -Nru linux-5.4.55/arch/arm64/crypto/Makefile linux-5.4.55-modified/arch/arm64/crypto/Makefile ---- linux-5.4.55/arch/arm64/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/arm64/crypto/Makefile 2020-08-01 15:38:51.325407794 -0400 +diff -Nru linux-5.4.63/arch/arm64/crypto/Makefile linux-5.4.63-modified/arch/arm64/crypto/Makefile +--- linux-5.4.63/arch/arm64/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/arm64/crypto/Makefile 2020-09-08 18:16:45.699317866 -0400 @@ -50,6 +50,10 @@ obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o chacha-neon-y := chacha-neon-core.o chacha-neon-glue.o @@ -6247,9 +6249,9 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/Makefile linux-5.4.55-modified/arch/arm -clean-files += sha256-core.S sha512-core.S +clean-files += poly1305-core.S sha256-core.S sha512-core.S -diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-armv8.pl linux-5.4.55-modified/arch/arm64/crypto/poly1305-armv8.pl ---- linux-5.4.55/arch/arm64/crypto/poly1305-armv8.pl 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/arm64/crypto/poly1305-armv8.pl 2020-08-01 15:38:51.325407794 -0400 +diff -Nru linux-5.4.63/arch/arm64/crypto/poly1305-armv8.pl linux-5.4.63-modified/arch/arm64/crypto/poly1305-armv8.pl +--- linux-5.4.63/arch/arm64/crypto/poly1305-armv8.pl 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/arm64/crypto/poly1305-armv8.pl 2020-09-08 18:16:45.699317866 -0400 @@ -0,0 +1,913 @@ +#!/usr/bin/env perl +# SPDX-License-Identifier: GPL-1.0+ OR BSD-3-Clause @@ -7164,9 +7166,9 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-armv8.pl linux-5.4.55-modified + print $_,"\n"; +} +close STDOUT; -diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-core.S_shipped linux-5.4.55-modified/arch/arm64/crypto/poly1305-core.S_shipped ---- linux-5.4.55/arch/arm64/crypto/poly1305-core.S_shipped 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/arm64/crypto/poly1305-core.S_shipped 2020-08-01 15:38:51.325407794 -0400 +diff -Nru linux-5.4.63/arch/arm64/crypto/poly1305-core.S_shipped linux-5.4.63-modified/arch/arm64/crypto/poly1305-core.S_shipped +--- linux-5.4.63/arch/arm64/crypto/poly1305-core.S_shipped 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/arm64/crypto/poly1305-core.S_shipped 2020-09-08 18:16:45.699317866 -0400 @@ -0,0 +1,835 @@ +#ifndef __KERNEL__ +# include "arm_arch.h" @@ -8003,9 +8005,9 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-core.S_shipped linux-5.4.55-mo +.comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P +#endif -diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-glue.c linux-5.4.55-modified/arch/arm64/crypto/poly1305-glue.c ---- linux-5.4.55/arch/arm64/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/arm64/crypto/poly1305-glue.c 2020-08-01 15:38:51.348407940 -0400 +diff -Nru linux-5.4.63/arch/arm64/crypto/poly1305-glue.c linux-5.4.63-modified/arch/arm64/crypto/poly1305-glue.c +--- linux-5.4.63/arch/arm64/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/arm64/crypto/poly1305-glue.c 2020-09-08 18:16:45.721318134 -0400 @@ -0,0 +1,231 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -8238,9 +8240,9 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-glue.c linux-5.4.55-modified/a +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS_CRYPTO("poly1305"); +MODULE_ALIAS_CRYPTO("poly1305-neon"); -diff -Nru linux-5.4.55/arch/mips/crypto/chacha-core.S linux-5.4.55-modified/arch/mips/crypto/chacha-core.S ---- linux-5.4.55/arch/mips/crypto/chacha-core.S 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/mips/crypto/chacha-core.S 2020-08-01 15:38:51.323407782 -0400 +diff -Nru linux-5.4.63/arch/mips/crypto/chacha-core.S linux-5.4.63-modified/arch/mips/crypto/chacha-core.S +--- linux-5.4.63/arch/mips/crypto/chacha-core.S 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/mips/crypto/chacha-core.S 2020-09-08 18:16:45.696317830 -0400 @@ -0,0 +1,497 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* @@ -8739,9 +8741,9 @@ diff -Nru linux-5.4.55/arch/mips/crypto/chacha-core.S linux-5.4.55-modified/arch + jr $ra +.end hchacha_block_arch +.set at -diff -Nru linux-5.4.55/arch/mips/crypto/chacha-glue.c linux-5.4.55-modified/arch/mips/crypto/chacha-glue.c ---- linux-5.4.55/arch/mips/crypto/chacha-glue.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/mips/crypto/chacha-glue.c 2020-08-01 15:38:51.340407890 -0400 +diff -Nru linux-5.4.63/arch/mips/crypto/chacha-glue.c linux-5.4.63-modified/arch/mips/crypto/chacha-glue.c +--- linux-5.4.63/arch/mips/crypto/chacha-glue.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/mips/crypto/chacha-glue.c 2020-09-08 18:16:45.713318037 -0400 @@ -0,0 +1,152 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -8895,9 +8897,9 @@ diff -Nru linux-5.4.55/arch/mips/crypto/chacha-glue.c linux-5.4.55-modified/arch +MODULE_ALIAS_CRYPTO("xchacha20-mips"); +MODULE_ALIAS_CRYPTO("xchacha12"); +MODULE_ALIAS_CRYPTO("xchacha12-mips"); -diff -Nru linux-5.4.55/arch/mips/crypto/Makefile linux-5.4.55-modified/arch/mips/crypto/Makefile ---- linux-5.4.55/arch/mips/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/mips/crypto/Makefile 2020-08-01 15:38:51.326407801 -0400 +diff -Nru linux-5.4.63/arch/mips/crypto/Makefile linux-5.4.63-modified/arch/mips/crypto/Makefile +--- linux-5.4.63/arch/mips/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/mips/crypto/Makefile 2020-09-08 18:16:45.700317878 -0400 @@ -4,3 +4,21 @@ # @@ -8920,9 +8922,9 @@ diff -Nru linux-5.4.55/arch/mips/crypto/Makefile linux-5.4.55-modified/arch/mips + $(call if_changed,perlasm) + +targets += poly1305-core.S -diff -Nru linux-5.4.55/arch/mips/crypto/poly1305-glue.c linux-5.4.55-modified/arch/mips/crypto/poly1305-glue.c ---- linux-5.4.55/arch/mips/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/mips/crypto/poly1305-glue.c 2020-08-01 15:38:51.344407915 -0400 +diff -Nru linux-5.4.63/arch/mips/crypto/poly1305-glue.c linux-5.4.63-modified/arch/mips/crypto/poly1305-glue.c +--- linux-5.4.63/arch/mips/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/mips/crypto/poly1305-glue.c 2020-09-08 18:16:45.717318086 -0400 @@ -0,0 +1,191 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -9115,9 +9117,9 @@ diff -Nru linux-5.4.55/arch/mips/crypto/poly1305-glue.c linux-5.4.55-modified/ar +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS_CRYPTO("poly1305"); +MODULE_ALIAS_CRYPTO("poly1305-mips"); -diff -Nru linux-5.4.55/arch/mips/crypto/poly1305-mips.pl linux-5.4.55-modified/arch/mips/crypto/poly1305-mips.pl ---- linux-5.4.55/arch/mips/crypto/poly1305-mips.pl 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/mips/crypto/poly1305-mips.pl 2020-08-01 15:38:51.327407807 -0400 +diff -Nru linux-5.4.63/arch/mips/crypto/poly1305-mips.pl linux-5.4.63-modified/arch/mips/crypto/poly1305-mips.pl +--- linux-5.4.63/arch/mips/crypto/poly1305-mips.pl 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/mips/crypto/poly1305-mips.pl 2020-09-08 18:16:45.701317891 -0400 @@ -0,0 +1,1273 @@ +#!/usr/bin/env perl +# SPDX-License-Identifier: GPL-1.0+ OR BSD-3-Clause @@ -10392,9 +10394,9 @@ diff -Nru linux-5.4.55/arch/mips/crypto/poly1305-mips.pl linux-5.4.55-modified/a +$output=pop and open STDOUT,">$output"; +print $code; +close STDOUT; -diff -Nru linux-5.4.55/arch/mips/Makefile linux-5.4.55-modified/arch/mips/Makefile ---- linux-5.4.55/arch/mips/Makefile 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/mips/Makefile 2020-08-01 15:38:51.323407782 -0400 +diff -Nru linux-5.4.63/arch/mips/Makefile linux-5.4.63-modified/arch/mips/Makefile +--- linux-5.4.63/arch/mips/Makefile 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/mips/Makefile 2020-09-08 18:16:45.696317830 -0400 @@ -334,7 +334,7 @@ # See arch/mips/Kbuild for content of core part of the kernel core-y += arch/mips/ @@ -10404,9 +10406,9 @@ diff -Nru linux-5.4.55/arch/mips/Makefile linux-5.4.55-modified/arch/mips/Makefi drivers-$(CONFIG_OPROFILE) += arch/mips/oprofile/ # suspend and hibernation support -diff -Nru linux-5.4.55/arch/x86/crypto/blake2s-core.S linux-5.4.55-modified/arch/x86/crypto/blake2s-core.S ---- linux-5.4.55/arch/x86/crypto/blake2s-core.S 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/x86/crypto/blake2s-core.S 2020-08-01 15:38:51.331407832 -0400 +diff -Nru linux-5.4.63/arch/x86/crypto/blake2s-core.S linux-5.4.63-modified/arch/x86/crypto/blake2s-core.S +--- linux-5.4.63/arch/x86/crypto/blake2s-core.S 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/x86/crypto/blake2s-core.S 2020-09-08 18:16:45.704317927 -0400 @@ -0,0 +1,258 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* @@ -10666,9 +10668,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/blake2s-core.S linux-5.4.55-modified/arch + retq +ENDPROC(blake2s_compress_avx512) +#endif /* CONFIG_AS_AVX512 */ -diff -Nru linux-5.4.55/arch/x86/crypto/blake2s-glue.c linux-5.4.55-modified/arch/x86/crypto/blake2s-glue.c ---- linux-5.4.55/arch/x86/crypto/blake2s-glue.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/x86/crypto/blake2s-glue.c 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/arch/x86/crypto/blake2s-glue.c linux-5.4.63-modified/arch/x86/crypto/blake2s-glue.c +--- linux-5.4.63/arch/x86/crypto/blake2s-glue.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/x86/crypto/blake2s-glue.c 2020-09-08 18:16:45.721318134 -0400 @@ -0,0 +1,233 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -10903,9 +10905,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/blake2s-glue.c linux-5.4.55-modified/arch +MODULE_ALIAS_CRYPTO("blake2s-256"); +MODULE_ALIAS_CRYPTO("blake2s-256-x86"); +MODULE_LICENSE("GPL v2"); -diff -Nru linux-5.4.55/arch/x86/crypto/chacha_glue.c linux-5.4.55-modified/arch/x86/crypto/chacha_glue.c ---- linux-5.4.55/arch/x86/crypto/chacha_glue.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/x86/crypto/chacha_glue.c 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/arch/x86/crypto/chacha_glue.c linux-5.4.63-modified/arch/x86/crypto/chacha_glue.c +--- linux-5.4.63/arch/x86/crypto/chacha_glue.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/x86/crypto/chacha_glue.c 2020-09-08 18:16:45.721318134 -0400 @@ -7,38 +7,36 @@ */ @@ -11220,9 +11222,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/chacha_glue.c linux-5.4.55-modified/arch/ } module_init(chacha_simd_mod_init); -diff -Nru linux-5.4.55/arch/x86/crypto/chacha-ssse3-x86_64.S linux-5.4.55-modified/arch/x86/crypto/chacha-ssse3-x86_64.S ---- linux-5.4.55/arch/x86/crypto/chacha-ssse3-x86_64.S 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/x86/crypto/chacha-ssse3-x86_64.S 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/arch/x86/crypto/chacha-ssse3-x86_64.S linux-5.4.63-modified/arch/x86/crypto/chacha-ssse3-x86_64.S +--- linux-5.4.63/arch/x86/crypto/chacha-ssse3-x86_64.S 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/x86/crypto/chacha-ssse3-x86_64.S 2020-09-08 18:16:45.721318134 -0400 @@ -120,10 +120,10 @@ FRAME_BEGIN @@ -11253,10 +11255,10 @@ diff -Nru linux-5.4.55/arch/x86/crypto/chacha-ssse3-x86_64.S linux-5.4.55-modifi mov %edx,%r8d call chacha_permute -diff -Nru linux-5.4.55/arch/x86/crypto/curve25519-x86_64.c linux-5.4.55-modified/arch/x86/crypto/curve25519-x86_64.c ---- linux-5.4.55/arch/x86/crypto/curve25519-x86_64.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/x86/crypto/curve25519-x86_64.c 2020-08-01 15:38:51.348407940 -0400 -@@ -0,0 +1,1514 @@ +diff -Nru linux-5.4.63/arch/x86/crypto/curve25519-x86_64.c linux-5.4.63-modified/arch/x86/crypto/curve25519-x86_64.c +--- linux-5.4.63/arch/x86/crypto/curve25519-x86_64.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/x86/crypto/curve25519-x86_64.c 2020-09-08 18:16:45.722318146 -0400 +@@ -0,0 +1,1512 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* + * Copyright (C) 2020 Jason A. Donenfeld <[email protected]>. All Rights Reserved. @@ -12207,10 +12209,8 @@ diff -Nru linux-5.4.55/arch/x86/crypto/curve25519-x86_64.c linux-5.4.55-modified +{ + u64 f30 = f[3U]; + u64 top_bit0 = f30 >> (u32)63U; -+ u64 carry0; + u64 f31; + u64 top_bit; -+ u64 carry; + u64 f0; + u64 f1; + u64 f2; @@ -12229,11 +12229,11 @@ diff -Nru linux-5.4.55/arch/x86/crypto/curve25519-x86_64.c linux-5.4.55-modified + u64 o2; + u64 o3; + f[3U] = f30 & (u64)0x7fffffffffffffffU; -+ carry0 = add_scalar(f, f, (u64)19U * top_bit0); ++ add_scalar(f, f, (u64)19U * top_bit0); + f31 = f[3U]; + top_bit = f31 >> (u32)63U; + f[3U] = f31 & (u64)0x7fffffffffffffffU; -+ carry = add_scalar(f, f, (u64)19U * top_bit); ++ add_scalar(f, f, (u64)19U * top_bit); + f0 = f[0U]; + f1 = f[1U]; + f2 = f[2U]; @@ -12771,14 +12771,14 @@ diff -Nru linux-5.4.55/arch/x86/crypto/curve25519-x86_64.c linux-5.4.55-modified +MODULE_ALIAS_CRYPTO("curve25519-x86"); +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Jason A. Donenfeld <[email protected]>"); -diff -Nru linux-5.4.55/arch/x86/crypto/.gitignore linux-5.4.55-modified/arch/x86/crypto/.gitignore ---- linux-5.4.55/arch/x86/crypto/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/x86/crypto/.gitignore 2020-08-01 15:38:51.345407921 -0400 +diff -Nru linux-5.4.63/arch/x86/crypto/.gitignore linux-5.4.63-modified/arch/x86/crypto/.gitignore +--- linux-5.4.63/arch/x86/crypto/.gitignore 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/x86/crypto/.gitignore 2020-09-08 18:16:45.717318086 -0400 @@ -0,0 +1 @@ +poly1305-x86_64-cryptogams.S -diff -Nru linux-5.4.55/arch/x86/crypto/Makefile linux-5.4.55-modified/arch/x86/crypto/Makefile ---- linux-5.4.55/arch/x86/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/x86/crypto/Makefile 2020-08-01 15:38:51.346407928 -0400 +diff -Nru linux-5.4.63/arch/x86/crypto/Makefile linux-5.4.63-modified/arch/x86/crypto/Makefile +--- linux-5.4.63/arch/x86/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/x86/crypto/Makefile 2020-09-08 18:16:45.719318110 -0400 @@ -11,6 +11,7 @@ avx512_supported :=$(call as-instr,vpmovm2b %k1$(comma)%zmm5,yes,no) sha1_ni_supported :=$(call as-instr,sha1msg1 %xmm0$(comma)%xmm1,yes,no) @@ -12839,9 +12839,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/Makefile linux-5.4.55-modified/arch/x86/c + cmd_perlasm = $(PERL) $< > $@ +$(obj)/%.S: $(src)/%.pl FORCE + $(call if_changed,perlasm) -diff -Nru linux-5.4.55/arch/x86/crypto/poly1305-avx2-x86_64.S linux-5.4.55-modified/arch/x86/crypto/poly1305-avx2-x86_64.S ---- linux-5.4.55/arch/x86/crypto/poly1305-avx2-x86_64.S 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/x86/crypto/poly1305-avx2-x86_64.S 1969-12-31 19:00:00.000000000 -0500 +diff -Nru linux-5.4.63/arch/x86/crypto/poly1305-avx2-x86_64.S linux-5.4.63-modified/arch/x86/crypto/poly1305-avx2-x86_64.S +--- linux-5.4.63/arch/x86/crypto/poly1305-avx2-x86_64.S 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/x86/crypto/poly1305-avx2-x86_64.S 1969-12-31 19:00:00.000000000 -0500 @@ -1,390 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* @@ -13233,9 +13233,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/poly1305-avx2-x86_64.S linux-5.4.55-modif - pop %rbx - ret -ENDPROC(poly1305_4block_avx2) -diff -Nru linux-5.4.55/arch/x86/crypto/poly1305_glue.c linux-5.4.55-modified/arch/x86/crypto/poly1305_glue.c ---- linux-5.4.55/arch/x86/crypto/poly1305_glue.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/x86/crypto/poly1305_glue.c 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/arch/x86/crypto/poly1305_glue.c linux-5.4.63-modified/arch/x86/crypto/poly1305_glue.c +--- linux-5.4.63/arch/x86/crypto/poly1305_glue.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/x86/crypto/poly1305_glue.c 2020-09-08 18:16:45.721318134 -0400 @@ -1,131 +1,175 @@ -// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-License-Identifier: GPL-2.0 OR MIT @@ -13643,9 +13643,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/poly1305_glue.c linux-5.4.55-modified/arc MODULE_DESCRIPTION("Poly1305 authenticator"); MODULE_ALIAS_CRYPTO("poly1305"); MODULE_ALIAS_CRYPTO("poly1305-simd"); -diff -Nru linux-5.4.55/arch/x86/crypto/poly1305-sse2-x86_64.S linux-5.4.55-modified/arch/x86/crypto/poly1305-sse2-x86_64.S ---- linux-5.4.55/arch/x86/crypto/poly1305-sse2-x86_64.S 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/x86/crypto/poly1305-sse2-x86_64.S 1969-12-31 19:00:00.000000000 -0500 +diff -Nru linux-5.4.63/arch/x86/crypto/poly1305-sse2-x86_64.S linux-5.4.63-modified/arch/x86/crypto/poly1305-sse2-x86_64.S +--- linux-5.4.63/arch/x86/crypto/poly1305-sse2-x86_64.S 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/x86/crypto/poly1305-sse2-x86_64.S 1969-12-31 19:00:00.000000000 -0500 @@ -1,590 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* @@ -14237,9 +14237,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/poly1305-sse2-x86_64.S linux-5.4.55-modif - pop %rbx - ret -ENDPROC(poly1305_2block_sse2) -diff -Nru linux-5.4.55/arch/x86/crypto/poly1305-x86_64-cryptogams.pl linux-5.4.55-modified/arch/x86/crypto/poly1305-x86_64-cryptogams.pl ---- linux-5.4.55/arch/x86/crypto/poly1305-x86_64-cryptogams.pl 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/arch/x86/crypto/poly1305-x86_64-cryptogams.pl 2020-08-01 15:38:51.344407915 -0400 +diff -Nru linux-5.4.63/arch/x86/crypto/poly1305-x86_64-cryptogams.pl linux-5.4.63-modified/arch/x86/crypto/poly1305-x86_64-cryptogams.pl +--- linux-5.4.63/arch/x86/crypto/poly1305-x86_64-cryptogams.pl 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/arch/x86/crypto/poly1305-x86_64-cryptogams.pl 2020-09-08 18:16:45.717318086 -0400 @@ -0,0 +1,4265 @@ +#!/usr/bin/env perl +# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause @@ -18506,9 +18506,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/poly1305-x86_64-cryptogams.pl linux-5.4.5 + print $_,"\n"; +} +close STDOUT; -diff -Nru linux-5.4.55/arch/x86/Makefile linux-5.4.55-modified/arch/x86/Makefile ---- linux-5.4.55/arch/x86/Makefile 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/arch/x86/Makefile 2020-08-01 15:38:51.346407928 -0400 +diff -Nru linux-5.4.63/arch/x86/Makefile linux-5.4.63-modified/arch/x86/Makefile +--- linux-5.4.63/arch/x86/Makefile 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/arch/x86/Makefile 2020-09-08 18:16:45.719318110 -0400 @@ -194,9 +194,10 @@ avx512_instr :=$(call as-instr,vpmovm2b %k1$(comma)%zmm5,-DCONFIG_AS_AVX512=1) sha1_ni_instr :=$(call as-instr,sha1msg1 %xmm0$(comma)%xmm1,-DCONFIG_AS_SHA1_NI=1) @@ -18522,9 +18522,9 @@ diff -Nru linux-5.4.55/arch/x86/Makefile linux-5.4.55-modified/arch/x86/Makefile KBUILD_LDFLAGS := -m elf_$(UTS_MACHINE) -diff -Nru linux-5.4.55/crypto/adiantum.c linux-5.4.55-modified/crypto/adiantum.c ---- linux-5.4.55/crypto/adiantum.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/crypto/adiantum.c 2020-08-01 15:38:51.342407902 -0400 +diff -Nru linux-5.4.63/crypto/adiantum.c linux-5.4.63-modified/crypto/adiantum.c +--- linux-5.4.63/crypto/adiantum.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/crypto/adiantum.c 2020-09-08 18:16:45.715318061 -0400 @@ -33,6 +33,7 @@ #include <crypto/b128ops.h> #include <crypto/chacha.h> @@ -18559,9 +18559,9 @@ diff -Nru linux-5.4.55/crypto/adiantum.c linux-5.4.55-modified/crypto/adiantum.c } /* Hash the left-hand part (the "bulk") of the message using NHPoly1305 */ -diff -Nru linux-5.4.55/crypto/blake2s_generic.c linux-5.4.55-modified/crypto/blake2s_generic.c ---- linux-5.4.55/crypto/blake2s_generic.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/crypto/blake2s_generic.c 2020-08-01 15:38:51.330407826 -0400 +diff -Nru linux-5.4.63/crypto/blake2s_generic.c linux-5.4.63-modified/crypto/blake2s_generic.c +--- linux-5.4.63/crypto/blake2s_generic.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/crypto/blake2s_generic.c 2020-09-08 18:16:45.704317927 -0400 @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -18734,9 +18734,9 @@ diff -Nru linux-5.4.55/crypto/blake2s_generic.c linux-5.4.55-modified/crypto/bla +MODULE_ALIAS_CRYPTO("blake2s-256"); +MODULE_ALIAS_CRYPTO("blake2s-256-generic"); +MODULE_LICENSE("GPL v2"); -diff -Nru linux-5.4.55/crypto/chacha_generic.c linux-5.4.55-modified/crypto/chacha_generic.c ---- linux-5.4.55/crypto/chacha_generic.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/crypto/chacha_generic.c 2020-08-01 15:38:51.339407883 -0400 +diff -Nru linux-5.4.63/crypto/chacha_generic.c linux-5.4.63-modified/crypto/chacha_generic.c +--- linux-5.4.63/crypto/chacha_generic.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/crypto/chacha_generic.c 2020-09-08 18:16:45.713318037 -0400 @@ -8,29 +8,10 @@ #include <asm/unaligned.h> @@ -18903,9 +18903,9 @@ diff -Nru linux-5.4.55/crypto/chacha_generic.c linux-5.4.55-modified/crypto/chac .encrypt = crypto_xchacha_crypt, .decrypt = crypto_xchacha_crypt, } -diff -Nru linux-5.4.55/crypto/curve25519-generic.c linux-5.4.55-modified/crypto/curve25519-generic.c ---- linux-5.4.55/crypto/curve25519-generic.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/crypto/curve25519-generic.c 2020-08-01 15:38:51.334407851 -0400 +diff -Nru linux-5.4.63/crypto/curve25519-generic.c linux-5.4.63-modified/crypto/curve25519-generic.c +--- linux-5.4.63/crypto/curve25519-generic.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/crypto/curve25519-generic.c 2020-09-08 18:16:45.708317976 -0400 @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + @@ -18997,9 +18997,9 @@ diff -Nru linux-5.4.55/crypto/curve25519-generic.c linux-5.4.55-modified/crypto/ +MODULE_ALIAS_CRYPTO("curve25519"); +MODULE_ALIAS_CRYPTO("curve25519-generic"); +MODULE_LICENSE("GPL"); -diff -Nru linux-5.4.55/crypto/Kconfig linux-5.4.55-modified/crypto/Kconfig ---- linux-5.4.55/crypto/Kconfig 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/crypto/Kconfig 2020-08-01 15:38:51.346407928 -0400 +diff -Nru linux-5.4.63/crypto/Kconfig linux-5.4.63-modified/crypto/Kconfig +--- linux-5.4.63/crypto/Kconfig 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/crypto/Kconfig 2020-09-08 18:16:45.719318110 -0400 @@ -136,8 +136,6 @@ Userspace configuration for cryptographic instantiations such as cbc(aes). @@ -19191,9 +19191,9 @@ diff -Nru linux-5.4.55/crypto/Kconfig linux-5.4.55-modified/crypto/Kconfig source "drivers/crypto/Kconfig" source "crypto/asymmetric_keys/Kconfig" source "certs/Kconfig" -diff -Nru linux-5.4.55/crypto/Makefile linux-5.4.55-modified/crypto/Makefile ---- linux-5.4.55/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/crypto/Makefile 2020-08-01 15:38:51.334407851 -0400 +diff -Nru linux-5.4.63/crypto/Makefile linux-5.4.63-modified/crypto/Makefile +--- linux-5.4.63/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/crypto/Makefile 2020-09-08 18:16:45.708317976 -0400 @@ -74,6 +74,7 @@ obj-$(CONFIG_CRYPTO_WP512) += wp512.o CFLAGS_wp512.o := $(call cc-option,-fno-schedule-insns) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149 @@ -19210,9 +19210,9 @@ diff -Nru linux-5.4.55/crypto/Makefile linux-5.4.55-modified/crypto/Makefile ecdh_generic-y += ecdh.o ecdh_generic-y += ecdh_helper.o -diff -Nru linux-5.4.55/crypto/nhpoly1305.c linux-5.4.55-modified/crypto/nhpoly1305.c ---- linux-5.4.55/crypto/nhpoly1305.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/crypto/nhpoly1305.c 2020-08-01 15:38:51.342407902 -0400 +diff -Nru linux-5.4.63/crypto/nhpoly1305.c linux-5.4.63-modified/crypto/nhpoly1305.c +--- linux-5.4.63/crypto/nhpoly1305.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/crypto/nhpoly1305.c 2020-09-08 18:16:45.715318061 -0400 @@ -33,6 +33,7 @@ #include <asm/unaligned.h> #include <crypto/algapi.h> @@ -19239,9 +19239,9 @@ diff -Nru linux-5.4.55/crypto/nhpoly1305.c linux-5.4.55-modified/crypto/nhpoly13 return 0; } EXPORT_SYMBOL(crypto_nhpoly1305_final_helper); -diff -Nru linux-5.4.55/crypto/poly1305_generic.c linux-5.4.55-modified/crypto/poly1305_generic.c ---- linux-5.4.55/crypto/poly1305_generic.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/crypto/poly1305_generic.c 2020-08-01 15:38:51.342407902 -0400 +diff -Nru linux-5.4.63/crypto/poly1305_generic.c linux-5.4.63-modified/crypto/poly1305_generic.c +--- linux-5.4.63/crypto/poly1305_generic.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/crypto/poly1305_generic.c 2020-09-08 18:16:45.715318061 -0400 @@ -13,65 +13,33 @@ #include <crypto/algapi.h> @@ -19527,9 +19527,9 @@ diff -Nru linux-5.4.55/crypto/poly1305_generic.c linux-5.4.55-modified/crypto/po static struct shash_alg poly1305_alg = { .digestsize = POLY1305_DIGEST_SIZE, -diff -Nru linux-5.4.55/crypto/testmgr.c linux-5.4.55-modified/crypto/testmgr.c ---- linux-5.4.55/crypto/testmgr.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/crypto/testmgr.c 2020-08-01 15:38:51.332407839 -0400 +diff -Nru linux-5.4.63/crypto/testmgr.c linux-5.4.63-modified/crypto/testmgr.c +--- linux-5.4.63/crypto/testmgr.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/crypto/testmgr.c 2020-09-08 18:16:45.706317951 -0400 @@ -4035,6 +4035,30 @@ .test = alg_test_null, .fips_allowed = 1, @@ -19574,9 +19574,9 @@ diff -Nru linux-5.4.55/crypto/testmgr.c linux-5.4.55-modified/crypto/testmgr.c .alg = "deflate", .test = alg_test_comp, .fips_allowed = 1, -diff -Nru linux-5.4.55/crypto/testmgr.h linux-5.4.55-modified/crypto/testmgr.h ---- linux-5.4.55/crypto/testmgr.h 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/crypto/testmgr.h 2020-08-01 15:38:51.334407851 -0400 +diff -Nru linux-5.4.63/crypto/testmgr.h linux-5.4.63-modified/crypto/testmgr.h +--- linux-5.4.63/crypto/testmgr.h 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/crypto/testmgr.h 2020-09-08 18:16:45.708317976 -0400 @@ -1030,6 +1030,1231 @@ } }; @@ -21065,9 +21065,9 @@ diff -Nru linux-5.4.55/crypto/testmgr.h linux-5.4.55-modified/crypto/testmgr.h +}}; + #endif /* _CRYPTO_TESTMGR_H */ -diff -Nru linux-5.4.55/drivers/net/Kconfig linux-5.4.55-modified/drivers/net/Kconfig ---- linux-5.4.55/drivers/net/Kconfig 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/drivers/net/Kconfig 2020-08-01 15:38:51.355407985 -0400 +diff -Nru linux-5.4.63/drivers/net/Kconfig linux-5.4.63-modified/drivers/net/Kconfig +--- linux-5.4.63/drivers/net/Kconfig 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/drivers/net/Kconfig 2020-09-08 18:16:45.727318207 -0400 @@ -71,6 +71,49 @@ To compile this driver as a module, choose M here: the module will be called dummy. @@ -21118,9 +21118,9 @@ diff -Nru linux-5.4.55/drivers/net/Kconfig linux-5.4.55-modified/drivers/net/Kco config EQUALIZER tristate "EQL (serial line load balancing) support" ---help--- -diff -Nru linux-5.4.55/drivers/net/Makefile linux-5.4.55-modified/drivers/net/Makefile ---- linux-5.4.55/drivers/net/Makefile 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/drivers/net/Makefile 2020-08-01 15:38:51.351407959 -0400 +diff -Nru linux-5.4.63/drivers/net/Makefile linux-5.4.63-modified/drivers/net/Makefile +--- linux-5.4.63/drivers/net/Makefile 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/drivers/net/Makefile 2020-09-08 18:16:45.723318159 -0400 @@ -10,6 +10,7 @@ obj-$(CONFIG_IPVLAN) += ipvlan/ obj-$(CONFIG_IPVTAP) += ipvlan/ @@ -21129,9 +21129,9 @@ diff -Nru linux-5.4.55/drivers/net/Makefile linux-5.4.55-modified/drivers/net/Ma obj-$(CONFIG_EQUALIZER) += eql.o obj-$(CONFIG_IFB) += ifb.o obj-$(CONFIG_MACSEC) += macsec.o -diff -Nru linux-5.4.55/drivers/net/wireguard/allowedips.c linux-5.4.55-modified/drivers/net/wireguard/allowedips.c ---- linux-5.4.55/drivers/net/wireguard/allowedips.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/allowedips.c 2020-08-01 15:38:51.358408004 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/allowedips.c linux-5.4.63-modified/drivers/net/wireguard/allowedips.c +--- linux-5.4.63/drivers/net/wireguard/allowedips.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/allowedips.c 2020-09-08 18:16:45.729318232 -0400 @@ -0,0 +1,377 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -21510,9 +21510,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/allowedips.c linux-5.4.55-modified/ +} + +#include "selftest/allowedips.c" -diff -Nru linux-5.4.55/drivers/net/wireguard/allowedips.h linux-5.4.55-modified/drivers/net/wireguard/allowedips.h ---- linux-5.4.55/drivers/net/wireguard/allowedips.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/allowedips.h 2020-08-01 15:38:51.351407959 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/allowedips.h linux-5.4.63-modified/drivers/net/wireguard/allowedips.h +--- linux-5.4.63/drivers/net/wireguard/allowedips.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/allowedips.h 2020-09-08 18:16:45.724318171 -0400 @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -21573,9 +21573,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/allowedips.h linux-5.4.55-modified/ +#endif + +#endif /* _WG_ALLOWEDIPS_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/cookie.c linux-5.4.55-modified/drivers/net/wireguard/cookie.c ---- linux-5.4.55/drivers/net/wireguard/cookie.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/cookie.c 2020-08-01 15:38:51.351407959 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/cookie.c linux-5.4.63-modified/drivers/net/wireguard/cookie.c +--- linux-5.4.63/drivers/net/wireguard/cookie.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/cookie.c 2020-09-08 18:16:45.724318171 -0400 @@ -0,0 +1,236 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -21813,9 +21813,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/cookie.c linux-5.4.55-modified/driv +out: + wg_peer_put(peer); +} -diff -Nru linux-5.4.55/drivers/net/wireguard/cookie.h linux-5.4.55-modified/drivers/net/wireguard/cookie.h ---- linux-5.4.55/drivers/net/wireguard/cookie.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/cookie.h 2020-08-01 15:38:51.351407959 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/cookie.h linux-5.4.63-modified/drivers/net/wireguard/cookie.h +--- linux-5.4.63/drivers/net/wireguard/cookie.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/cookie.h 2020-09-08 18:16:45.724318171 -0400 @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -21876,9 +21876,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/cookie.h linux-5.4.55-modified/driv + struct wg_device *wg); + +#endif /* _WG_COOKIE_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/device.c linux-5.4.55-modified/drivers/net/wireguard/device.c ---- linux-5.4.55/drivers/net/wireguard/device.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/device.c 2020-08-01 15:38:51.366408055 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/device.c linux-5.4.63-modified/drivers/net/wireguard/device.c +--- linux-5.4.63/drivers/net/wireguard/device.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/device.c 2020-09-08 18:16:45.733318281 -0400 @@ -0,0 +1,456 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22336,9 +22336,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/device.c linux-5.4.55-modified/driv +#endif + rcu_barrier(); +} -diff -Nru linux-5.4.55/drivers/net/wireguard/device.h linux-5.4.55-modified/drivers/net/wireguard/device.h ---- linux-5.4.55/drivers/net/wireguard/device.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/device.h 2020-08-01 15:38:51.365408048 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/device.h linux-5.4.63-modified/drivers/net/wireguard/device.h +--- linux-5.4.63/drivers/net/wireguard/device.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/device.h 2020-09-08 18:16:45.732318268 -0400 @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -22404,9 +22404,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/device.h linux-5.4.55-modified/driv +void wg_device_uninit(void); + +#endif /* _WG_DEVICE_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/main.c linux-5.4.55-modified/drivers/net/wireguard/main.c ---- linux-5.4.55/drivers/net/wireguard/main.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/main.c 2020-08-01 15:38:51.355407985 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/main.c linux-5.4.63-modified/drivers/net/wireguard/main.c +--- linux-5.4.63/drivers/net/wireguard/main.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/main.c 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22471,9 +22471,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/main.c linux-5.4.55-modified/driver +MODULE_VERSION(WIREGUARD_VERSION); +MODULE_ALIAS_RTNL_LINK(KBUILD_MODNAME); +MODULE_ALIAS_GENL_FAMILY(WG_GENL_NAME); -diff -Nru linux-5.4.55/drivers/net/wireguard/Makefile linux-5.4.55-modified/drivers/net/wireguard/Makefile ---- linux-5.4.55/drivers/net/wireguard/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/Makefile 2020-08-01 15:38:51.351407959 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/Makefile linux-5.4.63-modified/drivers/net/wireguard/Makefile +--- linux-5.4.63/drivers/net/wireguard/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/Makefile 2020-09-08 18:16:45.723318159 -0400 @@ -0,0 +1,18 @@ +ccflags-y := -O3 +ccflags-y += -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt' @@ -22493,9 +22493,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/Makefile linux-5.4.55-modified/driv +wireguard-y += cookie.o +wireguard-y += netlink.o +obj-$(CONFIG_WIREGUARD) := wireguard.o -diff -Nru linux-5.4.55/drivers/net/wireguard/messages.h linux-5.4.55-modified/drivers/net/wireguard/messages.h ---- linux-5.4.55/drivers/net/wireguard/messages.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/messages.h 2020-08-01 15:38:51.363408036 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/messages.h linux-5.4.63-modified/drivers/net/wireguard/messages.h +--- linux-5.4.63/drivers/net/wireguard/messages.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/messages.h 2020-09-08 18:16:45.732318268 -0400 @@ -0,0 +1,128 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -22625,9 +22625,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/messages.h linux-5.4.55-modified/dr +enum { HANDSHAKE_DSCP = 0x88 /* AF41, plus 00 ECN */ }; + +#endif /* _WG_MESSAGES_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.c linux-5.4.55-modified/drivers/net/wireguard/netlink.c ---- linux-5.4.55/drivers/net/wireguard/netlink.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/netlink.c 2020-08-01 15:38:51.365408048 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/netlink.c linux-5.4.63-modified/drivers/net/wireguard/netlink.c +--- linux-5.4.63/drivers/net/wireguard/netlink.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/netlink.c 2020-09-08 18:16:45.733318281 -0400 @@ -0,0 +1,646 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -22653,8 +22653,8 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.c linux-5.4.55-modified/dri +static const struct nla_policy device_policy[WGDEVICE_A_MAX + 1] = { + [WGDEVICE_A_IFINDEX] = { .type = NLA_U32 }, + [WGDEVICE_A_IFNAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 }, -+ [WGDEVICE_A_PRIVATE_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_PUBLIC_KEY_LEN }, -+ [WGDEVICE_A_PUBLIC_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_PUBLIC_KEY_LEN }, ++ [WGDEVICE_A_PRIVATE_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN), ++ [WGDEVICE_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN), + [WGDEVICE_A_FLAGS] = { .type = NLA_U32 }, + [WGDEVICE_A_LISTEN_PORT] = { .type = NLA_U16 }, + [WGDEVICE_A_FWMARK] = { .type = NLA_U32 }, @@ -22662,12 +22662,12 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.c linux-5.4.55-modified/dri +}; + +static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = { -+ [WGPEER_A_PUBLIC_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_PUBLIC_KEY_LEN }, -+ [WGPEER_A_PRESHARED_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_SYMMETRIC_KEY_LEN }, ++ [WGPEER_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN), ++ [WGPEER_A_PRESHARED_KEY] = NLA_POLICY_EXACT_LEN(NOISE_SYMMETRIC_KEY_LEN), + [WGPEER_A_FLAGS] = { .type = NLA_U32 }, -+ [WGPEER_A_ENDPOINT] = { .type = NLA_MIN_LEN, .len = sizeof(struct sockaddr) }, ++ [WGPEER_A_ENDPOINT] = NLA_POLICY_MIN_LEN(sizeof(struct sockaddr)), + [WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL] = { .type = NLA_U16 }, -+ [WGPEER_A_LAST_HANDSHAKE_TIME] = { .type = NLA_EXACT_LEN, .len = sizeof(struct __kernel_timespec) }, ++ [WGPEER_A_LAST_HANDSHAKE_TIME] = NLA_POLICY_EXACT_LEN(sizeof(struct __kernel_timespec)), + [WGPEER_A_RX_BYTES] = { .type = NLA_U64 }, + [WGPEER_A_TX_BYTES] = { .type = NLA_U64 }, + [WGPEER_A_ALLOWEDIPS] = { .type = NLA_NESTED }, @@ -22676,7 +22676,7 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.c linux-5.4.55-modified/dri + +static const struct nla_policy allowedip_policy[WGALLOWEDIP_A_MAX + 1] = { + [WGALLOWEDIP_A_FAMILY] = { .type = NLA_U16 }, -+ [WGALLOWEDIP_A_IPADDR] = { .type = NLA_MIN_LEN, .len = sizeof(struct in_addr) }, ++ [WGALLOWEDIP_A_IPADDR] = NLA_POLICY_MIN_LEN(sizeof(struct in_addr)), + [WGALLOWEDIP_A_CIDR_MASK] = { .type = NLA_U8 } +}; + @@ -23275,9 +23275,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.c linux-5.4.55-modified/dri +{ + genl_unregister_family(&genl_family); +} -diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.h linux-5.4.55-modified/drivers/net/wireguard/netlink.h ---- linux-5.4.55/drivers/net/wireguard/netlink.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/netlink.h 2020-08-01 15:38:51.352407966 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/netlink.h linux-5.4.63-modified/drivers/net/wireguard/netlink.h +--- linux-5.4.63/drivers/net/wireguard/netlink.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/netlink.h 2020-09-08 18:16:45.724318171 -0400 @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -23291,9 +23291,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.h linux-5.4.55-modified/dri +void wg_genetlink_uninit(void); + +#endif /* _WG_NETLINK_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/noise.c linux-5.4.55-modified/drivers/net/wireguard/noise.c ---- linux-5.4.55/drivers/net/wireguard/noise.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/noise.c 2020-08-01 15:38:51.365408048 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/noise.c linux-5.4.63-modified/drivers/net/wireguard/noise.c +--- linux-5.4.63/drivers/net/wireguard/noise.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/noise.c 2020-09-08 18:16:45.732318268 -0400 @@ -0,0 +1,831 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24126,9 +24126,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/noise.c linux-5.4.55-modified/drive + up_write(&handshake->lock); + return ret; +} -diff -Nru linux-5.4.55/drivers/net/wireguard/noise.h linux-5.4.55-modified/drivers/net/wireguard/noise.h ---- linux-5.4.55/drivers/net/wireguard/noise.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/noise.h 2020-08-01 15:38:51.364408042 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/noise.h linux-5.4.63-modified/drivers/net/wireguard/noise.h +--- linux-5.4.63/drivers/net/wireguard/noise.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/noise.h 2020-09-08 18:16:45.732318268 -0400 @@ -0,0 +1,135 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24265,9 +24265,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/noise.h linux-5.4.55-modified/drive + struct noise_keypairs *keypairs); + +#endif /* _WG_NOISE_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/peer.c linux-5.4.55-modified/drivers/net/wireguard/peer.c ---- linux-5.4.55/drivers/net/wireguard/peer.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/peer.c 2020-08-01 15:38:51.361408023 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/peer.c linux-5.4.63-modified/drivers/net/wireguard/peer.c +--- linux-5.4.63/drivers/net/wireguard/peer.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/peer.c 2020-09-08 18:16:45.730318244 -0400 @@ -0,0 +1,237 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24506,9 +24506,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/peer.c linux-5.4.55-modified/driver + return; + kref_put(&peer->refcount, kref_release); +} -diff -Nru linux-5.4.55/drivers/net/wireguard/peer.h linux-5.4.55-modified/drivers/net/wireguard/peer.h ---- linux-5.4.55/drivers/net/wireguard/peer.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/peer.h 2020-08-01 15:38:51.352407966 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/peer.h linux-5.4.63-modified/drivers/net/wireguard/peer.h +--- linux-5.4.63/drivers/net/wireguard/peer.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/peer.h 2020-09-08 18:16:45.725318183 -0400 @@ -0,0 +1,83 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24593,9 +24593,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/peer.h linux-5.4.55-modified/driver +void wg_peer_remove_all(struct wg_device *wg); + +#endif /* _WG_PEER_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/peerlookup.c linux-5.4.55-modified/drivers/net/wireguard/peerlookup.c ---- linux-5.4.55/drivers/net/wireguard/peerlookup.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/peerlookup.c 2020-08-01 15:38:51.352407966 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/peerlookup.c linux-5.4.63-modified/drivers/net/wireguard/peerlookup.c +--- linux-5.4.63/drivers/net/wireguard/peerlookup.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/peerlookup.c 2020-09-08 18:16:45.725318183 -0400 @@ -0,0 +1,221 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24818,9 +24818,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/peerlookup.c linux-5.4.55-modified/ + rcu_read_unlock_bh(); + return entry; +} -diff -Nru linux-5.4.55/drivers/net/wireguard/peerlookup.h linux-5.4.55-modified/drivers/net/wireguard/peerlookup.h ---- linux-5.4.55/drivers/net/wireguard/peerlookup.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/peerlookup.h 2020-08-01 15:38:51.352407966 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/peerlookup.h linux-5.4.63-modified/drivers/net/wireguard/peerlookup.h +--- linux-5.4.63/drivers/net/wireguard/peerlookup.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/peerlookup.h 2020-09-08 18:16:45.725318183 -0400 @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -24886,9 +24886,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/peerlookup.h linux-5.4.55-modified/ + const __le32 index, struct wg_peer **peer); + +#endif /* _WG_PEERLOOKUP_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/queueing.c linux-5.4.55-modified/drivers/net/wireguard/queueing.c ---- linux-5.4.55/drivers/net/wireguard/queueing.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/queueing.c 2020-08-01 15:38:51.361408023 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/queueing.c linux-5.4.63-modified/drivers/net/wireguard/queueing.c +--- linux-5.4.63/drivers/net/wireguard/queueing.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/queueing.c 2020-09-08 18:16:45.731318256 -0400 @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -24945,9 +24945,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/queueing.c linux-5.4.55-modified/dr + WARN_ON(!__ptr_ring_empty(&queue->ring)); + ptr_ring_cleanup(&queue->ring, NULL); +} -diff -Nru linux-5.4.55/drivers/net/wireguard/queueing.h linux-5.4.55-modified/drivers/net/wireguard/queueing.h ---- linux-5.4.55/drivers/net/wireguard/queueing.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/queueing.h 2020-08-01 15:38:51.366408055 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/queueing.h linux-5.4.63-modified/drivers/net/wireguard/queueing.h +--- linux-5.4.63/drivers/net/wireguard/queueing.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/queueing.h 2020-09-08 18:16:45.733318281 -0400 @@ -0,0 +1,193 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -25142,9 +25142,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/queueing.h linux-5.4.55-modified/dr +#endif + +#endif /* _WG_QUEUEING_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/ratelimiter.c linux-5.4.55-modified/drivers/net/wireguard/ratelimiter.c ---- linux-5.4.55/drivers/net/wireguard/ratelimiter.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/ratelimiter.c 2020-08-01 15:38:51.353407972 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/ratelimiter.c linux-5.4.63-modified/drivers/net/wireguard/ratelimiter.c +--- linux-5.4.63/drivers/net/wireguard/ratelimiter.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/ratelimiter.c 2020-09-08 18:16:45.725318183 -0400 @@ -0,0 +1,223 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25369,9 +25369,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/ratelimiter.c linux-5.4.55-modified +} + +#include "selftest/ratelimiter.c" -diff -Nru linux-5.4.55/drivers/net/wireguard/ratelimiter.h linux-5.4.55-modified/drivers/net/wireguard/ratelimiter.h ---- linux-5.4.55/drivers/net/wireguard/ratelimiter.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/ratelimiter.h 2020-08-01 15:38:51.353407972 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/ratelimiter.h linux-5.4.63-modified/drivers/net/wireguard/ratelimiter.h +--- linux-5.4.63/drivers/net/wireguard/ratelimiter.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/ratelimiter.h 2020-09-08 18:16:45.725318183 -0400 @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -25392,9 +25392,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/ratelimiter.h linux-5.4.55-modified +#endif + +#endif /* _WG_RATELIMITER_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/receive.c linux-5.4.55-modified/drivers/net/wireguard/receive.c ---- linux-5.4.55/drivers/net/wireguard/receive.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/receive.c 2020-08-01 15:38:51.366408055 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/receive.c linux-5.4.63-modified/drivers/net/wireguard/receive.c +--- linux-5.4.63/drivers/net/wireguard/receive.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/receive.c 2020-09-08 18:16:45.733318281 -0400 @@ -0,0 +1,590 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -25986,9 +25986,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/receive.c linux-5.4.55-modified/dri +err: + dev_kfree_skb(skb); +} -diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/allowedips.c linux-5.4.55-modified/drivers/net/wireguard/selftest/allowedips.c ---- linux-5.4.55/drivers/net/wireguard/selftest/allowedips.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/selftest/allowedips.c 2020-08-01 15:38:51.353407972 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/selftest/allowedips.c linux-5.4.63-modified/drivers/net/wireguard/selftest/allowedips.c +--- linux-5.4.63/drivers/net/wireguard/selftest/allowedips.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/selftest/allowedips.c 2020-09-08 18:16:45.725318183 -0400 @@ -0,0 +1,683 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -26673,9 +26673,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/allowedips.c linux-5.4.55- +#undef init_peer + +#endif -diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/counter.c linux-5.4.55-modified/drivers/net/wireguard/selftest/counter.c ---- linux-5.4.55/drivers/net/wireguard/selftest/counter.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/selftest/counter.c 2020-08-01 15:38:51.364408042 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/selftest/counter.c linux-5.4.63-modified/drivers/net/wireguard/selftest/counter.c +--- linux-5.4.63/drivers/net/wireguard/selftest/counter.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/selftest/counter.c 2020-09-08 18:16:45.732318268 -0400 @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -26788,9 +26788,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/counter.c linux-5.4.55-mod + return success; +} +#endif -diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/ratelimiter.c linux-5.4.55-modified/drivers/net/wireguard/selftest/ratelimiter.c ---- linux-5.4.55/drivers/net/wireguard/selftest/ratelimiter.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/selftest/ratelimiter.c 2020-08-01 15:38:51.362408029 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/selftest/ratelimiter.c linux-5.4.63-modified/drivers/net/wireguard/selftest/ratelimiter.c +--- linux-5.4.63/drivers/net/wireguard/selftest/ratelimiter.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/selftest/ratelimiter.c 2020-09-08 18:16:45.731318256 -0400 @@ -0,0 +1,226 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27018,9 +27018,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/ratelimiter.c linux-5.4.55 + return success; +} +#endif -diff -Nru linux-5.4.55/drivers/net/wireguard/send.c linux-5.4.55-modified/drivers/net/wireguard/send.c ---- linux-5.4.55/drivers/net/wireguard/send.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/send.c 2020-08-01 15:38:51.364408042 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/send.c linux-5.4.63-modified/drivers/net/wireguard/send.c +--- linux-5.4.63/drivers/net/wireguard/send.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/send.c 2020-09-08 18:16:45.732318268 -0400 @@ -0,0 +1,422 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27444,9 +27444,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/send.c linux-5.4.55-modified/driver + */ + wg_packet_send_queued_handshake_initiation(peer, false); +} -diff -Nru linux-5.4.55/drivers/net/wireguard/socket.c linux-5.4.55-modified/drivers/net/wireguard/socket.c ---- linux-5.4.55/drivers/net/wireguard/socket.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/socket.c 2020-08-01 15:38:51.365408048 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/socket.c linux-5.4.63-modified/drivers/net/wireguard/socket.c +--- linux-5.4.63/drivers/net/wireguard/socket.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/socket.c 2020-09-08 18:16:45.733318281 -0400 @@ -0,0 +1,436 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -27884,9 +27884,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/socket.c linux-5.4.55-modified/driv + sock_free(old4); + sock_free(old6); +} -diff -Nru linux-5.4.55/drivers/net/wireguard/socket.h linux-5.4.55-modified/drivers/net/wireguard/socket.h ---- linux-5.4.55/drivers/net/wireguard/socket.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/socket.h 2020-08-01 15:38:51.353407972 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/socket.h linux-5.4.63-modified/drivers/net/wireguard/socket.h +--- linux-5.4.63/drivers/net/wireguard/socket.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/socket.h 2020-09-08 18:16:45.726318195 -0400 @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -27932,9 +27932,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/socket.h linux-5.4.55-modified/driv +#endif + +#endif /* _WG_SOCKET_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/timers.c linux-5.4.55-modified/drivers/net/wireguard/timers.c ---- linux-5.4.55/drivers/net/wireguard/timers.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/timers.c 2020-08-01 15:38:51.354407979 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/timers.c linux-5.4.63-modified/drivers/net/wireguard/timers.c +--- linux-5.4.63/drivers/net/wireguard/timers.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/timers.c 2020-09-08 18:16:45.726318195 -0400 @@ -0,0 +1,243 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -28179,9 +28179,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/timers.c linux-5.4.55-modified/driv + del_timer_sync(&peer->timer_persistent_keepalive); + flush_work(&peer->clear_peer_work); +} -diff -Nru linux-5.4.55/drivers/net/wireguard/timers.h linux-5.4.55-modified/drivers/net/wireguard/timers.h ---- linux-5.4.55/drivers/net/wireguard/timers.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/timers.h 2020-08-01 15:38:51.354407979 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/timers.h linux-5.4.63-modified/drivers/net/wireguard/timers.h +--- linux-5.4.63/drivers/net/wireguard/timers.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/timers.h 2020-09-08 18:16:45.726318195 -0400 @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -28214,14 +28214,14 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/timers.h linux-5.4.55-modified/driv +} + +#endif /* _WG_TIMERS_H */ -diff -Nru linux-5.4.55/drivers/net/wireguard/version.h linux-5.4.55-modified/drivers/net/wireguard/version.h ---- linux-5.4.55/drivers/net/wireguard/version.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/drivers/net/wireguard/version.h 2020-08-01 15:38:51.354407979 -0400 +diff -Nru linux-5.4.63/drivers/net/wireguard/version.h linux-5.4.63-modified/drivers/net/wireguard/version.h +--- linux-5.4.63/drivers/net/wireguard/version.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/drivers/net/wireguard/version.h 2020-09-08 18:16:45.726318195 -0400 @@ -0,0 +1 @@ +#define WIREGUARD_VERSION "1.0.0" -diff -Nru linux-5.4.55/include/crypto/blake2s.h linux-5.4.55-modified/include/crypto/blake2s.h ---- linux-5.4.55/include/crypto/blake2s.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/include/crypto/blake2s.h 2020-08-01 15:38:51.327407807 -0400 +diff -Nru linux-5.4.63/include/crypto/blake2s.h linux-5.4.63-modified/include/crypto/blake2s.h +--- linux-5.4.63/include/crypto/blake2s.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/include/crypto/blake2s.h 2020-09-08 18:16:45.701317891 -0400 @@ -0,0 +1,106 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* @@ -28329,9 +28329,9 @@ diff -Nru linux-5.4.55/include/crypto/blake2s.h linux-5.4.55-modified/include/cr + const size_t keylen); + +#endif /* BLAKE2S_H */ -diff -Nru linux-5.4.55/include/crypto/chacha20poly1305.h linux-5.4.55-modified/include/crypto/chacha20poly1305.h ---- linux-5.4.55/include/crypto/chacha20poly1305.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/include/crypto/chacha20poly1305.h 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/include/crypto/chacha20poly1305.h linux-5.4.63-modified/include/crypto/chacha20poly1305.h +--- linux-5.4.63/include/crypto/chacha20poly1305.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/include/crypto/chacha20poly1305.h 2020-09-08 18:16:45.721318134 -0400 @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* @@ -28383,9 +28383,9 @@ diff -Nru linux-5.4.55/include/crypto/chacha20poly1305.h linux-5.4.55-modified/i +bool chacha20poly1305_selftest(void); + +#endif /* __CHACHA20POLY1305_H */ -diff -Nru linux-5.4.55/include/crypto/chacha.h linux-5.4.55-modified/include/crypto/chacha.h ---- linux-5.4.55/include/crypto/chacha.h 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/include/crypto/chacha.h 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/include/crypto/chacha.h linux-5.4.63-modified/include/crypto/chacha.h +--- linux-5.4.63/include/crypto/chacha.h 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/include/crypto/chacha.h 2020-09-08 18:16:45.722318146 -0400 @@ -15,9 +15,8 @@ #ifndef _CRYPTO_CHACHA_H #define _CRYPTO_CHACHA_H @@ -28488,9 +28488,9 @@ diff -Nru linux-5.4.55/include/crypto/chacha.h linux-5.4.55-modified/include/cry +} #endif /* _CRYPTO_CHACHA_H */ -diff -Nru linux-5.4.55/include/crypto/curve25519.h linux-5.4.55-modified/include/crypto/curve25519.h ---- linux-5.4.55/include/crypto/curve25519.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/include/crypto/curve25519.h 2020-08-01 15:38:51.346407928 -0400 +diff -Nru linux-5.4.63/include/crypto/curve25519.h linux-5.4.63-modified/include/crypto/curve25519.h +--- linux-5.4.63/include/crypto/curve25519.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/include/crypto/curve25519.h 2020-09-08 18:16:45.719318110 -0400 @@ -0,0 +1,73 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ +/* @@ -28565,9 +28565,9 @@ diff -Nru linux-5.4.55/include/crypto/curve25519.h linux-5.4.55-modified/include +} + +#endif /* CURVE25519_H */ -diff -Nru linux-5.4.55/include/crypto/internal/blake2s.h linux-5.4.55-modified/include/crypto/internal/blake2s.h ---- linux-5.4.55/include/crypto/internal/blake2s.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/include/crypto/internal/blake2s.h 2020-08-01 15:38:51.330407826 -0400 +diff -Nru linux-5.4.63/include/crypto/internal/blake2s.h linux-5.4.63-modified/include/crypto/internal/blake2s.h +--- linux-5.4.63/include/crypto/internal/blake2s.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/include/crypto/internal/blake2s.h 2020-09-08 18:16:45.704317927 -0400 @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ + @@ -28593,9 +28593,9 @@ diff -Nru linux-5.4.55/include/crypto/internal/blake2s.h linux-5.4.55-modified/i +} + +#endif /* BLAKE2S_INTERNAL_H */ -diff -Nru linux-5.4.55/include/crypto/internal/chacha.h linux-5.4.55-modified/include/crypto/internal/chacha.h ---- linux-5.4.55/include/crypto/internal/chacha.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/include/crypto/internal/chacha.h 2020-08-01 15:38:51.340407890 -0400 +diff -Nru linux-5.4.63/include/crypto/internal/chacha.h linux-5.4.63-modified/include/crypto/internal/chacha.h +--- linux-5.4.63/include/crypto/internal/chacha.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/include/crypto/internal/chacha.h 2020-09-08 18:16:45.714318049 -0400 @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + @@ -28640,9 +28640,9 @@ diff -Nru linux-5.4.55/include/crypto/internal/chacha.h linux-5.4.55-modified/in +} + +#endif /* _CRYPTO_CHACHA_H */ -diff -Nru linux-5.4.55/include/crypto/internal/poly1305.h linux-5.4.55-modified/include/crypto/internal/poly1305.h ---- linux-5.4.55/include/crypto/internal/poly1305.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/include/crypto/internal/poly1305.h 2020-08-01 15:38:51.342407902 -0400 +diff -Nru linux-5.4.63/include/crypto/internal/poly1305.h linux-5.4.63-modified/include/crypto/internal/poly1305.h +--- linux-5.4.63/include/crypto/internal/poly1305.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/include/crypto/internal/poly1305.h 2020-09-08 18:16:45.715318061 -0400 @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* @@ -28677,9 +28677,9 @@ diff -Nru linux-5.4.55/include/crypto/internal/poly1305.h linux-5.4.55-modified/ + void *dst); + +#endif -diff -Nru linux-5.4.55/include/crypto/nhpoly1305.h linux-5.4.55-modified/include/crypto/nhpoly1305.h ---- linux-5.4.55/include/crypto/nhpoly1305.h 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/include/crypto/nhpoly1305.h 2020-08-01 15:38:51.342407902 -0400 +diff -Nru linux-5.4.63/include/crypto/nhpoly1305.h linux-5.4.63-modified/include/crypto/nhpoly1305.h +--- linux-5.4.63/include/crypto/nhpoly1305.h 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/include/crypto/nhpoly1305.h 2020-09-08 18:16:45.715318061 -0400 @@ -7,7 +7,7 @@ #define _NHPOLY1305_H @@ -28698,9 +28698,9 @@ diff -Nru linux-5.4.55/include/crypto/nhpoly1305.h linux-5.4.55-modified/include u32 nh_key[NH_KEY_WORDS]; }; -diff -Nru linux-5.4.55/include/crypto/poly1305.h linux-5.4.55-modified/include/crypto/poly1305.h ---- linux-5.4.55/include/crypto/poly1305.h 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/include/crypto/poly1305.h 2020-08-01 15:38:51.342407902 -0400 +diff -Nru linux-5.4.63/include/crypto/poly1305.h linux-5.4.63-modified/include/crypto/poly1305.h +--- linux-5.4.63/include/crypto/poly1305.h 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/include/crypto/poly1305.h 2020-09-08 18:16:45.715318061 -0400 @@ -13,52 +13,85 @@ #define POLY1305_KEY_SIZE 32 #define POLY1305_DIGEST_SIZE 16 @@ -28818,9 +28818,9 @@ diff -Nru linux-5.4.55/include/crypto/poly1305.h linux-5.4.55-modified/include/c -int crypto_poly1305_final(struct shash_desc *desc, u8 *dst); #endif -diff -Nru linux-5.4.55/include/linux/icmpv6.h linux-5.4.55-modified/include/linux/icmpv6.h ---- linux-5.4.55/include/linux/icmpv6.h 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/include/linux/icmpv6.h 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/include/linux/icmpv6.h linux-5.4.63-modified/include/linux/icmpv6.h +--- linux-5.4.63/include/linux/icmpv6.h 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/include/linux/icmpv6.h 2020-09-08 18:16:45.722318146 -0400 @@ -22,12 +22,22 @@ int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type, unsigned int data_len); @@ -28844,9 +28844,9 @@ diff -Nru linux-5.4.55/include/linux/icmpv6.h linux-5.4.55-modified/include/linu } #endif -diff -Nru linux-5.4.55/include/linux/skbuff.h linux-5.4.55-modified/include/linux/skbuff.h ---- linux-5.4.55/include/linux/skbuff.h 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/include/linux/skbuff.h 2020-08-01 15:38:51.358408004 -0400 +diff -Nru linux-5.4.63/include/linux/skbuff.h linux-5.4.63-modified/include/linux/skbuff.h +--- linux-5.4.63/include/linux/skbuff.h 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/include/linux/skbuff.h 2020-09-08 18:16:45.729318232 -0400 @@ -1480,6 +1480,11 @@ skb->next = NULL; } @@ -28859,9 +28859,9 @@ diff -Nru linux-5.4.55/include/linux/skbuff.h linux-5.4.55-modified/include/linu static inline void skb_list_del_init(struct sk_buff *skb) { __list_del_entry(&skb->list); -diff -Nru linux-5.4.55/include/net/icmp.h linux-5.4.55-modified/include/net/icmp.h ---- linux-5.4.55/include/net/icmp.h 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/include/net/icmp.h 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/include/net/icmp.h linux-5.4.63-modified/include/net/icmp.h +--- linux-5.4.63/include/net/icmp.h 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/include/net/icmp.h 2020-09-08 18:16:45.722318146 -0400 @@ -43,6 +43,12 @@ __icmp_send(skb_in, type, code, info, &IPCB(skb_in)->opt); } @@ -28875,9 +28875,9 @@ diff -Nru linux-5.4.55/include/net/icmp.h linux-5.4.55-modified/include/net/icmp int icmp_rcv(struct sk_buff *skb); int icmp_err(struct sk_buff *skb, u32 info); int icmp_init(void); -diff -Nru linux-5.4.55/include/net/ip_tunnels.h linux-5.4.55-modified/include/net/ip_tunnels.h ---- linux-5.4.55/include/net/ip_tunnels.h 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/include/net/ip_tunnels.h 2020-08-01 15:38:51.365408048 -0400 +diff -Nru linux-5.4.63/include/net/ip_tunnels.h linux-5.4.63-modified/include/net/ip_tunnels.h +--- linux-5.4.63/include/net/ip_tunnels.h 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/include/net/ip_tunnels.h 2020-09-08 18:16:45.733318281 -0400 @@ -289,6 +289,9 @@ struct ip_tunnel_parm *p, __u32 fwmark); void ip_tunnel_setup(struct net_device *dev, unsigned int net_id); @@ -28888,9 +28888,9 @@ diff -Nru linux-5.4.55/include/net/ip_tunnels.h linux-5.4.55-modified/include/ne struct ip_tunnel_encap_ops { size_t (*encap_hlen)(struct ip_tunnel_encap *e); int (*build_header)(struct sk_buff *skb, struct ip_tunnel_encap *e, -diff -Nru linux-5.4.55/include/uapi/linux/wireguard.h linux-5.4.55-modified/include/uapi/linux/wireguard.h ---- linux-5.4.55/include/uapi/linux/wireguard.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/include/uapi/linux/wireguard.h 2020-08-01 15:38:51.355407985 -0400 +diff -Nru linux-5.4.63/include/uapi/linux/wireguard.h linux-5.4.63-modified/include/uapi/linux/wireguard.h +--- linux-5.4.63/include/uapi/linux/wireguard.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/include/uapi/linux/wireguard.h 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,196 @@ +/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */ +/* @@ -29088,9 +29088,9 @@ diff -Nru linux-5.4.55/include/uapi/linux/wireguard.h linux-5.4.55-modified/incl +#define WGALLOWEDIP_A_MAX (__WGALLOWEDIP_A_LAST - 1) + +#endif /* _WG_UAPI_WIREGUARD_H */ -diff -Nru linux-5.4.55/lib/chacha.c linux-5.4.55-modified/lib/chacha.c ---- linux-5.4.55/lib/chacha.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/lib/chacha.c 1969-12-31 19:00:00.000000000 -0500 +diff -Nru linux-5.4.63/lib/chacha.c linux-5.4.63-modified/lib/chacha.c +--- linux-5.4.63/lib/chacha.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/lib/chacha.c 1969-12-31 19:00:00.000000000 -0500 @@ -1,113 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* @@ -29205,9 +29205,9 @@ diff -Nru linux-5.4.55/lib/chacha.c linux-5.4.55-modified/lib/chacha.c - memcpy(&out[4], &x[12], 16); -} -EXPORT_SYMBOL(hchacha_block); -diff -Nru linux-5.4.55/lib/crypto/blake2s.c linux-5.4.55-modified/lib/crypto/blake2s.c ---- linux-5.4.55/lib/crypto/blake2s.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/blake2s.c 2020-08-01 15:38:51.328407813 -0400 +diff -Nru linux-5.4.63/lib/crypto/blake2s.c linux-5.4.63-modified/lib/crypto/blake2s.c +--- linux-5.4.63/lib/crypto/blake2s.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/blake2s.c 2020-09-08 18:16:45.702317903 -0400 @@ -0,0 +1,126 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -29335,9 +29335,9 @@ diff -Nru linux-5.4.55/lib/crypto/blake2s.c linux-5.4.55-modified/lib/crypto/bla +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("BLAKE2s hash function"); +MODULE_AUTHOR("Jason A. Donenfeld <[email protected]>"); -diff -Nru linux-5.4.55/lib/crypto/blake2s-generic.c linux-5.4.55-modified/lib/crypto/blake2s-generic.c ---- linux-5.4.55/lib/crypto/blake2s-generic.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/blake2s-generic.c 2020-08-01 15:38:51.327407807 -0400 +diff -Nru linux-5.4.63/lib/crypto/blake2s-generic.c linux-5.4.63-modified/lib/crypto/blake2s-generic.c +--- linux-5.4.63/lib/crypto/blake2s-generic.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/blake2s-generic.c 2020-09-08 18:16:45.701317891 -0400 @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -29450,9 +29450,9 @@ diff -Nru linux-5.4.55/lib/crypto/blake2s-generic.c linux-5.4.55-modified/lib/cr +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("BLAKE2s hash function"); +MODULE_AUTHOR("Jason A. Donenfeld <[email protected]>"); -diff -Nru linux-5.4.55/lib/crypto/blake2s-selftest.c linux-5.4.55-modified/lib/crypto/blake2s-selftest.c ---- linux-5.4.55/lib/crypto/blake2s-selftest.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/blake2s-selftest.c 2020-08-01 15:38:51.328407813 -0400 +diff -Nru linux-5.4.63/lib/crypto/blake2s-selftest.c linux-5.4.63-modified/lib/crypto/blake2s-selftest.c +--- linux-5.4.63/lib/crypto/blake2s-selftest.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/blake2s-selftest.c 2020-09-08 18:16:45.701317891 -0400 @@ -0,0 +1,622 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -30076,9 +30076,9 @@ diff -Nru linux-5.4.55/lib/crypto/blake2s-selftest.c linux-5.4.55-modified/lib/c + + return success; +} -diff -Nru linux-5.4.55/lib/crypto/chacha20poly1305.c linux-5.4.55-modified/lib/crypto/chacha20poly1305.c ---- linux-5.4.55/lib/crypto/chacha20poly1305.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/chacha20poly1305.c 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/lib/crypto/chacha20poly1305.c linux-5.4.63-modified/lib/crypto/chacha20poly1305.c +--- linux-5.4.63/lib/crypto/chacha20poly1305.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/chacha20poly1305.c 2020-09-08 18:16:45.721318134 -0400 @@ -0,0 +1,370 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -30450,9 +30450,9 @@ diff -Nru linux-5.4.55/lib/crypto/chacha20poly1305.c linux-5.4.55-modified/lib/c +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("ChaCha20Poly1305 AEAD construction"); +MODULE_AUTHOR("Jason A. Donenfeld <[email protected]>"); -diff -Nru linux-5.4.55/lib/crypto/chacha20poly1305-selftest.c linux-5.4.55-modified/lib/crypto/chacha20poly1305-selftest.c ---- linux-5.4.55/lib/crypto/chacha20poly1305-selftest.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/chacha20poly1305-selftest.c 2020-08-01 15:38:51.347407934 -0400 +diff -Nru linux-5.4.63/lib/crypto/chacha20poly1305-selftest.c linux-5.4.63-modified/lib/crypto/chacha20poly1305-selftest.c +--- linux-5.4.63/lib/crypto/chacha20poly1305-selftest.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/chacha20poly1305-selftest.c 2020-09-08 18:16:45.720318122 -0400 @@ -0,0 +1,9082 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -39536,9 +39536,9 @@ diff -Nru linux-5.4.55/lib/crypto/chacha20poly1305-selftest.c linux-5.4.55-modif + kfree(input); + return success; +} -diff -Nru linux-5.4.55/lib/crypto/chacha.c linux-5.4.55-modified/lib/crypto/chacha.c ---- linux-5.4.55/lib/crypto/chacha.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/chacha.c 2020-08-01 15:38:51.321407769 -0400 +diff -Nru linux-5.4.63/lib/crypto/chacha.c linux-5.4.63-modified/lib/crypto/chacha.c +--- linux-5.4.63/lib/crypto/chacha.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/chacha.c 2020-09-08 18:16:45.695317817 -0400 @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* @@ -39655,9 +39655,9 @@ diff -Nru linux-5.4.55/lib/crypto/chacha.c linux-5.4.55-modified/lib/crypto/chac + memcpy(&stream[4], &x[12], 16); +} +EXPORT_SYMBOL(hchacha_block_generic); -diff -Nru linux-5.4.55/lib/crypto/curve25519.c linux-5.4.55-modified/lib/crypto/curve25519.c ---- linux-5.4.55/lib/crypto/curve25519.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/curve25519.c 2020-08-01 15:38:51.344407915 -0400 +diff -Nru linux-5.4.63/lib/crypto/curve25519.c linux-5.4.63-modified/lib/crypto/curve25519.c +--- linux-5.4.63/lib/crypto/curve25519.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/curve25519.c 2020-09-08 18:16:45.717318086 -0400 @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -39694,9 +39694,9 @@ diff -Nru linux-5.4.55/lib/crypto/curve25519.c linux-5.4.55-modified/lib/crypto/ +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Curve25519 scalar multiplication"); +MODULE_AUTHOR("Jason A. Donenfeld <[email protected]>"); -diff -Nru linux-5.4.55/lib/crypto/curve25519-fiat32.c linux-5.4.55-modified/lib/crypto/curve25519-fiat32.c ---- linux-5.4.55/lib/crypto/curve25519-fiat32.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/curve25519-fiat32.c 2020-08-01 15:38:51.335407858 -0400 +diff -Nru linux-5.4.63/lib/crypto/curve25519-fiat32.c linux-5.4.63-modified/lib/crypto/curve25519-fiat32.c +--- linux-5.4.63/lib/crypto/curve25519-fiat32.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/curve25519-fiat32.c 2020-09-08 18:16:45.708317976 -0400 @@ -0,0 +1,864 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -40562,9 +40562,9 @@ diff -Nru linux-5.4.55/lib/crypto/curve25519-fiat32.c linux-5.4.55-modified/lib/ + memzero_explicit(&x3l, sizeof(x3l)); + memzero_explicit(&e, sizeof(e)); +} -diff -Nru linux-5.4.55/lib/crypto/curve25519-generic.c linux-5.4.55-modified/lib/crypto/curve25519-generic.c ---- linux-5.4.55/lib/crypto/curve25519-generic.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/curve25519-generic.c 2020-08-01 15:38:51.344407915 -0400 +diff -Nru linux-5.4.63/lib/crypto/curve25519-generic.c linux-5.4.63-modified/lib/crypto/curve25519-generic.c +--- linux-5.4.63/lib/crypto/curve25519-generic.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/curve25519-generic.c 2020-09-08 18:16:45.717318086 -0400 @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -40590,9 +40590,9 @@ diff -Nru linux-5.4.55/lib/crypto/curve25519-generic.c linux-5.4.55-modified/lib +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Curve25519 scalar multiplication"); +MODULE_AUTHOR("Jason A. Donenfeld <[email protected]>"); -diff -Nru linux-5.4.55/lib/crypto/curve25519-hacl64.c linux-5.4.55-modified/lib/crypto/curve25519-hacl64.c ---- linux-5.4.55/lib/crypto/curve25519-hacl64.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/curve25519-hacl64.c 2020-08-01 15:38:51.331407832 -0400 +diff -Nru linux-5.4.63/lib/crypto/curve25519-hacl64.c linux-5.4.63-modified/lib/crypto/curve25519-hacl64.c +--- linux-5.4.63/lib/crypto/curve25519-hacl64.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/curve25519-hacl64.c 2020-09-08 18:16:45.705317939 -0400 @@ -0,0 +1,788 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -41382,9 +41382,9 @@ diff -Nru linux-5.4.55/lib/crypto/curve25519-hacl64.c linux-5.4.55-modified/lib/ + } + memzero_explicit(buf0, sizeof(buf0)); +} -diff -Nru linux-5.4.55/lib/crypto/curve25519-selftest.c linux-5.4.55-modified/lib/crypto/curve25519-selftest.c ---- linux-5.4.55/lib/crypto/curve25519-selftest.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/curve25519-selftest.c 2020-08-01 15:38:51.341407896 -0400 +diff -Nru linux-5.4.63/lib/crypto/curve25519-selftest.c linux-5.4.63-modified/lib/crypto/curve25519-selftest.c +--- linux-5.4.63/lib/crypto/curve25519-selftest.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/curve25519-selftest.c 2020-09-08 18:16:45.714318049 -0400 @@ -0,0 +1,1321 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -42707,9 +42707,9 @@ diff -Nru linux-5.4.55/lib/crypto/curve25519-selftest.c linux-5.4.55-modified/li + + return success; +} -diff -Nru linux-5.4.55/lib/crypto/Kconfig linux-5.4.55-modified/lib/crypto/Kconfig ---- linux-5.4.55/lib/crypto/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/Kconfig 2020-08-01 15:38:51.344407915 -0400 +diff -Nru linux-5.4.63/lib/crypto/Kconfig linux-5.4.63-modified/lib/crypto/Kconfig +--- linux-5.4.63/lib/crypto/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/Kconfig 2020-09-08 18:16:45.717318086 -0400 @@ -0,0 +1,130 @@ +# SPDX-License-Identifier: GPL-2.0 + @@ -42841,9 +42841,9 @@ diff -Nru linux-5.4.55/lib/crypto/Kconfig linux-5.4.55-modified/lib/crypto/Kconf + +config CRYPTO_LIB_SHA256 + tristate -diff -Nru linux-5.4.55/lib/crypto/libchacha.c linux-5.4.55-modified/lib/crypto/libchacha.c ---- linux-5.4.55/lib/crypto/libchacha.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/libchacha.c 2020-08-01 15:38:51.321407769 -0400 +diff -Nru linux-5.4.63/lib/crypto/libchacha.c linux-5.4.63-modified/lib/crypto/libchacha.c +--- linux-5.4.63/lib/crypto/libchacha.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/libchacha.c 2020-09-08 18:16:45.695317817 -0400 @@ -0,0 +1,35 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* @@ -42880,9 +42880,9 @@ diff -Nru linux-5.4.55/lib/crypto/libchacha.c linux-5.4.55-modified/lib/crypto/l +EXPORT_SYMBOL(chacha_crypt_generic); + +MODULE_LICENSE("GPL"); -diff -Nru linux-5.4.55/lib/crypto/Makefile linux-5.4.55-modified/lib/crypto/Makefile ---- linux-5.4.55/lib/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/lib/crypto/Makefile 2020-08-01 15:38:51.344407915 -0400 +diff -Nru linux-5.4.63/lib/crypto/Makefile linux-5.4.63-modified/lib/crypto/Makefile +--- linux-5.4.63/lib/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/lib/crypto/Makefile 2020-09-08 18:16:45.717318086 -0400 @@ -1,13 +1,45 @@ # SPDX-License-Identifier: GPL-2.0 @@ -42937,9 +42937,9 @@ diff -Nru linux-5.4.55/lib/crypto/Makefile linux-5.4.55-modified/lib/crypto/Make +libchacha20poly1305-y += chacha20poly1305-selftest.o +libcurve25519-y += curve25519-selftest.o +endif -diff -Nru linux-5.4.55/lib/crypto/poly1305.c linux-5.4.55-modified/lib/crypto/poly1305.c ---- linux-5.4.55/lib/crypto/poly1305.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/poly1305.c 2020-08-01 15:38:51.342407902 -0400 +diff -Nru linux-5.4.63/lib/crypto/poly1305.c linux-5.4.63-modified/lib/crypto/poly1305.c +--- linux-5.4.63/lib/crypto/poly1305.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/poly1305.c 2020-09-08 18:16:45.715318061 -0400 @@ -0,0 +1,77 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* @@ -43018,9 +43018,9 @@ diff -Nru linux-5.4.55/lib/crypto/poly1305.c linux-5.4.55-modified/lib/crypto/po + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Martin Willi <[email protected]>"); -diff -Nru linux-5.4.55/lib/crypto/poly1305-donna32.c linux-5.4.55-modified/lib/crypto/poly1305-donna32.c ---- linux-5.4.55/lib/crypto/poly1305-donna32.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/poly1305-donna32.c 2020-08-01 15:38:51.342407902 -0400 +diff -Nru linux-5.4.63/lib/crypto/poly1305-donna32.c linux-5.4.63-modified/lib/crypto/poly1305-donna32.c +--- linux-5.4.63/lib/crypto/poly1305-donna32.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/poly1305-donna32.c 2020-09-08 18:16:45.715318061 -0400 @@ -0,0 +1,204 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -43226,9 +43226,9 @@ diff -Nru linux-5.4.55/lib/crypto/poly1305-donna32.c linux-5.4.55-modified/lib/c + put_unaligned_le32(h3, &mac[12]); +} +EXPORT_SYMBOL(poly1305_core_emit); -diff -Nru linux-5.4.55/lib/crypto/poly1305-donna64.c linux-5.4.55-modified/lib/crypto/poly1305-donna64.c ---- linux-5.4.55/lib/crypto/poly1305-donna64.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/lib/crypto/poly1305-donna64.c 2020-08-01 15:38:51.342407902 -0400 +diff -Nru linux-5.4.63/lib/crypto/poly1305-donna64.c linux-5.4.63-modified/lib/crypto/poly1305-donna64.c +--- linux-5.4.63/lib/crypto/poly1305-donna64.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/lib/crypto/poly1305-donna64.c 2020-09-08 18:16:45.715318061 -0400 @@ -0,0 +1,185 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT +/* @@ -43415,9 +43415,9 @@ diff -Nru linux-5.4.55/lib/crypto/poly1305-donna64.c linux-5.4.55-modified/lib/c + put_unaligned_le64(h1, &mac[8]); +} +EXPORT_SYMBOL(poly1305_core_emit); -diff -Nru linux-5.4.55/lib/Makefile linux-5.4.55-modified/lib/Makefile ---- linux-5.4.55/lib/Makefile 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/lib/Makefile 2020-08-01 15:38:51.320407762 -0400 +diff -Nru linux-5.4.63/lib/Makefile linux-5.4.63-modified/lib/Makefile +--- linux-5.4.63/lib/Makefile 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/lib/Makefile 2020-09-08 18:16:45.694317805 -0400 @@ -26,8 +26,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ @@ -43428,10 +43428,10 @@ diff -Nru linux-5.4.55/lib/Makefile linux-5.4.55-modified/lib/Makefile flex_proportions.o ratelimit.o show_mem.o \ is_single_threaded.o plist.o decompress.o kobject_uevent.o \ earlycpio.o seq_buf.o siphash.o dec_and_lock.o \ -diff -Nru linux-5.4.55/MAINTAINERS linux-5.4.55-modified/MAINTAINERS ---- linux-5.4.55/MAINTAINERS 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/MAINTAINERS 2020-08-01 15:38:51.350407953 -0400 -@@ -17583,6 +17583,14 @@ +diff -Nru linux-5.4.63/MAINTAINERS linux-5.4.63-modified/MAINTAINERS +--- linux-5.4.63/MAINTAINERS 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/MAINTAINERS 2020-09-08 18:16:45.723318159 -0400 +@@ -17584,6 +17584,14 @@ S: Maintained F: drivers/gpio/gpio-ws16c48.c @@ -43446,9 +43446,9 @@ diff -Nru linux-5.4.55/MAINTAINERS linux-5.4.55-modified/MAINTAINERS WISTRON LAPTOP BUTTON DRIVER M: Miloslav Trmac <[email protected]> S: Maintained -diff -Nru linux-5.4.55/net/ipv4/icmp.c linux-5.4.55-modified/net/ipv4/icmp.c ---- linux-5.4.55/net/ipv4/icmp.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/net/ipv4/icmp.c 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/net/ipv4/icmp.c linux-5.4.63-modified/net/ipv4/icmp.c +--- linux-5.4.63/net/ipv4/icmp.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/net/ipv4/icmp.c 2020-09-08 18:16:45.722318146 -0400 @@ -747,6 +747,39 @@ } EXPORT_SYMBOL(__icmp_send); @@ -43489,9 +43489,9 @@ diff -Nru linux-5.4.55/net/ipv4/icmp.c linux-5.4.55-modified/net/ipv4/icmp.c static void icmp_socket_deliver(struct sk_buff *skb, u32 info) { -diff -Nru linux-5.4.55/net/ipv4/ip_tunnel_core.c linux-5.4.55-modified/net/ipv4/ip_tunnel_core.c ---- linux-5.4.55/net/ipv4/ip_tunnel_core.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/net/ipv4/ip_tunnel_core.c 2020-08-01 15:38:51.365408048 -0400 +diff -Nru linux-5.4.63/net/ipv4/ip_tunnel_core.c linux-5.4.63-modified/net/ipv4/ip_tunnel_core.c +--- linux-5.4.63/net/ipv4/ip_tunnel_core.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/net/ipv4/ip_tunnel_core.c 2020-09-08 18:16:45.733318281 -0400 @@ -446,3 +446,21 @@ static_branch_dec(&ip_tunnel_metadata_cnt); } @@ -43514,9 +43514,9 @@ diff -Nru linux-5.4.55/net/ipv4/ip_tunnel_core.c linux-5.4.55-modified/net/ipv4/ + +const struct header_ops ip_tunnel_header_ops = { .parse_protocol = ip_tunnel_parse_protocol }; +EXPORT_SYMBOL(ip_tunnel_header_ops); -diff -Nru linux-5.4.55/net/ipv6/ip6_icmp.c linux-5.4.55-modified/net/ipv6/ip6_icmp.c ---- linux-5.4.55/net/ipv6/ip6_icmp.c 2020-07-31 12:39:32.000000000 -0400 -+++ linux-5.4.55-modified/net/ipv6/ip6_icmp.c 2020-08-01 15:38:51.349407947 -0400 +diff -Nru linux-5.4.63/net/ipv6/ip6_icmp.c linux-5.4.63-modified/net/ipv6/ip6_icmp.c +--- linux-5.4.63/net/ipv6/ip6_icmp.c 2020-09-05 05:22:51.000000000 -0400 ++++ linux-5.4.63-modified/net/ipv6/ip6_icmp.c 2020-09-08 18:16:45.722318146 -0400 @@ -45,4 +45,38 @@ rcu_read_unlock(); } @@ -43556,9 +43556,9 @@ diff -Nru linux-5.4.55/net/ipv6/ip6_icmp.c linux-5.4.55-modified/net/ipv6/ip6_ic +EXPORT_SYMBOL(icmpv6_ndo_send); +#endif #endif -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/netns.sh linux-5.4.55-modified/tools/testing/selftests/wireguard/netns.sh ---- linux-5.4.55/tools/testing/selftests/wireguard/netns.sh 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/netns.sh 2020-08-01 15:38:51.365408048 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/netns.sh linux-5.4.63-modified/tools/testing/selftests/wireguard/netns.sh +--- linux-5.4.63/tools/testing/selftests/wireguard/netns.sh 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/netns.sh 2020-09-08 18:16:45.733318281 -0400 @@ -0,0 +1,614 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 @@ -44174,9 +44174,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/netns.sh linux-5.4.55-m +done +[[ $alldeleted -eq 1 ]] +pretty "" "Objects that were created were also destroyed." -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config 2020-08-01 15:38:51.354407979 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,6 @@ +CONFIG_CPU_BIG_ENDIAN=y +CONFIG_SERIAL_AMBA_PL011=y @@ -44184,18 +44184,18 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.co +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" +CONFIG_FRAME_WARN=1280 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/aarch64.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/aarch64.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64.config 2020-08-01 15:38:51.354407979 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/aarch64.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/aarch64.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64.config 2020-09-08 18:16:45.726318195 -0400 @@ -0,0 +1,5 @@ +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" +CONFIG_FRAME_WARN=1280 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/arm.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/arm.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/arm.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/arm.config 2020-08-01 15:38:51.354407979 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/arm.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/arm.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/arm.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/arm.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,9 @@ +CONFIG_MMU=y +CONFIG_ARCH_MULTI_V7=y @@ -44206,9 +44206,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/arm.config li +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" +CONFIG_FRAME_WARN=1024 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/armeb.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/armeb.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/armeb.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/armeb.config 2020-08-01 15:38:51.354407979 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/armeb.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/armeb.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/armeb.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/armeb.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,10 @@ +CONFIG_MMU=y +CONFIG_ARCH_MULTI_V7=y @@ -44220,18 +44220,18 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/armeb.config +CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" +CONFIG_CPU_BIG_ENDIAN=y +CONFIG_FRAME_WARN=1024 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/i686.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/i686.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/i686.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/i686.config 2020-08-01 15:38:51.354407979 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/i686.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/i686.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/i686.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/i686.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,5 @@ +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1024 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/m68k.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/m68k.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/m68k.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/m68k.config 2020-08-01 15:38:51.356407991 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/m68k.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/m68k.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/m68k.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/m68k.config 2020-09-08 18:16:45.728318220 -0400 @@ -0,0 +1,9 @@ +CONFIG_MMU=y +CONFIG_M68KCLASSIC=y @@ -44242,9 +44242,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/m68k.config l +CONFIG_SERIAL_PMACZILOG_CONSOLE=y +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1024 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips64.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mips64.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips64.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mips64.config 2020-08-01 15:38:51.355407985 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mips64.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mips64.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mips64.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mips64.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,14 @@ +CONFIG_64BIT=y +CONFIG_CPU_MIPS64_R2=y @@ -44260,9 +44260,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips64.config +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1280 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips64el.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mips64el.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips64el.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mips64el.config 2020-08-01 15:38:51.355407985 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mips64el.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mips64el.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mips64el.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mips64el.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,15 @@ +CONFIG_64BIT=y +CONFIG_CPU_MIPS64_R2=y @@ -44279,9 +44279,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips64el.conf +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1280 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mips.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mips.config 2020-08-01 15:38:51.354407979 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mips.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mips.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mips.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mips.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,11 @@ +CONFIG_CPU_MIPS32_R2=y +CONFIG_MIPS_MALTA=y @@ -44294,9 +44294,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips.config l +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1024 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mipsel.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mipsel.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mipsel.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mipsel.config 2020-08-01 15:38:51.355407985 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mipsel.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mipsel.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mipsel.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mipsel.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,12 @@ +CONFIG_CPU_MIPS32_R2=y +CONFIG_MIPS_MALTA=y @@ -44310,9 +44310,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mipsel.config +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1024 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config 2020-08-01 15:38:51.362408029 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config 2020-09-08 18:16:45.731318256 -0400 @@ -0,0 +1,13 @@ +CONFIG_PPC64=y +CONFIG_PPC_PSERIES=y @@ -44327,9 +44327,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.c +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_FRAME_WARN=1280 +CONFIG_THREAD_SHIFT=14 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/powerpc.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/powerpc.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc.config 2020-08-01 15:38:51.355407985 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/powerpc.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/powerpc.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,10 @@ +CONFIG_PPC_QEMU_E500=y +CONFIG_FSL_SOC_BOOKE=y @@ -44341,18 +44341,18 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/powerpc.confi +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1024 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/x86_64.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/x86_64.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/x86_64.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/x86_64.config 2020-08-01 15:38:51.355407985 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/x86_64.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/x86_64.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/x86_64.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/x86_64.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,5 @@ +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_FRAME_WARN=1280 -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/debug.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/debug.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/debug.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/debug.config 2020-08-01 15:38:51.355407985 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/debug.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/debug.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/debug.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/debug.config 2020-09-08 18:16:45.727318207 -0400 @@ -0,0 +1,67 @@ +CONFIG_LOCALVERSION="-debug" +CONFIG_ENABLE_WARN_DEPRECATED=y @@ -44421,15 +44421,15 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/debug.config linux +CONFIG_DEBUG_PAGEALLOC=y +CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y +CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/.gitignore linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/.gitignore ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/.gitignore 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/.gitignore 2020-08-01 15:38:51.354407979 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/.gitignore linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/.gitignore +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/.gitignore 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/.gitignore 2020-09-08 18:16:45.726318195 -0400 @@ -0,0 +1,2 @@ +build/ +distfiles/ -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/init.c linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/init.c ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/init.c 2020-08-01 15:38:51.360408017 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/init.c linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/init.c +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/init.c 2020-09-08 18:16:45.730318244 -0400 @@ -0,0 +1,284 @@ +// SPDX-License-Identifier: GPL-2.0 +/* @@ -44715,9 +44715,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/init.c linux-5.4.5 + poweroff(); + return 1; +} -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/kernel.config linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/kernel.config ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/kernel.config 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/kernel.config 2020-08-01 15:38:51.356407991 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/kernel.config linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/kernel.config +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/kernel.config 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/kernel.config 2020-09-08 18:16:45.728318220 -0400 @@ -0,0 +1,88 @@ +CONFIG_LOCALVERSION="" +CONFIG_NET=y @@ -44807,9 +44807,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/kernel.config linu +CONFIG_GDB_SCRIPTS=y +CONFIG_WIREGUARD=y +CONFIG_WIREGUARD_DEBUG=y -diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/Makefile linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/Makefile ---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/Makefile 2020-08-01 15:38:51.363408036 -0400 +diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/Makefile linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/Makefile +--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/Makefile 2020-09-08 18:16:45.731318256 -0400 @@ -0,0 +1,377 @@ +# SPDX-License-Identifier: GPL-2.0 +#
