diff options
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0012-image-Use-constants-for-required-and-key-name-hint.patch')
| -rw-r--r-- | meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0012-image-Use-constants-for-required-and-key-name-hint.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0012-image-Use-constants-for-required-and-key-name-hint.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0012-image-Use-constants-for-required-and-key-name-hint.patch index 4f5704e7c..a04f68fb3 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0012-image-Use-constants-for-required-and-key-name-hint.patch +++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0012-image-Use-constants-for-required-and-key-name-hint.patch @@ -1,4 +1,4 @@ -From 82d0b38436fd44bc54372ebe3f3d3fef63835b83 Mon Sep 17 00:00:00 2001 +From dfe95ace84f7bb04b6302fd8f51f8a942a288e40 Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg@chromium.org> Date: Tue, 31 Mar 2020 18:43:55 +0200 Subject: [PATCH] image: Use constants for 'required' and 'key-name-hint' @@ -7,6 +7,7 @@ These are used in multiple places so update them to use a shared #define. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> + --- common/image-fit.c | 6 +++--- common/image-sig.c | 8 +++++--- @@ -16,7 +17,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/common/image-fit.c b/common/image-fit.c -index 8a7c78f4c144..322fde728b50 100644 +index 8a7c78f4c1..322fde728b 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -264,7 +264,7 @@ static void fit_image_print_data(const void *fit, int noffset, const char *p, @@ -40,7 +41,7 @@ index 8a7c78f4c144..322fde728b50 100644 printf(":%s", keyname); if (required) diff --git a/common/image-sig.c b/common/image-sig.c -index 057d654c17d4..b49732117927 100644 +index 057d654c17..b497321179 100644 --- a/common/image-sig.c +++ b/common/image-sig.c @@ -156,7 +156,7 @@ static int fit_image_setup_verify(struct image_sign_info *info, @@ -73,7 +74,7 @@ index 057d654c17d4..b49732117927 100644 continue; ret = fit_config_verify_sig(fit, conf_noffset, sig_blob, diff --git a/include/image.h b/include/image.h -index b05e8552cc5b..2c6ef4de259d 100644 +index b05e8552cc..2c6ef4de25 100644 --- a/include/image.h +++ b/include/image.h @@ -782,12 +782,14 @@ int bootz_setup(ulong image, ulong *start, ulong *end); @@ -93,7 +94,7 @@ index b05e8552cc5b..2c6ef4de259d 100644 /* image node */ #define FIT_DATA_PROP "data" diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c -index 5d9716f01349..972af6b8a7e2 100644 +index 5d9716f013..972af6b8a7 100644 --- a/lib/rsa/rsa-sign.c +++ b/lib/rsa/rsa-sign.c @@ -486,8 +486,8 @@ int rsa_add_verify_data(struct image_sign_info *info, void *keydest) @@ -117,7 +118,7 @@ index 5d9716f01349..972af6b8a7e2 100644 } done: diff --git a/tools/image-host.c b/tools/image-host.c -index da374eeabf5e..afeba22a09be 100644 +index da374eeabf..afeba22a09 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -161,7 +161,7 @@ static int fit_image_setup_sig(struct image_sign_info *info, @@ -147,6 +148,3 @@ index da374eeabf5e..afeba22a09be 100644 /* Write the public key into the supplied FDT file */ if (keydest) { --- -2.17.1 - |