Commit edc8e80b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Herbert Xu
Browse files

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: e56e1898 ("lib/crypto: add prompts back to crypto libraries")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 92c6a707

drivers/crypto/marvell/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

lib/crypto/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -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

security/keys/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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