summaryrefslogtreecommitdiff
path: root/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch')
-rw-r--r--meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch
index 687946e4c..4f151f84e 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch
+++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/CVE-2020-10648/0009-fit_check_sign-Allow-selecting-the-configuration-to-.patch
@@ -1,4 +1,4 @@
-From 86a746eecc231886fbca97db6c6544997b95e49a Mon Sep 17 00:00:00 2001
+From ef74a120215a65d34b4c4658327049c7a7ac5bea Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Tue, 31 Mar 2020 18:43:55 +0200
Subject: [PATCH] fit_check_sign: Allow selecting the configuration to verify
@@ -9,6 +9,7 @@ the logic through.
Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
+
---
tools/fdt_host.h | 3 ++-
tools/fit_check_sign.c | 8 ++++++--
@@ -16,7 +17,7 @@ Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/tools/fdt_host.h b/tools/fdt_host.h
-index 134d9657139b..4eceab19dd3a 100644
+index 134d965713..4eceab19dd 100644
--- a/tools/fdt_host.h
+++ b/tools/fdt_host.h
@@ -11,6 +11,7 @@
@@ -29,7 +30,7 @@ index 134d9657139b..4eceab19dd3a 100644
#endif /* __FDT_HOST_H__ */
diff --git a/tools/fit_check_sign.c b/tools/fit_check_sign.c
-index d9361b00950c..e9a489db3920 100644
+index d9361b0095..e9a489db39 100644
--- a/tools/fit_check_sign.c
+++ b/tools/fit_check_sign.c
@@ -42,6 +42,7 @@ int main(int argc, char **argv)
@@ -69,7 +70,7 @@ index d9361b00950c..e9a489db3920 100644
ret = EXIT_SUCCESS;
fprintf(stderr, "Signature check OK\n");
diff --git a/tools/image-host.c b/tools/image-host.c
-index 01fdec276da4..da374eeabf5e 100644
+index 01fdec276d..da374eeabf 100644
--- a/tools/image-host.c
+++ b/tools/image-host.c
@@ -708,12 +708,13 @@ int fit_add_verification_data(const char *keydir, void *keydest, void *fit,
@@ -96,6 +97,3 @@ index 01fdec276da4..da374eeabf5e 100644
ret = bootm_host_load_images(fit, cfg_noffset);
return ret;
---
-2.17.1
-