196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Mon, 22 Feb 2021 17:25:49 +0100
|
|
Subject: [PATCH] wireguard: kconfig: use arm chacha even with no neon
|
|
|
|
commit bce2473927af8de12ad131a743f55d69d358c0b9 upstream.
|
|
|
|
The condition here was incorrect: a non-neon fallback implementation is
|
|
available on arm32 when NEON is not supported.
|
|
|
|
Reported-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
|
|
Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
drivers/net/Kconfig | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/Kconfig
|
|
+++ b/drivers/net/Kconfig
|
|
@@ -87,7 +87,7 @@ config WIREGUARD
|
|
select CRYPTO_CURVE25519_X86 if X86 && 64BIT
|
|
select ARM_CRYPTO if ARM
|
|
select ARM64_CRYPTO if ARM64
|
|
- select CRYPTO_CHACHA20_NEON if (ARM || ARM64) && KERNEL_MODE_NEON
|
|
+ select CRYPTO_CHACHA20_NEON if ARM || (ARM64 && KERNEL_MODE_NEON)
|
|
select CRYPTO_POLY1305_NEON if ARM64 && KERNEL_MODE_NEON
|
|
select CRYPTO_POLY1305_ARM if ARM
|
|
select CRYPTO_CURVE25519_NEON if ARM && KERNEL_MODE_NEON
|