Change VerifyFirmware() to take separate pointers to firmware verification header and firmware data.

src/platform/vboot_reference/tests/firmware_image_tests.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Tests for firmware image library.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "cryptolib.h"
 #include "file_keys.h"
 #include "firmware_image.h"
 #include "test_common.h"
 #include "utility.h"
 
 /* Normal Firmware Blob Verification Tests. */
-void VerifyFirmwareTest(uint8_t* firmware_blob, uint8_t* root_key_blob) {
-  TEST_EQ(VerifyFirmware(root_key_blob, firmware_blob),
+void VerifyFirmwareTest(uint8_t* verification_header,
+                        uint8_t* firmware_data,
+                        uint8_t* root_key_blob) {
+  TEST_EQ(VerifyFirmware(root_key_blob,
+                         verification_header,
+                         firmware_data),
           VERIFY_FIRMWARE_SUCCESS,
           "Normal Firmware Blob Verification");
 }
 
 /* Normal FirmwareImage Verification Tests. */
 void VerifyFirmwareImageTest(FirmwareImage* image,
                              RSAPublicKey* root_key) {
   TEST_EQ(VerifyFirmwareImage(root_key, image),
           VERIFY_FIRMWARE_SUCCESS,
           "Normal FirmwareImage Verification");
@@ skipping 55 matching lines @@
                                     firmware_key_file,
                                     'F');
 
   if (!root_key_pub || !firmware_sign_key_buf || !image) {
     error_code = 1;
     goto failure;
   }
   firmware_blob = GetFirmwareBlob(image, &firmware_blob_len);
 
   /* Test Firmware blob verify operations. */
-  VerifyFirmwareTest(firmware_blob, root_key_blob);
+  VerifyFirmwareTest(firmware_blob,
+                     image->firmware_data,
+                     root_key_blob);
 
   /* Test FirmwareImage verify operations. */
   VerifyFirmwareImageTest(image, root_key_pub);
   VerifyFirmwareImageTamperTest(image, root_key_pub);
 
   if (!gTestSuccess)
     error_code = 255;
 
 failure:
   Free(firmware_blob);
   FirmwareImageFree(image);
   Free(firmware_sign_key_buf);
   Free(root_key_blob);
   RSAPublicKeyFree(root_key_pub);
 
   return error_code;
 }