diff options
| author | Joel Kitching <kitching@google.com> | 2019-08-30 16:02:24 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-23 16:28:17 +0000 |
| commit | 1ff5597e282df81fb2cddcf4b7b47a01553a86fc (patch) | |
| tree | 74bd0832b75af2f6bb9511b6b7521a9a41755118 /futility | |
| parent | d3b2117f9abe2f7413f6315867ae3c3dbfaf5db1 (diff) | |
| download | vboot-1ff5597e282df81fb2cddcf4b7b47a01553a86fc.tar.gz | |
vboot: relocate vb2_signature and vb2_keybock structs
Move from vboot20 to vboot2.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Change-Id: Ib1fe0e2cfb0865fffe33ad35e7bd67d416da4589
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1776291
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'futility')
| -rw-r--r-- | futility/cmd_vbutil_keyblock.c | 8 | ||||
| -rw-r--r-- | futility/vb1_helper.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/futility/cmd_vbutil_keyblock.c b/futility/cmd_vbutil_keyblock.c index b81da878..8e4b22d1 100644 --- a/futility/cmd_vbutil_keyblock.c +++ b/futility/cmd_vbutil_keyblock.c @@ -215,13 +215,13 @@ static int Unpack(const char *infile, const char *datapubkey, printf("Keyblock file: %s\n", infile); printf("Signature %s\n", sign_key ? "valid" : "ignored"); printf("Flags: %u ", block->keyblock_flags); - if (block->keyblock_flags & KEYBLOCK_FLAG_DEVELOPER_0) + if (block->keyblock_flags & VB2_KEYBLOCK_FLAG_DEVELOPER_0) printf(" !DEV"); - if (block->keyblock_flags & KEYBLOCK_FLAG_DEVELOPER_1) + if (block->keyblock_flags & VB2_KEYBLOCK_FLAG_DEVELOPER_1) printf(" DEV"); - if (block->keyblock_flags & KEYBLOCK_FLAG_RECOVERY_0) + if (block->keyblock_flags & VB2_KEYBLOCK_FLAG_RECOVERY_0) printf(" !REC"); - if (block->keyblock_flags & KEYBLOCK_FLAG_RECOVERY_1) + if (block->keyblock_flags & VB2_KEYBLOCK_FLAG_RECOVERY_1) printf(" REC"); printf("\n"); diff --git a/futility/vb1_helper.c b/futility/vb1_helper.c index a106b5b8..01c63ebd 100644 --- a/futility/vb1_helper.c +++ b/futility/vb1_helper.c @@ -538,13 +538,13 @@ int VerifyKernelBlob(uint8_t *kernel_blob, signpub_key ? "valid" : "ignored"); printf(" Size: %#x\n", g_keyblock->keyblock_size); printf(" Flags: %u ", g_keyblock->keyblock_flags); - if (g_keyblock->keyblock_flags & KEYBLOCK_FLAG_DEVELOPER_0) + if (g_keyblock->keyblock_flags & VB2_KEYBLOCK_FLAG_DEVELOPER_0) printf(" !DEV"); - if (g_keyblock->keyblock_flags & KEYBLOCK_FLAG_DEVELOPER_1) + if (g_keyblock->keyblock_flags & VB2_KEYBLOCK_FLAG_DEVELOPER_1) printf(" DEV"); - if (g_keyblock->keyblock_flags & KEYBLOCK_FLAG_RECOVERY_0) + if (g_keyblock->keyblock_flags & VB2_KEYBLOCK_FLAG_RECOVERY_0) printf(" !REC"); - if (g_keyblock->keyblock_flags & KEYBLOCK_FLAG_RECOVERY_1) + if (g_keyblock->keyblock_flags & VB2_KEYBLOCK_FLAG_RECOVERY_1) printf(" REC"); printf("\n"); printf(" Data key algorithm: %u %s\n", data_key->algorithm, |