From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BDC6C433F5 for ; Thu, 9 Sep 2021 15:01:08 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 72883611B0 for ; Thu, 9 Sep 2021 15:01:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 72883611B0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6AD42834DC; Thu, 9 Sep 2021 17:01:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id E9AF4834DA; Thu, 9 Sep 2021 17:01:01 +0200 (CEST) Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7F754834DD for ; Thu, 9 Sep 2021 17:00:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f176.google.com with SMTP id 22so2091213qkg.2 for ; Thu, 09 Sep 2021 08:00:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HY/1u0c8VY6zvF8Qj3/rIhVrq+5YRlXwBypUNN2OU5k=; b=vEfbY9aomKo0PViloLK1M5K8khFutYNeYE3b/6eiQj9OWrIEGKgHgL087u5Ibm6ZQW 9Gc09GUko+5iqkWjbKLnE9adBRgp1G7TnM4nRbzIiF3VrbTuSJYSUqWOjVSf5tdajOUI V2z2sDlaAob7XK3k20qd3OrT2CxJDCtMf84oI6HL4II6VcdSbmhZngQw3y8aT1SZbCb2 Kz/i9mzVvQjcpWFEDBA9CT8WAAEG8YXETJtUddvzTg4EXKJdv38Dy7xw9sfgI/RbQl5o vigGps9jveqcfhU8L02gBBhAxtGCFoHqW87w4tc1tDyKvmQToXuZXFLvqsx28IO2DVhF C75A== X-Gm-Message-State: AOAM531iGWkyFKt7bAoa2iJ4kLLXNuDbQ+vqU2GKeTKbIhNSr5fkoQWi OmASXjHikR+NyhAO1zXGENbQN4IYlg== X-Google-Smtp-Source: ABdhPJzTCaBFxaHThqw8W5tuKm6+59mFhF1muZJyhSwqrGO02Q7cd46dQvb0Zy2sZCmLPRd6dJdovA== X-Received: by 2002:a05:620a:14ad:: with SMTP id x13mr3186649qkj.172.1631199656740; Thu, 09 Sep 2021 08:00:56 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-f91e-f867-d1bc-397d.res6.spectrum.com. [2603:6081:7b01:cbda:f91e:f867:d1bc:397d]) by smtp.gmail.com with ESMTPSA id u27sm1496494qku.9.2021.09.09.08.00.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Sep 2021 08:00:55 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Andreas Schwab Subject: [PATCH] Kconfig: Drop duplicate 'select SHA512' instances Date: Thu, 9 Sep 2021 11:00:53 -0400 Message-Id: <20210909150053.10795-1-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 Signed-off-by: Tom Rini --- 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