Skip to contentSkip to conversation

image: Display FIT signature for configs

PATCH In review Clément Péron 2 participants 3 messages Apr 13, 2018 – Apr 29, 2018

lore
Share & tools
lore

Clément Péron

author
#0 lore raw

PATCH 1/1 image: Display FIT signature for configs

The signature/hash information are displayed for images but nor for configurations.

Add subnodes printing in fit_conf_print() like it's done in fit_image_print()

---
 common/image-fit.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
common/image-fit.c +11 -0
index 4b03390454..b87f4420fa 100644
@@ -1589,6 +1589,7 @@ void fit_conf_print(const void *fit, int noffset, const char *p)
 	const char *uname;
 	int ret;
 	int fdt_index, loadables_index;
+	int ndepth;
 
 	/* Mandatory properties */
 	ret = fit_get_desc(fit, noffset, &desc);

@@ -1638,6 +1639,16 @@ void fit_conf_print(const void *fit, int noffset, const char *p)
 		}
 		printf("%s\n", uname);
 	}
+
+	/* Process all hash subnodes of the component image node */
+	for (ndepth = 0, noffset = fdt_next_node(fit, noffset, &ndepth);
+	     (noffset >= 0) && (ndepth > 0);
+	     noffset = fdt_next_node(fit, noffset, &ndepth)) {
+		if (ndepth == 1) {
+			/* Direct child node of the component image node */
+			fit_image_print_verification_data(fit, noffset, p);
+		}
+	}
 }
 
 static int fit_image_select(const void *fit, int rd_noffset, int verify)
Signature · 1 line
2.17.0
#1 lore raw
Quoted 27 lines · Clément Péron

The signature/hash information are displayed for images but nor for configurations.

Add subnodes printing in fit_conf_print() like it's done in fit_image_print()

---
 common/image-fit.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
common/image-fit.c +4 -0
index 4b03390454..b87f4420fa 100644
@@ -1589,6 +1589,7 @@ void fit_conf_print(const void *fit, int noffset, const char *p)
 	const char *uname;
 	int ret;
 	int fdt_index, loadables_index;
+	int ndepth;
 
 	/* Mandatory properties */
 	ret = fit_get_desc(fit, noffset, &desc);

@@ -1638,6 +1639,16 @@ void fit_conf_print(const void *fit, int noffset, const char *p)
 		}
 		printf("%s\n", uname);
 	}
+
+	/* Process all hash subnodes of the component image node */
+	for (ndepth = 0, noffset = fdt_next_node(fit, noffset, &ndepth);

common/image-fit.c void fit_conf_print(const void *fit, int noffset, const char *p) · line 1654

Quoted 10 lines
common/image-fit.c +7 -0
+	     (noffset >= 0) && (ndepth > 0);
+	     noffset = fdt_next_node(fit, noffset, &ndepth)) {
+		if (ndepth == 1) {
+			/* Direct child node of the component image node */
+			fit_image_print_verification_data(fit, noffset, p);
+		}
+	}
 }
 
 static int fit_image_select(const void *fit, int rd_noffset, int verify)

I think this is fine, but can you please re-post with a Signed off by line? Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180429/33c0507d/attachment.sig>
author
#2 lore raw
Quoted 5 lines

I think this is fine, but can you please re-post with a Signed off by line? Thanks!

--
Tom

Yes I will, and also missed to substitute "image" by "configuration" in the comments,

Thanks,
Clement