Adding --repack and --headeronly options to vbutil_kernel

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 83 matching lines @@
     return 1;
   }
 
   /* Read the key block and keys */
   key_block = (VbKeyBlockHeader*)ReadFile(keyblock_file, &key_block_size);
   if (!key_block) {
     error("Error reading key block.\n");
     return 1;
   }
 
-  signing_key = PrivateKeyRead(signprivate, key_block->data_key.algorithm);
+  signing_key = PrivateKeyReadPem(signprivate, key_block->data_key.algorithm);
   if (!signing_key) {
     error("Error reading signing key.\n");
     return 1;
   }
 
   kernel_subkey = PublicKeyRead(kernelkey_file);
   if (!kernel_subkey) {
     error("Error reading kernel subkey.\n");
     return 1;
   }
@@ skipping 206 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();
   }
 }