1 |
commit: 6a34e6a35e0db9ae314fe7a3fb51061601b35b24 |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 8 22:26:08 2020 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 8 22:26:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=6a34e6a3 |
7 |
|
8 |
Update wireguard patchset to v1.0.20200908 |
9 |
|
10 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
11 |
|
12 |
0000_README | 2 +- |
13 |
... => 2400_wireguard-backport-v1.0.20200908.patch | 840 ++++++++++----------- |
14 |
2 files changed, 421 insertions(+), 421 deletions(-) |
15 |
|
16 |
diff --git a/0000_README b/0000_README |
17 |
index ddaf543..85c6dae 100644 |
18 |
--- a/0000_README |
19 |
+++ b/0000_README |
20 |
@@ -307,7 +307,7 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch |
21 |
From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@××××××××.org/raw |
22 |
Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 |
23 |
|
24 |
-Patch: 2400_wireguard-backport-v5.4.54.patch |
25 |
+Patch: 2400_wireguard-backport-v1.0.20200908.patch |
26 |
From: https://git.zx2c4.com/wireguard-linux/ |
27 |
Desc: Extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography |
28 |
|
29 |
|
30 |
diff --git a/2400_wireguard-backport-v5.4.54.patch b/2400_wireguard-backport-v1.0.20200908.patch |
31 |
similarity index 97% |
32 |
rename from 2400_wireguard-backport-v5.4.54.patch |
33 |
rename to 2400_wireguard-backport-v1.0.20200908.patch |
34 |
index 99c359a..d11ac0c 100644 |
35 |
--- a/2400_wireguard-backport-v5.4.54.patch |
36 |
+++ b/2400_wireguard-backport-v1.0.20200908.patch |
37 |
@@ -1,6 +1,6 @@ |
38 |
-diff -Nru linux-5.4.55/arch/arm/crypto/chacha-glue.c linux-5.4.55-modified/arch/arm/crypto/chacha-glue.c |
39 |
---- linux-5.4.55/arch/arm/crypto/chacha-glue.c 1969-12-31 19:00:00.000000000 -0500 |
40 |
-+++ linux-5.4.55-modified/arch/arm/crypto/chacha-glue.c 2020-08-01 15:38:51.348407940 -0400 |
41 |
+diff -Nru linux-5.4.63/arch/arm/crypto/chacha-glue.c linux-5.4.63-modified/arch/arm/crypto/chacha-glue.c |
42 |
+--- linux-5.4.63/arch/arm/crypto/chacha-glue.c 1969-12-31 19:00:00.000000000 -0500 |
43 |
++++ linux-5.4.63-modified/arch/arm/crypto/chacha-glue.c 2020-09-08 18:16:45.721318134 -0400 |
44 |
@@ -0,0 +1,357 @@ |
45 |
+// SPDX-License-Identifier: GPL-2.0 |
46 |
+/* |
47 |
@@ -359,9 +359,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/chacha-glue.c linux-5.4.55-modified/arch/ |
48 |
+MODULE_ALIAS_CRYPTO("xchacha20-neon"); |
49 |
+MODULE_ALIAS_CRYPTO("xchacha12-neon"); |
50 |
+#endif |
51 |
-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 |
52 |
---- linux-5.4.55/arch/arm/crypto/chacha-neon-glue.c 2020-07-31 12:39:32.000000000 -0400 |
53 |
-+++ linux-5.4.55-modified/arch/arm/crypto/chacha-neon-glue.c 1969-12-31 19:00:00.000000000 -0500 |
54 |
+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 |
55 |
+--- linux-5.4.63/arch/arm/crypto/chacha-neon-glue.c 2020-09-05 05:22:51.000000000 -0400 |
56 |
++++ linux-5.4.63-modified/arch/arm/crypto/chacha-neon-glue.c 1969-12-31 19:00:00.000000000 -0500 |
57 |
@@ -1,202 +0,0 @@ |
58 |
-/* |
59 |
- * ARM NEON accelerated ChaCha and XChaCha stream ciphers, |
60 |
@@ -565,9 +565,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/chacha-neon-glue.c linux-5.4.55-modified/ |
61 |
-MODULE_ALIAS_CRYPTO("xchacha20-neon"); |
62 |
-MODULE_ALIAS_CRYPTO("xchacha12"); |
63 |
-MODULE_ALIAS_CRYPTO("xchacha12-neon"); |
64 |
-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 |
65 |
---- linux-5.4.55/arch/arm/crypto/chacha-scalar-core.S 1969-12-31 19:00:00.000000000 -0500 |
66 |
-+++ linux-5.4.55-modified/arch/arm/crypto/chacha-scalar-core.S 2020-08-01 15:38:51.322407775 -0400 |
67 |
+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 |
68 |
+--- linux-5.4.63/arch/arm/crypto/chacha-scalar-core.S 1969-12-31 19:00:00.000000000 -0500 |
69 |
++++ linux-5.4.63-modified/arch/arm/crypto/chacha-scalar-core.S 2020-09-08 18:16:45.696317830 -0400 |
70 |
@@ -0,0 +1,460 @@ |
71 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
72 |
+/* |
73 |
@@ -1029,9 +1029,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/chacha-scalar-core.S linux-5.4.55-modifie |
74 |
+1: _chacha_permute 12 |
75 |
+ b 0b |
76 |
+ENDPROC(hchacha_block_arm) |
77 |
-diff -Nru linux-5.4.55/arch/arm/crypto/curve25519-core.S linux-5.4.55-modified/arch/arm/crypto/curve25519-core.S |
78 |
---- linux-5.4.55/arch/arm/crypto/curve25519-core.S 1969-12-31 19:00:00.000000000 -0500 |
79 |
-+++ linux-5.4.55-modified/arch/arm/crypto/curve25519-core.S 2020-08-01 15:38:51.336407864 -0400 |
80 |
+diff -Nru linux-5.4.63/arch/arm/crypto/curve25519-core.S linux-5.4.63-modified/arch/arm/crypto/curve25519-core.S |
81 |
+--- linux-5.4.63/arch/arm/crypto/curve25519-core.S 1969-12-31 19:00:00.000000000 -0500 |
82 |
++++ linux-5.4.63-modified/arch/arm/crypto/curve25519-core.S 2020-09-08 18:16:45.710318000 -0400 |
83 |
@@ -0,0 +1,2062 @@ |
84 |
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */ |
85 |
+/* |
86 |
@@ -3095,10 +3095,10 @@ diff -Nru linux-5.4.55/arch/arm/crypto/curve25519-core.S linux-5.4.55-modified/a |
87 |
+ mov sp, ip |
88 |
+ pop {r4-r11, pc} |
89 |
+ENDPROC(curve25519_neon) |
90 |
-diff -Nru linux-5.4.55/arch/arm/crypto/curve25519-glue.c linux-5.4.55-modified/arch/arm/crypto/curve25519-glue.c |
91 |
---- linux-5.4.55/arch/arm/crypto/curve25519-glue.c 1969-12-31 19:00:00.000000000 -0500 |
92 |
-+++ linux-5.4.55-modified/arch/arm/crypto/curve25519-glue.c 2020-08-01 15:38:51.340407890 -0400 |
93 |
-@@ -0,0 +1,135 @@ |
94 |
+diff -Nru linux-5.4.63/arch/arm/crypto/curve25519-glue.c linux-5.4.63-modified/arch/arm/crypto/curve25519-glue.c |
95 |
+--- linux-5.4.63/arch/arm/crypto/curve25519-glue.c 1969-12-31 19:00:00.000000000 -0500 |
96 |
++++ linux-5.4.63-modified/arch/arm/crypto/curve25519-glue.c 2020-09-08 18:16:45.722318146 -0400 |
97 |
+@@ -0,0 +1,136 @@ |
98 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
99 |
+/* |
100 |
+ * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@×××××.com>. All Rights Reserved. |
101 |
@@ -3117,6 +3117,7 @@ diff -Nru linux-5.4.55/arch/arm/crypto/curve25519-glue.c linux-5.4.55-modified/a |
102 |
+#include <linux/module.h> |
103 |
+#include <linux/init.h> |
104 |
+#include <linux/jump_label.h> |
105 |
++#include <linux/scatterlist.h> |
106 |
+#include <crypto/curve25519.h> |
107 |
+ |
108 |
+asmlinkage void curve25519_neon(u8 mypublic[CURVE25519_KEY_SIZE], |
109 |
@@ -3234,17 +3235,17 @@ diff -Nru linux-5.4.55/arch/arm/crypto/curve25519-glue.c linux-5.4.55-modified/a |
110 |
+MODULE_ALIAS_CRYPTO("curve25519"); |
111 |
+MODULE_ALIAS_CRYPTO("curve25519-neon"); |
112 |
+MODULE_LICENSE("GPL v2"); |
113 |
-diff -Nru linux-5.4.55/arch/arm/crypto/.gitignore linux-5.4.55-modified/arch/arm/crypto/.gitignore |
114 |
---- linux-5.4.55/arch/arm/crypto/.gitignore 2020-07-31 12:39:32.000000000 -0400 |
115 |
-+++ linux-5.4.55-modified/arch/arm/crypto/.gitignore 2020-08-01 15:38:51.348407940 -0400 |
116 |
+diff -Nru linux-5.4.63/arch/arm/crypto/.gitignore linux-5.4.63-modified/arch/arm/crypto/.gitignore |
117 |
+--- linux-5.4.63/arch/arm/crypto/.gitignore 2020-09-05 05:22:51.000000000 -0400 |
118 |
++++ linux-5.4.63-modified/arch/arm/crypto/.gitignore 2020-09-08 18:16:45.721318134 -0400 |
119 |
@@ -1,3 +1,4 @@ |
120 |
aesbs-core.S |
121 |
sha256-core.S |
122 |
sha512-core.S |
123 |
+poly1305-core.S |
124 |
-diff -Nru linux-5.4.55/arch/arm/crypto/Kconfig linux-5.4.55-modified/arch/arm/crypto/Kconfig |
125 |
---- linux-5.4.55/arch/arm/crypto/Kconfig 2020-07-31 12:39:32.000000000 -0400 |
126 |
-+++ linux-5.4.55-modified/arch/arm/crypto/Kconfig 2020-08-01 15:38:51.336407864 -0400 |
127 |
+diff -Nru linux-5.4.63/arch/arm/crypto/Kconfig linux-5.4.63-modified/arch/arm/crypto/Kconfig |
128 |
+--- linux-5.4.63/arch/arm/crypto/Kconfig 2020-09-05 05:22:51.000000000 -0400 |
129 |
++++ linux-5.4.63-modified/arch/arm/crypto/Kconfig 2020-09-08 18:16:45.710318000 -0400 |
130 |
@@ -127,14 +127,24 @@ |
131 |
select CRYPTO_HASH |
132 |
|
133 |
@@ -3273,9 +3274,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/Kconfig linux-5.4.55-modified/arch/arm/cr |
134 |
+ select CRYPTO_ARCH_HAVE_LIB_CURVE25519 |
135 |
+ |
136 |
endif |
137 |
-diff -Nru linux-5.4.55/arch/arm/crypto/Makefile linux-5.4.55-modified/arch/arm/crypto/Makefile |
138 |
---- linux-5.4.55/arch/arm/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 |
139 |
-+++ linux-5.4.55-modified/arch/arm/crypto/Makefile 2020-08-01 15:38:51.336407864 -0400 |
140 |
+diff -Nru linux-5.4.63/arch/arm/crypto/Makefile linux-5.4.63-modified/arch/arm/crypto/Makefile |
141 |
+--- linux-5.4.63/arch/arm/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 |
142 |
++++ linux-5.4.63-modified/arch/arm/crypto/Makefile 2020-09-08 18:16:45.710318000 -0400 |
143 |
@@ -10,7 +10,9 @@ |
144 |
obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o |
145 |
obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o |
146 |
@@ -3318,9 +3319,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/Makefile linux-5.4.55-modified/arch/arm/c |
147 |
+poly1305-aflags-$(CONFIG_CPU_V7) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=5 |
148 |
+poly1305-aflags-$(CONFIG_KERNEL_MODE_NEON) := -U__LINUX_ARM_ARCH__ -D__LINUX_ARM_ARCH__=7 |
149 |
+AFLAGS_poly1305-core.o += $(poly1305-aflags-y) |
150 |
-diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-armv4.pl linux-5.4.55-modified/arch/arm/crypto/poly1305-armv4.pl |
151 |
---- linux-5.4.55/arch/arm/crypto/poly1305-armv4.pl 1969-12-31 19:00:00.000000000 -0500 |
152 |
-+++ linux-5.4.55-modified/arch/arm/crypto/poly1305-armv4.pl 2020-08-01 15:38:51.326407801 -0400 |
153 |
+diff -Nru linux-5.4.63/arch/arm/crypto/poly1305-armv4.pl linux-5.4.63-modified/arch/arm/crypto/poly1305-armv4.pl |
154 |
+--- linux-5.4.63/arch/arm/crypto/poly1305-armv4.pl 1969-12-31 19:00:00.000000000 -0500 |
155 |
++++ linux-5.4.63-modified/arch/arm/crypto/poly1305-armv4.pl 2020-09-08 18:16:45.700317878 -0400 |
156 |
@@ -0,0 +1,1236 @@ |
157 |
+#!/usr/bin/env perl |
158 |
+# SPDX-License-Identifier: GPL-1.0+ OR BSD-3-Clause |
159 |
@@ -4558,9 +4559,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-armv4.pl linux-5.4.55-modified/a |
160 |
+ print $_,"\n"; |
161 |
+} |
162 |
+close STDOUT; # enforce flush |
163 |
-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 |
164 |
---- linux-5.4.55/arch/arm/crypto/poly1305-core.S_shipped 1969-12-31 19:00:00.000000000 -0500 |
165 |
-+++ linux-5.4.55-modified/arch/arm/crypto/poly1305-core.S_shipped 2020-08-01 15:38:51.326407801 -0400 |
166 |
+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 |
167 |
+--- linux-5.4.63/arch/arm/crypto/poly1305-core.S_shipped 1969-12-31 19:00:00.000000000 -0500 |
168 |
++++ linux-5.4.63-modified/arch/arm/crypto/poly1305-core.S_shipped 2020-09-08 18:16:45.700317878 -0400 |
169 |
@@ -0,0 +1,1158 @@ |
170 |
+#ifndef __KERNEL__ |
171 |
+# include "arm_arch.h" |
172 |
@@ -5720,10 +5721,10 @@ diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-core.S_shipped linux-5.4.55-modi |
173 |
+#endif |
174 |
+.asciz "Poly1305 for ARMv4/NEON, CRYPTOGAMS by @dot-asm" |
175 |
+.align 2 |
176 |
-diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-glue.c linux-5.4.55-modified/arch/arm/crypto/poly1305-glue.c |
177 |
---- linux-5.4.55/arch/arm/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 |
178 |
-+++ linux-5.4.55-modified/arch/arm/crypto/poly1305-glue.c 2020-08-01 15:38:51.348407940 -0400 |
179 |
-@@ -0,0 +1,272 @@ |
180 |
+diff -Nru linux-5.4.63/arch/arm/crypto/poly1305-glue.c linux-5.4.63-modified/arch/arm/crypto/poly1305-glue.c |
181 |
+--- linux-5.4.63/arch/arm/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 |
182 |
++++ linux-5.4.63-modified/arch/arm/crypto/poly1305-glue.c 2020-09-08 18:16:45.722318146 -0400 |
183 |
+@@ -0,0 +1,273 @@ |
184 |
+// SPDX-License-Identifier: GPL-2.0 |
185 |
+/* |
186 |
+ * OpenSSL/Cryptogams accelerated Poly1305 transform for ARM |
187 |
@@ -5746,6 +5747,7 @@ diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-glue.c linux-5.4.55-modified/arc |
188 |
+ |
189 |
+void poly1305_init_arm(void *state, const u8 *key); |
190 |
+void poly1305_blocks_arm(void *state, const u8 *src, u32 len, u32 hibit); |
191 |
++void poly1305_blocks_neon(void *state, const u8 *src, u32 len, u32 hibit); |
192 |
+void poly1305_emit_arm(void *state, u8 *digest, const u32 *nonce); |
193 |
+ |
194 |
+void __weak poly1305_blocks_neon(void *state, const u8 *src, u32 len, u32 hibit) |
195 |
@@ -5996,9 +5998,9 @@ diff -Nru linux-5.4.55/arch/arm/crypto/poly1305-glue.c linux-5.4.55-modified/arc |
196 |
+MODULE_ALIAS_CRYPTO("poly1305"); |
197 |
+MODULE_ALIAS_CRYPTO("poly1305-arm"); |
198 |
+MODULE_ALIAS_CRYPTO("poly1305-neon"); |
199 |
-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 |
200 |
---- linux-5.4.55/arch/arm64/crypto/chacha-neon-glue.c 2020-07-31 12:39:32.000000000 -0400 |
201 |
-+++ linux-5.4.55-modified/arch/arm64/crypto/chacha-neon-glue.c 2020-08-01 15:38:51.348407940 -0400 |
202 |
+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 |
203 |
+--- linux-5.4.63/arch/arm64/crypto/chacha-neon-glue.c 2020-09-05 05:22:51.000000000 -0400 |
204 |
++++ linux-5.4.63-modified/arch/arm64/crypto/chacha-neon-glue.c 2020-09-08 18:16:45.721318134 -0400 |
205 |
@@ -1,5 +1,5 @@ |
206 |
/* |
207 |
- * ARM NEON accelerated ChaCha and XChaCha stream ciphers, |
208 |
@@ -6190,16 +6192,16 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/chacha-neon-glue.c linux-5.4.55-modifie |
209 |
} |
210 |
|
211 |
module_init(chacha_simd_mod_init); |
212 |
-diff -Nru linux-5.4.55/arch/arm64/crypto/.gitignore linux-5.4.55-modified/arch/arm64/crypto/.gitignore |
213 |
---- linux-5.4.55/arch/arm64/crypto/.gitignore 2020-07-31 12:39:32.000000000 -0400 |
214 |
-+++ linux-5.4.55-modified/arch/arm64/crypto/.gitignore 2020-08-01 15:38:51.348407940 -0400 |
215 |
+diff -Nru linux-5.4.63/arch/arm64/crypto/.gitignore linux-5.4.63-modified/arch/arm64/crypto/.gitignore |
216 |
+--- linux-5.4.63/arch/arm64/crypto/.gitignore 2020-09-05 05:22:51.000000000 -0400 |
217 |
++++ linux-5.4.63-modified/arch/arm64/crypto/.gitignore 2020-09-08 18:16:45.721318134 -0400 |
218 |
@@ -1,2 +1,3 @@ |
219 |
sha256-core.S |
220 |
sha512-core.S |
221 |
+poly1305-core.S |
222 |
-diff -Nru linux-5.4.55/arch/arm64/crypto/Kconfig linux-5.4.55-modified/arch/arm64/crypto/Kconfig |
223 |
---- linux-5.4.55/arch/arm64/crypto/Kconfig 2020-07-31 12:39:32.000000000 -0400 |
224 |
-+++ linux-5.4.55-modified/arch/arm64/crypto/Kconfig 2020-08-01 15:38:51.325407794 -0400 |
225 |
+diff -Nru linux-5.4.63/arch/arm64/crypto/Kconfig linux-5.4.63-modified/arch/arm64/crypto/Kconfig |
226 |
+--- linux-5.4.63/arch/arm64/crypto/Kconfig 2020-09-05 05:22:51.000000000 -0400 |
227 |
++++ linux-5.4.63-modified/arch/arm64/crypto/Kconfig 2020-09-08 18:16:45.699317866 -0400 |
228 |
@@ -103,7 +103,14 @@ |
229 |
tristate "ChaCha20, XChaCha20, and XChaCha12 stream ciphers using NEON instructions" |
230 |
depends on KERNEL_MODE_NEON |
231 |
@@ -6216,9 +6218,9 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/Kconfig linux-5.4.55-modified/arch/arm6 |
232 |
|
233 |
config CRYPTO_NHPOLY1305_NEON |
234 |
tristate "NHPoly1305 hash function using NEON instructions (for Adiantum)" |
235 |
-diff -Nru linux-5.4.55/arch/arm64/crypto/Makefile linux-5.4.55-modified/arch/arm64/crypto/Makefile |
236 |
---- linux-5.4.55/arch/arm64/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 |
237 |
-+++ linux-5.4.55-modified/arch/arm64/crypto/Makefile 2020-08-01 15:38:51.325407794 -0400 |
238 |
+diff -Nru linux-5.4.63/arch/arm64/crypto/Makefile linux-5.4.63-modified/arch/arm64/crypto/Makefile |
239 |
+--- linux-5.4.63/arch/arm64/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 |
240 |
++++ linux-5.4.63-modified/arch/arm64/crypto/Makefile 2020-09-08 18:16:45.699317866 -0400 |
241 |
@@ -50,6 +50,10 @@ |
242 |
obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o |
243 |
chacha-neon-y := chacha-neon-core.o chacha-neon-glue.o |
244 |
@@ -6247,9 +6249,9 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/Makefile linux-5.4.55-modified/arch/arm |
245 |
|
246 |
-clean-files += sha256-core.S sha512-core.S |
247 |
+clean-files += poly1305-core.S sha256-core.S sha512-core.S |
248 |
-diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-armv8.pl linux-5.4.55-modified/arch/arm64/crypto/poly1305-armv8.pl |
249 |
---- linux-5.4.55/arch/arm64/crypto/poly1305-armv8.pl 1969-12-31 19:00:00.000000000 -0500 |
250 |
-+++ linux-5.4.55-modified/arch/arm64/crypto/poly1305-armv8.pl 2020-08-01 15:38:51.325407794 -0400 |
251 |
+diff -Nru linux-5.4.63/arch/arm64/crypto/poly1305-armv8.pl linux-5.4.63-modified/arch/arm64/crypto/poly1305-armv8.pl |
252 |
+--- linux-5.4.63/arch/arm64/crypto/poly1305-armv8.pl 1969-12-31 19:00:00.000000000 -0500 |
253 |
++++ linux-5.4.63-modified/arch/arm64/crypto/poly1305-armv8.pl 2020-09-08 18:16:45.699317866 -0400 |
254 |
@@ -0,0 +1,913 @@ |
255 |
+#!/usr/bin/env perl |
256 |
+# SPDX-License-Identifier: GPL-1.0+ OR BSD-3-Clause |
257 |
@@ -7164,9 +7166,9 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-armv8.pl linux-5.4.55-modified |
258 |
+ print $_,"\n"; |
259 |
+} |
260 |
+close STDOUT; |
261 |
-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 |
262 |
---- linux-5.4.55/arch/arm64/crypto/poly1305-core.S_shipped 1969-12-31 19:00:00.000000000 -0500 |
263 |
-+++ linux-5.4.55-modified/arch/arm64/crypto/poly1305-core.S_shipped 2020-08-01 15:38:51.325407794 -0400 |
264 |
+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 |
265 |
+--- linux-5.4.63/arch/arm64/crypto/poly1305-core.S_shipped 1969-12-31 19:00:00.000000000 -0500 |
266 |
++++ linux-5.4.63-modified/arch/arm64/crypto/poly1305-core.S_shipped 2020-09-08 18:16:45.699317866 -0400 |
267 |
@@ -0,0 +1,835 @@ |
268 |
+#ifndef __KERNEL__ |
269 |
+# include "arm_arch.h" |
270 |
@@ -8003,9 +8005,9 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-core.S_shipped linux-5.4.55-mo |
271 |
+.comm OPENSSL_armcap_P,4,4 |
272 |
+.hidden OPENSSL_armcap_P |
273 |
+#endif |
274 |
-diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-glue.c linux-5.4.55-modified/arch/arm64/crypto/poly1305-glue.c |
275 |
---- linux-5.4.55/arch/arm64/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 |
276 |
-+++ linux-5.4.55-modified/arch/arm64/crypto/poly1305-glue.c 2020-08-01 15:38:51.348407940 -0400 |
277 |
+diff -Nru linux-5.4.63/arch/arm64/crypto/poly1305-glue.c linux-5.4.63-modified/arch/arm64/crypto/poly1305-glue.c |
278 |
+--- linux-5.4.63/arch/arm64/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 |
279 |
++++ linux-5.4.63-modified/arch/arm64/crypto/poly1305-glue.c 2020-09-08 18:16:45.721318134 -0400 |
280 |
@@ -0,0 +1,231 @@ |
281 |
+// SPDX-License-Identifier: GPL-2.0 |
282 |
+/* |
283 |
@@ -8238,9 +8240,9 @@ diff -Nru linux-5.4.55/arch/arm64/crypto/poly1305-glue.c linux-5.4.55-modified/a |
284 |
+MODULE_LICENSE("GPL v2"); |
285 |
+MODULE_ALIAS_CRYPTO("poly1305"); |
286 |
+MODULE_ALIAS_CRYPTO("poly1305-neon"); |
287 |
-diff -Nru linux-5.4.55/arch/mips/crypto/chacha-core.S linux-5.4.55-modified/arch/mips/crypto/chacha-core.S |
288 |
---- linux-5.4.55/arch/mips/crypto/chacha-core.S 1969-12-31 19:00:00.000000000 -0500 |
289 |
-+++ linux-5.4.55-modified/arch/mips/crypto/chacha-core.S 2020-08-01 15:38:51.323407782 -0400 |
290 |
+diff -Nru linux-5.4.63/arch/mips/crypto/chacha-core.S linux-5.4.63-modified/arch/mips/crypto/chacha-core.S |
291 |
+--- linux-5.4.63/arch/mips/crypto/chacha-core.S 1969-12-31 19:00:00.000000000 -0500 |
292 |
++++ linux-5.4.63-modified/arch/mips/crypto/chacha-core.S 2020-09-08 18:16:45.696317830 -0400 |
293 |
@@ -0,0 +1,497 @@ |
294 |
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */ |
295 |
+/* |
296 |
@@ -8739,9 +8741,9 @@ diff -Nru linux-5.4.55/arch/mips/crypto/chacha-core.S linux-5.4.55-modified/arch |
297 |
+ jr $ra |
298 |
+.end hchacha_block_arch |
299 |
+.set at |
300 |
-diff -Nru linux-5.4.55/arch/mips/crypto/chacha-glue.c linux-5.4.55-modified/arch/mips/crypto/chacha-glue.c |
301 |
---- linux-5.4.55/arch/mips/crypto/chacha-glue.c 1969-12-31 19:00:00.000000000 -0500 |
302 |
-+++ linux-5.4.55-modified/arch/mips/crypto/chacha-glue.c 2020-08-01 15:38:51.340407890 -0400 |
303 |
+diff -Nru linux-5.4.63/arch/mips/crypto/chacha-glue.c linux-5.4.63-modified/arch/mips/crypto/chacha-glue.c |
304 |
+--- linux-5.4.63/arch/mips/crypto/chacha-glue.c 1969-12-31 19:00:00.000000000 -0500 |
305 |
++++ linux-5.4.63-modified/arch/mips/crypto/chacha-glue.c 2020-09-08 18:16:45.713318037 -0400 |
306 |
@@ -0,0 +1,152 @@ |
307 |
+// SPDX-License-Identifier: GPL-2.0 |
308 |
+/* |
309 |
@@ -8895,9 +8897,9 @@ diff -Nru linux-5.4.55/arch/mips/crypto/chacha-glue.c linux-5.4.55-modified/arch |
310 |
+MODULE_ALIAS_CRYPTO("xchacha20-mips"); |
311 |
+MODULE_ALIAS_CRYPTO("xchacha12"); |
312 |
+MODULE_ALIAS_CRYPTO("xchacha12-mips"); |
313 |
-diff -Nru linux-5.4.55/arch/mips/crypto/Makefile linux-5.4.55-modified/arch/mips/crypto/Makefile |
314 |
---- linux-5.4.55/arch/mips/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 |
315 |
-+++ linux-5.4.55-modified/arch/mips/crypto/Makefile 2020-08-01 15:38:51.326407801 -0400 |
316 |
+diff -Nru linux-5.4.63/arch/mips/crypto/Makefile linux-5.4.63-modified/arch/mips/crypto/Makefile |
317 |
+--- linux-5.4.63/arch/mips/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 |
318 |
++++ linux-5.4.63-modified/arch/mips/crypto/Makefile 2020-09-08 18:16:45.700317878 -0400 |
319 |
@@ -4,3 +4,21 @@ |
320 |
# |
321 |
|
322 |
@@ -8920,9 +8922,9 @@ diff -Nru linux-5.4.55/arch/mips/crypto/Makefile linux-5.4.55-modified/arch/mips |
323 |
+ $(call if_changed,perlasm) |
324 |
+ |
325 |
+targets += poly1305-core.S |
326 |
-diff -Nru linux-5.4.55/arch/mips/crypto/poly1305-glue.c linux-5.4.55-modified/arch/mips/crypto/poly1305-glue.c |
327 |
---- linux-5.4.55/arch/mips/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 |
328 |
-+++ linux-5.4.55-modified/arch/mips/crypto/poly1305-glue.c 2020-08-01 15:38:51.344407915 -0400 |
329 |
+diff -Nru linux-5.4.63/arch/mips/crypto/poly1305-glue.c linux-5.4.63-modified/arch/mips/crypto/poly1305-glue.c |
330 |
+--- linux-5.4.63/arch/mips/crypto/poly1305-glue.c 1969-12-31 19:00:00.000000000 -0500 |
331 |
++++ linux-5.4.63-modified/arch/mips/crypto/poly1305-glue.c 2020-09-08 18:16:45.717318086 -0400 |
332 |
@@ -0,0 +1,191 @@ |
333 |
+// SPDX-License-Identifier: GPL-2.0 |
334 |
+/* |
335 |
@@ -9115,9 +9117,9 @@ diff -Nru linux-5.4.55/arch/mips/crypto/poly1305-glue.c linux-5.4.55-modified/ar |
336 |
+MODULE_LICENSE("GPL v2"); |
337 |
+MODULE_ALIAS_CRYPTO("poly1305"); |
338 |
+MODULE_ALIAS_CRYPTO("poly1305-mips"); |
339 |
-diff -Nru linux-5.4.55/arch/mips/crypto/poly1305-mips.pl linux-5.4.55-modified/arch/mips/crypto/poly1305-mips.pl |
340 |
---- linux-5.4.55/arch/mips/crypto/poly1305-mips.pl 1969-12-31 19:00:00.000000000 -0500 |
341 |
-+++ linux-5.4.55-modified/arch/mips/crypto/poly1305-mips.pl 2020-08-01 15:38:51.327407807 -0400 |
342 |
+diff -Nru linux-5.4.63/arch/mips/crypto/poly1305-mips.pl linux-5.4.63-modified/arch/mips/crypto/poly1305-mips.pl |
343 |
+--- linux-5.4.63/arch/mips/crypto/poly1305-mips.pl 1969-12-31 19:00:00.000000000 -0500 |
344 |
++++ linux-5.4.63-modified/arch/mips/crypto/poly1305-mips.pl 2020-09-08 18:16:45.701317891 -0400 |
345 |
@@ -0,0 +1,1273 @@ |
346 |
+#!/usr/bin/env perl |
347 |
+# SPDX-License-Identifier: GPL-1.0+ OR BSD-3-Clause |
348 |
@@ -10392,9 +10394,9 @@ diff -Nru linux-5.4.55/arch/mips/crypto/poly1305-mips.pl linux-5.4.55-modified/a |
349 |
+$output=pop and open STDOUT,">$output"; |
350 |
+print $code; |
351 |
+close STDOUT; |
352 |
-diff -Nru linux-5.4.55/arch/mips/Makefile linux-5.4.55-modified/arch/mips/Makefile |
353 |
---- linux-5.4.55/arch/mips/Makefile 2020-07-31 12:39:32.000000000 -0400 |
354 |
-+++ linux-5.4.55-modified/arch/mips/Makefile 2020-08-01 15:38:51.323407782 -0400 |
355 |
+diff -Nru linux-5.4.63/arch/mips/Makefile linux-5.4.63-modified/arch/mips/Makefile |
356 |
+--- linux-5.4.63/arch/mips/Makefile 2020-09-05 05:22:51.000000000 -0400 |
357 |
++++ linux-5.4.63-modified/arch/mips/Makefile 2020-09-08 18:16:45.696317830 -0400 |
358 |
@@ -334,7 +334,7 @@ |
359 |
# See arch/mips/Kbuild for content of core part of the kernel |
360 |
core-y += arch/mips/ |
361 |
@@ -10404,9 +10406,9 @@ diff -Nru linux-5.4.55/arch/mips/Makefile linux-5.4.55-modified/arch/mips/Makefi |
362 |
drivers-$(CONFIG_OPROFILE) += arch/mips/oprofile/ |
363 |
|
364 |
# suspend and hibernation support |
365 |
-diff -Nru linux-5.4.55/arch/x86/crypto/blake2s-core.S linux-5.4.55-modified/arch/x86/crypto/blake2s-core.S |
366 |
---- linux-5.4.55/arch/x86/crypto/blake2s-core.S 1969-12-31 19:00:00.000000000 -0500 |
367 |
-+++ linux-5.4.55-modified/arch/x86/crypto/blake2s-core.S 2020-08-01 15:38:51.331407832 -0400 |
368 |
+diff -Nru linux-5.4.63/arch/x86/crypto/blake2s-core.S linux-5.4.63-modified/arch/x86/crypto/blake2s-core.S |
369 |
+--- linux-5.4.63/arch/x86/crypto/blake2s-core.S 1969-12-31 19:00:00.000000000 -0500 |
370 |
++++ linux-5.4.63-modified/arch/x86/crypto/blake2s-core.S 2020-09-08 18:16:45.704317927 -0400 |
371 |
@@ -0,0 +1,258 @@ |
372 |
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */ |
373 |
+/* |
374 |
@@ -10666,9 +10668,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/blake2s-core.S linux-5.4.55-modified/arch |
375 |
+ retq |
376 |
+ENDPROC(blake2s_compress_avx512) |
377 |
+#endif /* CONFIG_AS_AVX512 */ |
378 |
-diff -Nru linux-5.4.55/arch/x86/crypto/blake2s-glue.c linux-5.4.55-modified/arch/x86/crypto/blake2s-glue.c |
379 |
---- linux-5.4.55/arch/x86/crypto/blake2s-glue.c 1969-12-31 19:00:00.000000000 -0500 |
380 |
-+++ linux-5.4.55-modified/arch/x86/crypto/blake2s-glue.c 2020-08-01 15:38:51.349407947 -0400 |
381 |
+diff -Nru linux-5.4.63/arch/x86/crypto/blake2s-glue.c linux-5.4.63-modified/arch/x86/crypto/blake2s-glue.c |
382 |
+--- linux-5.4.63/arch/x86/crypto/blake2s-glue.c 1969-12-31 19:00:00.000000000 -0500 |
383 |
++++ linux-5.4.63-modified/arch/x86/crypto/blake2s-glue.c 2020-09-08 18:16:45.721318134 -0400 |
384 |
@@ -0,0 +1,233 @@ |
385 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
386 |
+/* |
387 |
@@ -10903,9 +10905,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/blake2s-glue.c linux-5.4.55-modified/arch |
388 |
+MODULE_ALIAS_CRYPTO("blake2s-256"); |
389 |
+MODULE_ALIAS_CRYPTO("blake2s-256-x86"); |
390 |
+MODULE_LICENSE("GPL v2"); |
391 |
-diff -Nru linux-5.4.55/arch/x86/crypto/chacha_glue.c linux-5.4.55-modified/arch/x86/crypto/chacha_glue.c |
392 |
---- linux-5.4.55/arch/x86/crypto/chacha_glue.c 2020-07-31 12:39:32.000000000 -0400 |
393 |
-+++ linux-5.4.55-modified/arch/x86/crypto/chacha_glue.c 2020-08-01 15:38:51.349407947 -0400 |
394 |
+diff -Nru linux-5.4.63/arch/x86/crypto/chacha_glue.c linux-5.4.63-modified/arch/x86/crypto/chacha_glue.c |
395 |
+--- linux-5.4.63/arch/x86/crypto/chacha_glue.c 2020-09-05 05:22:51.000000000 -0400 |
396 |
++++ linux-5.4.63-modified/arch/x86/crypto/chacha_glue.c 2020-09-08 18:16:45.721318134 -0400 |
397 |
@@ -7,38 +7,36 @@ |
398 |
*/ |
399 |
|
400 |
@@ -11220,9 +11222,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/chacha_glue.c linux-5.4.55-modified/arch/ |
401 |
} |
402 |
|
403 |
module_init(chacha_simd_mod_init); |
404 |
-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 |
405 |
---- linux-5.4.55/arch/x86/crypto/chacha-ssse3-x86_64.S 2020-07-31 12:39:32.000000000 -0400 |
406 |
-+++ linux-5.4.55-modified/arch/x86/crypto/chacha-ssse3-x86_64.S 2020-08-01 15:38:51.349407947 -0400 |
407 |
+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 |
408 |
+--- linux-5.4.63/arch/x86/crypto/chacha-ssse3-x86_64.S 2020-09-05 05:22:51.000000000 -0400 |
409 |
++++ linux-5.4.63-modified/arch/x86/crypto/chacha-ssse3-x86_64.S 2020-09-08 18:16:45.721318134 -0400 |
410 |
@@ -120,10 +120,10 @@ |
411 |
FRAME_BEGIN |
412 |
|
413 |
@@ -11253,10 +11255,10 @@ diff -Nru linux-5.4.55/arch/x86/crypto/chacha-ssse3-x86_64.S linux-5.4.55-modifi |
414 |
|
415 |
mov %edx,%r8d |
416 |
call chacha_permute |
417 |
-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 |
418 |
---- linux-5.4.55/arch/x86/crypto/curve25519-x86_64.c 1969-12-31 19:00:00.000000000 -0500 |
419 |
-+++ linux-5.4.55-modified/arch/x86/crypto/curve25519-x86_64.c 2020-08-01 15:38:51.348407940 -0400 |
420 |
-@@ -0,0 +1,1514 @@ |
421 |
+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 |
422 |
+--- linux-5.4.63/arch/x86/crypto/curve25519-x86_64.c 1969-12-31 19:00:00.000000000 -0500 |
423 |
++++ linux-5.4.63-modified/arch/x86/crypto/curve25519-x86_64.c 2020-09-08 18:16:45.722318146 -0400 |
424 |
+@@ -0,0 +1,1512 @@ |
425 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
426 |
+/* |
427 |
+ * Copyright (C) 2020 Jason A. Donenfeld <Jason@×××××.com>. All Rights Reserved. |
428 |
@@ -12207,10 +12209,8 @@ diff -Nru linux-5.4.55/arch/x86/crypto/curve25519-x86_64.c linux-5.4.55-modified |
429 |
+{ |
430 |
+ u64 f30 = f[3U]; |
431 |
+ u64 top_bit0 = f30 >> (u32)63U; |
432 |
-+ u64 carry0; |
433 |
+ u64 f31; |
434 |
+ u64 top_bit; |
435 |
-+ u64 carry; |
436 |
+ u64 f0; |
437 |
+ u64 f1; |
438 |
+ u64 f2; |
439 |
@@ -12229,11 +12229,11 @@ diff -Nru linux-5.4.55/arch/x86/crypto/curve25519-x86_64.c linux-5.4.55-modified |
440 |
+ u64 o2; |
441 |
+ u64 o3; |
442 |
+ f[3U] = f30 & (u64)0x7fffffffffffffffU; |
443 |
-+ carry0 = add_scalar(f, f, (u64)19U * top_bit0); |
444 |
++ add_scalar(f, f, (u64)19U * top_bit0); |
445 |
+ f31 = f[3U]; |
446 |
+ top_bit = f31 >> (u32)63U; |
447 |
+ f[3U] = f31 & (u64)0x7fffffffffffffffU; |
448 |
-+ carry = add_scalar(f, f, (u64)19U * top_bit); |
449 |
++ add_scalar(f, f, (u64)19U * top_bit); |
450 |
+ f0 = f[0U]; |
451 |
+ f1 = f[1U]; |
452 |
+ f2 = f[2U]; |
453 |
@@ -12771,14 +12771,14 @@ diff -Nru linux-5.4.55/arch/x86/crypto/curve25519-x86_64.c linux-5.4.55-modified |
454 |
+MODULE_ALIAS_CRYPTO("curve25519-x86"); |
455 |
+MODULE_LICENSE("GPL v2"); |
456 |
+MODULE_AUTHOR("Jason A. Donenfeld <Jason@×××××.com>"); |
457 |
-diff -Nru linux-5.4.55/arch/x86/crypto/.gitignore linux-5.4.55-modified/arch/x86/crypto/.gitignore |
458 |
---- linux-5.4.55/arch/x86/crypto/.gitignore 1969-12-31 19:00:00.000000000 -0500 |
459 |
-+++ linux-5.4.55-modified/arch/x86/crypto/.gitignore 2020-08-01 15:38:51.345407921 -0400 |
460 |
+diff -Nru linux-5.4.63/arch/x86/crypto/.gitignore linux-5.4.63-modified/arch/x86/crypto/.gitignore |
461 |
+--- linux-5.4.63/arch/x86/crypto/.gitignore 1969-12-31 19:00:00.000000000 -0500 |
462 |
++++ linux-5.4.63-modified/arch/x86/crypto/.gitignore 2020-09-08 18:16:45.717318086 -0400 |
463 |
@@ -0,0 +1 @@ |
464 |
+poly1305-x86_64-cryptogams.S |
465 |
-diff -Nru linux-5.4.55/arch/x86/crypto/Makefile linux-5.4.55-modified/arch/x86/crypto/Makefile |
466 |
---- linux-5.4.55/arch/x86/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 |
467 |
-+++ linux-5.4.55-modified/arch/x86/crypto/Makefile 2020-08-01 15:38:51.346407928 -0400 |
468 |
+diff -Nru linux-5.4.63/arch/x86/crypto/Makefile linux-5.4.63-modified/arch/x86/crypto/Makefile |
469 |
+--- linux-5.4.63/arch/x86/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 |
470 |
++++ linux-5.4.63-modified/arch/x86/crypto/Makefile 2020-09-08 18:16:45.719318110 -0400 |
471 |
@@ -11,6 +11,7 @@ |
472 |
avx512_supported :=$(call as-instr,vpmovm2b %k1$(comma)%zmm5,yes,no) |
473 |
sha1_ni_supported :=$(call as-instr,sha1msg1 %xmm0$(comma)%xmm1,yes,no) |
474 |
@@ -12839,9 +12839,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/Makefile linux-5.4.55-modified/arch/x86/c |
475 |
+ cmd_perlasm = $(PERL) $< > $@ |
476 |
+$(obj)/%.S: $(src)/%.pl FORCE |
477 |
+ $(call if_changed,perlasm) |
478 |
-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 |
479 |
---- linux-5.4.55/arch/x86/crypto/poly1305-avx2-x86_64.S 2020-07-31 12:39:32.000000000 -0400 |
480 |
-+++ linux-5.4.55-modified/arch/x86/crypto/poly1305-avx2-x86_64.S 1969-12-31 19:00:00.000000000 -0500 |
481 |
+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 |
482 |
+--- linux-5.4.63/arch/x86/crypto/poly1305-avx2-x86_64.S 2020-09-05 05:22:51.000000000 -0400 |
483 |
++++ linux-5.4.63-modified/arch/x86/crypto/poly1305-avx2-x86_64.S 1969-12-31 19:00:00.000000000 -0500 |
484 |
@@ -1,390 +0,0 @@ |
485 |
-/* SPDX-License-Identifier: GPL-2.0-or-later */ |
486 |
-/* |
487 |
@@ -13233,9 +13233,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/poly1305-avx2-x86_64.S linux-5.4.55-modif |
488 |
- pop %rbx |
489 |
- ret |
490 |
-ENDPROC(poly1305_4block_avx2) |
491 |
-diff -Nru linux-5.4.55/arch/x86/crypto/poly1305_glue.c linux-5.4.55-modified/arch/x86/crypto/poly1305_glue.c |
492 |
---- linux-5.4.55/arch/x86/crypto/poly1305_glue.c 2020-07-31 12:39:32.000000000 -0400 |
493 |
-+++ linux-5.4.55-modified/arch/x86/crypto/poly1305_glue.c 2020-08-01 15:38:51.349407947 -0400 |
494 |
+diff -Nru linux-5.4.63/arch/x86/crypto/poly1305_glue.c linux-5.4.63-modified/arch/x86/crypto/poly1305_glue.c |
495 |
+--- linux-5.4.63/arch/x86/crypto/poly1305_glue.c 2020-09-05 05:22:51.000000000 -0400 |
496 |
++++ linux-5.4.63-modified/arch/x86/crypto/poly1305_glue.c 2020-09-08 18:16:45.721318134 -0400 |
497 |
@@ -1,131 +1,175 @@ |
498 |
-// SPDX-License-Identifier: GPL-2.0-or-later |
499 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
500 |
@@ -13643,9 +13643,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/poly1305_glue.c linux-5.4.55-modified/arc |
501 |
MODULE_DESCRIPTION("Poly1305 authenticator"); |
502 |
MODULE_ALIAS_CRYPTO("poly1305"); |
503 |
MODULE_ALIAS_CRYPTO("poly1305-simd"); |
504 |
-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 |
505 |
---- linux-5.4.55/arch/x86/crypto/poly1305-sse2-x86_64.S 2020-07-31 12:39:32.000000000 -0400 |
506 |
-+++ linux-5.4.55-modified/arch/x86/crypto/poly1305-sse2-x86_64.S 1969-12-31 19:00:00.000000000 -0500 |
507 |
+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 |
508 |
+--- linux-5.4.63/arch/x86/crypto/poly1305-sse2-x86_64.S 2020-09-05 05:22:51.000000000 -0400 |
509 |
++++ linux-5.4.63-modified/arch/x86/crypto/poly1305-sse2-x86_64.S 1969-12-31 19:00:00.000000000 -0500 |
510 |
@@ -1,590 +0,0 @@ |
511 |
-/* SPDX-License-Identifier: GPL-2.0-or-later */ |
512 |
-/* |
513 |
@@ -14237,9 +14237,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/poly1305-sse2-x86_64.S linux-5.4.55-modif |
514 |
- pop %rbx |
515 |
- ret |
516 |
-ENDPROC(poly1305_2block_sse2) |
517 |
-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 |
518 |
---- linux-5.4.55/arch/x86/crypto/poly1305-x86_64-cryptogams.pl 1969-12-31 19:00:00.000000000 -0500 |
519 |
-+++ linux-5.4.55-modified/arch/x86/crypto/poly1305-x86_64-cryptogams.pl 2020-08-01 15:38:51.344407915 -0400 |
520 |
+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 |
521 |
+--- linux-5.4.63/arch/x86/crypto/poly1305-x86_64-cryptogams.pl 1969-12-31 19:00:00.000000000 -0500 |
522 |
++++ linux-5.4.63-modified/arch/x86/crypto/poly1305-x86_64-cryptogams.pl 2020-09-08 18:16:45.717318086 -0400 |
523 |
@@ -0,0 +1,4265 @@ |
524 |
+#!/usr/bin/env perl |
525 |
+# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause |
526 |
@@ -18506,9 +18506,9 @@ diff -Nru linux-5.4.55/arch/x86/crypto/poly1305-x86_64-cryptogams.pl linux-5.4.5 |
527 |
+ print $_,"\n"; |
528 |
+} |
529 |
+close STDOUT; |
530 |
-diff -Nru linux-5.4.55/arch/x86/Makefile linux-5.4.55-modified/arch/x86/Makefile |
531 |
---- linux-5.4.55/arch/x86/Makefile 2020-07-31 12:39:32.000000000 -0400 |
532 |
-+++ linux-5.4.55-modified/arch/x86/Makefile 2020-08-01 15:38:51.346407928 -0400 |
533 |
+diff -Nru linux-5.4.63/arch/x86/Makefile linux-5.4.63-modified/arch/x86/Makefile |
534 |
+--- linux-5.4.63/arch/x86/Makefile 2020-09-05 05:22:51.000000000 -0400 |
535 |
++++ linux-5.4.63-modified/arch/x86/Makefile 2020-09-08 18:16:45.719318110 -0400 |
536 |
@@ -194,9 +194,10 @@ |
537 |
avx512_instr :=$(call as-instr,vpmovm2b %k1$(comma)%zmm5,-DCONFIG_AS_AVX512=1) |
538 |
sha1_ni_instr :=$(call as-instr,sha1msg1 %xmm0$(comma)%xmm1,-DCONFIG_AS_SHA1_NI=1) |
539 |
@@ -18522,9 +18522,9 @@ diff -Nru linux-5.4.55/arch/x86/Makefile linux-5.4.55-modified/arch/x86/Makefile |
540 |
|
541 |
KBUILD_LDFLAGS := -m elf_$(UTS_MACHINE) |
542 |
|
543 |
-diff -Nru linux-5.4.55/crypto/adiantum.c linux-5.4.55-modified/crypto/adiantum.c |
544 |
---- linux-5.4.55/crypto/adiantum.c 2020-07-31 12:39:32.000000000 -0400 |
545 |
-+++ linux-5.4.55-modified/crypto/adiantum.c 2020-08-01 15:38:51.342407902 -0400 |
546 |
+diff -Nru linux-5.4.63/crypto/adiantum.c linux-5.4.63-modified/crypto/adiantum.c |
547 |
+--- linux-5.4.63/crypto/adiantum.c 2020-09-05 05:22:51.000000000 -0400 |
548 |
++++ linux-5.4.63-modified/crypto/adiantum.c 2020-09-08 18:16:45.715318061 -0400 |
549 |
@@ -33,6 +33,7 @@ |
550 |
#include <crypto/b128ops.h> |
551 |
#include <crypto/chacha.h> |
552 |
@@ -18559,9 +18559,9 @@ diff -Nru linux-5.4.55/crypto/adiantum.c linux-5.4.55-modified/crypto/adiantum.c |
553 |
} |
554 |
|
555 |
/* Hash the left-hand part (the "bulk") of the message using NHPoly1305 */ |
556 |
-diff -Nru linux-5.4.55/crypto/blake2s_generic.c linux-5.4.55-modified/crypto/blake2s_generic.c |
557 |
---- linux-5.4.55/crypto/blake2s_generic.c 1969-12-31 19:00:00.000000000 -0500 |
558 |
-+++ linux-5.4.55-modified/crypto/blake2s_generic.c 2020-08-01 15:38:51.330407826 -0400 |
559 |
+diff -Nru linux-5.4.63/crypto/blake2s_generic.c linux-5.4.63-modified/crypto/blake2s_generic.c |
560 |
+--- linux-5.4.63/crypto/blake2s_generic.c 1969-12-31 19:00:00.000000000 -0500 |
561 |
++++ linux-5.4.63-modified/crypto/blake2s_generic.c 2020-09-08 18:16:45.704317927 -0400 |
562 |
@@ -0,0 +1,171 @@ |
563 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
564 |
+/* |
565 |
@@ -18734,9 +18734,9 @@ diff -Nru linux-5.4.55/crypto/blake2s_generic.c linux-5.4.55-modified/crypto/bla |
566 |
+MODULE_ALIAS_CRYPTO("blake2s-256"); |
567 |
+MODULE_ALIAS_CRYPTO("blake2s-256-generic"); |
568 |
+MODULE_LICENSE("GPL v2"); |
569 |
-diff -Nru linux-5.4.55/crypto/chacha_generic.c linux-5.4.55-modified/crypto/chacha_generic.c |
570 |
---- linux-5.4.55/crypto/chacha_generic.c 2020-07-31 12:39:32.000000000 -0400 |
571 |
-+++ linux-5.4.55-modified/crypto/chacha_generic.c 2020-08-01 15:38:51.339407883 -0400 |
572 |
+diff -Nru linux-5.4.63/crypto/chacha_generic.c linux-5.4.63-modified/crypto/chacha_generic.c |
573 |
+--- linux-5.4.63/crypto/chacha_generic.c 2020-09-05 05:22:51.000000000 -0400 |
574 |
++++ linux-5.4.63-modified/crypto/chacha_generic.c 2020-09-08 18:16:45.713318037 -0400 |
575 |
@@ -8,29 +8,10 @@ |
576 |
|
577 |
#include <asm/unaligned.h> |
578 |
@@ -18903,9 +18903,9 @@ diff -Nru linux-5.4.55/crypto/chacha_generic.c linux-5.4.55-modified/crypto/chac |
579 |
.encrypt = crypto_xchacha_crypt, |
580 |
.decrypt = crypto_xchacha_crypt, |
581 |
} |
582 |
-diff -Nru linux-5.4.55/crypto/curve25519-generic.c linux-5.4.55-modified/crypto/curve25519-generic.c |
583 |
---- linux-5.4.55/crypto/curve25519-generic.c 1969-12-31 19:00:00.000000000 -0500 |
584 |
-+++ linux-5.4.55-modified/crypto/curve25519-generic.c 2020-08-01 15:38:51.334407851 -0400 |
585 |
+diff -Nru linux-5.4.63/crypto/curve25519-generic.c linux-5.4.63-modified/crypto/curve25519-generic.c |
586 |
+--- linux-5.4.63/crypto/curve25519-generic.c 1969-12-31 19:00:00.000000000 -0500 |
587 |
++++ linux-5.4.63-modified/crypto/curve25519-generic.c 2020-09-08 18:16:45.708317976 -0400 |
588 |
@@ -0,0 +1,90 @@ |
589 |
+// SPDX-License-Identifier: GPL-2.0-or-later |
590 |
+ |
591 |
@@ -18997,9 +18997,9 @@ diff -Nru linux-5.4.55/crypto/curve25519-generic.c linux-5.4.55-modified/crypto/ |
592 |
+MODULE_ALIAS_CRYPTO("curve25519"); |
593 |
+MODULE_ALIAS_CRYPTO("curve25519-generic"); |
594 |
+MODULE_LICENSE("GPL"); |
595 |
-diff -Nru linux-5.4.55/crypto/Kconfig linux-5.4.55-modified/crypto/Kconfig |
596 |
---- linux-5.4.55/crypto/Kconfig 2020-07-31 12:39:32.000000000 -0400 |
597 |
-+++ linux-5.4.55-modified/crypto/Kconfig 2020-08-01 15:38:51.346407928 -0400 |
598 |
+diff -Nru linux-5.4.63/crypto/Kconfig linux-5.4.63-modified/crypto/Kconfig |
599 |
+--- linux-5.4.63/crypto/Kconfig 2020-09-05 05:22:51.000000000 -0400 |
600 |
++++ linux-5.4.63-modified/crypto/Kconfig 2020-09-08 18:16:45.719318110 -0400 |
601 |
@@ -136,8 +136,6 @@ |
602 |
Userspace configuration for cryptographic instantiations such as |
603 |
cbc(aes). |
604 |
@@ -19191,9 +19191,9 @@ diff -Nru linux-5.4.55/crypto/Kconfig linux-5.4.55-modified/crypto/Kconfig |
605 |
source "drivers/crypto/Kconfig" |
606 |
source "crypto/asymmetric_keys/Kconfig" |
607 |
source "certs/Kconfig" |
608 |
-diff -Nru linux-5.4.55/crypto/Makefile linux-5.4.55-modified/crypto/Makefile |
609 |
---- linux-5.4.55/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 |
610 |
-+++ linux-5.4.55-modified/crypto/Makefile 2020-08-01 15:38:51.334407851 -0400 |
611 |
+diff -Nru linux-5.4.63/crypto/Makefile linux-5.4.63-modified/crypto/Makefile |
612 |
+--- linux-5.4.63/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 |
613 |
++++ linux-5.4.63-modified/crypto/Makefile 2020-09-08 18:16:45.708317976 -0400 |
614 |
@@ -74,6 +74,7 @@ |
615 |
obj-$(CONFIG_CRYPTO_WP512) += wp512.o |
616 |
CFLAGS_wp512.o := $(call cc-option,-fno-schedule-insns) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149 |
617 |
@@ -19210,9 +19210,9 @@ diff -Nru linux-5.4.55/crypto/Makefile linux-5.4.55-modified/crypto/Makefile |
618 |
|
619 |
ecdh_generic-y += ecdh.o |
620 |
ecdh_generic-y += ecdh_helper.o |
621 |
-diff -Nru linux-5.4.55/crypto/nhpoly1305.c linux-5.4.55-modified/crypto/nhpoly1305.c |
622 |
---- linux-5.4.55/crypto/nhpoly1305.c 2020-07-31 12:39:32.000000000 -0400 |
623 |
-+++ linux-5.4.55-modified/crypto/nhpoly1305.c 2020-08-01 15:38:51.342407902 -0400 |
624 |
+diff -Nru linux-5.4.63/crypto/nhpoly1305.c linux-5.4.63-modified/crypto/nhpoly1305.c |
625 |
+--- linux-5.4.63/crypto/nhpoly1305.c 2020-09-05 05:22:51.000000000 -0400 |
626 |
++++ linux-5.4.63-modified/crypto/nhpoly1305.c 2020-09-08 18:16:45.715318061 -0400 |
627 |
@@ -33,6 +33,7 @@ |
628 |
#include <asm/unaligned.h> |
629 |
#include <crypto/algapi.h> |
630 |
@@ -19239,9 +19239,9 @@ diff -Nru linux-5.4.55/crypto/nhpoly1305.c linux-5.4.55-modified/crypto/nhpoly13 |
631 |
return 0; |
632 |
} |
633 |
EXPORT_SYMBOL(crypto_nhpoly1305_final_helper); |
634 |
-diff -Nru linux-5.4.55/crypto/poly1305_generic.c linux-5.4.55-modified/crypto/poly1305_generic.c |
635 |
---- linux-5.4.55/crypto/poly1305_generic.c 2020-07-31 12:39:32.000000000 -0400 |
636 |
-+++ linux-5.4.55-modified/crypto/poly1305_generic.c 2020-08-01 15:38:51.342407902 -0400 |
637 |
+diff -Nru linux-5.4.63/crypto/poly1305_generic.c linux-5.4.63-modified/crypto/poly1305_generic.c |
638 |
+--- linux-5.4.63/crypto/poly1305_generic.c 2020-09-05 05:22:51.000000000 -0400 |
639 |
++++ linux-5.4.63-modified/crypto/poly1305_generic.c 2020-09-08 18:16:45.715318061 -0400 |
640 |
@@ -13,65 +13,33 @@ |
641 |
|
642 |
#include <crypto/algapi.h> |
643 |
@@ -19527,9 +19527,9 @@ diff -Nru linux-5.4.55/crypto/poly1305_generic.c linux-5.4.55-modified/crypto/po |
644 |
|
645 |
static struct shash_alg poly1305_alg = { |
646 |
.digestsize = POLY1305_DIGEST_SIZE, |
647 |
-diff -Nru linux-5.4.55/crypto/testmgr.c linux-5.4.55-modified/crypto/testmgr.c |
648 |
---- linux-5.4.55/crypto/testmgr.c 2020-07-31 12:39:32.000000000 -0400 |
649 |
-+++ linux-5.4.55-modified/crypto/testmgr.c 2020-08-01 15:38:51.332407839 -0400 |
650 |
+diff -Nru linux-5.4.63/crypto/testmgr.c linux-5.4.63-modified/crypto/testmgr.c |
651 |
+--- linux-5.4.63/crypto/testmgr.c 2020-09-05 05:22:51.000000000 -0400 |
652 |
++++ linux-5.4.63-modified/crypto/testmgr.c 2020-09-08 18:16:45.706317951 -0400 |
653 |
@@ -4035,6 +4035,30 @@ |
654 |
.test = alg_test_null, |
655 |
.fips_allowed = 1, |
656 |
@@ -19574,9 +19574,9 @@ diff -Nru linux-5.4.55/crypto/testmgr.c linux-5.4.55-modified/crypto/testmgr.c |
657 |
.alg = "deflate", |
658 |
.test = alg_test_comp, |
659 |
.fips_allowed = 1, |
660 |
-diff -Nru linux-5.4.55/crypto/testmgr.h linux-5.4.55-modified/crypto/testmgr.h |
661 |
---- linux-5.4.55/crypto/testmgr.h 2020-07-31 12:39:32.000000000 -0400 |
662 |
-+++ linux-5.4.55-modified/crypto/testmgr.h 2020-08-01 15:38:51.334407851 -0400 |
663 |
+diff -Nru linux-5.4.63/crypto/testmgr.h linux-5.4.63-modified/crypto/testmgr.h |
664 |
+--- linux-5.4.63/crypto/testmgr.h 2020-09-05 05:22:51.000000000 -0400 |
665 |
++++ linux-5.4.63-modified/crypto/testmgr.h 2020-09-08 18:16:45.708317976 -0400 |
666 |
@@ -1030,6 +1030,1231 @@ |
667 |
} |
668 |
}; |
669 |
@@ -21065,9 +21065,9 @@ diff -Nru linux-5.4.55/crypto/testmgr.h linux-5.4.55-modified/crypto/testmgr.h |
670 |
+}}; |
671 |
+ |
672 |
#endif /* _CRYPTO_TESTMGR_H */ |
673 |
-diff -Nru linux-5.4.55/drivers/net/Kconfig linux-5.4.55-modified/drivers/net/Kconfig |
674 |
---- linux-5.4.55/drivers/net/Kconfig 2020-07-31 12:39:32.000000000 -0400 |
675 |
-+++ linux-5.4.55-modified/drivers/net/Kconfig 2020-08-01 15:38:51.355407985 -0400 |
676 |
+diff -Nru linux-5.4.63/drivers/net/Kconfig linux-5.4.63-modified/drivers/net/Kconfig |
677 |
+--- linux-5.4.63/drivers/net/Kconfig 2020-09-05 05:22:51.000000000 -0400 |
678 |
++++ linux-5.4.63-modified/drivers/net/Kconfig 2020-09-08 18:16:45.727318207 -0400 |
679 |
@@ -71,6 +71,49 @@ |
680 |
To compile this driver as a module, choose M here: the module |
681 |
will be called dummy. |
682 |
@@ -21118,9 +21118,9 @@ diff -Nru linux-5.4.55/drivers/net/Kconfig linux-5.4.55-modified/drivers/net/Kco |
683 |
config EQUALIZER |
684 |
tristate "EQL (serial line load balancing) support" |
685 |
---help--- |
686 |
-diff -Nru linux-5.4.55/drivers/net/Makefile linux-5.4.55-modified/drivers/net/Makefile |
687 |
---- linux-5.4.55/drivers/net/Makefile 2020-07-31 12:39:32.000000000 -0400 |
688 |
-+++ linux-5.4.55-modified/drivers/net/Makefile 2020-08-01 15:38:51.351407959 -0400 |
689 |
+diff -Nru linux-5.4.63/drivers/net/Makefile linux-5.4.63-modified/drivers/net/Makefile |
690 |
+--- linux-5.4.63/drivers/net/Makefile 2020-09-05 05:22:51.000000000 -0400 |
691 |
++++ linux-5.4.63-modified/drivers/net/Makefile 2020-09-08 18:16:45.723318159 -0400 |
692 |
@@ -10,6 +10,7 @@ |
693 |
obj-$(CONFIG_IPVLAN) += ipvlan/ |
694 |
obj-$(CONFIG_IPVTAP) += ipvlan/ |
695 |
@@ -21129,9 +21129,9 @@ diff -Nru linux-5.4.55/drivers/net/Makefile linux-5.4.55-modified/drivers/net/Ma |
696 |
obj-$(CONFIG_EQUALIZER) += eql.o |
697 |
obj-$(CONFIG_IFB) += ifb.o |
698 |
obj-$(CONFIG_MACSEC) += macsec.o |
699 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/allowedips.c linux-5.4.55-modified/drivers/net/wireguard/allowedips.c |
700 |
---- linux-5.4.55/drivers/net/wireguard/allowedips.c 1969-12-31 19:00:00.000000000 -0500 |
701 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/allowedips.c 2020-08-01 15:38:51.358408004 -0400 |
702 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/allowedips.c linux-5.4.63-modified/drivers/net/wireguard/allowedips.c |
703 |
+--- linux-5.4.63/drivers/net/wireguard/allowedips.c 1969-12-31 19:00:00.000000000 -0500 |
704 |
++++ linux-5.4.63-modified/drivers/net/wireguard/allowedips.c 2020-09-08 18:16:45.729318232 -0400 |
705 |
@@ -0,0 +1,377 @@ |
706 |
+// SPDX-License-Identifier: GPL-2.0 |
707 |
+/* |
708 |
@@ -21510,9 +21510,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/allowedips.c linux-5.4.55-modified/ |
709 |
+} |
710 |
+ |
711 |
+#include "selftest/allowedips.c" |
712 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/allowedips.h linux-5.4.55-modified/drivers/net/wireguard/allowedips.h |
713 |
---- linux-5.4.55/drivers/net/wireguard/allowedips.h 1969-12-31 19:00:00.000000000 -0500 |
714 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/allowedips.h 2020-08-01 15:38:51.351407959 -0400 |
715 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/allowedips.h linux-5.4.63-modified/drivers/net/wireguard/allowedips.h |
716 |
+--- linux-5.4.63/drivers/net/wireguard/allowedips.h 1969-12-31 19:00:00.000000000 -0500 |
717 |
++++ linux-5.4.63-modified/drivers/net/wireguard/allowedips.h 2020-09-08 18:16:45.724318171 -0400 |
718 |
@@ -0,0 +1,59 @@ |
719 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
720 |
+/* |
721 |
@@ -21573,9 +21573,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/allowedips.h linux-5.4.55-modified/ |
722 |
+#endif |
723 |
+ |
724 |
+#endif /* _WG_ALLOWEDIPS_H */ |
725 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/cookie.c linux-5.4.55-modified/drivers/net/wireguard/cookie.c |
726 |
---- linux-5.4.55/drivers/net/wireguard/cookie.c 1969-12-31 19:00:00.000000000 -0500 |
727 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/cookie.c 2020-08-01 15:38:51.351407959 -0400 |
728 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/cookie.c linux-5.4.63-modified/drivers/net/wireguard/cookie.c |
729 |
+--- linux-5.4.63/drivers/net/wireguard/cookie.c 1969-12-31 19:00:00.000000000 -0500 |
730 |
++++ linux-5.4.63-modified/drivers/net/wireguard/cookie.c 2020-09-08 18:16:45.724318171 -0400 |
731 |
@@ -0,0 +1,236 @@ |
732 |
+// SPDX-License-Identifier: GPL-2.0 |
733 |
+/* |
734 |
@@ -21813,9 +21813,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/cookie.c linux-5.4.55-modified/driv |
735 |
+out: |
736 |
+ wg_peer_put(peer); |
737 |
+} |
738 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/cookie.h linux-5.4.55-modified/drivers/net/wireguard/cookie.h |
739 |
---- linux-5.4.55/drivers/net/wireguard/cookie.h 1969-12-31 19:00:00.000000000 -0500 |
740 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/cookie.h 2020-08-01 15:38:51.351407959 -0400 |
741 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/cookie.h linux-5.4.63-modified/drivers/net/wireguard/cookie.h |
742 |
+--- linux-5.4.63/drivers/net/wireguard/cookie.h 1969-12-31 19:00:00.000000000 -0500 |
743 |
++++ linux-5.4.63-modified/drivers/net/wireguard/cookie.h 2020-09-08 18:16:45.724318171 -0400 |
744 |
@@ -0,0 +1,59 @@ |
745 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
746 |
+/* |
747 |
@@ -21876,9 +21876,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/cookie.h linux-5.4.55-modified/driv |
748 |
+ struct wg_device *wg); |
749 |
+ |
750 |
+#endif /* _WG_COOKIE_H */ |
751 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/device.c linux-5.4.55-modified/drivers/net/wireguard/device.c |
752 |
---- linux-5.4.55/drivers/net/wireguard/device.c 1969-12-31 19:00:00.000000000 -0500 |
753 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/device.c 2020-08-01 15:38:51.366408055 -0400 |
754 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/device.c linux-5.4.63-modified/drivers/net/wireguard/device.c |
755 |
+--- linux-5.4.63/drivers/net/wireguard/device.c 1969-12-31 19:00:00.000000000 -0500 |
756 |
++++ linux-5.4.63-modified/drivers/net/wireguard/device.c 2020-09-08 18:16:45.733318281 -0400 |
757 |
@@ -0,0 +1,456 @@ |
758 |
+// SPDX-License-Identifier: GPL-2.0 |
759 |
+/* |
760 |
@@ -22336,9 +22336,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/device.c linux-5.4.55-modified/driv |
761 |
+#endif |
762 |
+ rcu_barrier(); |
763 |
+} |
764 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/device.h linux-5.4.55-modified/drivers/net/wireguard/device.h |
765 |
---- linux-5.4.55/drivers/net/wireguard/device.h 1969-12-31 19:00:00.000000000 -0500 |
766 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/device.h 2020-08-01 15:38:51.365408048 -0400 |
767 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/device.h linux-5.4.63-modified/drivers/net/wireguard/device.h |
768 |
+--- linux-5.4.63/drivers/net/wireguard/device.h 1969-12-31 19:00:00.000000000 -0500 |
769 |
++++ linux-5.4.63-modified/drivers/net/wireguard/device.h 2020-09-08 18:16:45.732318268 -0400 |
770 |
@@ -0,0 +1,64 @@ |
771 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
772 |
+/* |
773 |
@@ -22404,9 +22404,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/device.h linux-5.4.55-modified/driv |
774 |
+void wg_device_uninit(void); |
775 |
+ |
776 |
+#endif /* _WG_DEVICE_H */ |
777 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/main.c linux-5.4.55-modified/drivers/net/wireguard/main.c |
778 |
---- linux-5.4.55/drivers/net/wireguard/main.c 1969-12-31 19:00:00.000000000 -0500 |
779 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/main.c 2020-08-01 15:38:51.355407985 -0400 |
780 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/main.c linux-5.4.63-modified/drivers/net/wireguard/main.c |
781 |
+--- linux-5.4.63/drivers/net/wireguard/main.c 1969-12-31 19:00:00.000000000 -0500 |
782 |
++++ linux-5.4.63-modified/drivers/net/wireguard/main.c 2020-09-08 18:16:45.727318207 -0400 |
783 |
@@ -0,0 +1,63 @@ |
784 |
+// SPDX-License-Identifier: GPL-2.0 |
785 |
+/* |
786 |
@@ -22471,9 +22471,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/main.c linux-5.4.55-modified/driver |
787 |
+MODULE_VERSION(WIREGUARD_VERSION); |
788 |
+MODULE_ALIAS_RTNL_LINK(KBUILD_MODNAME); |
789 |
+MODULE_ALIAS_GENL_FAMILY(WG_GENL_NAME); |
790 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/Makefile linux-5.4.55-modified/drivers/net/wireguard/Makefile |
791 |
---- linux-5.4.55/drivers/net/wireguard/Makefile 1969-12-31 19:00:00.000000000 -0500 |
792 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/Makefile 2020-08-01 15:38:51.351407959 -0400 |
793 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/Makefile linux-5.4.63-modified/drivers/net/wireguard/Makefile |
794 |
+--- linux-5.4.63/drivers/net/wireguard/Makefile 1969-12-31 19:00:00.000000000 -0500 |
795 |
++++ linux-5.4.63-modified/drivers/net/wireguard/Makefile 2020-09-08 18:16:45.723318159 -0400 |
796 |
@@ -0,0 +1,18 @@ |
797 |
+ccflags-y := -O3 |
798 |
+ccflags-y += -D'pr_fmt(fmt)=KBUILD_MODNAME ": " fmt' |
799 |
@@ -22493,9 +22493,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/Makefile linux-5.4.55-modified/driv |
800 |
+wireguard-y += cookie.o |
801 |
+wireguard-y += netlink.o |
802 |
+obj-$(CONFIG_WIREGUARD) := wireguard.o |
803 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/messages.h linux-5.4.55-modified/drivers/net/wireguard/messages.h |
804 |
---- linux-5.4.55/drivers/net/wireguard/messages.h 1969-12-31 19:00:00.000000000 -0500 |
805 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/messages.h 2020-08-01 15:38:51.363408036 -0400 |
806 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/messages.h linux-5.4.63-modified/drivers/net/wireguard/messages.h |
807 |
+--- linux-5.4.63/drivers/net/wireguard/messages.h 1969-12-31 19:00:00.000000000 -0500 |
808 |
++++ linux-5.4.63-modified/drivers/net/wireguard/messages.h 2020-09-08 18:16:45.732318268 -0400 |
809 |
@@ -0,0 +1,128 @@ |
810 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
811 |
+/* |
812 |
@@ -22625,9 +22625,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/messages.h linux-5.4.55-modified/dr |
813 |
+enum { HANDSHAKE_DSCP = 0x88 /* AF41, plus 00 ECN */ }; |
814 |
+ |
815 |
+#endif /* _WG_MESSAGES_H */ |
816 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.c linux-5.4.55-modified/drivers/net/wireguard/netlink.c |
817 |
---- linux-5.4.55/drivers/net/wireguard/netlink.c 1969-12-31 19:00:00.000000000 -0500 |
818 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/netlink.c 2020-08-01 15:38:51.365408048 -0400 |
819 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/netlink.c linux-5.4.63-modified/drivers/net/wireguard/netlink.c |
820 |
+--- linux-5.4.63/drivers/net/wireguard/netlink.c 1969-12-31 19:00:00.000000000 -0500 |
821 |
++++ linux-5.4.63-modified/drivers/net/wireguard/netlink.c 2020-09-08 18:16:45.733318281 -0400 |
822 |
@@ -0,0 +1,646 @@ |
823 |
+// SPDX-License-Identifier: GPL-2.0 |
824 |
+/* |
825 |
@@ -22653,8 +22653,8 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.c linux-5.4.55-modified/dri |
826 |
+static const struct nla_policy device_policy[WGDEVICE_A_MAX + 1] = { |
827 |
+ [WGDEVICE_A_IFINDEX] = { .type = NLA_U32 }, |
828 |
+ [WGDEVICE_A_IFNAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 }, |
829 |
-+ [WGDEVICE_A_PRIVATE_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_PUBLIC_KEY_LEN }, |
830 |
-+ [WGDEVICE_A_PUBLIC_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_PUBLIC_KEY_LEN }, |
831 |
++ [WGDEVICE_A_PRIVATE_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN), |
832 |
++ [WGDEVICE_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN), |
833 |
+ [WGDEVICE_A_FLAGS] = { .type = NLA_U32 }, |
834 |
+ [WGDEVICE_A_LISTEN_PORT] = { .type = NLA_U16 }, |
835 |
+ [WGDEVICE_A_FWMARK] = { .type = NLA_U32 }, |
836 |
@@ -22662,12 +22662,12 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.c linux-5.4.55-modified/dri |
837 |
+}; |
838 |
+ |
839 |
+static const struct nla_policy peer_policy[WGPEER_A_MAX + 1] = { |
840 |
-+ [WGPEER_A_PUBLIC_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_PUBLIC_KEY_LEN }, |
841 |
-+ [WGPEER_A_PRESHARED_KEY] = { .type = NLA_EXACT_LEN, .len = NOISE_SYMMETRIC_KEY_LEN }, |
842 |
++ [WGPEER_A_PUBLIC_KEY] = NLA_POLICY_EXACT_LEN(NOISE_PUBLIC_KEY_LEN), |
843 |
++ [WGPEER_A_PRESHARED_KEY] = NLA_POLICY_EXACT_LEN(NOISE_SYMMETRIC_KEY_LEN), |
844 |
+ [WGPEER_A_FLAGS] = { .type = NLA_U32 }, |
845 |
-+ [WGPEER_A_ENDPOINT] = { .type = NLA_MIN_LEN, .len = sizeof(struct sockaddr) }, |
846 |
++ [WGPEER_A_ENDPOINT] = NLA_POLICY_MIN_LEN(sizeof(struct sockaddr)), |
847 |
+ [WGPEER_A_PERSISTENT_KEEPALIVE_INTERVAL] = { .type = NLA_U16 }, |
848 |
-+ [WGPEER_A_LAST_HANDSHAKE_TIME] = { .type = NLA_EXACT_LEN, .len = sizeof(struct __kernel_timespec) }, |
849 |
++ [WGPEER_A_LAST_HANDSHAKE_TIME] = NLA_POLICY_EXACT_LEN(sizeof(struct __kernel_timespec)), |
850 |
+ [WGPEER_A_RX_BYTES] = { .type = NLA_U64 }, |
851 |
+ [WGPEER_A_TX_BYTES] = { .type = NLA_U64 }, |
852 |
+ [WGPEER_A_ALLOWEDIPS] = { .type = NLA_NESTED }, |
853 |
@@ -22676,7 +22676,7 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.c linux-5.4.55-modified/dri |
854 |
+ |
855 |
+static const struct nla_policy allowedip_policy[WGALLOWEDIP_A_MAX + 1] = { |
856 |
+ [WGALLOWEDIP_A_FAMILY] = { .type = NLA_U16 }, |
857 |
-+ [WGALLOWEDIP_A_IPADDR] = { .type = NLA_MIN_LEN, .len = sizeof(struct in_addr) }, |
858 |
++ [WGALLOWEDIP_A_IPADDR] = NLA_POLICY_MIN_LEN(sizeof(struct in_addr)), |
859 |
+ [WGALLOWEDIP_A_CIDR_MASK] = { .type = NLA_U8 } |
860 |
+}; |
861 |
+ |
862 |
@@ -23275,9 +23275,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.c linux-5.4.55-modified/dri |
863 |
+{ |
864 |
+ genl_unregister_family(&genl_family); |
865 |
+} |
866 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.h linux-5.4.55-modified/drivers/net/wireguard/netlink.h |
867 |
---- linux-5.4.55/drivers/net/wireguard/netlink.h 1969-12-31 19:00:00.000000000 -0500 |
868 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/netlink.h 2020-08-01 15:38:51.352407966 -0400 |
869 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/netlink.h linux-5.4.63-modified/drivers/net/wireguard/netlink.h |
870 |
+--- linux-5.4.63/drivers/net/wireguard/netlink.h 1969-12-31 19:00:00.000000000 -0500 |
871 |
++++ linux-5.4.63-modified/drivers/net/wireguard/netlink.h 2020-09-08 18:16:45.724318171 -0400 |
872 |
@@ -0,0 +1,12 @@ |
873 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
874 |
+/* |
875 |
@@ -23291,9 +23291,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/netlink.h linux-5.4.55-modified/dri |
876 |
+void wg_genetlink_uninit(void); |
877 |
+ |
878 |
+#endif /* _WG_NETLINK_H */ |
879 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/noise.c linux-5.4.55-modified/drivers/net/wireguard/noise.c |
880 |
---- linux-5.4.55/drivers/net/wireguard/noise.c 1969-12-31 19:00:00.000000000 -0500 |
881 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/noise.c 2020-08-01 15:38:51.365408048 -0400 |
882 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/noise.c linux-5.4.63-modified/drivers/net/wireguard/noise.c |
883 |
+--- linux-5.4.63/drivers/net/wireguard/noise.c 1969-12-31 19:00:00.000000000 -0500 |
884 |
++++ linux-5.4.63-modified/drivers/net/wireguard/noise.c 2020-09-08 18:16:45.732318268 -0400 |
885 |
@@ -0,0 +1,831 @@ |
886 |
+// SPDX-License-Identifier: GPL-2.0 |
887 |
+/* |
888 |
@@ -24126,9 +24126,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/noise.c linux-5.4.55-modified/drive |
889 |
+ up_write(&handshake->lock); |
890 |
+ return ret; |
891 |
+} |
892 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/noise.h linux-5.4.55-modified/drivers/net/wireguard/noise.h |
893 |
---- linux-5.4.55/drivers/net/wireguard/noise.h 1969-12-31 19:00:00.000000000 -0500 |
894 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/noise.h 2020-08-01 15:38:51.364408042 -0400 |
895 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/noise.h linux-5.4.63-modified/drivers/net/wireguard/noise.h |
896 |
+--- linux-5.4.63/drivers/net/wireguard/noise.h 1969-12-31 19:00:00.000000000 -0500 |
897 |
++++ linux-5.4.63-modified/drivers/net/wireguard/noise.h 2020-09-08 18:16:45.732318268 -0400 |
898 |
@@ -0,0 +1,135 @@ |
899 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
900 |
+/* |
901 |
@@ -24265,9 +24265,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/noise.h linux-5.4.55-modified/drive |
902 |
+ struct noise_keypairs *keypairs); |
903 |
+ |
904 |
+#endif /* _WG_NOISE_H */ |
905 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/peer.c linux-5.4.55-modified/drivers/net/wireguard/peer.c |
906 |
---- linux-5.4.55/drivers/net/wireguard/peer.c 1969-12-31 19:00:00.000000000 -0500 |
907 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/peer.c 2020-08-01 15:38:51.361408023 -0400 |
908 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/peer.c linux-5.4.63-modified/drivers/net/wireguard/peer.c |
909 |
+--- linux-5.4.63/drivers/net/wireguard/peer.c 1969-12-31 19:00:00.000000000 -0500 |
910 |
++++ linux-5.4.63-modified/drivers/net/wireguard/peer.c 2020-09-08 18:16:45.730318244 -0400 |
911 |
@@ -0,0 +1,237 @@ |
912 |
+// SPDX-License-Identifier: GPL-2.0 |
913 |
+/* |
914 |
@@ -24506,9 +24506,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/peer.c linux-5.4.55-modified/driver |
915 |
+ return; |
916 |
+ kref_put(&peer->refcount, kref_release); |
917 |
+} |
918 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/peer.h linux-5.4.55-modified/drivers/net/wireguard/peer.h |
919 |
---- linux-5.4.55/drivers/net/wireguard/peer.h 1969-12-31 19:00:00.000000000 -0500 |
920 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/peer.h 2020-08-01 15:38:51.352407966 -0400 |
921 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/peer.h linux-5.4.63-modified/drivers/net/wireguard/peer.h |
922 |
+--- linux-5.4.63/drivers/net/wireguard/peer.h 1969-12-31 19:00:00.000000000 -0500 |
923 |
++++ linux-5.4.63-modified/drivers/net/wireguard/peer.h 2020-09-08 18:16:45.725318183 -0400 |
924 |
@@ -0,0 +1,83 @@ |
925 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
926 |
+/* |
927 |
@@ -24593,9 +24593,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/peer.h linux-5.4.55-modified/driver |
928 |
+void wg_peer_remove_all(struct wg_device *wg); |
929 |
+ |
930 |
+#endif /* _WG_PEER_H */ |
931 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/peerlookup.c linux-5.4.55-modified/drivers/net/wireguard/peerlookup.c |
932 |
---- linux-5.4.55/drivers/net/wireguard/peerlookup.c 1969-12-31 19:00:00.000000000 -0500 |
933 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/peerlookup.c 2020-08-01 15:38:51.352407966 -0400 |
934 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/peerlookup.c linux-5.4.63-modified/drivers/net/wireguard/peerlookup.c |
935 |
+--- linux-5.4.63/drivers/net/wireguard/peerlookup.c 1969-12-31 19:00:00.000000000 -0500 |
936 |
++++ linux-5.4.63-modified/drivers/net/wireguard/peerlookup.c 2020-09-08 18:16:45.725318183 -0400 |
937 |
@@ -0,0 +1,221 @@ |
938 |
+// SPDX-License-Identifier: GPL-2.0 |
939 |
+/* |
940 |
@@ -24818,9 +24818,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/peerlookup.c linux-5.4.55-modified/ |
941 |
+ rcu_read_unlock_bh(); |
942 |
+ return entry; |
943 |
+} |
944 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/peerlookup.h linux-5.4.55-modified/drivers/net/wireguard/peerlookup.h |
945 |
---- linux-5.4.55/drivers/net/wireguard/peerlookup.h 1969-12-31 19:00:00.000000000 -0500 |
946 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/peerlookup.h 2020-08-01 15:38:51.352407966 -0400 |
947 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/peerlookup.h linux-5.4.63-modified/drivers/net/wireguard/peerlookup.h |
948 |
+--- linux-5.4.63/drivers/net/wireguard/peerlookup.h 1969-12-31 19:00:00.000000000 -0500 |
949 |
++++ linux-5.4.63-modified/drivers/net/wireguard/peerlookup.h 2020-09-08 18:16:45.725318183 -0400 |
950 |
@@ -0,0 +1,64 @@ |
951 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
952 |
+/* |
953 |
@@ -24886,9 +24886,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/peerlookup.h linux-5.4.55-modified/ |
954 |
+ const __le32 index, struct wg_peer **peer); |
955 |
+ |
956 |
+#endif /* _WG_PEERLOOKUP_H */ |
957 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/queueing.c linux-5.4.55-modified/drivers/net/wireguard/queueing.c |
958 |
---- linux-5.4.55/drivers/net/wireguard/queueing.c 1969-12-31 19:00:00.000000000 -0500 |
959 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/queueing.c 2020-08-01 15:38:51.361408023 -0400 |
960 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/queueing.c linux-5.4.63-modified/drivers/net/wireguard/queueing.c |
961 |
+--- linux-5.4.63/drivers/net/wireguard/queueing.c 1969-12-31 19:00:00.000000000 -0500 |
962 |
++++ linux-5.4.63-modified/drivers/net/wireguard/queueing.c 2020-09-08 18:16:45.731318256 -0400 |
963 |
@@ -0,0 +1,55 @@ |
964 |
+// SPDX-License-Identifier: GPL-2.0 |
965 |
+/* |
966 |
@@ -24945,9 +24945,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/queueing.c linux-5.4.55-modified/dr |
967 |
+ WARN_ON(!__ptr_ring_empty(&queue->ring)); |
968 |
+ ptr_ring_cleanup(&queue->ring, NULL); |
969 |
+} |
970 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/queueing.h linux-5.4.55-modified/drivers/net/wireguard/queueing.h |
971 |
---- linux-5.4.55/drivers/net/wireguard/queueing.h 1969-12-31 19:00:00.000000000 -0500 |
972 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/queueing.h 2020-08-01 15:38:51.366408055 -0400 |
973 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/queueing.h linux-5.4.63-modified/drivers/net/wireguard/queueing.h |
974 |
+--- linux-5.4.63/drivers/net/wireguard/queueing.h 1969-12-31 19:00:00.000000000 -0500 |
975 |
++++ linux-5.4.63-modified/drivers/net/wireguard/queueing.h 2020-09-08 18:16:45.733318281 -0400 |
976 |
@@ -0,0 +1,193 @@ |
977 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
978 |
+/* |
979 |
@@ -25142,9 +25142,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/queueing.h linux-5.4.55-modified/dr |
980 |
+#endif |
981 |
+ |
982 |
+#endif /* _WG_QUEUEING_H */ |
983 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/ratelimiter.c linux-5.4.55-modified/drivers/net/wireguard/ratelimiter.c |
984 |
---- linux-5.4.55/drivers/net/wireguard/ratelimiter.c 1969-12-31 19:00:00.000000000 -0500 |
985 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/ratelimiter.c 2020-08-01 15:38:51.353407972 -0400 |
986 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/ratelimiter.c linux-5.4.63-modified/drivers/net/wireguard/ratelimiter.c |
987 |
+--- linux-5.4.63/drivers/net/wireguard/ratelimiter.c 1969-12-31 19:00:00.000000000 -0500 |
988 |
++++ linux-5.4.63-modified/drivers/net/wireguard/ratelimiter.c 2020-09-08 18:16:45.725318183 -0400 |
989 |
@@ -0,0 +1,223 @@ |
990 |
+// SPDX-License-Identifier: GPL-2.0 |
991 |
+/* |
992 |
@@ -25369,9 +25369,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/ratelimiter.c linux-5.4.55-modified |
993 |
+} |
994 |
+ |
995 |
+#include "selftest/ratelimiter.c" |
996 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/ratelimiter.h linux-5.4.55-modified/drivers/net/wireguard/ratelimiter.h |
997 |
---- linux-5.4.55/drivers/net/wireguard/ratelimiter.h 1969-12-31 19:00:00.000000000 -0500 |
998 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/ratelimiter.h 2020-08-01 15:38:51.353407972 -0400 |
999 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/ratelimiter.h linux-5.4.63-modified/drivers/net/wireguard/ratelimiter.h |
1000 |
+--- linux-5.4.63/drivers/net/wireguard/ratelimiter.h 1969-12-31 19:00:00.000000000 -0500 |
1001 |
++++ linux-5.4.63-modified/drivers/net/wireguard/ratelimiter.h 2020-09-08 18:16:45.725318183 -0400 |
1002 |
@@ -0,0 +1,19 @@ |
1003 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
1004 |
+/* |
1005 |
@@ -25392,9 +25392,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/ratelimiter.h linux-5.4.55-modified |
1006 |
+#endif |
1007 |
+ |
1008 |
+#endif /* _WG_RATELIMITER_H */ |
1009 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/receive.c linux-5.4.55-modified/drivers/net/wireguard/receive.c |
1010 |
---- linux-5.4.55/drivers/net/wireguard/receive.c 1969-12-31 19:00:00.000000000 -0500 |
1011 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/receive.c 2020-08-01 15:38:51.366408055 -0400 |
1012 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/receive.c linux-5.4.63-modified/drivers/net/wireguard/receive.c |
1013 |
+--- linux-5.4.63/drivers/net/wireguard/receive.c 1969-12-31 19:00:00.000000000 -0500 |
1014 |
++++ linux-5.4.63-modified/drivers/net/wireguard/receive.c 2020-09-08 18:16:45.733318281 -0400 |
1015 |
@@ -0,0 +1,590 @@ |
1016 |
+// SPDX-License-Identifier: GPL-2.0 |
1017 |
+/* |
1018 |
@@ -25986,9 +25986,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/receive.c linux-5.4.55-modified/dri |
1019 |
+err: |
1020 |
+ dev_kfree_skb(skb); |
1021 |
+} |
1022 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/allowedips.c linux-5.4.55-modified/drivers/net/wireguard/selftest/allowedips.c |
1023 |
---- linux-5.4.55/drivers/net/wireguard/selftest/allowedips.c 1969-12-31 19:00:00.000000000 -0500 |
1024 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/selftest/allowedips.c 2020-08-01 15:38:51.353407972 -0400 |
1025 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/selftest/allowedips.c linux-5.4.63-modified/drivers/net/wireguard/selftest/allowedips.c |
1026 |
+--- linux-5.4.63/drivers/net/wireguard/selftest/allowedips.c 1969-12-31 19:00:00.000000000 -0500 |
1027 |
++++ linux-5.4.63-modified/drivers/net/wireguard/selftest/allowedips.c 2020-09-08 18:16:45.725318183 -0400 |
1028 |
@@ -0,0 +1,683 @@ |
1029 |
+// SPDX-License-Identifier: GPL-2.0 |
1030 |
+/* |
1031 |
@@ -26673,9 +26673,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/allowedips.c linux-5.4.55- |
1032 |
+#undef init_peer |
1033 |
+ |
1034 |
+#endif |
1035 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/counter.c linux-5.4.55-modified/drivers/net/wireguard/selftest/counter.c |
1036 |
---- linux-5.4.55/drivers/net/wireguard/selftest/counter.c 1969-12-31 19:00:00.000000000 -0500 |
1037 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/selftest/counter.c 2020-08-01 15:38:51.364408042 -0400 |
1038 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/selftest/counter.c linux-5.4.63-modified/drivers/net/wireguard/selftest/counter.c |
1039 |
+--- linux-5.4.63/drivers/net/wireguard/selftest/counter.c 1969-12-31 19:00:00.000000000 -0500 |
1040 |
++++ linux-5.4.63-modified/drivers/net/wireguard/selftest/counter.c 2020-09-08 18:16:45.732318268 -0400 |
1041 |
@@ -0,0 +1,111 @@ |
1042 |
+// SPDX-License-Identifier: GPL-2.0 |
1043 |
+/* |
1044 |
@@ -26788,9 +26788,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/counter.c linux-5.4.55-mod |
1045 |
+ return success; |
1046 |
+} |
1047 |
+#endif |
1048 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/ratelimiter.c linux-5.4.55-modified/drivers/net/wireguard/selftest/ratelimiter.c |
1049 |
---- linux-5.4.55/drivers/net/wireguard/selftest/ratelimiter.c 1969-12-31 19:00:00.000000000 -0500 |
1050 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/selftest/ratelimiter.c 2020-08-01 15:38:51.362408029 -0400 |
1051 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/selftest/ratelimiter.c linux-5.4.63-modified/drivers/net/wireguard/selftest/ratelimiter.c |
1052 |
+--- linux-5.4.63/drivers/net/wireguard/selftest/ratelimiter.c 1969-12-31 19:00:00.000000000 -0500 |
1053 |
++++ linux-5.4.63-modified/drivers/net/wireguard/selftest/ratelimiter.c 2020-09-08 18:16:45.731318256 -0400 |
1054 |
@@ -0,0 +1,226 @@ |
1055 |
+// SPDX-License-Identifier: GPL-2.0 |
1056 |
+/* |
1057 |
@@ -27018,9 +27018,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/selftest/ratelimiter.c linux-5.4.55 |
1058 |
+ return success; |
1059 |
+} |
1060 |
+#endif |
1061 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/send.c linux-5.4.55-modified/drivers/net/wireguard/send.c |
1062 |
---- linux-5.4.55/drivers/net/wireguard/send.c 1969-12-31 19:00:00.000000000 -0500 |
1063 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/send.c 2020-08-01 15:38:51.364408042 -0400 |
1064 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/send.c linux-5.4.63-modified/drivers/net/wireguard/send.c |
1065 |
+--- linux-5.4.63/drivers/net/wireguard/send.c 1969-12-31 19:00:00.000000000 -0500 |
1066 |
++++ linux-5.4.63-modified/drivers/net/wireguard/send.c 2020-09-08 18:16:45.732318268 -0400 |
1067 |
@@ -0,0 +1,422 @@ |
1068 |
+// SPDX-License-Identifier: GPL-2.0 |
1069 |
+/* |
1070 |
@@ -27444,9 +27444,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/send.c linux-5.4.55-modified/driver |
1071 |
+ */ |
1072 |
+ wg_packet_send_queued_handshake_initiation(peer, false); |
1073 |
+} |
1074 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/socket.c linux-5.4.55-modified/drivers/net/wireguard/socket.c |
1075 |
---- linux-5.4.55/drivers/net/wireguard/socket.c 1969-12-31 19:00:00.000000000 -0500 |
1076 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/socket.c 2020-08-01 15:38:51.365408048 -0400 |
1077 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/socket.c linux-5.4.63-modified/drivers/net/wireguard/socket.c |
1078 |
+--- linux-5.4.63/drivers/net/wireguard/socket.c 1969-12-31 19:00:00.000000000 -0500 |
1079 |
++++ linux-5.4.63-modified/drivers/net/wireguard/socket.c 2020-09-08 18:16:45.733318281 -0400 |
1080 |
@@ -0,0 +1,436 @@ |
1081 |
+// SPDX-License-Identifier: GPL-2.0 |
1082 |
+/* |
1083 |
@@ -27884,9 +27884,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/socket.c linux-5.4.55-modified/driv |
1084 |
+ sock_free(old4); |
1085 |
+ sock_free(old6); |
1086 |
+} |
1087 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/socket.h linux-5.4.55-modified/drivers/net/wireguard/socket.h |
1088 |
---- linux-5.4.55/drivers/net/wireguard/socket.h 1969-12-31 19:00:00.000000000 -0500 |
1089 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/socket.h 2020-08-01 15:38:51.353407972 -0400 |
1090 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/socket.h linux-5.4.63-modified/drivers/net/wireguard/socket.h |
1091 |
+--- linux-5.4.63/drivers/net/wireguard/socket.h 1969-12-31 19:00:00.000000000 -0500 |
1092 |
++++ linux-5.4.63-modified/drivers/net/wireguard/socket.h 2020-09-08 18:16:45.726318195 -0400 |
1093 |
@@ -0,0 +1,44 @@ |
1094 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
1095 |
+/* |
1096 |
@@ -27932,9 +27932,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/socket.h linux-5.4.55-modified/driv |
1097 |
+#endif |
1098 |
+ |
1099 |
+#endif /* _WG_SOCKET_H */ |
1100 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/timers.c linux-5.4.55-modified/drivers/net/wireguard/timers.c |
1101 |
---- linux-5.4.55/drivers/net/wireguard/timers.c 1969-12-31 19:00:00.000000000 -0500 |
1102 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/timers.c 2020-08-01 15:38:51.354407979 -0400 |
1103 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/timers.c linux-5.4.63-modified/drivers/net/wireguard/timers.c |
1104 |
+--- linux-5.4.63/drivers/net/wireguard/timers.c 1969-12-31 19:00:00.000000000 -0500 |
1105 |
++++ linux-5.4.63-modified/drivers/net/wireguard/timers.c 2020-09-08 18:16:45.726318195 -0400 |
1106 |
@@ -0,0 +1,243 @@ |
1107 |
+// SPDX-License-Identifier: GPL-2.0 |
1108 |
+/* |
1109 |
@@ -28179,9 +28179,9 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/timers.c linux-5.4.55-modified/driv |
1110 |
+ del_timer_sync(&peer->timer_persistent_keepalive); |
1111 |
+ flush_work(&peer->clear_peer_work); |
1112 |
+} |
1113 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/timers.h linux-5.4.55-modified/drivers/net/wireguard/timers.h |
1114 |
---- linux-5.4.55/drivers/net/wireguard/timers.h 1969-12-31 19:00:00.000000000 -0500 |
1115 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/timers.h 2020-08-01 15:38:51.354407979 -0400 |
1116 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/timers.h linux-5.4.63-modified/drivers/net/wireguard/timers.h |
1117 |
+--- linux-5.4.63/drivers/net/wireguard/timers.h 1969-12-31 19:00:00.000000000 -0500 |
1118 |
++++ linux-5.4.63-modified/drivers/net/wireguard/timers.h 2020-09-08 18:16:45.726318195 -0400 |
1119 |
@@ -0,0 +1,31 @@ |
1120 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
1121 |
+/* |
1122 |
@@ -28214,14 +28214,14 @@ diff -Nru linux-5.4.55/drivers/net/wireguard/timers.h linux-5.4.55-modified/driv |
1123 |
+} |
1124 |
+ |
1125 |
+#endif /* _WG_TIMERS_H */ |
1126 |
-diff -Nru linux-5.4.55/drivers/net/wireguard/version.h linux-5.4.55-modified/drivers/net/wireguard/version.h |
1127 |
---- linux-5.4.55/drivers/net/wireguard/version.h 1969-12-31 19:00:00.000000000 -0500 |
1128 |
-+++ linux-5.4.55-modified/drivers/net/wireguard/version.h 2020-08-01 15:38:51.354407979 -0400 |
1129 |
+diff -Nru linux-5.4.63/drivers/net/wireguard/version.h linux-5.4.63-modified/drivers/net/wireguard/version.h |
1130 |
+--- linux-5.4.63/drivers/net/wireguard/version.h 1969-12-31 19:00:00.000000000 -0500 |
1131 |
++++ linux-5.4.63-modified/drivers/net/wireguard/version.h 2020-09-08 18:16:45.726318195 -0400 |
1132 |
@@ -0,0 +1 @@ |
1133 |
+#define WIREGUARD_VERSION "1.0.0" |
1134 |
-diff -Nru linux-5.4.55/include/crypto/blake2s.h linux-5.4.55-modified/include/crypto/blake2s.h |
1135 |
---- linux-5.4.55/include/crypto/blake2s.h 1969-12-31 19:00:00.000000000 -0500 |
1136 |
-+++ linux-5.4.55-modified/include/crypto/blake2s.h 2020-08-01 15:38:51.327407807 -0400 |
1137 |
+diff -Nru linux-5.4.63/include/crypto/blake2s.h linux-5.4.63-modified/include/crypto/blake2s.h |
1138 |
+--- linux-5.4.63/include/crypto/blake2s.h 1969-12-31 19:00:00.000000000 -0500 |
1139 |
++++ linux-5.4.63-modified/include/crypto/blake2s.h 2020-09-08 18:16:45.701317891 -0400 |
1140 |
@@ -0,0 +1,106 @@ |
1141 |
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */ |
1142 |
+/* |
1143 |
@@ -28329,9 +28329,9 @@ diff -Nru linux-5.4.55/include/crypto/blake2s.h linux-5.4.55-modified/include/cr |
1144 |
+ const size_t keylen); |
1145 |
+ |
1146 |
+#endif /* BLAKE2S_H */ |
1147 |
-diff -Nru linux-5.4.55/include/crypto/chacha20poly1305.h linux-5.4.55-modified/include/crypto/chacha20poly1305.h |
1148 |
---- linux-5.4.55/include/crypto/chacha20poly1305.h 1969-12-31 19:00:00.000000000 -0500 |
1149 |
-+++ linux-5.4.55-modified/include/crypto/chacha20poly1305.h 2020-08-01 15:38:51.349407947 -0400 |
1150 |
+diff -Nru linux-5.4.63/include/crypto/chacha20poly1305.h linux-5.4.63-modified/include/crypto/chacha20poly1305.h |
1151 |
+--- linux-5.4.63/include/crypto/chacha20poly1305.h 1969-12-31 19:00:00.000000000 -0500 |
1152 |
++++ linux-5.4.63-modified/include/crypto/chacha20poly1305.h 2020-09-08 18:16:45.721318134 -0400 |
1153 |
@@ -0,0 +1,50 @@ |
1154 |
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */ |
1155 |
+/* |
1156 |
@@ -28383,9 +28383,9 @@ diff -Nru linux-5.4.55/include/crypto/chacha20poly1305.h linux-5.4.55-modified/i |
1157 |
+bool chacha20poly1305_selftest(void); |
1158 |
+ |
1159 |
+#endif /* __CHACHA20POLY1305_H */ |
1160 |
-diff -Nru linux-5.4.55/include/crypto/chacha.h linux-5.4.55-modified/include/crypto/chacha.h |
1161 |
---- linux-5.4.55/include/crypto/chacha.h 2020-07-31 12:39:32.000000000 -0400 |
1162 |
-+++ linux-5.4.55-modified/include/crypto/chacha.h 2020-08-01 15:38:51.349407947 -0400 |
1163 |
+diff -Nru linux-5.4.63/include/crypto/chacha.h linux-5.4.63-modified/include/crypto/chacha.h |
1164 |
+--- linux-5.4.63/include/crypto/chacha.h 2020-09-05 05:22:51.000000000 -0400 |
1165 |
++++ linux-5.4.63-modified/include/crypto/chacha.h 2020-09-08 18:16:45.722318146 -0400 |
1166 |
@@ -15,9 +15,8 @@ |
1167 |
#ifndef _CRYPTO_CHACHA_H |
1168 |
#define _CRYPTO_CHACHA_H |
1169 |
@@ -28488,9 +28488,9 @@ diff -Nru linux-5.4.55/include/crypto/chacha.h linux-5.4.55-modified/include/cry |
1170 |
+} |
1171 |
|
1172 |
#endif /* _CRYPTO_CHACHA_H */ |
1173 |
-diff -Nru linux-5.4.55/include/crypto/curve25519.h linux-5.4.55-modified/include/crypto/curve25519.h |
1174 |
---- linux-5.4.55/include/crypto/curve25519.h 1969-12-31 19:00:00.000000000 -0500 |
1175 |
-+++ linux-5.4.55-modified/include/crypto/curve25519.h 2020-08-01 15:38:51.346407928 -0400 |
1176 |
+diff -Nru linux-5.4.63/include/crypto/curve25519.h linux-5.4.63-modified/include/crypto/curve25519.h |
1177 |
+--- linux-5.4.63/include/crypto/curve25519.h 1969-12-31 19:00:00.000000000 -0500 |
1178 |
++++ linux-5.4.63-modified/include/crypto/curve25519.h 2020-09-08 18:16:45.719318110 -0400 |
1179 |
@@ -0,0 +1,73 @@ |
1180 |
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */ |
1181 |
+/* |
1182 |
@@ -28565,9 +28565,9 @@ diff -Nru linux-5.4.55/include/crypto/curve25519.h linux-5.4.55-modified/include |
1183 |
+} |
1184 |
+ |
1185 |
+#endif /* CURVE25519_H */ |
1186 |
-diff -Nru linux-5.4.55/include/crypto/internal/blake2s.h linux-5.4.55-modified/include/crypto/internal/blake2s.h |
1187 |
---- linux-5.4.55/include/crypto/internal/blake2s.h 1969-12-31 19:00:00.000000000 -0500 |
1188 |
-+++ linux-5.4.55-modified/include/crypto/internal/blake2s.h 2020-08-01 15:38:51.330407826 -0400 |
1189 |
+diff -Nru linux-5.4.63/include/crypto/internal/blake2s.h linux-5.4.63-modified/include/crypto/internal/blake2s.h |
1190 |
+--- linux-5.4.63/include/crypto/internal/blake2s.h 1969-12-31 19:00:00.000000000 -0500 |
1191 |
++++ linux-5.4.63-modified/include/crypto/internal/blake2s.h 2020-09-08 18:16:45.704317927 -0400 |
1192 |
@@ -0,0 +1,24 @@ |
1193 |
+/* SPDX-License-Identifier: GPL-2.0 OR MIT */ |
1194 |
+ |
1195 |
@@ -28593,9 +28593,9 @@ diff -Nru linux-5.4.55/include/crypto/internal/blake2s.h linux-5.4.55-modified/i |
1196 |
+} |
1197 |
+ |
1198 |
+#endif /* BLAKE2S_INTERNAL_H */ |
1199 |
-diff -Nru linux-5.4.55/include/crypto/internal/chacha.h linux-5.4.55-modified/include/crypto/internal/chacha.h |
1200 |
---- linux-5.4.55/include/crypto/internal/chacha.h 1969-12-31 19:00:00.000000000 -0500 |
1201 |
-+++ linux-5.4.55-modified/include/crypto/internal/chacha.h 2020-08-01 15:38:51.340407890 -0400 |
1202 |
+diff -Nru linux-5.4.63/include/crypto/internal/chacha.h linux-5.4.63-modified/include/crypto/internal/chacha.h |
1203 |
+--- linux-5.4.63/include/crypto/internal/chacha.h 1969-12-31 19:00:00.000000000 -0500 |
1204 |
++++ linux-5.4.63-modified/include/crypto/internal/chacha.h 2020-09-08 18:16:45.714318049 -0400 |
1205 |
@@ -0,0 +1,43 @@ |
1206 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
1207 |
+ |
1208 |
@@ -28640,9 +28640,9 @@ diff -Nru linux-5.4.55/include/crypto/internal/chacha.h linux-5.4.55-modified/in |
1209 |
+} |
1210 |
+ |
1211 |
+#endif /* _CRYPTO_CHACHA_H */ |
1212 |
-diff -Nru linux-5.4.55/include/crypto/internal/poly1305.h linux-5.4.55-modified/include/crypto/internal/poly1305.h |
1213 |
---- linux-5.4.55/include/crypto/internal/poly1305.h 1969-12-31 19:00:00.000000000 -0500 |
1214 |
-+++ linux-5.4.55-modified/include/crypto/internal/poly1305.h 2020-08-01 15:38:51.342407902 -0400 |
1215 |
+diff -Nru linux-5.4.63/include/crypto/internal/poly1305.h linux-5.4.63-modified/include/crypto/internal/poly1305.h |
1216 |
+--- linux-5.4.63/include/crypto/internal/poly1305.h 1969-12-31 19:00:00.000000000 -0500 |
1217 |
++++ linux-5.4.63-modified/include/crypto/internal/poly1305.h 2020-09-08 18:16:45.715318061 -0400 |
1218 |
@@ -0,0 +1,33 @@ |
1219 |
+/* SPDX-License-Identifier: GPL-2.0 */ |
1220 |
+/* |
1221 |
@@ -28677,9 +28677,9 @@ diff -Nru linux-5.4.55/include/crypto/internal/poly1305.h linux-5.4.55-modified/ |
1222 |
+ void *dst); |
1223 |
+ |
1224 |
+#endif |
1225 |
-diff -Nru linux-5.4.55/include/crypto/nhpoly1305.h linux-5.4.55-modified/include/crypto/nhpoly1305.h |
1226 |
---- linux-5.4.55/include/crypto/nhpoly1305.h 2020-07-31 12:39:32.000000000 -0400 |
1227 |
-+++ linux-5.4.55-modified/include/crypto/nhpoly1305.h 2020-08-01 15:38:51.342407902 -0400 |
1228 |
+diff -Nru linux-5.4.63/include/crypto/nhpoly1305.h linux-5.4.63-modified/include/crypto/nhpoly1305.h |
1229 |
+--- linux-5.4.63/include/crypto/nhpoly1305.h 2020-09-05 05:22:51.000000000 -0400 |
1230 |
++++ linux-5.4.63-modified/include/crypto/nhpoly1305.h 2020-09-08 18:16:45.715318061 -0400 |
1231 |
@@ -7,7 +7,7 @@ |
1232 |
#define _NHPOLY1305_H |
1233 |
|
1234 |
@@ -28698,9 +28698,9 @@ diff -Nru linux-5.4.55/include/crypto/nhpoly1305.h linux-5.4.55-modified/include |
1235 |
u32 nh_key[NH_KEY_WORDS]; |
1236 |
}; |
1237 |
|
1238 |
-diff -Nru linux-5.4.55/include/crypto/poly1305.h linux-5.4.55-modified/include/crypto/poly1305.h |
1239 |
---- linux-5.4.55/include/crypto/poly1305.h 2020-07-31 12:39:32.000000000 -0400 |
1240 |
-+++ linux-5.4.55-modified/include/crypto/poly1305.h 2020-08-01 15:38:51.342407902 -0400 |
1241 |
+diff -Nru linux-5.4.63/include/crypto/poly1305.h linux-5.4.63-modified/include/crypto/poly1305.h |
1242 |
+--- linux-5.4.63/include/crypto/poly1305.h 2020-09-05 05:22:51.000000000 -0400 |
1243 |
++++ linux-5.4.63-modified/include/crypto/poly1305.h 2020-09-08 18:16:45.715318061 -0400 |
1244 |
@@ -13,52 +13,85 @@ |
1245 |
#define POLY1305_KEY_SIZE 32 |
1246 |
#define POLY1305_DIGEST_SIZE 16 |
1247 |
@@ -28818,9 +28818,9 @@ diff -Nru linux-5.4.55/include/crypto/poly1305.h linux-5.4.55-modified/include/c |
1248 |
-int crypto_poly1305_final(struct shash_desc *desc, u8 *dst); |
1249 |
|
1250 |
#endif |
1251 |
-diff -Nru linux-5.4.55/include/linux/icmpv6.h linux-5.4.55-modified/include/linux/icmpv6.h |
1252 |
---- linux-5.4.55/include/linux/icmpv6.h 2020-07-31 12:39:32.000000000 -0400 |
1253 |
-+++ linux-5.4.55-modified/include/linux/icmpv6.h 2020-08-01 15:38:51.349407947 -0400 |
1254 |
+diff -Nru linux-5.4.63/include/linux/icmpv6.h linux-5.4.63-modified/include/linux/icmpv6.h |
1255 |
+--- linux-5.4.63/include/linux/icmpv6.h 2020-09-05 05:22:51.000000000 -0400 |
1256 |
++++ linux-5.4.63-modified/include/linux/icmpv6.h 2020-09-08 18:16:45.722318146 -0400 |
1257 |
@@ -22,12 +22,22 @@ |
1258 |
int ip6_err_gen_icmpv6_unreach(struct sk_buff *skb, int nhs, int type, |
1259 |
unsigned int data_len); |
1260 |
@@ -28844,9 +28844,9 @@ diff -Nru linux-5.4.55/include/linux/icmpv6.h linux-5.4.55-modified/include/linu |
1261 |
} |
1262 |
#endif |
1263 |
|
1264 |
-diff -Nru linux-5.4.55/include/linux/skbuff.h linux-5.4.55-modified/include/linux/skbuff.h |
1265 |
---- linux-5.4.55/include/linux/skbuff.h 2020-07-31 12:39:32.000000000 -0400 |
1266 |
-+++ linux-5.4.55-modified/include/linux/skbuff.h 2020-08-01 15:38:51.358408004 -0400 |
1267 |
+diff -Nru linux-5.4.63/include/linux/skbuff.h linux-5.4.63-modified/include/linux/skbuff.h |
1268 |
+--- linux-5.4.63/include/linux/skbuff.h 2020-09-05 05:22:51.000000000 -0400 |
1269 |
++++ linux-5.4.63-modified/include/linux/skbuff.h 2020-09-08 18:16:45.729318232 -0400 |
1270 |
@@ -1480,6 +1480,11 @@ |
1271 |
skb->next = NULL; |
1272 |
} |
1273 |
@@ -28859,9 +28859,9 @@ diff -Nru linux-5.4.55/include/linux/skbuff.h linux-5.4.55-modified/include/linu |
1274 |
static inline void skb_list_del_init(struct sk_buff *skb) |
1275 |
{ |
1276 |
__list_del_entry(&skb->list); |
1277 |
-diff -Nru linux-5.4.55/include/net/icmp.h linux-5.4.55-modified/include/net/icmp.h |
1278 |
---- linux-5.4.55/include/net/icmp.h 2020-07-31 12:39:32.000000000 -0400 |
1279 |
-+++ linux-5.4.55-modified/include/net/icmp.h 2020-08-01 15:38:51.349407947 -0400 |
1280 |
+diff -Nru linux-5.4.63/include/net/icmp.h linux-5.4.63-modified/include/net/icmp.h |
1281 |
+--- linux-5.4.63/include/net/icmp.h 2020-09-05 05:22:51.000000000 -0400 |
1282 |
++++ linux-5.4.63-modified/include/net/icmp.h 2020-09-08 18:16:45.722318146 -0400 |
1283 |
@@ -43,6 +43,12 @@ |
1284 |
__icmp_send(skb_in, type, code, info, &IPCB(skb_in)->opt); |
1285 |
} |
1286 |
@@ -28875,9 +28875,9 @@ diff -Nru linux-5.4.55/include/net/icmp.h linux-5.4.55-modified/include/net/icmp |
1287 |
int icmp_rcv(struct sk_buff *skb); |
1288 |
int icmp_err(struct sk_buff *skb, u32 info); |
1289 |
int icmp_init(void); |
1290 |
-diff -Nru linux-5.4.55/include/net/ip_tunnels.h linux-5.4.55-modified/include/net/ip_tunnels.h |
1291 |
---- linux-5.4.55/include/net/ip_tunnels.h 2020-07-31 12:39:32.000000000 -0400 |
1292 |
-+++ linux-5.4.55-modified/include/net/ip_tunnels.h 2020-08-01 15:38:51.365408048 -0400 |
1293 |
+diff -Nru linux-5.4.63/include/net/ip_tunnels.h linux-5.4.63-modified/include/net/ip_tunnels.h |
1294 |
+--- linux-5.4.63/include/net/ip_tunnels.h 2020-09-05 05:22:51.000000000 -0400 |
1295 |
++++ linux-5.4.63-modified/include/net/ip_tunnels.h 2020-09-08 18:16:45.733318281 -0400 |
1296 |
@@ -289,6 +289,9 @@ |
1297 |
struct ip_tunnel_parm *p, __u32 fwmark); |
1298 |
void ip_tunnel_setup(struct net_device *dev, unsigned int net_id); |
1299 |
@@ -28888,9 +28888,9 @@ diff -Nru linux-5.4.55/include/net/ip_tunnels.h linux-5.4.55-modified/include/ne |
1300 |
struct ip_tunnel_encap_ops { |
1301 |
size_t (*encap_hlen)(struct ip_tunnel_encap *e); |
1302 |
int (*build_header)(struct sk_buff *skb, struct ip_tunnel_encap *e, |
1303 |
-diff -Nru linux-5.4.55/include/uapi/linux/wireguard.h linux-5.4.55-modified/include/uapi/linux/wireguard.h |
1304 |
---- linux-5.4.55/include/uapi/linux/wireguard.h 1969-12-31 19:00:00.000000000 -0500 |
1305 |
-+++ linux-5.4.55-modified/include/uapi/linux/wireguard.h 2020-08-01 15:38:51.355407985 -0400 |
1306 |
+diff -Nru linux-5.4.63/include/uapi/linux/wireguard.h linux-5.4.63-modified/include/uapi/linux/wireguard.h |
1307 |
+--- linux-5.4.63/include/uapi/linux/wireguard.h 1969-12-31 19:00:00.000000000 -0500 |
1308 |
++++ linux-5.4.63-modified/include/uapi/linux/wireguard.h 2020-09-08 18:16:45.727318207 -0400 |
1309 |
@@ -0,0 +1,196 @@ |
1310 |
+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */ |
1311 |
+/* |
1312 |
@@ -29088,9 +29088,9 @@ diff -Nru linux-5.4.55/include/uapi/linux/wireguard.h linux-5.4.55-modified/incl |
1313 |
+#define WGALLOWEDIP_A_MAX (__WGALLOWEDIP_A_LAST - 1) |
1314 |
+ |
1315 |
+#endif /* _WG_UAPI_WIREGUARD_H */ |
1316 |
-diff -Nru linux-5.4.55/lib/chacha.c linux-5.4.55-modified/lib/chacha.c |
1317 |
---- linux-5.4.55/lib/chacha.c 2020-07-31 12:39:32.000000000 -0400 |
1318 |
-+++ linux-5.4.55-modified/lib/chacha.c 1969-12-31 19:00:00.000000000 -0500 |
1319 |
+diff -Nru linux-5.4.63/lib/chacha.c linux-5.4.63-modified/lib/chacha.c |
1320 |
+--- linux-5.4.63/lib/chacha.c 2020-09-05 05:22:51.000000000 -0400 |
1321 |
++++ linux-5.4.63-modified/lib/chacha.c 1969-12-31 19:00:00.000000000 -0500 |
1322 |
@@ -1,113 +0,0 @@ |
1323 |
-// SPDX-License-Identifier: GPL-2.0-or-later |
1324 |
-/* |
1325 |
@@ -29205,9 +29205,9 @@ diff -Nru linux-5.4.55/lib/chacha.c linux-5.4.55-modified/lib/chacha.c |
1326 |
- memcpy(&out[4], &x[12], 16); |
1327 |
-} |
1328 |
-EXPORT_SYMBOL(hchacha_block); |
1329 |
-diff -Nru linux-5.4.55/lib/crypto/blake2s.c linux-5.4.55-modified/lib/crypto/blake2s.c |
1330 |
---- linux-5.4.55/lib/crypto/blake2s.c 1969-12-31 19:00:00.000000000 -0500 |
1331 |
-+++ linux-5.4.55-modified/lib/crypto/blake2s.c 2020-08-01 15:38:51.328407813 -0400 |
1332 |
+diff -Nru linux-5.4.63/lib/crypto/blake2s.c linux-5.4.63-modified/lib/crypto/blake2s.c |
1333 |
+--- linux-5.4.63/lib/crypto/blake2s.c 1969-12-31 19:00:00.000000000 -0500 |
1334 |
++++ linux-5.4.63-modified/lib/crypto/blake2s.c 2020-09-08 18:16:45.702317903 -0400 |
1335 |
@@ -0,0 +1,126 @@ |
1336 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1337 |
+/* |
1338 |
@@ -29335,9 +29335,9 @@ diff -Nru linux-5.4.55/lib/crypto/blake2s.c linux-5.4.55-modified/lib/crypto/bla |
1339 |
+MODULE_LICENSE("GPL v2"); |
1340 |
+MODULE_DESCRIPTION("BLAKE2s hash function"); |
1341 |
+MODULE_AUTHOR("Jason A. Donenfeld <Jason@×××××.com>"); |
1342 |
-diff -Nru linux-5.4.55/lib/crypto/blake2s-generic.c linux-5.4.55-modified/lib/crypto/blake2s-generic.c |
1343 |
---- linux-5.4.55/lib/crypto/blake2s-generic.c 1969-12-31 19:00:00.000000000 -0500 |
1344 |
-+++ linux-5.4.55-modified/lib/crypto/blake2s-generic.c 2020-08-01 15:38:51.327407807 -0400 |
1345 |
+diff -Nru linux-5.4.63/lib/crypto/blake2s-generic.c linux-5.4.63-modified/lib/crypto/blake2s-generic.c |
1346 |
+--- linux-5.4.63/lib/crypto/blake2s-generic.c 1969-12-31 19:00:00.000000000 -0500 |
1347 |
++++ linux-5.4.63-modified/lib/crypto/blake2s-generic.c 2020-09-08 18:16:45.701317891 -0400 |
1348 |
@@ -0,0 +1,111 @@ |
1349 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1350 |
+/* |
1351 |
@@ -29450,9 +29450,9 @@ diff -Nru linux-5.4.55/lib/crypto/blake2s-generic.c linux-5.4.55-modified/lib/cr |
1352 |
+MODULE_LICENSE("GPL v2"); |
1353 |
+MODULE_DESCRIPTION("BLAKE2s hash function"); |
1354 |
+MODULE_AUTHOR("Jason A. Donenfeld <Jason@×××××.com>"); |
1355 |
-diff -Nru linux-5.4.55/lib/crypto/blake2s-selftest.c linux-5.4.55-modified/lib/crypto/blake2s-selftest.c |
1356 |
---- linux-5.4.55/lib/crypto/blake2s-selftest.c 1969-12-31 19:00:00.000000000 -0500 |
1357 |
-+++ linux-5.4.55-modified/lib/crypto/blake2s-selftest.c 2020-08-01 15:38:51.328407813 -0400 |
1358 |
+diff -Nru linux-5.4.63/lib/crypto/blake2s-selftest.c linux-5.4.63-modified/lib/crypto/blake2s-selftest.c |
1359 |
+--- linux-5.4.63/lib/crypto/blake2s-selftest.c 1969-12-31 19:00:00.000000000 -0500 |
1360 |
++++ linux-5.4.63-modified/lib/crypto/blake2s-selftest.c 2020-09-08 18:16:45.701317891 -0400 |
1361 |
@@ -0,0 +1,622 @@ |
1362 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1363 |
+/* |
1364 |
@@ -30076,9 +30076,9 @@ diff -Nru linux-5.4.55/lib/crypto/blake2s-selftest.c linux-5.4.55-modified/lib/c |
1365 |
+ |
1366 |
+ return success; |
1367 |
+} |
1368 |
-diff -Nru linux-5.4.55/lib/crypto/chacha20poly1305.c linux-5.4.55-modified/lib/crypto/chacha20poly1305.c |
1369 |
---- linux-5.4.55/lib/crypto/chacha20poly1305.c 1969-12-31 19:00:00.000000000 -0500 |
1370 |
-+++ linux-5.4.55-modified/lib/crypto/chacha20poly1305.c 2020-08-01 15:38:51.349407947 -0400 |
1371 |
+diff -Nru linux-5.4.63/lib/crypto/chacha20poly1305.c linux-5.4.63-modified/lib/crypto/chacha20poly1305.c |
1372 |
+--- linux-5.4.63/lib/crypto/chacha20poly1305.c 1969-12-31 19:00:00.000000000 -0500 |
1373 |
++++ linux-5.4.63-modified/lib/crypto/chacha20poly1305.c 2020-09-08 18:16:45.721318134 -0400 |
1374 |
@@ -0,0 +1,370 @@ |
1375 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1376 |
+/* |
1377 |
@@ -30450,9 +30450,9 @@ diff -Nru linux-5.4.55/lib/crypto/chacha20poly1305.c linux-5.4.55-modified/lib/c |
1378 |
+MODULE_LICENSE("GPL v2"); |
1379 |
+MODULE_DESCRIPTION("ChaCha20Poly1305 AEAD construction"); |
1380 |
+MODULE_AUTHOR("Jason A. Donenfeld <Jason@×××××.com>"); |
1381 |
-diff -Nru linux-5.4.55/lib/crypto/chacha20poly1305-selftest.c linux-5.4.55-modified/lib/crypto/chacha20poly1305-selftest.c |
1382 |
---- linux-5.4.55/lib/crypto/chacha20poly1305-selftest.c 1969-12-31 19:00:00.000000000 -0500 |
1383 |
-+++ linux-5.4.55-modified/lib/crypto/chacha20poly1305-selftest.c 2020-08-01 15:38:51.347407934 -0400 |
1384 |
+diff -Nru linux-5.4.63/lib/crypto/chacha20poly1305-selftest.c linux-5.4.63-modified/lib/crypto/chacha20poly1305-selftest.c |
1385 |
+--- linux-5.4.63/lib/crypto/chacha20poly1305-selftest.c 1969-12-31 19:00:00.000000000 -0500 |
1386 |
++++ linux-5.4.63-modified/lib/crypto/chacha20poly1305-selftest.c 2020-09-08 18:16:45.720318122 -0400 |
1387 |
@@ -0,0 +1,9082 @@ |
1388 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1389 |
+/* |
1390 |
@@ -39536,9 +39536,9 @@ diff -Nru linux-5.4.55/lib/crypto/chacha20poly1305-selftest.c linux-5.4.55-modif |
1391 |
+ kfree(input); |
1392 |
+ return success; |
1393 |
+} |
1394 |
-diff -Nru linux-5.4.55/lib/crypto/chacha.c linux-5.4.55-modified/lib/crypto/chacha.c |
1395 |
---- linux-5.4.55/lib/crypto/chacha.c 1969-12-31 19:00:00.000000000 -0500 |
1396 |
-+++ linux-5.4.55-modified/lib/crypto/chacha.c 2020-08-01 15:38:51.321407769 -0400 |
1397 |
+diff -Nru linux-5.4.63/lib/crypto/chacha.c linux-5.4.63-modified/lib/crypto/chacha.c |
1398 |
+--- linux-5.4.63/lib/crypto/chacha.c 1969-12-31 19:00:00.000000000 -0500 |
1399 |
++++ linux-5.4.63-modified/lib/crypto/chacha.c 2020-09-08 18:16:45.695317817 -0400 |
1400 |
@@ -0,0 +1,115 @@ |
1401 |
+// SPDX-License-Identifier: GPL-2.0-or-later |
1402 |
+/* |
1403 |
@@ -39655,9 +39655,9 @@ diff -Nru linux-5.4.55/lib/crypto/chacha.c linux-5.4.55-modified/lib/crypto/chac |
1404 |
+ memcpy(&stream[4], &x[12], 16); |
1405 |
+} |
1406 |
+EXPORT_SYMBOL(hchacha_block_generic); |
1407 |
-diff -Nru linux-5.4.55/lib/crypto/curve25519.c linux-5.4.55-modified/lib/crypto/curve25519.c |
1408 |
---- linux-5.4.55/lib/crypto/curve25519.c 1969-12-31 19:00:00.000000000 -0500 |
1409 |
-+++ linux-5.4.55-modified/lib/crypto/curve25519.c 2020-08-01 15:38:51.344407915 -0400 |
1410 |
+diff -Nru linux-5.4.63/lib/crypto/curve25519.c linux-5.4.63-modified/lib/crypto/curve25519.c |
1411 |
+--- linux-5.4.63/lib/crypto/curve25519.c 1969-12-31 19:00:00.000000000 -0500 |
1412 |
++++ linux-5.4.63-modified/lib/crypto/curve25519.c 2020-09-08 18:16:45.717318086 -0400 |
1413 |
@@ -0,0 +1,35 @@ |
1414 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1415 |
+/* |
1416 |
@@ -39694,9 +39694,9 @@ diff -Nru linux-5.4.55/lib/crypto/curve25519.c linux-5.4.55-modified/lib/crypto/ |
1417 |
+MODULE_LICENSE("GPL v2"); |
1418 |
+MODULE_DESCRIPTION("Curve25519 scalar multiplication"); |
1419 |
+MODULE_AUTHOR("Jason A. Donenfeld <Jason@×××××.com>"); |
1420 |
-diff -Nru linux-5.4.55/lib/crypto/curve25519-fiat32.c linux-5.4.55-modified/lib/crypto/curve25519-fiat32.c |
1421 |
---- linux-5.4.55/lib/crypto/curve25519-fiat32.c 1969-12-31 19:00:00.000000000 -0500 |
1422 |
-+++ linux-5.4.55-modified/lib/crypto/curve25519-fiat32.c 2020-08-01 15:38:51.335407858 -0400 |
1423 |
+diff -Nru linux-5.4.63/lib/crypto/curve25519-fiat32.c linux-5.4.63-modified/lib/crypto/curve25519-fiat32.c |
1424 |
+--- linux-5.4.63/lib/crypto/curve25519-fiat32.c 1969-12-31 19:00:00.000000000 -0500 |
1425 |
++++ linux-5.4.63-modified/lib/crypto/curve25519-fiat32.c 2020-09-08 18:16:45.708317976 -0400 |
1426 |
@@ -0,0 +1,864 @@ |
1427 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1428 |
+/* |
1429 |
@@ -40562,9 +40562,9 @@ diff -Nru linux-5.4.55/lib/crypto/curve25519-fiat32.c linux-5.4.55-modified/lib/ |
1430 |
+ memzero_explicit(&x3l, sizeof(x3l)); |
1431 |
+ memzero_explicit(&e, sizeof(e)); |
1432 |
+} |
1433 |
-diff -Nru linux-5.4.55/lib/crypto/curve25519-generic.c linux-5.4.55-modified/lib/crypto/curve25519-generic.c |
1434 |
---- linux-5.4.55/lib/crypto/curve25519-generic.c 1969-12-31 19:00:00.000000000 -0500 |
1435 |
-+++ linux-5.4.55-modified/lib/crypto/curve25519-generic.c 2020-08-01 15:38:51.344407915 -0400 |
1436 |
+diff -Nru linux-5.4.63/lib/crypto/curve25519-generic.c linux-5.4.63-modified/lib/crypto/curve25519-generic.c |
1437 |
+--- linux-5.4.63/lib/crypto/curve25519-generic.c 1969-12-31 19:00:00.000000000 -0500 |
1438 |
++++ linux-5.4.63-modified/lib/crypto/curve25519-generic.c 2020-09-08 18:16:45.717318086 -0400 |
1439 |
@@ -0,0 +1,24 @@ |
1440 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1441 |
+/* |
1442 |
@@ -40590,9 +40590,9 @@ diff -Nru linux-5.4.55/lib/crypto/curve25519-generic.c linux-5.4.55-modified/lib |
1443 |
+MODULE_LICENSE("GPL v2"); |
1444 |
+MODULE_DESCRIPTION("Curve25519 scalar multiplication"); |
1445 |
+MODULE_AUTHOR("Jason A. Donenfeld <Jason@×××××.com>"); |
1446 |
-diff -Nru linux-5.4.55/lib/crypto/curve25519-hacl64.c linux-5.4.55-modified/lib/crypto/curve25519-hacl64.c |
1447 |
---- linux-5.4.55/lib/crypto/curve25519-hacl64.c 1969-12-31 19:00:00.000000000 -0500 |
1448 |
-+++ linux-5.4.55-modified/lib/crypto/curve25519-hacl64.c 2020-08-01 15:38:51.331407832 -0400 |
1449 |
+diff -Nru linux-5.4.63/lib/crypto/curve25519-hacl64.c linux-5.4.63-modified/lib/crypto/curve25519-hacl64.c |
1450 |
+--- linux-5.4.63/lib/crypto/curve25519-hacl64.c 1969-12-31 19:00:00.000000000 -0500 |
1451 |
++++ linux-5.4.63-modified/lib/crypto/curve25519-hacl64.c 2020-09-08 18:16:45.705317939 -0400 |
1452 |
@@ -0,0 +1,788 @@ |
1453 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1454 |
+/* |
1455 |
@@ -41382,9 +41382,9 @@ diff -Nru linux-5.4.55/lib/crypto/curve25519-hacl64.c linux-5.4.55-modified/lib/ |
1456 |
+ } |
1457 |
+ memzero_explicit(buf0, sizeof(buf0)); |
1458 |
+} |
1459 |
-diff -Nru linux-5.4.55/lib/crypto/curve25519-selftest.c linux-5.4.55-modified/lib/crypto/curve25519-selftest.c |
1460 |
---- linux-5.4.55/lib/crypto/curve25519-selftest.c 1969-12-31 19:00:00.000000000 -0500 |
1461 |
-+++ linux-5.4.55-modified/lib/crypto/curve25519-selftest.c 2020-08-01 15:38:51.341407896 -0400 |
1462 |
+diff -Nru linux-5.4.63/lib/crypto/curve25519-selftest.c linux-5.4.63-modified/lib/crypto/curve25519-selftest.c |
1463 |
+--- linux-5.4.63/lib/crypto/curve25519-selftest.c 1969-12-31 19:00:00.000000000 -0500 |
1464 |
++++ linux-5.4.63-modified/lib/crypto/curve25519-selftest.c 2020-09-08 18:16:45.714318049 -0400 |
1465 |
@@ -0,0 +1,1321 @@ |
1466 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1467 |
+/* |
1468 |
@@ -42707,9 +42707,9 @@ diff -Nru linux-5.4.55/lib/crypto/curve25519-selftest.c linux-5.4.55-modified/li |
1469 |
+ |
1470 |
+ return success; |
1471 |
+} |
1472 |
-diff -Nru linux-5.4.55/lib/crypto/Kconfig linux-5.4.55-modified/lib/crypto/Kconfig |
1473 |
---- linux-5.4.55/lib/crypto/Kconfig 1969-12-31 19:00:00.000000000 -0500 |
1474 |
-+++ linux-5.4.55-modified/lib/crypto/Kconfig 2020-08-01 15:38:51.344407915 -0400 |
1475 |
+diff -Nru linux-5.4.63/lib/crypto/Kconfig linux-5.4.63-modified/lib/crypto/Kconfig |
1476 |
+--- linux-5.4.63/lib/crypto/Kconfig 1969-12-31 19:00:00.000000000 -0500 |
1477 |
++++ linux-5.4.63-modified/lib/crypto/Kconfig 2020-09-08 18:16:45.717318086 -0400 |
1478 |
@@ -0,0 +1,130 @@ |
1479 |
+# SPDX-License-Identifier: GPL-2.0 |
1480 |
+ |
1481 |
@@ -42841,9 +42841,9 @@ diff -Nru linux-5.4.55/lib/crypto/Kconfig linux-5.4.55-modified/lib/crypto/Kconf |
1482 |
+ |
1483 |
+config CRYPTO_LIB_SHA256 |
1484 |
+ tristate |
1485 |
-diff -Nru linux-5.4.55/lib/crypto/libchacha.c linux-5.4.55-modified/lib/crypto/libchacha.c |
1486 |
---- linux-5.4.55/lib/crypto/libchacha.c 1969-12-31 19:00:00.000000000 -0500 |
1487 |
-+++ linux-5.4.55-modified/lib/crypto/libchacha.c 2020-08-01 15:38:51.321407769 -0400 |
1488 |
+diff -Nru linux-5.4.63/lib/crypto/libchacha.c linux-5.4.63-modified/lib/crypto/libchacha.c |
1489 |
+--- linux-5.4.63/lib/crypto/libchacha.c 1969-12-31 19:00:00.000000000 -0500 |
1490 |
++++ linux-5.4.63-modified/lib/crypto/libchacha.c 2020-09-08 18:16:45.695317817 -0400 |
1491 |
@@ -0,0 +1,35 @@ |
1492 |
+// SPDX-License-Identifier: GPL-2.0-or-later |
1493 |
+/* |
1494 |
@@ -42880,9 +42880,9 @@ diff -Nru linux-5.4.55/lib/crypto/libchacha.c linux-5.4.55-modified/lib/crypto/l |
1495 |
+EXPORT_SYMBOL(chacha_crypt_generic); |
1496 |
+ |
1497 |
+MODULE_LICENSE("GPL"); |
1498 |
-diff -Nru linux-5.4.55/lib/crypto/Makefile linux-5.4.55-modified/lib/crypto/Makefile |
1499 |
---- linux-5.4.55/lib/crypto/Makefile 2020-07-31 12:39:32.000000000 -0400 |
1500 |
-+++ linux-5.4.55-modified/lib/crypto/Makefile 2020-08-01 15:38:51.344407915 -0400 |
1501 |
+diff -Nru linux-5.4.63/lib/crypto/Makefile linux-5.4.63-modified/lib/crypto/Makefile |
1502 |
+--- linux-5.4.63/lib/crypto/Makefile 2020-09-05 05:22:51.000000000 -0400 |
1503 |
++++ linux-5.4.63-modified/lib/crypto/Makefile 2020-09-08 18:16:45.717318086 -0400 |
1504 |
@@ -1,13 +1,45 @@ |
1505 |
# SPDX-License-Identifier: GPL-2.0 |
1506 |
|
1507 |
@@ -42937,9 +42937,9 @@ diff -Nru linux-5.4.55/lib/crypto/Makefile linux-5.4.55-modified/lib/crypto/Make |
1508 |
+libchacha20poly1305-y += chacha20poly1305-selftest.o |
1509 |
+libcurve25519-y += curve25519-selftest.o |
1510 |
+endif |
1511 |
-diff -Nru linux-5.4.55/lib/crypto/poly1305.c linux-5.4.55-modified/lib/crypto/poly1305.c |
1512 |
---- linux-5.4.55/lib/crypto/poly1305.c 1969-12-31 19:00:00.000000000 -0500 |
1513 |
-+++ linux-5.4.55-modified/lib/crypto/poly1305.c 2020-08-01 15:38:51.342407902 -0400 |
1514 |
+diff -Nru linux-5.4.63/lib/crypto/poly1305.c linux-5.4.63-modified/lib/crypto/poly1305.c |
1515 |
+--- linux-5.4.63/lib/crypto/poly1305.c 1969-12-31 19:00:00.000000000 -0500 |
1516 |
++++ linux-5.4.63-modified/lib/crypto/poly1305.c 2020-09-08 18:16:45.715318061 -0400 |
1517 |
@@ -0,0 +1,77 @@ |
1518 |
+// SPDX-License-Identifier: GPL-2.0-or-later |
1519 |
+/* |
1520 |
@@ -43018,9 +43018,9 @@ diff -Nru linux-5.4.55/lib/crypto/poly1305.c linux-5.4.55-modified/lib/crypto/po |
1521 |
+ |
1522 |
+MODULE_LICENSE("GPL"); |
1523 |
+MODULE_AUTHOR("Martin Willi <martin@××××××××××.org>"); |
1524 |
-diff -Nru linux-5.4.55/lib/crypto/poly1305-donna32.c linux-5.4.55-modified/lib/crypto/poly1305-donna32.c |
1525 |
---- linux-5.4.55/lib/crypto/poly1305-donna32.c 1969-12-31 19:00:00.000000000 -0500 |
1526 |
-+++ linux-5.4.55-modified/lib/crypto/poly1305-donna32.c 2020-08-01 15:38:51.342407902 -0400 |
1527 |
+diff -Nru linux-5.4.63/lib/crypto/poly1305-donna32.c linux-5.4.63-modified/lib/crypto/poly1305-donna32.c |
1528 |
+--- linux-5.4.63/lib/crypto/poly1305-donna32.c 1969-12-31 19:00:00.000000000 -0500 |
1529 |
++++ linux-5.4.63-modified/lib/crypto/poly1305-donna32.c 2020-09-08 18:16:45.715318061 -0400 |
1530 |
@@ -0,0 +1,204 @@ |
1531 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1532 |
+/* |
1533 |
@@ -43226,9 +43226,9 @@ diff -Nru linux-5.4.55/lib/crypto/poly1305-donna32.c linux-5.4.55-modified/lib/c |
1534 |
+ put_unaligned_le32(h3, &mac[12]); |
1535 |
+} |
1536 |
+EXPORT_SYMBOL(poly1305_core_emit); |
1537 |
-diff -Nru linux-5.4.55/lib/crypto/poly1305-donna64.c linux-5.4.55-modified/lib/crypto/poly1305-donna64.c |
1538 |
---- linux-5.4.55/lib/crypto/poly1305-donna64.c 1969-12-31 19:00:00.000000000 -0500 |
1539 |
-+++ linux-5.4.55-modified/lib/crypto/poly1305-donna64.c 2020-08-01 15:38:51.342407902 -0400 |
1540 |
+diff -Nru linux-5.4.63/lib/crypto/poly1305-donna64.c linux-5.4.63-modified/lib/crypto/poly1305-donna64.c |
1541 |
+--- linux-5.4.63/lib/crypto/poly1305-donna64.c 1969-12-31 19:00:00.000000000 -0500 |
1542 |
++++ linux-5.4.63-modified/lib/crypto/poly1305-donna64.c 2020-09-08 18:16:45.715318061 -0400 |
1543 |
@@ -0,0 +1,185 @@ |
1544 |
+// SPDX-License-Identifier: GPL-2.0 OR MIT |
1545 |
+/* |
1546 |
@@ -43415,9 +43415,9 @@ diff -Nru linux-5.4.55/lib/crypto/poly1305-donna64.c linux-5.4.55-modified/lib/c |
1547 |
+ put_unaligned_le64(h1, &mac[8]); |
1548 |
+} |
1549 |
+EXPORT_SYMBOL(poly1305_core_emit); |
1550 |
-diff -Nru linux-5.4.55/lib/Makefile linux-5.4.55-modified/lib/Makefile |
1551 |
---- linux-5.4.55/lib/Makefile 2020-07-31 12:39:32.000000000 -0400 |
1552 |
-+++ linux-5.4.55-modified/lib/Makefile 2020-08-01 15:38:51.320407762 -0400 |
1553 |
+diff -Nru linux-5.4.63/lib/Makefile linux-5.4.63-modified/lib/Makefile |
1554 |
+--- linux-5.4.63/lib/Makefile 2020-09-05 05:22:51.000000000 -0400 |
1555 |
++++ linux-5.4.63-modified/lib/Makefile 2020-09-08 18:16:45.694317805 -0400 |
1556 |
@@ -26,8 +26,7 @@ |
1557 |
|
1558 |
lib-y := ctype.o string.o vsprintf.o cmdline.o \ |
1559 |
@@ -43428,10 +43428,10 @@ diff -Nru linux-5.4.55/lib/Makefile linux-5.4.55-modified/lib/Makefile |
1560 |
flex_proportions.o ratelimit.o show_mem.o \ |
1561 |
is_single_threaded.o plist.o decompress.o kobject_uevent.o \ |
1562 |
earlycpio.o seq_buf.o siphash.o dec_and_lock.o \ |
1563 |
-diff -Nru linux-5.4.55/MAINTAINERS linux-5.4.55-modified/MAINTAINERS |
1564 |
---- linux-5.4.55/MAINTAINERS 2020-07-31 12:39:32.000000000 -0400 |
1565 |
-+++ linux-5.4.55-modified/MAINTAINERS 2020-08-01 15:38:51.350407953 -0400 |
1566 |
-@@ -17583,6 +17583,14 @@ |
1567 |
+diff -Nru linux-5.4.63/MAINTAINERS linux-5.4.63-modified/MAINTAINERS |
1568 |
+--- linux-5.4.63/MAINTAINERS 2020-09-05 05:22:51.000000000 -0400 |
1569 |
++++ linux-5.4.63-modified/MAINTAINERS 2020-09-08 18:16:45.723318159 -0400 |
1570 |
+@@ -17584,6 +17584,14 @@ |
1571 |
S: Maintained |
1572 |
F: drivers/gpio/gpio-ws16c48.c |
1573 |
|
1574 |
@@ -43446,9 +43446,9 @@ diff -Nru linux-5.4.55/MAINTAINERS linux-5.4.55-modified/MAINTAINERS |
1575 |
WISTRON LAPTOP BUTTON DRIVER |
1576 |
M: Miloslav Trmac <mitr@×××××.cz> |
1577 |
S: Maintained |
1578 |
-diff -Nru linux-5.4.55/net/ipv4/icmp.c linux-5.4.55-modified/net/ipv4/icmp.c |
1579 |
---- linux-5.4.55/net/ipv4/icmp.c 2020-07-31 12:39:32.000000000 -0400 |
1580 |
-+++ linux-5.4.55-modified/net/ipv4/icmp.c 2020-08-01 15:38:51.349407947 -0400 |
1581 |
+diff -Nru linux-5.4.63/net/ipv4/icmp.c linux-5.4.63-modified/net/ipv4/icmp.c |
1582 |
+--- linux-5.4.63/net/ipv4/icmp.c 2020-09-05 05:22:51.000000000 -0400 |
1583 |
++++ linux-5.4.63-modified/net/ipv4/icmp.c 2020-09-08 18:16:45.722318146 -0400 |
1584 |
@@ -747,6 +747,39 @@ |
1585 |
} |
1586 |
EXPORT_SYMBOL(__icmp_send); |
1587 |
@@ -43489,9 +43489,9 @@ diff -Nru linux-5.4.55/net/ipv4/icmp.c linux-5.4.55-modified/net/ipv4/icmp.c |
1588 |
|
1589 |
static void icmp_socket_deliver(struct sk_buff *skb, u32 info) |
1590 |
{ |
1591 |
-diff -Nru linux-5.4.55/net/ipv4/ip_tunnel_core.c linux-5.4.55-modified/net/ipv4/ip_tunnel_core.c |
1592 |
---- linux-5.4.55/net/ipv4/ip_tunnel_core.c 2020-07-31 12:39:32.000000000 -0400 |
1593 |
-+++ linux-5.4.55-modified/net/ipv4/ip_tunnel_core.c 2020-08-01 15:38:51.365408048 -0400 |
1594 |
+diff -Nru linux-5.4.63/net/ipv4/ip_tunnel_core.c linux-5.4.63-modified/net/ipv4/ip_tunnel_core.c |
1595 |
+--- linux-5.4.63/net/ipv4/ip_tunnel_core.c 2020-09-05 05:22:51.000000000 -0400 |
1596 |
++++ linux-5.4.63-modified/net/ipv4/ip_tunnel_core.c 2020-09-08 18:16:45.733318281 -0400 |
1597 |
@@ -446,3 +446,21 @@ |
1598 |
static_branch_dec(&ip_tunnel_metadata_cnt); |
1599 |
} |
1600 |
@@ -43514,9 +43514,9 @@ diff -Nru linux-5.4.55/net/ipv4/ip_tunnel_core.c linux-5.4.55-modified/net/ipv4/ |
1601 |
+ |
1602 |
+const struct header_ops ip_tunnel_header_ops = { .parse_protocol = ip_tunnel_parse_protocol }; |
1603 |
+EXPORT_SYMBOL(ip_tunnel_header_ops); |
1604 |
-diff -Nru linux-5.4.55/net/ipv6/ip6_icmp.c linux-5.4.55-modified/net/ipv6/ip6_icmp.c |
1605 |
---- linux-5.4.55/net/ipv6/ip6_icmp.c 2020-07-31 12:39:32.000000000 -0400 |
1606 |
-+++ linux-5.4.55-modified/net/ipv6/ip6_icmp.c 2020-08-01 15:38:51.349407947 -0400 |
1607 |
+diff -Nru linux-5.4.63/net/ipv6/ip6_icmp.c linux-5.4.63-modified/net/ipv6/ip6_icmp.c |
1608 |
+--- linux-5.4.63/net/ipv6/ip6_icmp.c 2020-09-05 05:22:51.000000000 -0400 |
1609 |
++++ linux-5.4.63-modified/net/ipv6/ip6_icmp.c 2020-09-08 18:16:45.722318146 -0400 |
1610 |
@@ -45,4 +45,38 @@ |
1611 |
rcu_read_unlock(); |
1612 |
} |
1613 |
@@ -43556,9 +43556,9 @@ diff -Nru linux-5.4.55/net/ipv6/ip6_icmp.c linux-5.4.55-modified/net/ipv6/ip6_ic |
1614 |
+EXPORT_SYMBOL(icmpv6_ndo_send); |
1615 |
+#endif |
1616 |
#endif |
1617 |
-diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/netns.sh linux-5.4.55-modified/tools/testing/selftests/wireguard/netns.sh |
1618 |
---- linux-5.4.55/tools/testing/selftests/wireguard/netns.sh 1969-12-31 19:00:00.000000000 -0500 |
1619 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/netns.sh 2020-08-01 15:38:51.365408048 -0400 |
1620 |
+diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/netns.sh linux-5.4.63-modified/tools/testing/selftests/wireguard/netns.sh |
1621 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/netns.sh 1969-12-31 19:00:00.000000000 -0500 |
1622 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/netns.sh 2020-09-08 18:16:45.733318281 -0400 |
1623 |
@@ -0,0 +1,614 @@ |
1624 |
+#!/bin/bash |
1625 |
+# SPDX-License-Identifier: GPL-2.0 |
1626 |
@@ -44174,9 +44174,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/netns.sh linux-5.4.55-m |
1627 |
+done |
1628 |
+[[ $alldeleted -eq 1 ]] |
1629 |
+pretty "" "Objects that were created were also destroyed." |
1630 |
-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 |
1631 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config 1969-12-31 19:00:00.000000000 -0500 |
1632 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config 2020-08-01 15:38:51.354407979 -0400 |
1633 |
+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 |
1634 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config 1969-12-31 19:00:00.000000000 -0500 |
1635 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.config 2020-09-08 18:16:45.727318207 -0400 |
1636 |
@@ -0,0 +1,6 @@ |
1637 |
+CONFIG_CPU_BIG_ENDIAN=y |
1638 |
+CONFIG_SERIAL_AMBA_PL011=y |
1639 |
@@ -44184,18 +44184,18 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/aarch64_be.co |
1640 |
+CONFIG_CMDLINE_BOOL=y |
1641 |
+CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" |
1642 |
+CONFIG_FRAME_WARN=1280 |
1643 |
-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 |
1644 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/aarch64.config 1969-12-31 19:00:00.000000000 -0500 |
1645 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64.config 2020-08-01 15:38:51.354407979 -0400 |
1646 |
+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 |
1647 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/aarch64.config 1969-12-31 19:00:00.000000000 -0500 |
1648 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/aarch64.config 2020-09-08 18:16:45.726318195 -0400 |
1649 |
@@ -0,0 +1,5 @@ |
1650 |
+CONFIG_SERIAL_AMBA_PL011=y |
1651 |
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
1652 |
+CONFIG_CMDLINE_BOOL=y |
1653 |
+CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" |
1654 |
+CONFIG_FRAME_WARN=1280 |
1655 |
-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 |
1656 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/arm.config 1969-12-31 19:00:00.000000000 -0500 |
1657 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/arm.config 2020-08-01 15:38:51.354407979 -0400 |
1658 |
+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 |
1659 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/arm.config 1969-12-31 19:00:00.000000000 -0500 |
1660 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/arm.config 2020-09-08 18:16:45.727318207 -0400 |
1661 |
@@ -0,0 +1,9 @@ |
1662 |
+CONFIG_MMU=y |
1663 |
+CONFIG_ARCH_MULTI_V7=y |
1664 |
@@ -44206,9 +44206,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/arm.config li |
1665 |
+CONFIG_CMDLINE_BOOL=y |
1666 |
+CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" |
1667 |
+CONFIG_FRAME_WARN=1024 |
1668 |
-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 |
1669 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/armeb.config 1969-12-31 19:00:00.000000000 -0500 |
1670 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/armeb.config 2020-08-01 15:38:51.354407979 -0400 |
1671 |
+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 |
1672 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/armeb.config 1969-12-31 19:00:00.000000000 -0500 |
1673 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/armeb.config 2020-09-08 18:16:45.727318207 -0400 |
1674 |
@@ -0,0 +1,10 @@ |
1675 |
+CONFIG_MMU=y |
1676 |
+CONFIG_ARCH_MULTI_V7=y |
1677 |
@@ -44220,18 +44220,18 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/armeb.config |
1678 |
+CONFIG_CMDLINE="console=ttyAMA0 wg.success=ttyAMA1" |
1679 |
+CONFIG_CPU_BIG_ENDIAN=y |
1680 |
+CONFIG_FRAME_WARN=1024 |
1681 |
-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 |
1682 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/i686.config 1969-12-31 19:00:00.000000000 -0500 |
1683 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/i686.config 2020-08-01 15:38:51.354407979 -0400 |
1684 |
+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 |
1685 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/i686.config 1969-12-31 19:00:00.000000000 -0500 |
1686 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/i686.config 2020-09-08 18:16:45.727318207 -0400 |
1687 |
@@ -0,0 +1,5 @@ |
1688 |
+CONFIG_SERIAL_8250=y |
1689 |
+CONFIG_SERIAL_8250_CONSOLE=y |
1690 |
+CONFIG_CMDLINE_BOOL=y |
1691 |
+CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" |
1692 |
+CONFIG_FRAME_WARN=1024 |
1693 |
-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 |
1694 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/m68k.config 1969-12-31 19:00:00.000000000 -0500 |
1695 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/m68k.config 2020-08-01 15:38:51.356407991 -0400 |
1696 |
+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 |
1697 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/m68k.config 1969-12-31 19:00:00.000000000 -0500 |
1698 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/m68k.config 2020-09-08 18:16:45.728318220 -0400 |
1699 |
@@ -0,0 +1,9 @@ |
1700 |
+CONFIG_MMU=y |
1701 |
+CONFIG_M68KCLASSIC=y |
1702 |
@@ -44242,9 +44242,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/m68k.config l |
1703 |
+CONFIG_SERIAL_PMACZILOG_CONSOLE=y |
1704 |
+CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" |
1705 |
+CONFIG_FRAME_WARN=1024 |
1706 |
-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 |
1707 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips64.config 1969-12-31 19:00:00.000000000 -0500 |
1708 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mips64.config 2020-08-01 15:38:51.355407985 -0400 |
1709 |
+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 |
1710 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mips64.config 1969-12-31 19:00:00.000000000 -0500 |
1711 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mips64.config 2020-09-08 18:16:45.727318207 -0400 |
1712 |
@@ -0,0 +1,14 @@ |
1713 |
+CONFIG_64BIT=y |
1714 |
+CONFIG_CPU_MIPS64_R2=y |
1715 |
@@ -44260,9 +44260,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips64.config |
1716 |
+CONFIG_CMDLINE_BOOL=y |
1717 |
+CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" |
1718 |
+CONFIG_FRAME_WARN=1280 |
1719 |
-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 |
1720 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips64el.config 1969-12-31 19:00:00.000000000 -0500 |
1721 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mips64el.config 2020-08-01 15:38:51.355407985 -0400 |
1722 |
+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 |
1723 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mips64el.config 1969-12-31 19:00:00.000000000 -0500 |
1724 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mips64el.config 2020-09-08 18:16:45.727318207 -0400 |
1725 |
@@ -0,0 +1,15 @@ |
1726 |
+CONFIG_64BIT=y |
1727 |
+CONFIG_CPU_MIPS64_R2=y |
1728 |
@@ -44279,9 +44279,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips64el.conf |
1729 |
+CONFIG_CMDLINE_BOOL=y |
1730 |
+CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" |
1731 |
+CONFIG_FRAME_WARN=1280 |
1732 |
-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 |
1733 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips.config 1969-12-31 19:00:00.000000000 -0500 |
1734 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mips.config 2020-08-01 15:38:51.354407979 -0400 |
1735 |
+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 |
1736 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mips.config 1969-12-31 19:00:00.000000000 -0500 |
1737 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mips.config 2020-09-08 18:16:45.727318207 -0400 |
1738 |
@@ -0,0 +1,11 @@ |
1739 |
+CONFIG_CPU_MIPS32_R2=y |
1740 |
+CONFIG_MIPS_MALTA=y |
1741 |
@@ -44294,9 +44294,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mips.config l |
1742 |
+CONFIG_CMDLINE_BOOL=y |
1743 |
+CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" |
1744 |
+CONFIG_FRAME_WARN=1024 |
1745 |
-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 |
1746 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mipsel.config 1969-12-31 19:00:00.000000000 -0500 |
1747 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/mipsel.config 2020-08-01 15:38:51.355407985 -0400 |
1748 |
+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 |
1749 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/mipsel.config 1969-12-31 19:00:00.000000000 -0500 |
1750 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/mipsel.config 2020-09-08 18:16:45.727318207 -0400 |
1751 |
@@ -0,0 +1,12 @@ |
1752 |
+CONFIG_CPU_MIPS32_R2=y |
1753 |
+CONFIG_MIPS_MALTA=y |
1754 |
@@ -44310,9 +44310,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/mipsel.config |
1755 |
+CONFIG_CMDLINE_BOOL=y |
1756 |
+CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" |
1757 |
+CONFIG_FRAME_WARN=1024 |
1758 |
-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 |
1759 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config 1969-12-31 19:00:00.000000000 -0500 |
1760 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config 2020-08-01 15:38:51.362408029 -0400 |
1761 |
+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 |
1762 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config 1969-12-31 19:00:00.000000000 -0500 |
1763 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.config 2020-09-08 18:16:45.731318256 -0400 |
1764 |
@@ -0,0 +1,13 @@ |
1765 |
+CONFIG_PPC64=y |
1766 |
+CONFIG_PPC_PSERIES=y |
1767 |
@@ -44327,9 +44327,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/powerpc64le.c |
1768 |
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y |
1769 |
+CONFIG_FRAME_WARN=1280 |
1770 |
+CONFIG_THREAD_SHIFT=14 |
1771 |
-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 |
1772 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/powerpc.config 1969-12-31 19:00:00.000000000 -0500 |
1773 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc.config 2020-08-01 15:38:51.355407985 -0400 |
1774 |
+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 |
1775 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/powerpc.config 1969-12-31 19:00:00.000000000 -0500 |
1776 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/powerpc.config 2020-09-08 18:16:45.727318207 -0400 |
1777 |
@@ -0,0 +1,10 @@ |
1778 |
+CONFIG_PPC_QEMU_E500=y |
1779 |
+CONFIG_FSL_SOC_BOOKE=y |
1780 |
@@ -44341,18 +44341,18 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/powerpc.confi |
1781 |
+CONFIG_CMDLINE_BOOL=y |
1782 |
+CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" |
1783 |
+CONFIG_FRAME_WARN=1024 |
1784 |
-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 |
1785 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/arch/x86_64.config 1969-12-31 19:00:00.000000000 -0500 |
1786 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/arch/x86_64.config 2020-08-01 15:38:51.355407985 -0400 |
1787 |
+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 |
1788 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/arch/x86_64.config 1969-12-31 19:00:00.000000000 -0500 |
1789 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/arch/x86_64.config 2020-09-08 18:16:45.727318207 -0400 |
1790 |
@@ -0,0 +1,5 @@ |
1791 |
+CONFIG_SERIAL_8250=y |
1792 |
+CONFIG_SERIAL_8250_CONSOLE=y |
1793 |
+CONFIG_CMDLINE_BOOL=y |
1794 |
+CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" |
1795 |
+CONFIG_FRAME_WARN=1280 |
1796 |
-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 |
1797 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/debug.config 1969-12-31 19:00:00.000000000 -0500 |
1798 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/debug.config 2020-08-01 15:38:51.355407985 -0400 |
1799 |
+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 |
1800 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/debug.config 1969-12-31 19:00:00.000000000 -0500 |
1801 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/debug.config 2020-09-08 18:16:45.727318207 -0400 |
1802 |
@@ -0,0 +1,67 @@ |
1803 |
+CONFIG_LOCALVERSION="-debug" |
1804 |
+CONFIG_ENABLE_WARN_DEPRECATED=y |
1805 |
@@ -44421,15 +44421,15 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/debug.config linux |
1806 |
+CONFIG_DEBUG_PAGEALLOC=y |
1807 |
+CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y |
1808 |
+CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y |
1809 |
-diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/.gitignore linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/.gitignore |
1810 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/.gitignore 1969-12-31 19:00:00.000000000 -0500 |
1811 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/.gitignore 2020-08-01 15:38:51.354407979 -0400 |
1812 |
+diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/.gitignore linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/.gitignore |
1813 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/.gitignore 1969-12-31 19:00:00.000000000 -0500 |
1814 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/.gitignore 2020-09-08 18:16:45.726318195 -0400 |
1815 |
@@ -0,0 +1,2 @@ |
1816 |
+build/ |
1817 |
+distfiles/ |
1818 |
-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 |
1819 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/init.c 1969-12-31 19:00:00.000000000 -0500 |
1820 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/init.c 2020-08-01 15:38:51.360408017 -0400 |
1821 |
+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 |
1822 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/init.c 1969-12-31 19:00:00.000000000 -0500 |
1823 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/init.c 2020-09-08 18:16:45.730318244 -0400 |
1824 |
@@ -0,0 +1,284 @@ |
1825 |
+// SPDX-License-Identifier: GPL-2.0 |
1826 |
+/* |
1827 |
@@ -44715,9 +44715,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/init.c linux-5.4.5 |
1828 |
+ poweroff(); |
1829 |
+ return 1; |
1830 |
+} |
1831 |
-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 |
1832 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/kernel.config 1969-12-31 19:00:00.000000000 -0500 |
1833 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/kernel.config 2020-08-01 15:38:51.356407991 -0400 |
1834 |
+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 |
1835 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/kernel.config 1969-12-31 19:00:00.000000000 -0500 |
1836 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/kernel.config 2020-09-08 18:16:45.728318220 -0400 |
1837 |
@@ -0,0 +1,88 @@ |
1838 |
+CONFIG_LOCALVERSION="" |
1839 |
+CONFIG_NET=y |
1840 |
@@ -44807,9 +44807,9 @@ diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/kernel.config linu |
1841 |
+CONFIG_GDB_SCRIPTS=y |
1842 |
+CONFIG_WIREGUARD=y |
1843 |
+CONFIG_WIREGUARD_DEBUG=y |
1844 |
-diff -Nru linux-5.4.55/tools/testing/selftests/wireguard/qemu/Makefile linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/Makefile |
1845 |
---- linux-5.4.55/tools/testing/selftests/wireguard/qemu/Makefile 1969-12-31 19:00:00.000000000 -0500 |
1846 |
-+++ linux-5.4.55-modified/tools/testing/selftests/wireguard/qemu/Makefile 2020-08-01 15:38:51.363408036 -0400 |
1847 |
+diff -Nru linux-5.4.63/tools/testing/selftests/wireguard/qemu/Makefile linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/Makefile |
1848 |
+--- linux-5.4.63/tools/testing/selftests/wireguard/qemu/Makefile 1969-12-31 19:00:00.000000000 -0500 |
1849 |
++++ linux-5.4.63-modified/tools/testing/selftests/wireguard/qemu/Makefile 2020-09-08 18:16:45.731318256 -0400 |
1850 |
@@ -0,0 +1,377 @@ |
1851 |
+# SPDX-License-Identifier: GPL-2.0 |
1852 |
+# |