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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 AF492C04FF3 for ; Mon, 24 May 2021 20:22:36 +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 326EB613CC for ; Mon, 24 May 2021 20:22:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 326EB613CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6DD3582F2D; Mon, 24 May 2021 22:20:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j3hyM0XQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 00D3782EDF; Mon, 24 May 2021 22:19:59 +0200 (CEST) Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) (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 7B30282EC9 for ; Mon, 24 May 2021 22:19:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mr.nuke.me@gmail.com Received: by mail-ot1-x32f.google.com with SMTP id 36-20020a9d0ba70000b02902e0a0a8fe36so26382276oth.8 for ; Mon, 24 May 2021 13:19:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U3UwACyWxBRutbHs3OG3YpDjfJmX2QfDBeKHUtcsJe0=; b=j3hyM0XQjfhnfCWfkMgZSKBWGJint6Qif0cCn513SZOu6D7pqq9xMBGEpwRv20OAsk aqG70NhamZnWC7cH7z2v8/vWmCJuijU5mTuEW5WufV3T+KVHW6SwAAuFC3QVn8ylTny9 HC34W/LwQ1nHA6HRV+TNBpbwq9ODJRoXDjz2w2nt9E88WQ4D6erBu0QX/FLva01UesyK Y1Mv2fEi6T9g58qmVjhEJCnSS5q91/X5BXxcW7sdoGtBo+Kgz5pEZTDwzNWNtTC3vZ33 iOE7kA4Eene7CHzye1IDNafeKFKU0Gs+9cJGJDGlsC24gg5NsLTcoeTcoszcd9iO91QA ujMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U3UwACyWxBRutbHs3OG3YpDjfJmX2QfDBeKHUtcsJe0=; b=c5lv5vxx9wmM0FiRQ/+sCP2sb7O5V/8+Rk1A8WITfeNlyZ4CFeZonjQAXCrAq99s8G rtz5ADm5heleqjA8Uhl9jzqMREKrSybNZIIaSB8zXKS7MfFHoXtm0EFc0Xgdx3yaMz4v j6JcUzXYcWHvzBGTrQf6Oc9FJaiddFGgWMv6KXdhtrh0QeXV8M35Mrfj97T5RWJQMHmd OY4pNXGmHpS66HNU+Ae2W62MpcqM7+2yC8bZsuoFdW7R5xM5HVaBvJkBWHdXWdAUBSU5 Kw/+g6KLTszrXC4Mm9HpTAIPW6mpLgeN3+mUL/bor812Km+lzd9raAKpcb3+ABXPsawL MGGA== X-Gm-Message-State: AOAM530+2c3cJUrgdECIwBDiXEuZ1QZPW+EvJZcgCG5ToMwmmmchH7CY fTsAqq87wMNrBgH292FVCkgP6q/J7WSXOg== X-Google-Smtp-Source: ABdhPJzcpRLKHu4/Q1FKJDLzcmN/O6PL5dbM0bPLQ2tt0LB4VEifCutbHTRoaQgrk5gBSTZ8/Xsp1w== X-Received: by 2002:a9d:6743:: with SMTP id w3mr19237536otm.82.1621887594098; Mon, 24 May 2021 13:19:54 -0700 (PDT) Received: from nuclearis3.lan (c-98-195-139-126.hsd1.tx.comcast.net. [98.195.139.126]) by smtp.gmail.com with ESMTPSA id w13sm2816338otp.10.2021.05.24.13.19.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 13:19:53 -0700 (PDT) From: Alexandru Gagniuc To: u-boot@lists.denx.de, sjg@chromium.org Cc: Alexandru Gagniuc , trini@konsulko.com, michal.simek@xilinx.com, rasmus.villemoes@prevas.dk Subject: [PATCH v2 16/18] image: Eliminate IMAGE_ENABLE_VERIFY macro Date: Mon, 24 May 2021 15:19:37 -0500 Message-Id: <20210524201939.1491676-17-mr.nuke.me@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524201939.1491676-1-mr.nuke.me@gmail.com> References: <20210524201939.1491676-1-mr.nuke.me@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.102.4 at phobos.denx.de X-Virus-Status: Clean This macro is no longer needed for code flow or #ifdefs. Remove it. Signed-off-by: Alexandru Gagniuc Reviewed-by: Simon Glass --- include/image.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/image.h b/include/image.h index f7f8f8a029..ee930b0265 100644 --- a/include/image.h +++ b/include/image.h @@ -1196,19 +1196,16 @@ int calculate_hash(const void *data, int data_len, const char *algo, #if defined(USE_HOSTCC) # if defined(CONFIG_FIT_SIGNATURE) # define IMAGE_ENABLE_SIGN 1 -# define IMAGE_ENABLE_VERIFY 1 # define IMAGE_ENABLE_VERIFY_ECDSA 1 # define FIT_IMAGE_ENABLE_VERIFY 1 # include # else # define IMAGE_ENABLE_SIGN 0 -# define IMAGE_ENABLE_VERIFY 0 # define IMAGE_ENABLE_VERIFY_ECDSA 0 # define FIT_IMAGE_ENABLE_VERIFY 0 # endif #else # define IMAGE_ENABLE_SIGN 0 -# define IMAGE_ENABLE_VERIFY CONFIG_IS_ENABLED(RSA_VERIFY) # define IMAGE_ENABLE_VERIFY_ECDSA 0 # define FIT_IMAGE_ENABLE_VERIFY CONFIG_IS_ENABLED(FIT_SIGNATURE) #endif @@ -1260,7 +1257,7 @@ struct image_region { int size; }; -#if IMAGE_ENABLE_VERIFY +#if FIT_IMAGE_ENABLE_VERIFY # include #endif struct checksum_algo { -- 2.31.1