GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security/tpm: Remove unnecessary tss_common.h 

Remove the unnecessary tss_common.h header from the repo.
tss_errors.h is a more appropriate place for the TPM_SUCCESS
value, and the other define is only used by tpm_common.c and
can be placed there.

BUG=b:296439237
TEST=Builds

Change-Id: I99cf90f244a75c1eeab5e9e1500e05c24ae0a8e5
Signed-off-by: Jon Murphy <jpmurphy@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78033
Reviewed-by: Tim Van Patten <timvp@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Jon Murphy 2023-09-20 10:43:07 -06:00 committed by Felix Held
parent ddfe719538
commit cce6d13aa7
6 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/security/tpm/tss.h
View File

@ -12,7 +12,6 @@
#include <types.h> #include <types.h>
#include <vb2_sha.h> #include <vb2_sha.h>
#include <security/tpm/tss/common/tss_common.h>
#include <security/tpm/tss_errors.h> #include <security/tpm/tss_errors.h>
#include <security/tpm/tss/vendor/cr50/cr50.h> #include <security/tpm/tss/vendor/cr50/cr50.h>

11
src/security/tpm/tss/common/tss_common.h
View File

@ -1,11 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef TCG_TSS_COMMON_H_
#define TCG_TSS_COMMON_H_
#include <stdint.h>
#define TPM_PCR_MINIMUM_DIGEST_SIZE 20
#define TPM_SUCCESS ((uint32_t)0x00000000)
#endif /* TCG_TSS_COMMON_H_ */

2
src/security/tpm/tss/tcg-1.2/tss_structures.h
View File

@ -8,7 +8,7 @@
#define TCG1_TSS_STRUCTURES_H_ #define TCG1_TSS_STRUCTURES_H_
#include <stdint.h> #include <stdint.h>
#include "../common/tss_common.h" #include <security/tpm/tss_errors.h>
#define TPM_MAX_COMMAND_SIZE 4096 #define TPM_MAX_COMMAND_SIZE 4096
#define TPM_LARGE_ENOUGH_COMMAND_SIZE 256 /* saves space in the firmware */ #define TPM_LARGE_ENOUGH_COMMAND_SIZE 256 /* saves space in the firmware */

2
src/security/tpm/tss/tcg-2.0/tss_structures.h
View File

@ -8,7 +8,7 @@
* constants and structures needed for functions used in coreboot. * constants and structures needed for functions used in coreboot.
*/ */
#include <types.h> #include <types.h>
#include "../common/tss_common.h" #include <security/tpm/tss_errors.h>
/* This should be plenty for what firmware needs. */ /* This should be plenty for what firmware needs. */
#define TPM_BUFFER_SIZE 256 #define TPM_BUFFER_SIZE 256

1
src/security/tpm/tss_errors.h
View File

@ -15,6 +15,7 @@
#define TPM_E_BASE 0x0 #define TPM_E_BASE 0x0
#define TPM_E_NON_FATAL 0x800 #define TPM_E_NON_FATAL 0x800
#define TPM_SUCCESS ((uint32_t)0x00000000)
#define TPM_E_AREA_LOCKED ((uint32_t)0x0000003c) #define TPM_E_AREA_LOCKED ((uint32_t)0x0000003c)
#define TPM_E_BADINDEX ((uint32_t)0x00000002) #define TPM_E_BADINDEX ((uint32_t)0x00000002)
#define TPM_E_BAD_PRESENCE ((uint32_t)0x0000002d) #define TPM_E_BAD_PRESENCE ((uint32_t)0x0000002d)

1
src/security/vboot/tpm_common.c
View File

@ -7,6 +7,7 @@
#define TPM_PCR_BOOT_MODE "VBOOT: boot mode" #define TPM_PCR_BOOT_MODE "VBOOT: boot mode"
#define TPM_PCR_GBB_HWID_NAME "VBOOT: GBB HWID" #define TPM_PCR_GBB_HWID_NAME "VBOOT: GBB HWID"
#define TPM_PCR_MINIMUM_DIGEST_SIZE 20
uint32_t vboot_setup_tpm(struct vb2_context *ctx) uint32_t vboot_setup_tpm(struct vb2_context *ctx)
{ {