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

src/platform/vboot_reference/tests/firmware_splicing_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.
  *
  * Splicing tests for the firmware image verification library.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
@@ skipping 49 matching lines @@
    * and put it into [image2]. */
   Memcpy(image2->firmware_signature, image1->firmware_signature,
          siglen_map[0]);
   Memcpy(image2->firmware_data, image1->firmware_data,
          image2->firmware_len);
 
   TEST_EQ(VerifyFirmwareImage(root_key, image2),
           VERIFY_FIRMWARE_SIGNATURE_FAILED,
           "FirmwareImage firmware_data Splicing");
   firmware_blob = GetFirmwareBlob(image2, &len);
-  TEST_EQ(VerifyFirmware(root_key_blob, firmware_blob),
+  TEST_EQ(VerifyFirmware(root_key_blob, firmware_blob, image2->firmware_data),
           VERIFY_FIRMWARE_SIGNATURE_FAILED,
           "Firmware Blob firmware_data Splicing");
 }
 
 int main(int argc, char* argv[])
 {
   int error_code = 0;
   VerifyFirmwareSplicingTest();
   if (!gTestSuccess)
     error_code = 255;
   return error_code;
 }