Skip to contentSkip to conversation

mkimage: Allow 'auto-conf' signing of scripts

PATCH In review Alexander Dahl 2 participants 2 messages Jun 20, 2024 – Jul 5, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mkimage: Allow 'auto-conf' signing of scripts

U-Boot configured for verified boot with the "required" option set to "conf" also checks scripts put in FIT images for a valid signature, and refuses to source and run such a script if the signature for the configuration is bad or missing. Such a script could not be packaged before, because mkimage failed like this:

% tools/mkimage -T script -C none -d tmp/my.scr -f auto-conf -k tmp -g dev -o sha256,rsa4096 my.uimg Failed to find any images for configuration 'conf-1/signature'
tools/mkimage Can't add hashes to FIT blob: -1
Error: Bad parameters for FIT image type

This is especially unfortunate if LEGACY_IMAGE_FORMAT is disabled as recommended.

Listing the script configuration in a "sign-images" subnode instead, would have added even more complexity to the already complex auto fit generation code.

---
 tools/image-host.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/image-host.c +1 -1
index 7bfc0cb6b18..49ce7436bb9 100644
@@ -730,7 +730,7 @@ static const char *fit_config_get_image_list(const void *fit, int noffset,
 					     int *lenp, int *allow_missingp)
 {
 	static const char default_list[] = FIT_KERNEL_PROP "\0"
-			FIT_FDT_PROP;
+			FIT_FDT_PROP "\0" FIT_SCRIPT_PROP;
 	const char *prop;
 
 	/* If there is an "sign-image" property, use that */

base-commit: fe2ce09a0753634543c32cafe85eb87a625f76ca

Signature · 1 line
2.39.2
#1 lore raw
Quoted 11 lines · Alexander Dahl

U-Boot configured for verified boot with the "required" option set to "conf" also checks scripts put in FIT images for a valid signature, and refuses to source and run such a script if the signature for the configuration is bad or missing. Such a script could not be packaged before, because mkimage failed like this:

% tools/mkimage -T script -C none -d tmp/my.scr -f auto-conf -k tmp -g dev -o sha256,rsa4096 my.uimg Failed to find any images for configuration 'conf-1/signature'
tools/mkimage Can't add hashes to FIT blob: -1
Error: Bad parameters for FIT image type

Quoted 8 lines

This is especially unfortunate if LEGACY_IMAGE_FORMAT is disabled as recommended.

Listing the script configuration in a "sign-images" subnode instead, would have added even more complexity to the already complex auto fit generation code.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom