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

Commit 109826cc authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Lee Jones
Browse files

UPSTREAM: crypto: mips/poly1305 - enable for all MIPS processors 



The MIPS Poly1305 implementation is generic MIPS code written such as to
support down to the original MIPS I and MIPS III ISA for the 32-bit and
64-bit variant respectively.  Lift the current limitation then to enable
code for MIPSr1 ISA or newer processors only and have it available for
all MIPS processors.

Bug: 254441685
Signed-off-by: default avatarMaciej W. Rozycki <macro@orcam.me.uk>
Fixes: a11d055e7a64 ("crypto: mips/poly1305 - incorporate OpenSSL/CRYPTOGAMS optimized implementation")
Cc: stable@vger.kernel.org # v5.5+
Acked-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
(cherry picked from commit 6c810cf20feef0d4338e9b424ab7f2644a8b353e)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I0939810d34bbc12ba426c8368c8f5a54de771b8f
parent 917cc909

arch/mips/crypto/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ AFLAGS_chacha-core.o += -O2 # needed to fill branch delay slots 
obj-$(CONFIG_CRYPTO_POLY1305_MIPS) += poly1305-mips.o

poly1305-mips-y := poly1305-core.o poly1305-glue.o



perlasm-flavour-$(CONFIG_CPU_MIPS32) := o32

perlasm-flavour-$(CONFIG_CPU_MIPS64) := 64

perlasm-flavour-$(CONFIG_32BIT) := o32

perlasm-flavour-$(CONFIG_64BIT) := 64



quiet_cmd_perlasm = PERLASM $@

      cmd_perlasm = $(PERL) $(<) $(perlasm-flavour-y) $(@)

crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ config CRYPTO_POLY1305_X86_64 


config CRYPTO_POLY1305_MIPS

	tristate "Poly1305 authenticator algorithm (MIPS optimized)"

	depends on CPU_MIPS32 || (CPU_MIPS64 && 64BIT)

	depends on MIPS

	select CRYPTO_ARCH_HAVE_LIB_POLY1305



config CRYPTO_MD4

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ config WIREGUARD 
	select CRYPTO_BLAKE2S_ARM if ARM

	select CRYPTO_CURVE25519_NEON if ARM && KERNEL_MODE_NEON

	select CRYPTO_CHACHA_MIPS if CPU_MIPS32_R2

	select CRYPTO_POLY1305_MIPS if CPU_MIPS32 || (CPU_MIPS64 && 64BIT)

	select CRYPTO_POLY1305_MIPS if MIPS

	help

	  WireGuard is a secure, fast, and easy to use replacement for IPSec

	  that uses modern cryptography and clever networking tricks. It's