From: Michael Tretter <m.tretter@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>,
BAREBOX <barebox@lists.infradead.org>
Cc: Michael Tretter <m.tretter@pengutronix.de>
Subject: [PATCH v2 3/5] scripts: rockchip: add helper for updating hash
Date: Tue, 05 Aug 2025 09:33:48 +0200 [thread overview]
Message-ID: <20250805-rkimage-cleanup-v2-3-5d015f6c9059@pengutronix.de> (raw)
In-Reply-To: <20250805-rkimage-cleanup-v2-0-5d015f6c9059@pengutronix.de>
The idb contains a flag for the used hash type. Use the flag to
determine the used hash function and update the hash accordingly.
Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
Changes in v2:
- Drop double negation in flag check
---
scripts/rkimage.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/scripts/rkimage.c b/scripts/rkimage.c
index 4c972746cdabbc831b0b5c0024e840c81b1c1120..be2267aa38b505312c131638d743b42faaf8978c 100644
--- a/scripts/rkimage.c
+++ b/scripts/rkimage.c
@@ -42,6 +42,17 @@ static void sha512(const void *buf, int len, void *out)
EVP_MD_CTX_free(md_ctx);
}
+static void idb_hash(struct newidb *idb)
+{
+ unsigned char *idbu8 = (void *)idb;
+ size_t size = 1536;
+
+ if (idb->flags & NEWIDB_FLAGS_SHA256)
+ sha256(idbu8, size, idbu8 + size);
+ else if (idb->flags & NEWIDB_FLAGS_SHA512)
+ sha512(idbu8, size, idbu8 + size);
+}
+
typedef enum {
HASH_TYPE_SHA256 = 1,
HASH_TYPE_SHA512 = 2,
@@ -62,7 +73,6 @@ static int create_newidb(struct newidb *idb)
bool keep_cert = false;
int image_offset;
int i;
- unsigned char *idbu8 = (void *)idb;
idb->magic = NEWIDB_MAGIC;
idb->n_files = (n_code << 16) | (1 << 7) | (1 << 8);
@@ -98,10 +108,7 @@ static int create_newidb(struct newidb *idb)
}
- if (hash_type == HASH_TYPE_SHA256)
- sha256(idbu8, 1536, idbu8 + 1536);
- else if (hash_type == HASH_TYPE_SHA512)
- sha512(idbu8, 1536, idbu8 + 1536);
+ idb_hash(idb);
return 0;
}
--
2.39.5
next prev parent reply other threads:[~2025-08-05 7:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-05 7:33 [PATCH v2 0/5] scripts: rockchip: fix and cleanup rkimage Michael Tretter
2025-08-05 7:33 ` [PATCH v2 1/5] scripts: rockchip: use correct header size Michael Tretter
2025-08-05 7:33 ` [PATCH v2 2/5] scripts: rockchip: rename hashtype to flags Michael Tretter
2025-08-05 7:33 ` Michael Tretter [this message]
2025-08-05 7:33 ` [PATCH v2 4/5] scripts: rockchip: rename NEWIDB_MAGIC to NEWIDB_MAGIC_RKNS Michael Tretter
2025-08-05 7:33 ` [PATCH v2 5/5] scripts: rockchip: support RKSS images Michael Tretter
2025-08-05 9:05 ` [PATCH v2 0/5] scripts: rockchip: fix and cleanup rkimage Sascha Hauer
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=20250805-rkimage-cleanup-v2-3-5d015f6c9059@pengutronix.de \
--to=m.tretter@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=s.hauer@pengutronix.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox