Clean up of key block functions

utility/vbutil_keyblock.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 key block utility
  */
 
 #include <getopt.h>
 #include <inttypes.h>  /* For PRIu64 */
 #include <stdio.h>
@@ skipping 81 matching lines @@
   if (!data_key) {
     fprintf(stderr, "vbutil_keyblock: Error reading data key.\n");
     return 1;
   }
   signing_key = PrivateKeyRead(signprivate, algorithm);
   if (!signing_key) {
     fprintf(stderr, "vbutil_keyblock: Error reading signing key.\n");
     return 1;
   }
 
-  block = CreateKeyBlock(data_key, signing_key, flags);
+  block = KeyBlockCreate(data_key, signing_key, flags);
   Free(data_key);
   Free(signing_key);
 
-  if (0 != WriteFile(outfile, block, block->key_block_size)) {
+  if (0 != KeyBlockWrite(outfile, block)) {
     fprintf(stderr, "vbutil_keyblock: Error writing key block.\n");
     return 1;
   }
   Free(block);
   return 0;
 }
 
 
 static int Unpack(const char* infile, const char* datapubkey,
                   const char* signpubkey) {
   VbPublicKey* data_key;
   VbPublicKey* sign_key;
   VbKeyBlockHeader* block;
-  uint64_t block_size;
 
   if (!infile || !signpubkey) {
     fprintf(stderr, "vbutil_keyblock: Must specify filename and signpubkey\n");
     return 1;
   }
 
   sign_key = PublicKeyRead(signpubkey);
   if (!sign_key) {
     fprintf(stderr, "vbutil_keyblock: Error reading signpubkey.\n");
     return 1;
   }
 
-  block = (VbKeyBlockHeader*)ReadFile(infile, &block_size);
+  block = KeyBlockRead(infile);
   if (!block) {
     fprintf(stderr, "vbutil_keyblock: Error reading key block.\n");
     return 1;
   }
-  if (0 != VerifyKeyBlock(block, block_size, sign_key)) {
+  /* Verify the block with the signing public key, since
+   * KeyBlockRead() only verified the hash. */
+  /* TODO: should just print a warning, since self-signed key blocks
+   * won't have a public key; signpubkey should also be an optional
+   * argument. */
+  if (0 != KeyBlockVerify(block, block->key_block_size, sign_key)) {
     fprintf(stderr, "vbutil_keyblock: Error verifying key block.\n");
     return 1;
   }
   Free(sign_key);
 
   printf("Key block file:      %s\n", infile);
   printf("Flags:               %" PRIu64 "\n", block->key_block_flags);
 
   data_key = &block->data_key;
   printf("Data key algorithm:  %" PRIu64 " %s\n", data_key->algorithm,
@@ skipping 71 matching lines @@
   switch(mode) {
     case OPT_MODE_PACK:
       return Pack(filename, datapubkey, signprivate, algorithm, flags);
     case OPT_MODE_UNPACK:
       return Unpack(filename, datapubkey, signpubkey);
     default:
       printf("Must specify a mode.\n");
       return PrintHelp();
   }
 }