From 220ac049ba3898911a7af990df82b56768a47aaf Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Wed, 31 Jul 2019 14:19:00 +0800 Subject: vboot: update vboot2 functions to use new vb2_error_t To make explicit when vboot2 error codes should be returned, use the new vb2_error_t type on all functions which return VB2_ERROR_* constants. Additionally, add required vboot submodule commit id e6700f4c: 2019-07-31 14:12:30 +0800 - (vboot: update vboot2 functions to use new vb2_error_t) NOTE: This patch was merged separately on the Chromium tree: https://chromium-review.googlesource.com/c/1728499 BUG=b:124141368, chromium:988410 TEST=make clean && make test-abuild BRANCH=none Change-Id: I804c2b407e496d0c8eb9833be629b7c40118415c Signed-off-by: Joel Kitching Cq-Depend: chromium:1728292 Reviewed-on: https://review.coreboot.org/c/coreboot/+/34860 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/security/vboot/tpm_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/security/vboot/tpm_common.c') diff --git a/src/security/vboot/tpm_common.c b/src/security/vboot/tpm_common.c index 1a07ef6def..1db7189d7a 100644 --- a/src/security/vboot/tpm_common.c +++ b/src/security/vboot/tpm_common.c @@ -30,12 +30,12 @@ uint32_t vboot_setup_tpm(struct vb2_context *ctx) return result; } -uint32_t vboot_extend_pcr(struct vb2_context *ctx, int pcr, - enum vb2_pcr_digest which_digest) +vb2_error_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); - int rv; + vb2_error_t rv; rv = vb2api_get_pcr_digest(ctx, which_digest, buffer, &size); if (rv != VB2_SUCCESS) -- cgit v1.2.3