diff options
Diffstat (limited to 'futility/cmd_vbutil_firmware.c')
| -rw-r--r-- | futility/cmd_vbutil_firmware.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/futility/cmd_vbutil_firmware.c b/futility/cmd_vbutil_firmware.c index b8e9bc63..1c954aef 100644 --- a/futility/cmd_vbutil_firmware.c +++ b/futility/cmd_vbutil_firmware.c @@ -60,7 +60,7 @@ static void print_help(int argc, char *argv[]) "\n" "For '--vblock <file>', required OPTIONS are:\n" "\n" - " --keyblock <file> Key block in .keyblock format\n" + " --keyblock <file> Keyblock in .keyblock format\n" " --signprivate <file>" " Signing private key in .vbprivk format\n" " --version <number> Firmware version\n" @@ -109,10 +109,10 @@ static int do_vblock(const char *outfile, const char *keyblock_file, goto vblock_cleanup; } - /* Read the key block and keys */ + /* Read the keyblock and keys */ keyblock = vb2_read_keyblock(keyblock_file); if (!keyblock) { - FATAL("Error reading key block.\n"); + FATAL("Error reading keyblock.\n"); goto vblock_cleanup; } @@ -230,17 +230,17 @@ static int do_verify(const char *infile, const char *signpubkey, goto verify_cleanup; } - /* Verify key block */ + /* Verify keyblock */ struct vb2_keyblock *keyblock = (struct vb2_keyblock *)blob; if (VB2_SUCCESS != vb2_verify_keyblock(keyblock, blob_size, &sign_key, &wb)) { - FATAL("Error verifying key block.\n"); + FATAL("Error verifying keyblock.\n"); goto verify_cleanup; } now += keyblock->keyblock_size; - printf("Key block:\n"); + printf("Keyblock:\n"); printf(" Size: %d\n", keyblock->keyblock_size); printf(" Flags: %d (ignored)\n", keyblock->keyblock_flags); @@ -327,7 +327,7 @@ static int do_vbutil_firmware(int argc, char *argv[]) { char *filename = NULL; - char *key_block_file = NULL; + char *keyblock_file = NULL; char *signpubkey = NULL; char *signprivate = NULL; uint32_t version = 0; @@ -357,7 +357,7 @@ static int do_vbutil_firmware(int argc, char *argv[]) break; case OPT_KEYBLOCK: - key_block_file = optarg; + keyblock_file = optarg; break; case OPT_SIGNPUBKEY: @@ -401,7 +401,7 @@ static int do_vbutil_firmware(int argc, char *argv[]) switch (mode) { case OPT_MODE_VBLOCK: - return do_vblock(filename, key_block_file, signprivate, version, + return do_vblock(filename, keyblock_file, signprivate, version, fv_file, kernelkey_file, preamble_flags); case OPT_MODE_VERIFY: return do_verify(filename, signpubkey, fv_file, kernelkey_file); |