Subject: [PATCH 1/2] crypto/arm64: Kconfig - fix SHA1 symbol name

In the arm64 Kconfig file, revert an incorrect change of
the symbol name CRYPTO_SHA1_ARM64_CE to CRYPTO_SHA1_ARM64.

Fixes: 3f342a23257d ("crypto: Kconfig - simplify hash entries")
Reported-by: Lukas Bulwahn <[email protected]>
Signed-off-by: Robert Elliott <[email protected]>
---
arch/arm64/crypto/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
index 7ba9bcb6d409..8bd80508a710 100644
--- a/arch/arm64/crypto/Kconfig
+++ b/arch/arm64/crypto/Kconfig
@@ -36,7 +36,7 @@ config CRYPTO_POLY1305_NEON
Architecture: arm64 using:
- NEON (Advanced SIMD) extensions

-config CRYPTO_SHA1_ARM64
+config CRYPTO_SHA1_ARM64_CE
tristate "Hash functions: SHA-1 (ARMv8 Crypto Extensions)"
depends on KERNEL_MODE_NEON
select CRYPTO_HASH
--
2.37.2


Subject: [PATCH 2/2] crypto: Kconfig - remove CRYPTO_BLAKE2S symbol

Revert an incorrect change that reintroduced the CRYPTO_BLAKE2S
symbol that was removed by commit 2d16803c562e ("crypto: blake2s -
remove shash module").

Fixes: 3f342a23257d ("crypto: Kconfig - simplify hash entries")
Signed-off-by: Robert Elliott <[email protected]>
---
crypto/Kconfig | 21 ---------------------
1 file changed, 21 deletions(-)

diff --git a/crypto/Kconfig b/crypto/Kconfig
index e93da749f31b..8346e591d8df 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -916,27 +916,6 @@ config CRYPTO_BLAKE2B

See https://blake2.net for further information.

- config CRYPTO_BLAKE2S
- tristate "BLAKE2s"
- select CRYPTO_LIB_BLAKE2S_GENERIC
- select CRYPTO_HASH
- help
- BLAKE2s cryptographic hash function (RFC 7693)
-
- BLAKE2s is optimized for 8 to 32-bit platforms and can produce
- digests of any size between 1 and 32 bytes. The keyed hash is
- also implemented.
-
- This module provides the following algorithms:
- - blake2s-128
- - blake2s-160
- - blake2s-224
- - blake2s-256
-
- Used by Wireguard.
-
- See https://blake2.net for further information.
-
config CRYPTO_CMAC
tristate "CMAC (Cipher-based MAC)"
select CRYPTO_HASH
--
2.37.2