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 /tests/vboot_kernel_tests.c | |
| 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 'tests/vboot_kernel_tests.c')
| -rw-r--r-- | tests/vboot_kernel_tests.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c index 33705f2c..531a1187 100644 --- a/tests/vboot_kernel_tests.c +++ b/tests/vboot_kernel_tests.c @@ -61,7 +61,7 @@ static VbExDiskHandle_t handle; static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE]; static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data; static LoadKernelParams lkp; -static VbKeyBlockHeader kbh; +static struct vb2_keyblock kbh; static VbKernelPreambleHeader kph; static struct RollbackSpaceFwmp fwmp; static uint8_t mock_disk[MOCK_SECTOR_SIZE * MOCK_SECTOR_COUNT]; @@ -683,27 +683,27 @@ static void LoadKernelTest(void) /* Check keyblock flag mismatches */ ResetMocks(); kbh.keyblock_flags = - KEYBLOCK_FLAG_RECOVERY_0 | KEYBLOCK_FLAG_DEVELOPER_1; + VB2_KEYBLOCK_FLAG_RECOVERY_0 | VB2_KEYBLOCK_FLAG_DEVELOPER_1; TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Keyblock dev flag mismatch"); ResetMocks(); kbh.keyblock_flags = - KEYBLOCK_FLAG_RECOVERY_1 | KEYBLOCK_FLAG_DEVELOPER_0; + VB2_KEYBLOCK_FLAG_RECOVERY_1 | VB2_KEYBLOCK_FLAG_DEVELOPER_0; TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Keyblock rec flag mismatch"); ResetMocks(); ctx.flags |= VB2_CONTEXT_RECOVERY_MODE; kbh.keyblock_flags = - KEYBLOCK_FLAG_RECOVERY_1 | KEYBLOCK_FLAG_DEVELOPER_1; + VB2_KEYBLOCK_FLAG_RECOVERY_1 | VB2_KEYBLOCK_FLAG_DEVELOPER_1; TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Keyblock recdev flag mismatch"); ResetMocks(); ctx.flags |= VB2_CONTEXT_RECOVERY_MODE | VB2_CONTEXT_DEVELOPER_MODE; kbh.keyblock_flags = - KEYBLOCK_FLAG_RECOVERY_1 | KEYBLOCK_FLAG_DEVELOPER_0; + VB2_KEYBLOCK_FLAG_RECOVERY_1 | VB2_KEYBLOCK_FLAG_DEVELOPER_0; TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Keyblock rec!dev flag mismatch"); |