Skip to content

Commit a1388fc

Browse files
committed
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
2 parents c668da9 + 44e8241 commit a1388fc

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

lib/crypto/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ config CRYPTO_LIB_CURVE25519
6464
config CRYPTO_LIB_CURVE25519_ARCH
6565
bool
6666
depends on CRYPTO_LIB_CURVE25519 && !UML && !KMSAN
67-
default y if ARM && KERNEL_MODE_NEON
67+
default y if ARM && KERNEL_MODE_NEON && !CPU_BIG_ENDIAN
6868
default y if PPC64 && CPU_LITTLE_ENDIAN
6969
default y if X86_64
7070

lib/crypto/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ else
9090
libcurve25519-$(CONFIG_CRYPTO_LIB_CURVE25519_GENERIC) += curve25519-fiat32.o
9191
endif
9292
# clang versions prior to 18 may blow out the stack with KASAN
93-
ifeq ($(call clang-min-version, 180000),)
93+
ifeq ($(CONFIG_CC_IS_CLANG)_$(call clang-min-version, 180000),y_)
9494
KASAN_SANITIZE_curve25519-hacl64.o := n
9595
endif
9696

0 commit comments

Comments
 (0)