Commit a1388fcb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux 

Pull crypto library fixes from Eric Biggers:
 "Two Curve25519 related fixes:

   - Re-enable KASAN support on curve25519-hacl64.c with gcc.

   - Disable the arm optimized Curve25519 code on CPU_BIG_ENDIAN
     kernels. It has always been broken in that configuration"

* tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
  lib/crypto: arm/curve25519: Disable on CPU_BIG_ENDIAN
  lib/crypto: curve25519-hacl64: Fix older clang KASAN workaround for GCC
parents c668da99 44e8241c

lib/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ config CRYPTO_LIB_CURVE25519 
config CRYPTO_LIB_CURVE25519_ARCH

	bool

	depends on CRYPTO_LIB_CURVE25519 && !UML && !KMSAN

	default y if ARM && KERNEL_MODE_NEON

	default y if ARM && KERNEL_MODE_NEON && !CPU_BIG_ENDIAN

	default y if PPC64 && CPU_LITTLE_ENDIAN

	default y if X86_64

lib/crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ else 
libcurve25519-$(CONFIG_CRYPTO_LIB_CURVE25519_GENERIC) += curve25519-fiat32.o

endif

# clang versions prior to 18 may blow out the stack with KASAN

ifeq ($(call clang-min-version, 180000),)

ifeq ($(CONFIG_CC_IS_CLANG)_$(call clang-min-version, 180000),y_)

KASAN_SANITIZE_curve25519-hacl64.o := n

endif