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

src/platform/vboot_reference/tests/test_common.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.
  *
  * Common functions used by tests.
  */
 
 #include "test_common.h"
 
 #include <stdio.h>
@@ skipping 62 matching lines @@
   }
 
   if (!AddFirmwareSignature(image, firmware_key_file)) {
     debug("Couldn't create firmware and preamble signature.\n");
     FirmwareImageFree(image);
     return NULL;
   }
   return image;
 }
 
-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) {
   FirmwareImage* image = NULL;
   uint8_t* firmware_blob = NULL;
   uint64_t firmware_blob_len = 0;
 
   image = GenerateTestFirmwareImage(algorithm,
                                     firmware_sign_key,
                                     firmware_key_version,
                                     firmware_version,
                                     firmware_len,
                                     root_key_file,
                                     firmware_key_file,
                                     'F');
   firmware_blob = GetFirmwareBlob(image, &firmware_blob_len);
   FirmwareImageFree(image);
   return firmware_blob;
 }
 
-uint8_t* GenerateRollbackTestFirmwareBlob(int firmware_key_version,
-                                          int firmware_version,
-                                          int is_corrupt) {
+uint8_t* GenerateRollbackTestVerificationBlob(int firmware_key_version,
+                                              int firmware_version) {
   FirmwareImage* image = NULL;
   uint64_t len;
-  uint8_t* firmware_blob = NULL;
+  uint8_t* verification_blob = NULL;
   uint8_t* firmware_sign_key = NULL;
 
   firmware_sign_key = BufferFromFile("testkeys/key_rsa1024.keyb",
                                      &len);
   if (!firmware_sign_key)
     return NULL;
   image = GenerateTestFirmwareImage(0,  /* RSA1024/SHA1 */
                                     firmware_sign_key,
                                     firmware_key_version,
                                     firmware_version,
                                     1,  /* Firmware length. */
                                     "testkeys/key_rsa8192.pem",
                                     "testkeys/key_rsa1024.pem",
                                     'F');
   if (!image)
     return NULL;
-  if (is_corrupt) {
-    /* Invalidate image. */
-    Memset(image->firmware_data, 'X', image->firmware_len);
-  }
-
-  firmware_blob = GetFirmwareBlob(image, &len);
+  verification_blob = GetFirmwareBlob(image, &len);
   FirmwareImageFree(image);
-  return firmware_blob;
+  return verification_blob;
 }
 
 
 KernelImage* GenerateTestKernelImage(int firmware_sign_algorithm,
                                      int kernel_sign_algorithm,
                                      const uint8_t* kernel_sign_key,
                                      int kernel_key_version,
                                      int kernel_version,
                                      uint64_t kernel_len,
                                      const char* firmware_key_file,
@@ skipping 95 matching lines @@
  if (!image)
    return NULL;
  if (is_corrupt) {
    /* Invalidate image. */
    Memset(image->kernel_data, 'X', image->options.kernel_len);
  }
  kernel_blob = GetKernelBlob(image, &len);
  KernelImageFree(image);
  return kernel_blob;
 }