From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 31 Jul 2025 12:54:26 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uhQva-005Zt7-2C for lore@lore.pengutronix.de; Thu, 31 Jul 2025 12:54:26 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1uhQvZ-0000wk-KR for lore@pengutronix.de; Thu, 31 Jul 2025 12:54:26 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VRGZetROGG3Tw6Rm6Zu4SiYlyNngXbeBM78zbDxauQg=; b=pjvxva0qJTtwCC0a1nrqTlr90n M5AMQkASfeWe1Ge56QYTRVh6KvnwRRSVoxp2bS4aPp63wj6jkQ3/sP/8DqvbCpGk5XFfqLQ6k+aWX aanWCcFUdWL0igjHfuJgm5qYl3qs4njAfsGv5Tvj77qe6w0tbx4yaR91AoPF9MVnigk1PIS+dmkfq Y4TOtIGjBcGXghK7AdMiekegqFpOSNbYMMIrksCkmaLvj0oItQm5R3OJ1QscPwybug2TADuB+mnLO yPSMIMVy6NZxBYuVuTG3FZCHYsD7W3JvlQ2DQyrgO94vFR4L7XeF7JWFgtTaz31fEA6Ey2fFeYBrL rlQfv74g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uhQv5-00000003Pqz-1QyX; Thu, 31 Jul 2025 10:53:55 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uhQqH-00000003PIo-12Wf for barebox@lists.infradead.org; Thu, 31 Jul 2025 10:48:59 +0000 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1uhQqE-0008Vg-MS; Thu, 31 Jul 2025 12:48:54 +0200 From: Michael Tretter Date: Thu, 31 Jul 2025 12:48:22 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250731-rkimage-cleanup-v1-2-967037e5d67a@pengutronix.de> References: <20250731-rkimage-cleanup-v1-0-967037e5d67a@pengutronix.de> In-Reply-To: <20250731-rkimage-cleanup-v1-0-967037e5d67a@pengutronix.de> To: Sascha Hauer , BAREBOX Cc: Michael Tretter X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250731_034857_318221_6FCB2F56 X-CRM114-Status: GOOD ( 11.53 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 2/5] scripts: rockchip: add helper for updating hash X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.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 --- scripts/rkimage.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/rkimage.c b/scripts/rkimage.c index ba89f32d9376d0153692baa3ddde1c793c1e4cc2..fd97bd1dd9f5967762d0a8bf9d186594a05a2a9f 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); @@ -97,10 +107,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