Change VerifyFirmware() to take separate pointers to firmware verification header and firmware data.
The firmware verification code no longer assumes that verification data and firmware data are contiguous and follow each other. Needed for EFI where the actual firmware must be stored in its own firmware volume.
BUG=1704
TEST=modified existing tests for the new API, and they still pass
Review URL: http://codereview.chromium.org/1578035
diff --git a/tests/test_common.h b/tests/test_common.h
index 6fed1b4..d73dc0e 100644
--- a/tests/test_common.h
+++ b/tests/test_common.h
@@ -26,13 +26,13 @@
const char* root_key_file,
const char* firmware_key_file,
uint8_t firmware_data_fill_char);
-uint8_t* GenerateTestFirmwareBlob(int algorithm,
- const uint8_t* firmware_sign_key,
- int firmware_key_version,
- int firmware_version,
- uint64_t firmware_len,
- const char* root_key_file,
- const char* firmware_key_file);
+uint8_t* GenerateTestVerificationBlob(int algorithm,
+ const uint8_t* firmware_sign_key,
+ int firmware_key_version,
+ int firmware_version,
+ uint64_t firmware_len,
+ const char* root_key_file,
+ const char* firmware_key_file);
/* Test kernel image generation functions. */
KernelImage* GenerateTestKernelImage(int firmware_sign_algorithm,
@@ -44,7 +44,6 @@
const char* firmware_key_file,
const char* kernel_key_file,
uint8_t kernel_data_fill_char);
-;
uint8_t* GenerateTestKernelBlob(int firmware_sign_algorithm,
int kernel_sign_algorithm,
const uint8_t* kernel_sign_key,
@@ -54,12 +53,12 @@
const char* firmware_key_file,
const char* kernel_key_file);
-/* Generates a test firmware image for rollback tests with a given
- * [firmware_key_version] and [firmware_version]. If [is_corrupt] is 1,
- * then the image has invalid signatures and will fail verification. */
-uint8_t* GenerateRollbackTestFirmwareBlob(int firmware_key_version,
- int firmware_version,
- int is_corrupt);
+/* Generates a test verification block for rollback tests with a given
+ * [firmware_key_version] and [firmware_version]. The firmware length is
+ * assumed to be 1 bytes, and containing { 'F' }.
+ */
+uint8_t* GenerateRollbackTestVerificationBlob(int firmware_key_version,
+ int firmware_version);
/* Generates a test kernel iamge for rollback tests with a given
* [kernel_key_version} and [kernel_version]. If [is_corrupt] is 1,