[PATCH] Kconfig: Drop duplicate 'select SHA512' instances

[PATCH] Kconfig: Drop duplicate 'select SHA512' instances

[Tom Rini]

When dropping SHA512_ALGO in general, we didn't catch some cases where
an option was selecting  both SHA512 and SHA512_ALGO and caused them to
select SHA512 twice.  Kconfig doesn't complain, but this is still wrong
and should be corrected.

Fixes: e60e44993120 ("lib: Drop SHA512_ALGO in lieu of SHA512")
Reported-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 lib/crypt/Kconfig      | 1 -
 lib/efi_loader/Kconfig | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lib/crypt/Kconfig b/lib/crypt/Kconfig
index 6a5002964224..a59d5c7d1d54 100644
--- a/lib/crypt/Kconfig
+++ b/lib/crypt/Kconfig
@@ -20,7 +20,6 @@ config CRYPT_PW_SHA256
 config CRYPT_PW_SHA512
 	bool "Provide sha512crypt"
 	select SHA512
-	select SHA512
 	help
 	  Enables support for the sha512crypt password-hashing algorithm.
 	  The prefix is "$6$".
diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index 08463251cdf1..edd4ae29f163 100644
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -323,7 +323,6 @@ config EFI_TCG2_PROTOCOL
 	depends on TPM_V2
 	select SHA1
 	select SHA256
-	select SHA512
 	select SHA384
 	select SHA512
 	select HASH
-- 
2.17.1

Re: [PATCH] Kconfig: Drop duplicate 'select SHA512' instances

[Alex G.]

On 9/9/21 10:00 AM, Tom Rini wrote:
> When dropping SHA512_ALGO in general, we didn't catch some cases where
> an option was selecting  both SHA512 and SHA512_ALGO and caused them to
> select SHA512 twice.  Kconfig doesn't complain, but this is still wrong
> and should be corrected.
> 
> Fixes: e60e44993120 ("lib: Drop SHA512_ALGO in lieu of SHA512")
> Reported-by: Andreas Schwab <schwab@suse.de>
> Signed-off-by: Tom Rini <trini@konsulko.com>

Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

> ---
>   lib/crypt/Kconfig      | 1 -
>   lib/efi_loader/Kconfig | 1 -
>   2 files changed, 2 deletions(-)
> 
> diff --git a/lib/crypt/Kconfig b/lib/crypt/Kconfig
> index 6a5002964224..a59d5c7d1d54 100644
> --- a/lib/crypt/Kconfig
> +++ b/lib/crypt/Kconfig
> @@ -20,7 +20,6 @@ config CRYPT_PW_SHA256
>   config CRYPT_PW_SHA512
>   	bool "Provide sha512crypt"
>   	select SHA512
> -	select SHA512
>   	help
>   	  Enables support for the sha512crypt password-hashing algorithm.
>   	  The prefix is "$6$".
> diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
> index 08463251cdf1..edd4ae29f163 100644
> --- a/lib/efi_loader/Kconfig
> +++ b/lib/efi_loader/Kconfig
> @@ -323,7 +323,6 @@ config EFI_TCG2_PROTOCOL
>   	depends on TPM_V2
>   	select SHA1
>   	select SHA256
> -	select SHA512
>   	select SHA384
>   	select SHA512
>   	select HASH
> 

Re: [PATCH] Kconfig: Drop duplicate 'select SHA512' instances

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 642 bytes --]

On Thu, Sep 09, 2021 at 10:07:56AM -0500, Alex G. wrote:
> On 9/9/21 10:00 AM, Tom Rini wrote:
> > When dropping SHA512_ALGO in general, we didn't catch some cases where
> > an option was selecting  both SHA512 and SHA512_ALGO and caused them to
> > select SHA512 twice.  Kconfig doesn't complain, but this is still wrong
> > and should be corrected.
> > 
> > Fixes: e60e44993120 ("lib: Drop SHA512_ALGO in lieu of SHA512")
> > Reported-by: Andreas Schwab <schwab@suse.de>
> > Signed-off-by: Tom Rini <trini@konsulko.com>
> 
> Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]