mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: matthias.schiffer@ew.tq-group.com
To: barebox@lists.infradead.org
Cc: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Subject: [PATCH] FIT: look for hash-1 as well as hash@1 nodes in signature check
Date: Tue, 20 Nov 2018 10:40:35 +0100	[thread overview]
Message-ID: <20181120094035.18252-3-matthias.schiffer@ew.tq-group.com> (raw)
In-Reply-To: <20181120094035.18252-1-matthias.schiffer@ew.tq-group.com>

From: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>

The examples in the U-boot docs use "hash-N" as the name for hash nodes.
It seems "hash@N" was used instead at some point during the development of
the FIT format and "hash-N" is more correct; support for "hash@N" is
preserved for backward compatibility.

Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
---
 common/image-fit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/image-fit.c b/common/image-fit.c
index dfd1fa02c..356c1ae5d 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -392,7 +392,9 @@ static int fit_verify_hash(struct fit_handle *handle, struct device_node *image,
 		ret = -EINVAL;
 	}
 
-	hash = of_get_child_by_name(image, "hash@1");
+	hash = of_get_child_by_name(image, "hash-1");
+	if (!hash)
+		hash = of_get_child_by_name(image, "hash@1");
 	if (!hash) {
 		if (ret)
 			pr_err("image %s does not have hashes\n",
-- 
2.17.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-11-20  9:41 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-20  9:40 [PATCH] clk: fix NULL deref without OF node in debug message matthias.schiffer
2018-11-20  9:40 ` [PATCH] environment: do not attempt to erase devices with MTD_NO_ERASE matthias.schiffer
2018-11-21  7:56   ` Sascha Hauer
2018-11-22 10:19     ` Matthias Schiffer
2018-11-23  8:05       ` Sascha Hauer
2018-11-23 14:50         ` [PATCH v2] mtd: return EOPNOTSUPP when attempting to erase an MTD_NO_ERASE device Matthias Schiffer
2018-11-26  7:46           ` Sascha Hauer
2018-11-20  9:40 ` matthias.schiffer [this message]
2018-11-21  8:01   ` [PATCH] FIT: look for hash-1 as well as hash@1 nodes in signature check Sascha Hauer
2018-11-22 10:41     ` [PATCH v2] FIT: support hash-1/signature-1 " Matthias Schiffer
2018-11-23  8:07 ` [PATCH] clk: fix NULL deref without OF node in debug message 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=20181120094035.18252-3-matthias.schiffer@ew.tq-group.com \
    --to=matthias.schiffer@ew.tq-group.com \
    --cc=barebox@lists.infradead.org \
    /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