leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkimage: fit: Fix signing of configs with external data

Browse Source 
Just like we exclude data-size, data-position, and data-offset from
fit_config_check_sig, we must exclude them while signing as well.

While we're at it, use the FIT_DATA_* defines for fit_config_check_sig
as welll.

Fixes: 8edecd3110 ("fit: Fix verification of images with external data")
Fixes: c522949a29 ("rsa: sig: fix config signature check for fit with padding")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Sean Anderson 2022-10-20 15:41:10 -04:00 committed by Tom Rini
parent b487387226
commit 0abe3323f5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boot/image-fit-sig.c
View File

@ -260,10 +260,10 @@ static int fit_config_check_sig(const void *fit, int noffset, int conf_noffset,
char **err_msgp)
{
static char * const exc_prop[] = {
"data",
"data-size",
"data-position",
"data-offset"
FIT_DATA_PROP,
FIT_DATA_SIZE_PROP,
FIT_DATA_POSITION_PROP,
FIT_DATA_OFFSET_PROP,
};
const char *prop, *end, *name;

7
tools/image-host.c
View File

@ -915,7 +915,12 @@ static int fit_config_get_regions(const void *fit, int conf_noffset,
int *region_countp, char **region_propp,
int *region_proplen)
{
char * const exc_prop[] = {"data"};
char * const exc_prop[] = {
FIT_DATA_PROP,
FIT_DATA_SIZE_PROP,
FIT_DATA_POSITION_PROP,
FIT_DATA_OFFSET_PROP,
};
struct strlist node_inc;
struct image_region *region;
struct fdt_region fdt_regions[100];