diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-06 12:48:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-11-06 12:48:18 -0800 |
| commit | a1388fcb52fcad3e0b06e2cdd0ed757a82a5be30 (patch) | |
| tree | ad3465230d0d64c6887503903fb463a905adef63 | |
| parent | c668da99b923bc0527f19e361bb8496be087970f (diff) | |
| parent | 44e8241c51f762aafa50ed116da68fd6ecdcc954 (diff) | |
| download | linux-a1388fcb52fcad3e0b06e2cdd0ed757a82a5be30.tar.gz linux-a1388fcb52fcad3e0b06e2cdd0ed757a82a5be30.tar.bz2 linux-a1388fcb52fcad3e0b06e2cdd0ed757a82a5be30.zip | |
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
| -rw-r--r-- | lib/crypto/Kconfig | 2 | ||||
| -rw-r--r-- | lib/crypto/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index 8886055e938f..16859c6226dd 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -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 diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index bded351aeace..d2845b214585 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -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 |