vboot_firmware/lib/firmware_image_fw.c - Issue 2792009: Fix normal/recovery mode, and RO firmware vs. RW firmware behavior.

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 2792009: Fix normal/recovery mode, and RO firmware vs. RW firmware behavior. (Closed) Base URL: ssh://git@chromiumos-git/vboot_reference.git

Patch Set: add a comment 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

« vboot_firmware/include/rollback_index.h ('K') | « vboot_firmware/include/rollback_index.h ('k') | vboot_firmware/lib/include/tss_constants.h » ('j') | vboot_firmware/lib/vboot_firmware.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 75f4b09f30ea2e49686be420e97e0162dd34337d..827b36f35f1175ef994c9de9450ea1efa9868bb5 100644

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

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

@@ -273,7 +273,7 @@ int VerifyFirmwareDriver_f(uint8_t* root_key_blob,

uint16_t version, key_version; /* Temporary variables */

/* Initialize the TPM since we'll be reading the rollback indices. */

- SetupTPM();

+ SetupTPM(0, 0);

/* We get the key versions by reading directly from the image blobs without

* any additional (expensive) sanity checking on the blob since it's faster to