diff options
| author | Eric Biggers <ebiggers@google.com> | 2025-04-22 08:27:15 -0700 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2025-04-28 19:40:54 +0800 |
| commit | 879f47548b8710f6cdfde38be7d5a6302e9e015d (patch) | |
| tree | d629647792d86a84c008bb2e7769ddb156766183 /arch | |
| parent | crypto: x86 - move library functions to arch/x86/lib/crypto/ (diff) | |
| download | linux-879f47548b8710f6cdfde38be7d5a6302e9e015d.tar.gz linux-879f47548b8710f6cdfde38be7d5a6302e9e015d.zip | |
crypto: lib/chacha - remove INTERNAL symbol and selection of CRYPTO
Now that the architecture-optimized ChaCha kconfig symbols are defined
regardless of CRYPTO, there is no need for CRYPTO_LIB_CHACHA to select
CRYPTO. So, remove that. This makes the indirection through the
CRYPTO_LIB_CHACHA_INTERNAL symbol unnecessary, so get rid of that and
just use CRYPTO_LIB_CHACHA directly. Finally, make the fallback to the
generic implementation use a default value instead of a select; this
makes it consistent with how the arch-optimized code gets enabled and
also with how CRYPTO_LIB_BLAKE2S_GENERIC gets enabled.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/lib/crypto/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm64/lib/crypto/Kconfig | 2 | ||||
| -rw-r--r-- | arch/mips/lib/crypto/Kconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/lib/crypto/Kconfig | 2 | ||||
| -rw-r--r-- | arch/riscv/lib/crypto/Kconfig | 2 | ||||
| -rw-r--r-- | arch/s390/lib/crypto/Kconfig | 2 | ||||
| -rw-r--r-- | arch/x86/lib/crypto/Kconfig | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/lib/crypto/Kconfig b/arch/arm/lib/crypto/Kconfig index 181f138d563b..5d10bd13fc8d 100644 --- a/arch/arm/lib/crypto/Kconfig +++ b/arch/arm/lib/crypto/Kconfig @@ -15,7 +15,7 @@ config CRYPTO_BLAKE2S_ARM config CRYPTO_CHACHA20_NEON tristate - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_ARM diff --git a/arch/arm64/lib/crypto/Kconfig b/arch/arm64/lib/crypto/Kconfig index 169311547efe..2a8ff7cfc08d 100644 --- a/arch/arm64/lib/crypto/Kconfig +++ b/arch/arm64/lib/crypto/Kconfig @@ -3,7 +3,7 @@ config CRYPTO_CHACHA20_NEON tristate depends on KERNEL_MODE_NEON - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA diff --git a/arch/mips/lib/crypto/Kconfig b/arch/mips/lib/crypto/Kconfig index 5b82ba753c55..454354e30d76 100644 --- a/arch/mips/lib/crypto/Kconfig +++ b/arch/mips/lib/crypto/Kconfig @@ -3,7 +3,7 @@ config CRYPTO_CHACHA_MIPS tristate depends on CPU_MIPS32_R2 - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_ARCH_HAVE_LIB_CHACHA config CRYPTO_POLY1305_MIPS diff --git a/arch/powerpc/lib/crypto/Kconfig b/arch/powerpc/lib/crypto/Kconfig index 3f52610e45eb..6627d28cd24e 100644 --- a/arch/powerpc/lib/crypto/Kconfig +++ b/arch/powerpc/lib/crypto/Kconfig @@ -3,7 +3,7 @@ config CRYPTO_CHACHA20_P10 tristate depends on PPC64 && CPU_LITTLE_ENDIAN && VSX - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA diff --git a/arch/riscv/lib/crypto/Kconfig b/arch/riscv/lib/crypto/Kconfig index 46ce2a7ac1f2..bc7a43f33eb3 100644 --- a/arch/riscv/lib/crypto/Kconfig +++ b/arch/riscv/lib/crypto/Kconfig @@ -3,6 +3,6 @@ config CRYPTO_CHACHA_RISCV64 tristate depends on 64BIT && RISCV_ISA_V && TOOLCHAIN_HAS_VECTOR_CRYPTO - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_ARCH_HAVE_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC diff --git a/arch/s390/lib/crypto/Kconfig b/arch/s390/lib/crypto/Kconfig index b79fd91af9fe..069b355fe51a 100644 --- a/arch/s390/lib/crypto/Kconfig +++ b/arch/s390/lib/crypto/Kconfig @@ -2,6 +2,6 @@ config CRYPTO_CHACHA_S390 tristate - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA diff --git a/arch/x86/lib/crypto/Kconfig b/arch/x86/lib/crypto/Kconfig index f83aa51dd912..e44403d9677f 100644 --- a/arch/x86/lib/crypto/Kconfig +++ b/arch/x86/lib/crypto/Kconfig @@ -15,7 +15,7 @@ config CRYPTO_BLAKE2S_X86 config CRYPTO_CHACHA20_X86_64 tristate depends on 64BIT - default CRYPTO_LIB_CHACHA_INTERNAL + default CRYPTO_LIB_CHACHA select CRYPTO_LIB_CHACHA_GENERIC select CRYPTO_ARCH_HAVE_LIB_CHACHA |