From a8a2f78331fbf3451f8275d3e6f20e9853db746b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 6 Apr 2018 16:02:01 -0400 Subject: [PATCH] Fix rebase error. Signed-off-by: Peter Jones --- 0223-Measure-multiboot-images-and-modules.patch | 6 +++--- 0224-Fix-boot-when-there-s-no-TPM.patch | 2 +- 0225-Rework-TPM-measurements.patch | 8 ++++---- 0226-Fix-event-log-prefix.patch | 2 +- ...the-first-boot-menu-entry-as-default-when-using-.patch | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/0223-Measure-multiboot-images-and-modules.patch b/0223-Measure-multiboot-images-and-modules.patch index a289e83..2922570 100644 --- a/0223-Measure-multiboot-images-and-modules.patch +++ b/0223-Measure-multiboot-images-and-modules.patch @@ -1,4 +1,4 @@ -From 98dd154527b9cddaff15ab22b35c41815d9f1b13 Mon Sep 17 00:00:00 2001 +From 484c55d3bce0697de94d6dfd52aa8b8a92334aab Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 1 Sep 2015 16:02:55 -0700 Subject: [PATCH 223/227] Measure multiboot images and modules @@ -51,7 +51,7 @@ index fb044a60c79..0ca525380c9 100644 } diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c -index b0679a9f6c9..a7b4a57ec4f 100644 +index b0679a9f6c9..99ef9036423 100644 --- a/grub-core/loader/multiboot_mbi2.c +++ b/grub-core/loader/multiboot_mbi2.c @@ -36,6 +36,7 @@ @@ -66,7 +66,7 @@ index b0679a9f6c9..a7b4a57ec4f 100644 COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0); -+ grub_tpm_measure ((unsigned char *)buffer, len, GRUB_KERNEL_PCR, filename); ++ grub_tpm_measure ((unsigned char *)mld.buffer, len, GRUB_KERNEL_PCR, filename); + header = find_header (mld.buffer, len); - diff --git a/0224-Fix-boot-when-there-s-no-TPM.patch b/0224-Fix-boot-when-there-s-no-TPM.patch index 3638e68..2b1d5f3 100644 --- a/0224-Fix-boot-when-there-s-no-TPM.patch +++ b/0224-Fix-boot-when-there-s-no-TPM.patch @@ -1,4 +1,4 @@ -From d621b990b2d3ba20a275de963841c4c2c9246a90 Mon Sep 17 00:00:00 2001 +From 762607552528db56dedafac9825cab144c27eba3 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 23 Mar 2016 16:49:42 -0700 Subject: [PATCH 224/227] Fix boot when there's no TPM diff --git a/0225-Rework-TPM-measurements.patch b/0225-Rework-TPM-measurements.patch index 63d0964..95f5a1e 100644 --- a/0225-Rework-TPM-measurements.patch +++ b/0225-Rework-TPM-measurements.patch @@ -1,4 +1,4 @@ -From eb631580edb7cd1ed00de0a521373d363651be41 Mon Sep 17 00:00:00 2001 +From 654614fc2a0b075bc94907a58469c4df05f81994 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 23 Mar 2016 17:03:43 -0700 Subject: [PATCH 225/227] Rework TPM measurements @@ -160,15 +160,15 @@ index 0ca525380c9..cc53d429bca 100644 } diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c -index a7b4a57ec4f..f43482935cb 100644 +index 99ef9036423..f7e333f56c1 100644 --- a/grub-core/loader/multiboot_mbi2.c +++ b/grub-core/loader/multiboot_mbi2.c @@ -132,7 +132,7 @@ grub_multiboot_load (grub_file_t file, const char *filename) COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0); -- grub_tpm_measure ((unsigned char *)buffer, len, GRUB_KERNEL_PCR, filename); -+ grub_tpm_measure ((unsigned char *)buffer, len, GRUB_BINARY_PCR, "grub_multiboot", filename); +- grub_tpm_measure ((unsigned char *)mld.buffer, len, GRUB_KERNEL_PCR, filename); ++ grub_tpm_measure ((unsigned char *)mld.buffer, len, GRUB_BINARY_PCR, "grub_multiboot", filename); header = find_header (mld.buffer, len); if (header == 0) diff --git a/0226-Fix-event-log-prefix.patch b/0226-Fix-event-log-prefix.patch index 81ea11b..cbebfa6 100644 --- a/0226-Fix-event-log-prefix.patch +++ b/0226-Fix-event-log-prefix.patch @@ -1,4 +1,4 @@ -From 4caddfad92ef6fa251fbfaf7e10271434885f253 Mon Sep 17 00:00:00 2001 +From 8e7dae020dc6e789df42f8bc3ca73cbaa39af017 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 29 Mar 2016 15:36:49 -0700 Subject: [PATCH 226/227] Fix event log prefix diff --git a/0227-Set-the-first-boot-menu-entry-as-default-when-using-.patch b/0227-Set-the-first-boot-menu-entry-as-default-when-using-.patch index bef63a4..f0f6e5b 100644 --- a/0227-Set-the-first-boot-menu-entry-as-default-when-using-.patch +++ b/0227-Set-the-first-boot-menu-entry-as-default-when-using-.patch @@ -1,4 +1,4 @@ -From 5d9681adc296936bea6d070c4b93db42741f05ff Mon Sep 17 00:00:00 2001 +From a155931ed02d4517d9dba298f5c8da45fa9e7577 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 6 Apr 2018 14:08:36 +0200 Subject: [PATCH 227/227] Set the first boot menu entry as default when using