diff options
| author | Jon Murphy <jpmurphy@google.com> | 2023-09-05 11:36:43 -0600 |
|---|---|---|
| committer | Raul Rangel <rrangel@chromium.org> | 2023-09-28 16:54:37 +0000 |
| commit | d7b8dc9cf5978809912dcffefce2eda5937c9653 (patch) | |
| tree | 56befbc9563ce2baca6f31ccbfb041e99fb858d6 /src/security/vboot/tpm_common.c | |
| parent | 53fc667943052bd592b8406bdf4bf652c6c9cd3a (diff) | |
treewide: convert to tpm_result_t
Convert TPM functions to return TPM error codes(referred to as
tpm_result_t) values to match the TCG standard.
BUG=b:296439237
TEST=build and boot to Skyrim
BRANCH=None
Change-Id: Ifdf9ff6c2a1f9b938dbb04d245799391115eb6b1
Signed-off-by: Jon Murphy <jpmurphy@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/77666
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/security/vboot/tpm_common.c')
| -rw-r--r-- | src/security/vboot/tpm_common.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/security/vboot/tpm_common.c b/src/security/vboot/tpm_common.c index a2e9bb45cd..c330cc2dcd 100644 --- a/src/security/vboot/tpm_common.c +++ b/src/security/vboot/tpm_common.c @@ -2,6 +2,7 @@ #include <security/tpm/tspi.h> #include <security/vboot/tpm_common.h> +#include <security/tpm/tss_errors.h> #include <vb2_api.h> #include <vb2_sha.h> @@ -9,9 +10,9 @@ #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) +tpm_result_t vboot_setup_tpm(struct vb2_context *ctx) { - uint32_t rc; + tpm_result_t rc; rc = tpm_setup(ctx->flags & VB2_CONTEXT_S3_RESUME); if (rc == TPM_CB_MUST_REBOOT) @@ -20,16 +21,14 @@ uint32_t vboot_setup_tpm(struct vb2_context *ctx) return rc; } -vb2_error_t vboot_extend_pcr(struct vb2_context *ctx, int pcr, +tpm_result_t vboot_extend_pcr(struct vb2_context *ctx, int pcr, enum vb2_pcr_digest which_digest) { uint8_t buffer[VB2_PCR_DIGEST_RECOMMENDED_SIZE]; uint32_t size = sizeof(buffer); - vb2_error_t rv; - rv = vb2api_get_pcr_digest(ctx, which_digest, buffer, &size); - if (rv != VB2_SUCCESS) - return rv; + if (vb2api_get_pcr_digest(ctx, which_digest, buffer, &size) != VB2_SUCCESS) + return TPM_CB_FAIL; /* * On TPM 1.2, all PCRs are intended for use with SHA1. We truncate our @@ -56,6 +55,6 @@ vb2_error_t vboot_extend_pcr(struct vb2_context *ctx, int pcr, return tpm_extend_pcr(pcr, algo, buffer, vb2_digest_size(algo), TPM_PCR_GBB_HWID_NAME); default: - return VB2_ERROR_UNKNOWN; + return TPM_CB_FAIL; } } |