Adding --repack and --headeronly options to vbutil_kernel

tests/vboot_common3_tests.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.
  *
  * Tests for firmware image library.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
@@ skipping 246 matching lines @@
     fprintf(stderr, "Usage: %s <signing_key_algorithm> <data_key_algorithm>"
             " <signing key> <processed signing pubkey>"
             " <data key> <processed data pubkey>\n", argv[0]);
     return -1;
   }
 
   /* Read verification keys and create a test image. */
   signing_key_algorithm = atoi(argv[1]);
   data_key_algorithm = atoi(argv[2]);
 
-  signing_private_key = PrivateKeyRead(argv[3], signing_key_algorithm);
+  signing_private_key = PrivateKeyReadPem(argv[3], signing_key_algorithm);
   if (!signing_private_key) {
     fprintf(stderr, "Error reading signing_private_key");
     return 1;
   }
 
   signing_public_key = PublicKeyReadKeyb(argv[4], signing_key_algorithm, 1);
   if (!signing_public_key) {
     fprintf(stderr, "Error reading signing_public_key");
     return 1;
   }
@@ skipping 10 matching lines @@
 
   if (signing_public_key)
     Free(signing_public_key);
   if (signing_private_key)
     Free(signing_private_key);
   if (data_public_key)
     Free(data_public_key);
 
   return error_code;
 }