Commit 8d000c65 authored by Justin M. Forbes's avatar Justin M. Forbes Committed by Zheng Zengkai
Browse files

lib/crypto: add prompts back to crypto libraries

stable inclusion
from stable-v5.10.120
commit 630192aa45233acfe3d17952862ca215f6d31f09
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6BR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=630192aa45233acfe3d17952862ca215f6d31f09



--------------------------------

commit e56e1898 upstream.

Commit 6048fdcc ("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: 6048fdcc ("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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>

 Conflicts:
	lib/crypto/Kconfig
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent e96e1c07
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment