Added size param to VerifyData()

utility/vbutil_firmware.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.
  *
  * Verified boot firmware utility
  */
 
 #include <getopt.h>
 #include <inttypes.h>  /* For PRIu64 */
 #include <stddef.h>
@@ skipping 206 matching lines @@
   printf("  Flags:               %" PRIu64 "\n", key_block->key_block_flags);
 
   rsa = PublicKeyToRSA(&key_block->data_key);
   if (!rsa) {
     error("Error parsing data key.\n");
     return 1;
   }
 
   /* Verify preamble */
   preamble = (VbFirmwarePreambleHeader*)(blob + now);
-  if (0 != VerifyFirmwarePreamble2(preamble, blob_size - now, rsa)) {
+  if (0 != VerifyFirmwarePreamble(preamble, blob_size - now, rsa)) {
     error("Error verifying preamble.\n");
     return 1;
   }
   now += preamble->preamble_size;
 
   printf("Preamble:\n");
   printf("  Size:                  %" PRIu64 "\n", preamble->preamble_size);
   printf("  Header version:        %" PRIu32 ".%" PRIu32"\n",
          preamble->header_version_major, preamble->header_version_minor);
   printf("  Firmware version:      %" PRIu64 "\n", preamble->firmware_version);
   printf("  Kernel key algorithm:  %" PRIu64 " %s\n",
          preamble->kernel_subkey.algorithm,
          (preamble->kernel_subkey.algorithm < kNumAlgorithms ?
           algo_strings[preamble->kernel_subkey.algorithm] : "(invalid)"));
   printf("  Kernel key version:    %" PRIu64 "\n",
          preamble->kernel_subkey.key_version);
   printf("  Firmware body size:    %" PRIu64 "\n",
          preamble->body_signature.data_size);
 
   /* TODO: verify body size same as signature size */
 
   /* Verify body */
-  if (0 != VerifyData(fv_data, &preamble->body_signature, rsa)) {
+  if (0 != VerifyData(fv_data, fv_size, &preamble->body_signature, rsa)) {
     error("Error verifying firmware body.\n");
     return 1;
   }
   printf("Body verification succeeded.\n");
   return 0;
 }
 
 
 int main(int argc, char* argv[]) {
 
@@ skipping 60 matching lines @@
     case OPT_MODE_VBLOCK:
       return Vblock(filename, key_block_file, signprivate, version, fv_file,
                     kernelkey_file);
     case OPT_MODE_VERIFY:
       return Verify(filename, signpubkey, fv_file);
     default:
       printf("Must specify a mode.\n");
       return PrintHelp();
   }
 }