Clean up of key block functions

utility/vbutil_kernel.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 kernel utility
  */
 
 #include <getopt.h>
 #include <inttypes.h>  /* For PRIu64 */
 #include <stddef.h>
@@ skipping 308 matching lines @@
 
   /* Read blob */
   blob = ReadFile(infile, &blob_size);
   if (!blob) {
     error("Error reading input file\n");
     return 1;
   }
 
   /* Verify key block */
   key_block = (VbKeyBlockHeader*)blob;
-  if (0 != VerifyKeyBlock(key_block, blob_size, sign_key)) {
+  if (0 != KeyBlockVerify(key_block, blob_size, sign_key)) {
     error("Error verifying key block.\n");
     return 1;
   }
   Free(sign_key);
   now += key_block->key_block_size;
 
   printf("Key block:\n");
   data_key = &key_block->data_key;
   printf("  Size:                %" PRIu64 "\n", key_block->key_block_size);
   printf("  Data key algorithm:  %" PRIu64 " %s\n", data_key->algorithm,
@@ skipping 116 matching lines @@
     case OPT_MODE_PACK:
       return Pack(filename, key_block_file, signprivate, version, vmlinuz,
                   bootloader, config_file, pad);
     case OPT_MODE_VERIFY:
       return Verify(filename, signpubkey);
     default:
       printf("Must specify a mode.\n");
       return PrintHelp();
   }
 }