src/platform/vboot_reference/tests/test_common.c - Issue 1430001: VBoot Reference: Fix splicing bugs in Firmware and Kernel verification.

Unified Diff: src/platform/vboot_reference/tests/test_common.c

Issue 1430001: VBoot Reference: Fix splicing bugs in Firmware and Kernel verification. (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

« src/platform/vboot_reference/tests/kernel_splicing_tests.c ('K') | « src/platform/vboot_reference/tests/test_common.h ('k') | src/platform/vboot_reference/utils/firmware_image.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/platform/vboot_reference/tests/test_common.c

diff --git a/src/platform/vboot_reference/tests/test_common.c b/src/platform/vboot_reference/tests/test_common.c

index c1d1108e03d3e39ec632b3ba76e795eda7cc8d3c..929e91f3b2c5372cf831081188a2608816881ba7 100644

--- a/src/platform/vboot_reference/tests/test_common.c

+++ b/src/platform/vboot_reference/tests/test_common.c

@@ -39,7 +39,8 @@ FirmwareImage* GenerateTestFirmwareImage(int algorithm,

int firmware_version,

int firmware_len,

const char* root_key_file,

- const char* firmware_key_file) {

+ const char* firmware_key_file,

+ uint8_t firmware_data_fill_char) {

FirmwareImage* image = FirmwareImageNew();

Memcpy(image->magic, FIRMWARE_MAGIC, FIRMWARE_MAGIC_SIZE);

@@ -62,7 +63,7 @@ FirmwareImage* GenerateTestFirmwareImage(int algorithm,

image->preamble_signature = image->firmware_signature = NULL;

Memset(image->preamble, 'P', FIRMWARE_PREAMBLE_SIZE);

image->firmware_data = Malloc(image->firmware_len);

- Memset(image->firmware_data, 'F', image->firmware_len);

+ Memset(image->firmware_data, firmware_data_fill_char, image->firmware_len);

/* Generate and populate signatures. */

if (!AddFirmwareKeySignature(image, root_key_file)) {

@@ -96,7 +97,8 @@ uint8_t* GenerateTestFirmwareBlob(int algorithm,

firmware_version,

firmware_len,

root_key_file,

- firmware_key_file);

+ firmware_key_file,

+ 'F');

firmware_blob = GetFirmwareBlob(image, &firmware_blob_len);

FirmwareImageFree(image);

return firmware_blob;

@@ -120,7 +122,8 @@ uint8_t* GenerateRollbackTestFirmwareBlob(int firmware_key_version,

firmware_version,

1, /* Firmware length. */

"testkeys/key_rsa8192.pem",

- "testkeys/key_rsa1024.pem");

+ "testkeys/key_rsa1024.pem",

+ 'F');

if (!image)

return NULL;

if (is_corrupt) {

@@ -141,7 +144,8 @@ KernelImage* GenerateTestKernelImage(int firmware_sign_algorithm,

int kernel_version,

int kernel_len,

const char* firmware_key_file,

- const char* kernel_key_file) {

+ const char* kernel_key_file,

+ uint8_t kernel_data_fill_char) {

KernelImage* image = KernelImageNew();

Memcpy(image->magic, KERNEL_MAGIC, KERNEL_MAGIC_SIZE);

@@ -170,7 +174,7 @@ KernelImage* GenerateTestKernelImage(int firmware_sign_algorithm,

image->options.kernel_entry_addr = 0;

image->kernel_key_signature = image->kernel_signature = NULL;

image->kernel_data = Malloc(kernel_len);

- Memset(image->kernel_data, 'F', kernel_len);

+ Memset(image->kernel_data, kernel_data_fill_char, kernel_len);

/* Generate and populate signatures. */

if (!AddKernelKeySignature(image, firmware_key_file)) {

@@ -207,7 +211,8 @@ uint8_t* GenerateTestKernelBlob(int firmware_sign_algorithm,

kernel_version,

kernel_len,

firmware_key_file,

- kernel_key_file);

+ kernel_key_file,

+ 'K');

kernel_blob = GetKernelBlob(image, &kernel_blob_len);

KernelImageFree(image);

@@ -232,7 +237,8 @@ uint8_t* GenerateRollbackTestKernelBlob(int kernel_key_version,