summaryrefslogtreecommitdiff
path: root/tests/vboot_kernel_tests.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/vboot_kernel_tests.c')
-rw-r--r--tests/vboot_kernel_tests.c58
1 files changed, 32 insertions, 26 deletions
diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c
index 86afcb8d..4075e25d 100644
--- a/tests/vboot_kernel_tests.c
+++ b/tests/vboot_kernel_tests.c
@@ -606,12 +606,12 @@ static void InvalidParamsTest(void)
{
ResetMocks();
gpt_init_fail = 1;
- TestLoadKernel(VBERROR_NO_KERNEL_FOUND, "Bad GPT");
+ TestLoadKernel(VB2_ERROR_LK_NO_KERNEL_FOUND, "Bad GPT");
/* This causes the stream open call to fail */
ResetMocks();
lkp.disk_handle = NULL;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Bad disk handle");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND, "Bad disk handle");
}
static void LoadKernelTest(void)
@@ -635,27 +635,29 @@ static void LoadKernelTest(void)
/* Fail if no kernels found */
ResetMocks();
mock_parts[0].size = 0;
- TestLoadKernel(VBERROR_NO_KERNEL_FOUND, "No kernels");
+ TestLoadKernel(VB2_ERROR_LK_NO_KERNEL_FOUND, "No kernels");
/* Skip kernels which are too small */
ResetMocks();
mock_parts[0].size = 10;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Too small");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND, "Too small");
ResetMocks();
disk_read_to_fail = 100;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Fail reading kernel start");
ResetMocks();
keyblock_verify_fail = 1;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Fail keyblock sig");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
+ "Fail key block sig");
/* In dev mode, fail if hash is bad too */
ResetMocks();
ctx->flags |= VB2_CONTEXT_DEVELOPER_MODE;
keyblock_verify_fail = 2;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Fail keyblock dev hash");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
+ "Fail key block dev hash");
/* But just bad sig is ok */
ResetMocks();
@@ -668,50 +670,51 @@ static void LoadKernelTest(void)
ctx->flags |= VB2_CONTEXT_DEVELOPER_MODE;
vb2_nv_set(ctx, VB2_NV_DEV_BOOT_SIGNED_ONLY, 1);
keyblock_verify_fail = 1;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Fail keyblock dev sig");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
+ "Fail key block dev sig");
ResetMocks();
ctx->flags |= VB2_CONTEXT_DEVELOPER_MODE;
fwmp->flags |= VB2_SECDATA_FWMP_DEV_ENABLE_OFFICIAL_ONLY;
keyblock_verify_fail = 1;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
- "Fail keyblock dev sig fwmp");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
+ "Fail key block dev sig fwmp");
/* Check keyblock flag mismatches */
ResetMocks();
kbh.keyblock_flags =
VB2_KEYBLOCK_FLAG_RECOVERY_0 | VB2_KEYBLOCK_FLAG_DEVELOPER_1;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Keyblock dev flag mismatch");
ResetMocks();
kbh.keyblock_flags =
VB2_KEYBLOCK_FLAG_RECOVERY_1 | VB2_KEYBLOCK_FLAG_DEVELOPER_0;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Keyblock rec flag mismatch");
ResetMocks();
ctx->flags |= VB2_CONTEXT_RECOVERY_MODE;
kbh.keyblock_flags =
VB2_KEYBLOCK_FLAG_RECOVERY_1 | VB2_KEYBLOCK_FLAG_DEVELOPER_1;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Keyblock recdev flag mismatch");
ResetMocks();
ctx->flags |= VB2_CONTEXT_RECOVERY_MODE | VB2_CONTEXT_DEVELOPER_MODE;
kbh.keyblock_flags =
VB2_KEYBLOCK_FLAG_RECOVERY_1 | VB2_KEYBLOCK_FLAG_DEVELOPER_0;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Keyblock rec!dev flag mismatch");
ResetMocks();
kbh.data_key.key_version = 1;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Keyblock kernel key rollback");
ResetMocks();
kbh.data_key.key_version = 0x10000;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Keyblock kernel key version too big");
ResetMocks();
@@ -739,15 +742,16 @@ static void LoadKernelTest(void)
ResetMocks();
unpack_key_fail = 2;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Bad data key");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND, "Bad data key");
ResetMocks();
preamble_verify_fail = 1;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Bad preamble");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND, "Bad preamble");
ResetMocks();
kph.kernel_version = 0;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Kernel version rollback");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
+ "Kernel version rollback");
ResetMocks();
kph.kernel_version = 0;
@@ -764,7 +768,7 @@ static void LoadKernelTest(void)
ctx->flags |= VB2_CONTEXT_DEVELOPER_MODE;
fwmp->flags |= VB2_SECDATA_FWMP_DEV_USE_KEY_HASH;
fwmp->dev_key_hash[0]++;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Fail keyblock dev fwmp hash");
/* Check developer key hash - good */
@@ -775,11 +779,13 @@ static void LoadKernelTest(void)
ResetMocks();
kph.preamble_size |= 0x07;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Kernel body offset");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
+ "Kernel body offset");
ResetMocks();
kph.preamble_size += 65536;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Kernel body offset huge");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
+ "Kernel body offset huge");
/* Check getting kernel load address from header */
ResetMocks();
@@ -792,12 +798,12 @@ static void LoadKernelTest(void)
ResetMocks();
lkp.kernel_buffer_size = 8192;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Kernel too big for buffer");
ResetMocks();
mock_parts[0].size = 130;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Kernel too big for partition");
ResetMocks();
@@ -806,12 +812,12 @@ static void LoadKernelTest(void)
ResetMocks();
disk_read_to_fail = 228;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND,
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND,
"Fail reading kernel data");
ResetMocks();
verify_data_fail = 1;
- TestLoadKernel(VBERROR_INVALID_KERNEL_FOUND, "Bad data");
+ TestLoadKernel(VB2_ERROR_LK_INVALID_KERNEL_FOUND, "Bad data");
/* Check that EXTERNAL_GPT flag makes it down */
ResetMocks();