Skip to contentSkip to conversation

fit signature: Add fallback of required keys

PATCH New Sam Voss 2 participants 2 messages Apr 22, 2019 – May 10, 2019

lore
Share & tools
lore

Sam Voss

author
#0 lore raw

PATCH v2 1/1 fit signature: Add fallback of required keys

Validation of fit image configuration signatures does not seem to do a "fall-back" mechanism as mentioned in doc/uImage.FIT/signature.txt.

The current constraints seem to only allow the following:

- skipping keys not marked "required" (not attempting to validate with them at all)
- checking a key marked required, but if it does not pass the validation entirely fails (no fall-back)

This patch keeps the non-required mechanism, however changes the required key logic to check all keys until a key that can validate the configuration is found. If none is found, an error is raised as before and boot is halted.

--
v1->v2:
- Fix comment style
- Fix unused argument in printf
- Fix broken printf argument

---
 common/image-sig.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
common/image-sig.c +11 -5
index 455f2b9629..15073e60e9 100644
@@ -446,6 +446,7 @@ int fit_config_verify_required_sigs(const void *fit, int conf_noffset,
 		return 0;
 	}
 
+	/* Loop until either a valid key is found or we run out of keys */
 	fdt_for_each_subnode(noffset, sig_blob, sig_node) {
 		const char *required;
 		int ret;
@@ -455,14 +456,19 @@ int fit_config_verify_required_sigs(const void *fit, int conf_noffset,
 			continue;
 		ret = fit_config_verify_sig(fit, conf_noffset, sig_blob,
 					    noffset);
-		if (ret) {
-			printf("Failed to verify required signature '%s'\n",
-			       fit_get_name(sig_blob, noffset, NULL));
-			return ret;
+
+		if (!ret) { /* key verified successfully */
+			return 0;
 		}
+
+		printf("Failed to verify required signature with key '%s'\n",
+		       fit_get_name(sig_blob, noffset, NULL));
 	}
 
-	return 0;
+	printf("No keys were able to verify required signature\n");
+
+	return -1;
+
 }
 
 int fit_config_verify(const void *fit, int conf_noffset)
Signature · 1 line
2.14.2.746.g8fb8a94
#1 lore raw

PATCH v2 1/1 fit signature: Add fallback of required keys

Quoted 10 lines · Sam Voss

Validation of fit image configuration signatures does not seem to do a "fall-back" mechanism as mentioned in doc/uImage.FIT/signature.txt.

The current constraints seem to only allow the following:

- skipping keys not marked "required" (not attempting to validate with them at all)
- checking a key marked required, but if it does not pass the validation entirely fails (no fall-back)

Quoted 6 lines

This patch keeps the non-required mechanism, however changes the required key logic to check all keys until a key that can validate the configuration is found. If none is found, an error is raised as before and boot is halted.

This breaks 'make tests' as it doesn't update the tests, please fix, 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/20190509/be0b53dc/attachment.sig>