diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vboot_api_kernel4_tests.c | 2 | ||||
| -rw-r--r-- | tests/vboot_api_kernel5_tests.c | 27 |
2 files changed, 15 insertions, 14 deletions
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index 2d7e04e1..fb27add8 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -162,7 +162,7 @@ VbError_t VbBootDiagnostic(struct vb2_context *ctx) static void test_slk(VbError_t retval, int recovery_reason, const char *desc) { - TEST_EQ(VbSelectAndLoadKernel(&cparams, &kparams), retval, desc); + TEST_EQ(VbSelectAndLoadKernel(&ctx, &cparams, &kparams), retval, desc); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_RECOVERY_REQUEST), recovery_reason, " recovery reason"); } diff --git a/tests/vboot_api_kernel5_tests.c b/tests/vboot_api_kernel5_tests.c index 537c13b6..d836349e 100644 --- a/tests/vboot_api_kernel5_tests.c +++ b/tests/vboot_api_kernel5_tests.c @@ -193,7 +193,7 @@ static void VerifyMemoryBootImageTest(void) kernel_body_size = sizeof(kernel_buffer) - kernel_body_offset; kernel_body_start = (uintptr_t)kernel_buffer + kernel_body_offset; - u = VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + u = VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size); TEST_EQ(u, 0, "Image good"); TEST_EQ(kparams.partition_number, 0, " part num"); @@ -206,19 +206,20 @@ static void VerifyMemoryBootImageTest(void) /* Empty image buffer. */ ResetMocks(); - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, NULL, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, NULL, kernel_buffer_size), VBERROR_INVALID_PARAMETER, "Empty image"); /* Illegal image size. */ ResetMocks(); - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, 0), + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, + 0), VBERROR_INVALID_PARAMETER, "Illegal image size"); /* Key Block Verification Failure */ ResetMocks(); key_block_verify_fail = 1; - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size), VBERROR_INVALID_KERNEL_FOUND, "Key verify failed"); TEST_EQ(hash_only_check, 0, " hash check"); @@ -228,7 +229,7 @@ static void VerifyMemoryBootImageTest(void) shared->flags = VBSD_BOOT_DEV_SWITCH_ON; gbb->flags = GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP; key_block_verify_fail = 1; - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size), VBERROR_INVALID_KERNEL_FOUND, "Key verify failed"); TEST_EQ(hash_only_check, 1, " hash check"); @@ -238,7 +239,7 @@ static void VerifyMemoryBootImageTest(void) shared->flags = VBSD_BOOT_DEV_SWITCH_ON; key_block_verify_fail = 1; vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP, 1); - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size), VBERROR_INVALID_KERNEL_FOUND, "Key verify failed"); TEST_EQ(hash_only_check, 1, " hash check -- VBNV flag"); @@ -249,7 +250,7 @@ static void VerifyMemoryBootImageTest(void) KEY_BLOCK_FLAG_RECOVERY_1; copy_kbh(); shared->flags = VBSD_BOOT_DEV_SWITCH_ON; - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size), VBERROR_INVALID_KERNEL_FOUND, "Developer flag mismatch - dev switch on"); @@ -261,7 +262,7 @@ static void VerifyMemoryBootImageTest(void) copy_kbh(); gbb->flags = GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP; shared->flags = VBSD_BOOT_DEV_SWITCH_ON; - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size), VBERROR_SUCCESS, "Developer flag mismatch - dev switch on(gbb override)"); @@ -273,7 +274,7 @@ static void VerifyMemoryBootImageTest(void) copy_kbh(); shared->flags = VBSD_BOOT_DEV_SWITCH_ON; gbb->flags = GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP; - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size), VBERROR_SUCCESS, "Recovery flag mismatch - dev switch on(gbb override)"); @@ -283,7 +284,7 @@ static void VerifyMemoryBootImageTest(void) kbh.key_block_flags = KEY_BLOCK_FLAG_DEVELOPER_1 | KEY_BLOCK_FLAG_RECOVERY_1; copy_kbh(); - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size), VBERROR_INVALID_KERNEL_FOUND, "Developer flag mismatch - dev switch off"); @@ -294,21 +295,21 @@ static void VerifyMemoryBootImageTest(void) KEY_BLOCK_FLAG_RECOVERY_0; shared->flags = 0; copy_kbh(); - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size), VBERROR_INVALID_KERNEL_FOUND, "Recovery flag mismatch"); /* Preamble verification */ ResetMocks(); preamble_verify_fail = 1; - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size), VBERROR_INVALID_KERNEL_FOUND, "Preamble verification"); /* Data verification */ ResetMocks(); verify_data_fail = 1; - TEST_EQ(VbVerifyMemoryBootImage(&cparams, &kparams, kernel_buffer, + TEST_EQ(VbVerifyMemoryBootImage(&ctx, &cparams, &kparams, kernel_buffer, kernel_buffer_size), VBERROR_INVALID_KERNEL_FOUND, "Data verification"); } |