git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From 514091206bc055a159348ae8575276dc925aea24 Mon Sep 17 00:00:00 2001
   2 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
   3 Date: Mon, 22 Feb 2021 17:25:49 +0100
   4 Subject: [PATCH 124/124] wireguard: kconfig: use arm chacha even with no neon
   5
   6 commit bce2473927af8de12ad131a743f55d69d358c0b9 upstream.
   7
   8 The condition here was incorrect: a non-neon fallback implementation is
   9 available on arm32 when NEON is not supported.
  10
  11 Reported-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
  12 Fixes: e7096c131e51 ("net: WireGuard secure network tunnel")
  13 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  14 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  15 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  16 ---
  17  drivers/net/Kconfig | 2 +-
  18  1 file changed, 1 insertion(+), 1 deletion(-)
  19
  20 --- a/drivers/net/Kconfig
  21 +++ b/drivers/net/Kconfig
  22 @@ -87,7 +87,7 @@ config WIREGUARD
  23         select CRYPTO_CURVE25519_X86 if X86 && 64BIT
  24         select ARM_CRYPTO if ARM
  25         select ARM64_CRYPTO if ARM64
  26 -       select CRYPTO_CHACHA20_NEON if (ARM || ARM64) && KERNEL_MODE_NEON
  27 +       select CRYPTO_CHACHA20_NEON if ARM || (ARM64 && KERNEL_MODE_NEON)
  28         select CRYPTO_POLY1305_NEON if ARM64 && KERNEL_MODE_NEON
  29         select CRYPTO_POLY1305_ARM if ARM
  30         select CRYPTO_CURVE25519_NEON if ARM && KERNEL_MODE_NEON