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

loader: Move verity-hash.h to include

Browse source 
Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand 2017-01-25 14:54:46 -08:00
parent ff8d967eff
commit 57fca7d1a3
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grub-core/loader/i386/efi/linux.c
View file

@ -28,7 +28,7 @@
#include <grub/efi/efi.h>
#include <grub/tpm.h>
#include "../verity-hash.h"
#include <grub/verity-hash.h>
GRUB_MOD_LICENSE ("GPLv3+");

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

@ -37,7 +37,8 @@
#include <grub/linux.h>
#include <grub/tpm.h>
#include "verity-hash.h"
#include <grub/verity-hash.h>
GRUB_MOD_LICENSE ("GPLv3+");
#ifdef GRUB_MACHINE_PCBIOS

31
grub-core/loader/i386/verity-hash.h
View file

@ -1,31 +0,0 @@
#define VERITY_ARG " verity.usrhash="
#define VERITY_ARG_LENGTH (sizeof (VERITY_ARG) - 1)
#define VERITY_HASH_OFFSET 0x40
#define VERITY_HASH_LENGTH 64
static inline void grub_pass_verity_hash(struct linux_kernel_header *lh,
char *cmdline,
grub_size_t cmdline_max_len)
{
char *buf = (char *)lh;
grub_size_t cmdline_len;
int i;
for (i=VERITY_HASH_OFFSET; i<VERITY_HASH_OFFSET + VERITY_HASH_LENGTH; i++)
{
if (buf[i] < '0' || buf[i] > '9') // Not a number
if (buf[i] < 'a' || buf[i] > 'f') // Not a hex letter
return;
}
cmdline_len = grub_strlen(cmdline);
if (cmdline_len + VERITY_ARG_LENGTH + VERITY_HASH_LENGTH > cmdline_max_len)
return;
grub_memcpy (cmdline + cmdline_len, VERITY_ARG, VERITY_ARG_LENGTH);
cmdline_len += VERITY_ARG_LENGTH;
grub_memcpy (cmdline + cmdline_len, buf + VERITY_HASH_OFFSET,
VERITY_HASH_LENGTH);
cmdline_len += VERITY_HASH_LENGTH;
cmdline[cmdline_len] = '\0';
}

2
grub-core/loader/i386/xen_file.c
View file

@ -20,7 +20,7 @@
#include <grub/i386/linux.h>
#include <grub/misc.h>
#include "verity-hash.h"
#include <grub/verity-hash.h>
grub_elf_t
grub_xen_file (grub_file_t file)