| Message ID | 20220914083827.18939-1-lukas.bulwahn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 1b79573de717cfabe28221a98afaa6a3ff0e7458 |
| Headers | show |
| Series | crypto: revert unintended config addition of CRYPTO_BLAKE2S | expand |
On Wed, Sep 14, 2022 at 10:38:27AM +0200, Lukas Bulwahn wrote: > 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. > > Link: https://lore.kernel.org/all/MW5PR84MB18424AB8C095BFC041AE33FDAB479@MW5PR84MB1842.NAMPRD84.PROD.OUTLOOK.COM/ > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> > --- > crypto/Kconfig | 21 --------------------- > 1 file changed, 21 deletions(-) Patch applied. Thanks.
diff --git a/crypto/Kconfig b/crypto/Kconfig index 1dfe0583f302..df4a29905ab0 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -917,27 +917,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
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. Link: https://lore.kernel.org/all/MW5PR84MB18424AB8C095BFC041AE33FDAB479@MW5PR84MB1842.NAMPRD84.PROD.OUTLOOK.COM/ Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> --- crypto/Kconfig | 21 --------------------- 1 file changed, 21 deletions(-)