Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3632866 authored by Justin M. Forbes's avatar Justin M. Forbes Committed by Treehugger Robot
Browse files

BACKPORT: lib/crypto: add prompts back to crypto libraries 



Commit 6048fdcc5f269 ("lib/crypto: blake2s: include as built-in") took
away a number of prompt texts from other crypto libraries. This makes
values flip from built-in to module when oldconfig runs, and causes
problems when these crypto libs need to be built in for thingslike
BIG_KEYS.

Fixes: 6048fdcc5f269 ("lib/crypto: blake2s: include as built-in")
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: default avatarJustin M. Forbes <jforbes@fedoraproject.org>
[Jason: - moved menu into submenu of lib/ instead of root menu
        - fixed chacha sub-dependencies for CONFIG_CRYPTO]
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>

(cherry picked from commit e56e18985596617ae426ed5997fb2e737cffb58b)

Conflicts:
	lib/Kconfig
	lib/crypto/Kconfig

Change-Id: Ic152f89df593925e9467ca16ee98ff2750ee6dea
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent c9ff7eb7

crypto/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -1966,5 +1966,3 @@ source crypto/asymmetric_keys/Kconfig 
source certs/Kconfig



endif	# if CRYPTO
 


source "lib/crypto/Kconfig"

lib/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ config INDIRECT_PIO 


	  When in doubt, say N.



source "lib/crypto/Kconfig"



config CRC_CCITT

	tristate "CRC-CCITT functions"

	help

lib/crypto/Kconfig

+12 −5
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



menu "Crypto library routines"



config CRYPTO_ARCH_HAVE_LIB_BLAKE2S

	bool

	help
@@ -25,7 +27,7 @@ config CRYPTO_ARCH_HAVE_LIB_CHACHA 


config CRYPTO_LIB_CHACHA_GENERIC

	tristate

	select CRYPTO_ALGAPI

	select XOR_BLOCKS

	help

	  This symbol can be depended upon by arch implementations of the

	  ChaCha library interface that require the generic code as a
@@ -34,7 +36,8 @@ config CRYPTO_LIB_CHACHA_GENERIC 
	  of CRYPTO_LIB_CHACHA.



config CRYPTO_LIB_CHACHA

	tristate

	tristate "ChaCha library interface"

	depends on CRYPTO

	depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA

	select CRYPTO_LIB_CHACHA_GENERIC if CRYPTO_ARCH_HAVE_LIB_CHACHA=n

	help
@@ -59,7 +62,7 @@ config CRYPTO_LIB_CURVE25519_GENERIC 
	  of CRYPTO_LIB_CURVE25519.



config CRYPTO_LIB_CURVE25519

	tristate

	tristate "Curve25519 scalar multiplication library"

	depends on CRYPTO_ARCH_HAVE_LIB_CURVE25519 || !CRYPTO_ARCH_HAVE_LIB_CURVE25519

	select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n

	help
@@ -91,7 +94,7 @@ config CRYPTO_LIB_POLY1305_GENERIC 
	  of CRYPTO_LIB_POLY1305.



config CRYPTO_LIB_POLY1305

	tristate

	tristate "Poly1305 library interface"

	depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305

	select CRYPTO_LIB_POLY1305_GENERIC if CRYPTO_ARCH_HAVE_LIB_POLY1305=n

	help
@@ -100,8 +103,12 @@ config CRYPTO_LIB_POLY1305 
	  is available and enabled.



config CRYPTO_LIB_CHACHA20POLY1305

	tristate

	tristate "ChaCha20-Poly1305 AEAD support (8-byte nonce library version)"

	depends on CRYPTO_ARCH_HAVE_LIB_CHACHA || !CRYPTO_ARCH_HAVE_LIB_CHACHA

	depends on CRYPTO_ARCH_HAVE_LIB_POLY1305 || !CRYPTO_ARCH_HAVE_LIB_POLY1305

	depends on CRYPTO

	select CRYPTO_LIB_CHACHA

	select CRYPTO_LIB_POLY1305

	select CRYPTO_ALGAPI



endmenu