All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexandru Gagniuc <mr.nuke.me@gmail.com>
To: u-boot@lists.denx.de, sjg@chromium.org
Cc: Alexandru Gagniuc <mr.nuke.me@gmail.com>,
	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	[thread overview]
Message-ID: <20210524201939.1491676-17-mr.nuke.me@gmail.com> (raw)
In-Reply-To: <20210524201939.1491676-1-mr.nuke.me@gmail.com>

This macro is no longer needed for code flow or #ifdefs. Remove it.

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 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 <openssl/evp.h>
 # 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 <u-boot/hash-checksum.h>
 #endif
 struct checksum_algo {
-- 
2.31.1


  parent reply	other threads:[~2021-05-24 20:22 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-24 20:19 [PATCH v2 00/18] image: Reduce #ifdef abuse in image code Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 01/18] image: Shorten FIT_ENABLE_SHAxxx_SUPPORT Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 02/18] image: Rename SPL_SHAxxx_SUPPORT to SPL_FIT_SHAxxx Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 03/18] image: Rename CONFIG_FIT_ENABLE_RSASSA_PSS_SUPPORT Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 04/18] Kconfig: Rename SPL_CRC32_SUPPORT to SPL_CRC32 Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 05/18] Kconfig: Rename SPL_MD5_SUPPORT to SPL_MD5 Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 06/18] image: Drop IMAGE_ENABLE_SHA1 Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 07/18] image: Drop IMAGE_ENABLE_SHAxxx Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 08/18] image: Drop IMAGE_ENABLE_BEST_MATCH Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 09/18] common: Move host-only logic in image-sig.c to separate file Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 10/18] common: image-sig.c: Remove host-specific logic and #ifdefs Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 11/18] image: Add support for placing crypto_algo in linker lists Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 12/18] image: rsa: Move verification algorithm to a linker list Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 13/18] image: image-sig.c: Remove crypto_algos array Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 14/18] lib: ecdsa: Remove #ifdefs from ecdsa.h Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 15/18] lib: rsa: Remove #ifdefs from rsa.h Alexandru Gagniuc
2021-05-24 20:19 ` Alexandru Gagniuc [this message]
2021-05-24 20:19 ` [PATCH v2 17/18] image: Eliminate IMAGE_ENABLE_VERIFY_ECDSA macro Alexandru Gagniuc
2021-05-24 20:19 ` [PATCH v2 18/18] image: Add support for relocating crypto_algos in linker lists Alexandru Gagniuc

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210524201939.1491676-17-mr.nuke.me@gmail.com \
    --to=mr.nuke.me@gmail.com \
    --cc=michal.simek@xilinx.com \
    --cc=rasmus.villemoes@prevas.dk \
    --cc=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.