crypto: blake2s - revert unintended config addition of CRYPTO_BLAKE2S
authorLukas Bulwahn <lukas.bulwahn@gmail.com>
Wed, 14 Sep 2022 08:38:27 +0000 (10:38 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Sat, 24 Sep 2022 08:14:43 +0000 (16:14 +0800)
Commit 2d16803c562e ("crypto: blake2s - remove shash module") removes the
config CRYPTO_BLAKE2S.

Commit 3f342a23257d ("crypto: Kconfig - simplify hash entries") makes
various changes to the config descriptions as part of some consolidation
and clean-up, but among all those changes, it also accidently adds back
CRYPTO_BLAKE2S after its removal due to the original patch being based on
a state before the CRYPTO_BLAKE2S removal.

See Link for the author's confirmation of this happening accidently.

Fixes: 3f342a23257d ("crypto: Kconfig - simplify hash entries")
Link: https://lore.kernel.org/all/MW5PR84MB18424AB8C095BFC041AE33FDAB479@MW5PR84MB1842.NAMPRD84.PROD.OUTLOOK.COM/
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/Kconfig

index 40423a1..2589ad5 100644 (file)
@@ -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