vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Measure multiboot images and modules

Browse source
This commit is contained in:
Matthew Garrett 2015-09-01 16:02:55 -07:00
parent b47b5685b5
commit a0e69405e2
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
grub-core/loader/i386/multiboot_mbi.c
View file

@ -36,6 +36,7 @@
#include <grub/net.h> #include <grub/net.h>
#include <grub/i18n.h> #include <grub/i18n.h>
#include <grub/lib/cmdline.h> #include <grub/lib/cmdline.h>
#include <grub/tpm.h>
#ifdef GRUB_MACHINE_EFI #ifdef GRUB_MACHINE_EFI
#include <grub/efi/efi.h> #include <grub/efi/efi.h>
@ -164,6 +165,8 @@ grub_multiboot_load (grub_file_t file, const char *filename)
return grub_errno; return grub_errno;
} }
grub_tpm_measure((unsigned char*)buffer, len, GRUB_KERNEL_PCR, filename);
header = find_header (buffer, len); header = find_header (buffer, len);
if (header == 0) if (header == 0)

2
grub-core/loader/multiboot.c
View file

@ -42,6 +42,7 @@
#include <grub/video.h> #include <grub/video.h>
#include <grub/memory.h> #include <grub/memory.h>
#include <grub/i18n.h> #include <grub/i18n.h>
#include <grub/tpm.h>
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
@ -384,6 +385,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
} }
grub_file_close (file); grub_file_close (file);
grub_tpm_measure (module, size, GRUB_KERNEL_PCR, argv[0]);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }

3
grub-core/loader/multiboot_mbi2.c
View file

@ -36,6 +36,7 @@
#include <grub/i18n.h> #include <grub/i18n.h>
#include <grub/net.h> #include <grub/net.h>
#include <grub/lib/cmdline.h> #include <grub/lib/cmdline.h>
#include <grub/tpm.h>
#if defined (GRUB_MACHINE_EFI) #if defined (GRUB_MACHINE_EFI)
#include <grub/efi/efi.h> #include <grub/efi/efi.h>
@ -126,6 +127,8 @@ grub_multiboot_load (grub_file_t file, const char *filename)
COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0); COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0);
grub_tpm_measure ((unsigned char *)buffer, len, GRUB_KERNEL_PCR, filename);
header = find_header (buffer, len); header = find_header (buffer, len);
if (header == 0) if (header == 0)