Oops. Pass the correct args to Verify* functions.

utility/dev_sign_file.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.
  *
  * Developer file-signing utility
  */
 
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>  /* For PRIu64 */
@@ skipping 198 matching lines @@
   Debug("Preamble is 0x%" PRIx64 " bytes\n", preamble->preamble_size);
   current_buf_offset += preamble->preamble_size;
   if (current_buf_offset > buf_size ) {
     error("preamble_size advances past the end of the buffer\n");
     return 1;
   }
 
   Debug("Current buf offset is at 0x%" PRIx64 " bytes\n", current_buf_offset);
 
   /* Check the key block (hash only) */
-  if (0 != KeyBlockVerify(key_block, file_size, NULL, 1)) {
+  if (0 != KeyBlockVerify(key_block, key_block->key_block_size, NULL, 1)) {
     error("Error verifying key block.\n");
     return 1;
   }
 
   printf("Key block:\n");
   data_key = &key_block->data_key;
   printf("  Size:                0x%" PRIx64 "\n", key_block->key_block_size);
   printf("  Data key algorithm:  %" PRIu64 " %s\n", data_key->algorithm,
          (data_key->algorithm < kNumAlgorithms ?
           algo_strings[data_key->algorithm] : "(invalid)"));
   printf("  Data key version:    %" PRIu64 "\n", data_key->key_version);
   printf("  Flags:               %" PRIu64 "\n", key_block->key_block_flags);
 
 
   /* Verify preamble */
   rsa = PublicKeyToRSA(&key_block->data_key);
   if (!rsa) {
     error("Error parsing data key.\n");
     return 1;
   }
-  if (0 != VerifyKernelPreamble(preamble, file_size, rsa)) {
+  if (0 != VerifyKernelPreamble(preamble, preamble->preamble_size, rsa)) {
     error("Error verifying preamble.\n");
     return 1;
   }
 
   printf("Preamble:\n");
   printf("  Size:                0x%" PRIx64 "\n", preamble->preamble_size);
   printf("  Header version:      %" PRIu32 ".%" PRIu32"\n",
          preamble->header_version_major, preamble->header_version_minor);
   printf("  Kernel version:      %" PRIu64 "\n", preamble->kernel_version);
   printf("  Body load address:   0x%" PRIx64 "\n", preamble->body_load_address);
@@ skipping 95 matching lines @@
 
     default:
       fprintf(stderr,
               "You must specify either --sign or --verify\n");
       return PrintHelp(progname);
   }
 
   /* NOTREACHED */
   return 1;
 }