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>

diff --git a/arch/arm/lib/crypto/Kconfig b/arch/arm/lib/crypto/Kconfig
index 181f138d563b65931a7962139415ebb276ddd7a2..5d10bd13fc8df3308e7c5f2e46c5103b08061c38 100644 (file)
--- 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 169311547efe38a43c14b5756fcf0af4ef820c11..2a8ff7cfc08d3d9b5280531258fe3905e12b89be 100644 (file)
--- 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 5b82ba753c55c4ddfb66610da6c16e32740b6842..454354e30d76ce3a675f993c15c5db8d08a56a4f 100644 (file)
--- 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 3f52610e45eb43f33fe245a55254f270653fadca..6627d28cd24e0a46a490cfad17faabcd39db6385 100644 (file)
--- 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 46ce2a7ac1f2c9c03601e7f6ef7b87140890c935..bc7a43f33eb3a3ea12b856addfad3c54a7f73255 100644 (file)
--- 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 b79fd91af9fe1431725b8db381a74a47cd0c616c..069b355fe51aa91047c466f1f4e7c6a65198148a 100644 (file)
--- 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 f83aa51dd9129d395c3e33826d6339c8b853a9b5..e44403d9677f596dcb44c75f67c0f0038c46a8f8 100644 (file)
--- 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
 

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 9322e42e562de8ff3cde4a55aee227e8103fefe9..832af6363951f8ebe27242d625ada31df9212adc 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -634,8 +634,8 @@ config CRYPTO_ARC4
 
 config CRYPTO_CHACHA20
        tristate "ChaCha"
+       select CRYPTO_LIB_CHACHA
        select CRYPTO_LIB_CHACHA_GENERIC
-       select CRYPTO_LIB_CHACHA_INTERNAL
        select CRYPTO_SKCIPHER
        help
          The ChaCha20, XChaCha20, and XChaCha12 stream cipher algorithms

diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index f321fe1a8681be144392e24d99a0bd9668626108..c6ab724c1dbd9dec48e38ab931282b5d0e700162 100644 (file)
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -50,22 +50,16 @@ config CRYPTO_ARCH_HAVE_LIB_CHACHA
 
 config CRYPTO_LIB_CHACHA_GENERIC
        tristate
+       default CRYPTO_LIB_CHACHA if !CRYPTO_ARCH_HAVE_LIB_CHACHA
        select CRYPTO_LIB_UTILS
        help
-         This symbol can be depended upon by arch implementations of the
-         ChaCha library interface that require the generic code as a
-         fallback, e.g., for SIMD implementations. If no arch specific
-         implementation is enabled, this implementation serves the users
-         of CRYPTO_LIB_CHACHA.
-
-config CRYPTO_LIB_CHACHA_INTERNAL
-       tristate
-       select CRYPTO_LIB_CHACHA_GENERIC if CRYPTO_ARCH_HAVE_LIB_CHACHA=n
+         This symbol can be selected by arch implementations of the ChaCha
+         library interface that require the generic code as a fallback, e.g.,
+         for SIMD implementations. If no arch specific implementation is
+         enabled, this implementation serves the users of CRYPTO_LIB_CHACHA.
 
 config CRYPTO_LIB_CHACHA
        tristate
-       select CRYPTO
-       select CRYPTO_LIB_CHACHA_INTERNAL
        help
          Enable the ChaCha library interface. This interface may be fulfilled
          by either the generic implementation or an arch-specific one, if one