summaryrefslogtreecommitdiff
path: root/tests/vboot_kernel_tests.c
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2018-01-04 17:58:01 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-01-09 14:14:17 -0800
commitb07b4b9c71fd54a923fa914a046fcf7183d65c22 (patch)
treec214f67512f451953a40625655c9fa9af5b3cb8f /tests/vboot_kernel_tests.c
parent98616d79c6b60c719bc3e37f7f82028e77983d94 (diff)
downloadvboot-b07b4b9c71fd54a923fa914a046fcf7183d65c22.tar.gz
firmware: Stop using vboot1 cparams internally
Now that vb2_shared_data / vb2_context provides all the same data to lower-level kernel verification code that cparams did, stop passing cparams down to those functions. No change in functionality. BUG=chromium:611535 BRANCH=none TEST=make -j runtests; build bob firmware and boot it Change-Id: I86eb1801ee96d8b56404b74843a8d09e3122567f Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/852814 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Diffstat (limited to 'tests/vboot_kernel_tests.c')
-rw-r--r--tests/vboot_kernel_tests.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c
index c6798d2c..14bffc91 100644
--- a/tests/vboot_kernel_tests.c
+++ b/tests/vboot_kernel_tests.c
@@ -67,7 +67,6 @@ static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data;
static LoadKernelParams lkp;
static VbKeyBlockHeader kbh;
static VbKernelPreambleHeader kph;
-static VbCommonParams cparams;
static struct RollbackSpaceFwmp fwmp;
static uint8_t mock_disk[MOCK_SECTOR_SIZE * MOCK_SECTOR_COUNT];
static GptHeader *mock_gpt_primary =
@@ -145,8 +144,6 @@ static void ResetMocks(void)
VbSharedDataInit(shared, sizeof(shared_data));
shared->kernel_version_tpm = 0x20001;
- memset(&cparams, '\0', sizeof(cparams));
-
memset(&lkp, 0, sizeof(lkp));
lkp.bytes_per_lba = 512;
lkp.streaming_lba_count = 1024;
@@ -570,7 +567,7 @@ static void ReadWriteGptTest(void)
static void TestLoadKernel(int expect_retval, char *test_name)
{
- TEST_EQ(LoadKernel(&ctx, &lkp, &cparams), expect_retval, test_name);
+ TEST_EQ(LoadKernel(&ctx, &lkp), expect_retval, test_name);
}
/**