forked from pool/grub2
8e26f638e0
- TPM Support (FATE#315831) * 0001-tpm-Core-TPM-support.patch * 0002-tpm-Measure-kernel-initrd.patch * 0003-tpm-Add-BIOS-boot-measurement.patch * 0004-tpm-Rework-linux-command.patch * 0005-tpm-Rework-linux16-command.patch * 0006-tpm-Measure-kernel-and-initrd-on-BIOS-systems.patch * 0007-tpm-Measure-the-kernel-commandline.patch * 0008-tpm-Measure-commands.patch * 0009-tpm-Measure-multiboot-images-and-modules.patch * 0010-tpm-Fix-boot-when-there-s-no-TPM.patch * 0011-tpm-Fix-build-error.patch * 0012-tpm-Build-tpm-as-module.patch - grub2.spec : Add grub-tpm.efi for Secure Boot OBS-URL: https://build.opensuse.org/request/show/477882 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=263
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From b3afe6ad07192d3f38875e30b57a785ac3b1ea27 Mon Sep 17 00:00:00 2001
|
|
From: Matthew Garrett <mjg59@coreos.com>
|
|
Date: Thu, 16 Jul 2015 15:22:34 -0700
|
|
Subject: [PATCH 02/11] Measure kernel + initrd
|
|
|
|
Measure the kernel and initrd when loaded on UEFI systems
|
|
---
|
|
grub-core/loader/i386/efi/linux.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
Index: grub-2.02~beta3/grub-core/loader/i386/efi/linux.c
|
|
===================================================================
|
|
--- grub-2.02~beta3.orig/grub-core/loader/i386/efi/linux.c
|
|
+++ grub-2.02~beta3/grub-core/loader/i386/efi/linux.c
|
|
@@ -26,6 +26,7 @@
|
|
#include <grub/i18n.h>
|
|
#include <grub/lib/cmdline.h>
|
|
#include <grub/efi/efi.h>
|
|
+#include <grub/tpm.h>
|
|
|
|
GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
|
@@ -162,6 +163,7 @@ grub_cmd_initrd (grub_command_t cmd __at
|
|
argv[i]);
|
|
goto fail;
|
|
}
|
|
+ grub_tpm_measure (ptr, cursize, GRUB_BINARY_PCR, "grub_linuxefi", "Initrd");
|
|
ptr += cursize;
|
|
grub_memset (ptr, 0, ALIGN_UP_OVERHEAD (cursize, 4));
|
|
ptr += ALIGN_UP_OVERHEAD (cursize, 4);
|
|
@@ -217,6 +219,8 @@ grub_cmd_linux (grub_command_t cmd __att
|
|
goto fail;
|
|
}
|
|
|
|
+ grub_tpm_measure (kernel, filelen, GRUB_BINARY_PCR, "grub_linuxefi", "Kernel");
|
|
+
|
|
if (! grub_linuxefi_secure_validate (kernel, filelen))
|
|
{
|
|
grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
|