Adding --repack and --headeronly options to vbutil_kernel

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 75 matching lines @@
   if (algorithm >= kNumAlgorithms) {
     fprintf(stderr, "Invalid algorithm\n");
     return 1;
   }
 
   data_key = PublicKeyRead(datapubkey);
   if (!data_key) {
     fprintf(stderr, "vbutil_keyblock: Error reading data key.\n");
     return 1;
   }
-  signing_key = PrivateKeyRead(signprivate, algorithm);
+  signing_key = PrivateKeyReadPem(signprivate, algorithm);
   if (!signing_key) {
     fprintf(stderr, "vbutil_keyblock: Error reading signing key.\n");
     return 1;
   }
 
   block = KeyBlockCreate(data_key, signing_key, flags);
   Free(data_key);
   Free(signing_key);
 
   if (0 != KeyBlockWrite(outfile, block)) {
@@ skipping 117 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();
   }
 }