vboot_firmware/lib/firmware_image_fw.c - Issue 2711006: Import recent tpm_lite changes that make all TPM commands return a status.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: vboot_firmware/lib/firmware_image_fw.c

Issue 2711006: Import recent tpm_lite changes that make all TPM commands return a status. (Closed) Base URL: ssh://git@chromiumos-git/vboot_reference.git

Patch Set: cleanup from gauravsh's feedback Created 10 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: vboot_firmware/lib/firmware_image_fw.c

diff --git a/vboot_firmware/lib/firmware_image_fw.c b/vboot_firmware/lib/firmware_image_fw.c

index dc86887bab66933025cd3e44f6c4c361edd9db6d..75f4b09f30ea2e49686be420e97e0162dd34337d 100644

--- a/vboot_firmware/lib/firmware_image_fw.c

+++ b/vboot_firmware/lib/firmware_image_fw.c

@@ -10,6 +10,7 @@

#include "cryptolib.h"

#include "rollback_index.h"

+#include "tss_constants.h"

#include "utility.h"

/* Macro to determine the size of a field structure in the FirmwareImage

@@ -310,7 +311,9 @@ int VerifyFirmwareDriver_f(uint8_t* root_key_blob,

* this is done by setting the globalLock bit, which is cleared only by

* TPM_Init at reboot.

- LockFirmwareVersions();

+ if (TPM_SUCCESS != LockFirmwareVersions()) {

+ return VERIFY_FIRMWARE_TPM_ERROR;

+ }

/* Determine which firmware (if any) to jump to.

« no previous file with comments | « vboot_firmware/include/tlcl.h ('k') | vboot_firmware/lib/rollback_index.c » ('j') | no next file with comments »