diff options
| author | Joel Kitching <kitching@google.com> | 2019-09-04 14:12:42 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-23 16:28:16 +0000 |
| commit | d3b2117f9abe2f7413f6315867ae3c3dbfaf5db1 (patch) | |
| tree | d25a53c589d3547d25edfc299d68df55cc472652 /futility/cmd_vbutil_kernel.c | |
| parent | 53ce884528f734958d4845f6528809957b09934c (diff) | |
| download | vboot-d3b2117f9abe2f7413f6315867ae3c3dbfaf5db1.tar.gz | |
vboot: standardize on "keyblock" as one word
Stardardize on inconsistency between "keyblock" and "key block"
both in code, comments, and textual output.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Change-Id: Ib8819a2426c1179286663f21f0d254f3de9d94a4
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1786385
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'futility/cmd_vbutil_kernel.c')
| -rw-r--r-- | futility/cmd_vbutil_kernel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index cdcce0b1..125debb4 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -91,7 +91,7 @@ static const char usage[] = "Usage: " MYNAME " %s --pack <file> [PARAMETERS]\n" "\n" " Required parameters:\n" - " --keyblock <file> Key block in .keyblock format\n" + " --keyblock <file> Keyblock in .keyblock format\n" " --signprivate <file> Private key to sign kernel data,\n" " in .vbprivk format\n" " --version <number> Kernel version\n" @@ -115,7 +115,7 @@ static const char usage[] = " (including verfication blob)\n" "\n" " Optional:\n" - " --keyblock <file> Key block in .keyblock format\n" + " --keyblock <file> Keyblock in .keyblock format\n" " --config <file> New command line file\n" " --version <number> Kernel version\n" " --kloadaddr <address> Assign kernel body load address\n" @@ -129,7 +129,7 @@ static const char usage[] = " Public key to verify kernel keyblock,\n" " in .vbpubk format\n" " --verbose Print a more detailed report\n" - " --keyblock <file> Outputs the verified key block,\n" + " --keyblock <file> Outputs the verified keyblock,\n" " in .keyblock format\n" " --pad <number> Verification padding size in bytes\n" " --minversion <number> Minimum combined kernel key version\n" @@ -392,7 +392,7 @@ static int do_vbutil_kernel(int argc, char *argv[]) t_keyblock = (struct vb2_keyblock *)ReadFile(keyblock_file, 0); if (!t_keyblock) - FATAL("Error reading key block.\n"); + FATAL("Error reading keyblock.\n"); if (!signprivkey_file) FATAL("Missing required signprivate file.\n"); @@ -523,7 +523,7 @@ static int do_vbutil_kernel(int argc, char *argv[]) t_keyblock = (struct vb2_keyblock *) ReadFile(keyblock_file, 0); if (!t_keyblock) - FATAL("Error reading key block.\n"); + FATAL("Error reading keyblock.\n"); } /* Reuse previous body size */ |