Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42069377 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Lee Jones
Browse files

UPSTREAM: wireguard: kconfig: use arm chacha even with no neon 



The condition here was incorrect: a non-neon fallback implementation is
available on arm32 when NEON is not supported.

Bug: 254441685
Reported-by: default avatarIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
(cherry picked from commit bce2473927af8de12ad131a743f55d69d358c0b9)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: Ifbda8d9fc9e1f749a883d74c25c634fe82638b50
parent 7809c4bb

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,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_BLAKE2S_ARM if ARM