Adding --repack and --headeronly options to vbutil_kernel

tests/vboot_common2_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 195 matching lines @@
 
   if(argc != 4) {
     fprintf(stderr, "Usage: %s <key_algorithm> <key> <processed pubkey>"
             " <signing key> <processed signing key>\n", argv[0]);
     return -1;
   }
 
   /* Read verification keys and create a test image. */
   key_algorithm = atoi(argv[1]);
 
-  private_key = PrivateKeyRead(argv[2], key_algorithm);
+  private_key = PrivateKeyReadPem(argv[2], key_algorithm);
   if (!private_key) {
     fprintf(stderr, "Error reading private_key");
     return 1;
   }
 
   public_key = PublicKeyReadKeyb(argv[3], key_algorithm, 1);
   if (!public_key) {
     fprintf(stderr, "Error reading public_key");
     return 1;
   }
 
   VerifyPublicKeyToRSA(public_key);
   VerifyDataTest(public_key, private_key);
   VerifyDigestTest(public_key, private_key);
   VerifyKernelPreambleTest(public_key, private_key);
 
   if (public_key)
     Free(public_key);
   if (private_key)
     Free(private_key);
 
   return error_code;
 }