aboutsummaryrefslogtreecommitdiff
path: root/tools/image-host.c
diff options
context:
space:
mode:
authorSean Anderson2022-10-20 15:41:10 -0400
committerTom Rini2022-10-26 11:36:06 -0400
commit0abe3323f5062032f8deb71cdc0635b124855d16 (patch)
tree7d8428ec3c6ff3870d783717e546c9db3b124847 /tools/image-host.c
parentb487387226d49ba2f39757269fb95ea398e8f384 (diff)
mkimage: fit: Fix signing of configs with external data
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: 8edecd3110e ("fit: Fix verification of images with external data") Fixes: c522949a29d ("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>
Diffstat (limited to 'tools/image-host.c')
-rw-r--r--tools/image-host.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/image-host.c b/tools/image-host.c
index 0bf18df50e7..4e0512be634 100644
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -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];