Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(902)

Unified Diff: src/platform/vboot_reference/utils/firmware_image.c

Issue 874006: Add a command line string field to verified boot kernel config image. (Closed)
Patch Set: Created 10 years, 9 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: src/platform/vboot_reference/utils/firmware_image.c
diff --git a/src/platform/vboot_reference/utils/firmware_image.c b/src/platform/vboot_reference/utils/firmware_image.c
index cd8e942dda7b5a0383af45ba337e3ad15e82ec24..e7dcde93eb76814815756a96305e8eb8e39a08c0 100644
--- a/src/platform/vboot_reference/utils/firmware_image.c
+++ b/src/platform/vboot_reference/utils/firmware_image.c
@@ -87,11 +87,7 @@ FirmwareImage* ReadFirmwareImage(const char* input_file) {
signature_len = siglen_map[image->firmware_sign_algorithm];
/* Check whether the header length is correct. */
- header_len = (FIELD_LEN(header_len) +
- FIELD_LEN(firmware_sign_algorithm) +
- firmware_sign_key_len +
- FIELD_LEN(firmware_key_version) +
- FIELD_LEN(header_checksum));
+ header_len = GetFirmwareHeaderLen(image);
if (header_len != image->header_len) {
fprintf(stderr, "Header length mismatch. Got: %d Expected: %d\n",
image->header_len, header_len);
@@ -215,7 +211,7 @@ uint8_t* GetFirmwareBlob(const FirmwareImage* image, uint64_t* blob_len) {
StatefulMemcpy_r(&st, image->magic, FIELD_LEN(magic));
StatefulMemcpy_r(&st, header_blob, GetFirmwareHeaderLen(image));
StatefulMemcpy_r(&st, image->firmware_key_signature,
- FIELD_LEN(firmware_key_signature));
+ FIELD_LEN(firmware_key_signature));
StatefulMemcpy_r(&st, preamble_blob, GetFirmwarePreambleLen(image));
StatefulMemcpy_r(&st, image->preamble_signature, firmware_signature_len);
StatefulMemcpy_r(&st, image->firmware_signature, firmware_signature_len);
@@ -434,9 +430,7 @@ int VerifyFirmware(const uint8_t* root_key_blob,
}
/* Only continue if firmware data verification succeeds. */
firmware_ptr = (preamble_ptr +
- FIELD_LEN(firmware_version) +
- FIELD_LEN(firmware_len) +
- FIELD_LEN(preamble) +
+ GetFirmwarePreambleLen(NULL) +
signature_len);
if ((error_code = VerifyFirmwareData(firmware_sign_key, firmware_ptr,
« no previous file with comments | « src/platform/vboot_reference/tests/kernel_image_tests.c ('k') | src/platform/vboot_reference/utils/kernel_image.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698