crypto: lib/Kconfig - hide library options

Any driver that needs these library functions should already be selecting
the corresponding Kconfig symbols, so there is no real point in making
these visible.

The original patch that made these user selectable described problems
with drivers failing to select the code they use, but for consistency
it's better to always use 'select' on a symbol than to mix it with
'depends on'.

Fixes: e56e18985596 ("lib/crypto: add prompts back to crypto libraries")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/marvell/Kconfig b/drivers/crypto/marvell/Kconfig
index 4c25a78ab3ed4d6e240bbf560482e9249eabc1a4..aa269abb04996e13e693e2ef98f5f5fbd15059f6 100644 (file)
--- a/drivers/crypto/marvell/Kconfig
+++ b/drivers/crypto/marvell/Kconfig
@@ -24,7 +24,7 @@ config CRYPTO_DEV_OCTEONTX_CPT
        tristate "Support for Marvell OcteonTX CPT driver"
        depends on ARCH_THUNDER || COMPILE_TEST
        depends on PCI_MSI && 64BIT
-       depends on CRYPTO_LIB_AES
+       select CRYPTO_LIB_AES
        select CRYPTO_SKCIPHER
        select CRYPTO_HASH
        select CRYPTO_AEAD
@@ -41,10 +41,10 @@ config CRYPTO_DEV_OCTEONTX2_CPT
        tristate "Marvell OcteonTX2 CPT driver"
        depends on ARCH_THUNDER2 || COMPILE_TEST
        depends on PCI_MSI && 64BIT
-       depends on CRYPTO_LIB_AES
        depends on NET_VENDOR_MARVELL
        select OCTEONTX2_MBOX
        select CRYPTO_DEV_MARVELL
+       select CRYPTO_LIB_AES
        select CRYPTO_SKCIPHER
        select CRYPTO_HASH
        select CRYPTO_AEAD

diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig
index 17322f87158623d20bc9f9cb3dea514defa32e70..798972b29b68bce9491625f4c6dea81995e47a59 100644 (file)
--- a/lib/crypto/Kconfig
+++ b/lib/crypto/Kconfig
@@ -63,7 +63,7 @@ config CRYPTO_LIB_CHACHA_INTERNAL
        select CRYPTO_LIB_CHACHA_GENERIC if CRYPTO_ARCH_HAVE_LIB_CHACHA=n
 
 config CRYPTO_LIB_CHACHA
-       tristate "ChaCha library interface"
+       tristate
        select CRYPTO
        select CRYPTO_LIB_CHACHA_INTERNAL
        help
@@ -93,7 +93,7 @@ config CRYPTO_LIB_CURVE25519_INTERNAL
        select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n
 
 config CRYPTO_LIB_CURVE25519
-       tristate "Curve25519 scalar multiplication library"
+       tristate
        select CRYPTO
        select CRYPTO_LIB_CURVE25519_INTERNAL
        help
@@ -132,7 +132,7 @@ config CRYPTO_LIB_POLY1305_INTERNAL
        select CRYPTO_LIB_POLY1305_GENERIC if CRYPTO_ARCH_HAVE_LIB_POLY1305=n
 
 config CRYPTO_LIB_POLY1305
-       tristate "Poly1305 library interface"
+       tristate
        select CRYPTO
        select CRYPTO_LIB_POLY1305_INTERNAL
        help
@@ -141,7 +141,7 @@ config CRYPTO_LIB_POLY1305
          is available and enabled.
 
 config CRYPTO_LIB_CHACHA20POLY1305
-       tristate "ChaCha20-Poly1305 AEAD support (8-byte nonce library version)"
+       tristate
        select CRYPTO_LIB_CHACHA
        select CRYPTO_LIB_POLY1305
        select CRYPTO_LIB_UTILS

diff --git a/security/keys/Kconfig b/security/keys/Kconfig
index abb03a1b2a5c14788b785bf80537003af1e8cc64..d4f5fc1e72638f81a10b67295c607c4557a4ecda 100644 (file)
--- a/security/keys/Kconfig
+++ b/security/keys/Kconfig
@@ -60,7 +60,7 @@ config BIG_KEYS
        bool "Large payload keys"
        depends on KEYS
        depends on TMPFS
-       depends on CRYPTO_LIB_CHACHA20POLY1305 = y
+       select CRYPTO_LIB_CHACHA20POLY1305
        help
          This option provides support for holding large keys within the kernel
          (for example Kerberos ticket caches).  The data may be stored out to