diff options
author | Bill XIE <persmule@hardenedlinux.org> | 2019-08-22 20:28:36 +0800 |
---|---|---|
committer | Philipp Deppenwiese <zaolin.daisuki@gmail.com> | 2020-03-31 07:55:18 +0000 |
commit | c79e96b4eb310db9d44e36e2dff072c01469c380 (patch) | |
tree | eafc5710f120fa7f487118cada7c90ff91b251e9 /src/security/vboot/vboot_crtm.h | |
parent | 6b7bbc2b782938685ba08982c83c1694317a16b8 (diff) |
security/vboot: Decouple measured boot from verified boot
Currently, those who want to use measured boot implemented within
vboot should enable verified boot first, along with sections such
as GBB and RW slots defined with manually written fmd files, even
if they do not actually want to verify anything.
As discussed in CB:34977, measured boot should be decoupled from
verified boot and make them two fully independent options. Crypto
routines necessary for measurement could be reused, and TPM and CRTM
init should be done somewhere other than vboot_logic_executed() if
verified boot is not enabled.
In this revision, only TCPA log is initialized during bootblock.
Before TPM gets set up, digests are not measured into tpm immediately,
but cached in TCPA log, and measured into determined PCRs right after
TPM is up.
This change allows those who do not want to use the verified boot
scheme implemented by vboot as well as its requirement of a more
complex partition scheme designed for chromeos to make use of the
measured boot functionality implemented within vboot library to
measure the boot process.
TODO: Measure MRC Cache somewhere, as MRC Cache has never resided in
CBFS any more, so it cannot be covered by tspi_measure_cbfs_hook().
Change-Id: I1fb376b4a8b98baffaee4d574937797bba1f8aee
Signed-off-by: Bill XIE <persmule@hardenedlinux.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35077
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Diffstat (limited to 'src/security/vboot/vboot_crtm.h')
-rw-r--r-- | src/security/vboot/vboot_crtm.h | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/src/security/vboot/vboot_crtm.h b/src/security/vboot/vboot_crtm.h deleted file mode 100644 index ba3dd45abe..0000000000 --- a/src/security/vboot/vboot_crtm.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#ifndef __SECURITY_VBOOT_CRTM_H__ -#define __SECURITY_VBOOT_CRTM_H__ - -#include <commonlib/cbfs.h> -#include <program_loading.h> -#include <security/tpm/tspi.h> -#include <types.h> - -/* CRTM */ -#define TPM_CRTM_PCR 2 - -/* PCR for measuring data which changes during runtime - * e.g. CMOS, NVRAM... - */ -#define TPM_RUNTIME_DATA_PCR 3 - -/* - * Initializes the Core Root of Trust for Measurements - * in coreboot. The initial code in a chain of trust must measure - * itself. - * - * Summary: - * + Measures bootblock in CBFS or BOOTBLOCK FMAP partition. - * + If vboot starts in romstage, it measures the romstage - * in CBFS. - * + Measure the verstage if it is compiled as separate - * stage. - * - * Takes the current vboot context as parameter for s3 checks. - * returns on success VB2_SUCCESS, else a vboot error. - */ -uint32_t vboot_init_crtm(void); - -#if CONFIG(VBOOT_MEASURED_BOOT) -/* - * Measures cbfs data via hook (cbfs) - * fh is the cbfs file handle to measure - * return 0 if successful, else an error - */ -uint32_t vboot_measure_cbfs_hook(struct cbfsf *fh, const char *name); - -#else -#define vboot_measure_cbfs_hook(fh, name) 0 -#endif - -#endif /* __VBOOT_VBOOT_CRTM_H__ */ |