vbutil_firmware uses .vbprivk

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 34 matching lines @@
 
 /* Print help and return error */
 static int PrintHelp(void) {
 
   puts("vbutil_firmware - Verified boot key block utility\n"
        "\n"
        "Usage:  vbutil_firmware <--vblock|--verify> <file> [OPTIONS]\n"
        "\n"
        "For '--vblock <file>', required OPTIONS are:\n"
        "  --keyblock <file>           Key block in .keyblock format\n"
-       "  --signprivate <file>        Signing private key in .pem format\n"
+       "  --signprivate <file>        Signing private key in .vbprivk format\n"
        "  --version <number>          Firmware version\n"
        "  --fv <file>                 Firmware volume to sign\n"
        "  --kernelkey <file>          Kernel subkey in .vbpubk format\n"
        "\n"
        "For '--verify <file>', required OPTIONS are:\n"
        "  --signpubkey <file>         Signing public key in .vbpubk format\n"
        "  --fv <file>                 Firmware volume to verify\n"
        "");
   return 1;
 }
@@ skipping 28 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 = PrivateKeyReadPem(signprivate, key_block->data_key.algorithm);
+  signing_key = PrivateKeyRead(signprivate);
   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();
   }
 }