diff options
author | Randall Spangler <rspangler@chromium.org> | 2018-01-04 16:08:47 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-09 14:14:17 -0800 |
commit | 98616d79c6b60c719bc3e37f7f82028e77983d94 (patch) | |
tree | 3f060169830ac25f0c907d2c88052388805b1714 /tests/vboot_api_kernel2_tests.c | |
parent | 79c1c6194bc45728a5043443d80506fa1d35c83b (diff) | |
download | vboot-98616d79c6b60c719bc3e37f7f82028e77983d94.tar.gz |
firmware: Prune down old region API
The region API was a way for firmware and kernel verification to get
at various blocks of caller-provided data. In practice, we only used
it internally as a way to get at parts of the GBB. Prune it down to
access only the bits of GBB we still need, from the buffer we already
know we have.
In the long run we should use the same vb2ex_read_resource() API that
vb2 firmware verification does, but that should be done in a follow-up
CL since it'll need to be coordinated with support in depthcharge.
No change in functionality.
BUG=chromium:611535
BRANCH=none
TEST=make -j runtests; build bob firmware and boot it
Change-Id: I5715cb8d88274164a1a73ed4a56bbd93af46f9bf
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/852798
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Diffstat (limited to 'tests/vboot_api_kernel2_tests.c')
-rw-r--r-- | tests/vboot_api_kernel2_tests.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c index 04e64667..92041207 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_api_kernel2_tests.c @@ -28,7 +28,6 @@ static VbCommonParams cparams; static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE]; static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data; -static GoogleBinaryBlockHeader gbb; static LoadKernelParams lkp; static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE]; static struct vb2_context ctx; @@ -59,13 +58,6 @@ extern struct RollbackSpaceFwmp *VbApiKernelGetFwmp(void); static void ResetMocks(void) { memset(&cparams, 0, sizeof(cparams)); - cparams.gbb_data = &gbb; - cparams.gbb = &gbb; - - memset(&gbb, 0, sizeof(gbb)); - gbb.major_version = GBB_MAJOR_VER; - gbb.minor_version = GBB_MINOR_VER; - gbb.flags = 0; memset(VbApiKernelGetFwmp(), 0, sizeof(struct RollbackSpaceFwmp)); @@ -212,48 +204,48 @@ static void VbUserConfirmsTest(void) ResetMocks(); shutdown_request_calls_left = 1; - TEST_EQ(VbUserConfirms(&ctx, &cparams, 0), -1, "Shutdown requested"); + TEST_EQ(VbUserConfirms(&ctx, 0), -1, "Shutdown requested"); ResetMocks(); mock_keypress[0] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbUserConfirms(&ctx, &cparams, 0), -1, "Shutdown requested"); + TEST_EQ(VbUserConfirms(&ctx, 0), -1, "Shutdown requested"); ResetMocks(); mock_keypress[0] = '\r'; - TEST_EQ(VbUserConfirms(&ctx, &cparams, 0), 1, "Enter"); + TEST_EQ(VbUserConfirms(&ctx, 0), 1, "Enter"); ResetMocks(); mock_keypress[0] = 0x1b; - TEST_EQ(VbUserConfirms(&ctx, &cparams, 0), 0, "Esc"); + TEST_EQ(VbUserConfirms(&ctx, 0), 0, "Esc"); ResetMocks(); mock_keypress[0] = ' '; shutdown_request_calls_left = 1; - TEST_EQ(VbUserConfirms(&ctx, &cparams, VB_CONFIRM_SPACE_MEANS_NO), 0, + TEST_EQ(VbUserConfirms(&ctx, VB_CONFIRM_SPACE_MEANS_NO), 0, "Space means no"); ResetMocks(); mock_keypress[0] = ' '; shutdown_request_calls_left = 1; - TEST_EQ(VbUserConfirms(&ctx, &cparams, 0), -1, "Space ignored"); + TEST_EQ(VbUserConfirms(&ctx, 0), -1, "Space ignored"); ResetMocks(); mock_keypress[0] = '\r'; mock_keyflags[0] = VB_KEY_FLAG_TRUSTED_KEYBOARD; - TEST_EQ(VbUserConfirms(&ctx, &cparams, VB_CONFIRM_MUST_TRUST_KEYBOARD), + TEST_EQ(VbUserConfirms(&ctx, VB_CONFIRM_MUST_TRUST_KEYBOARD), 1, "Enter with trusted keyboard"); ResetMocks(); mock_keypress[0] = '\r'; /* untrusted */ mock_keypress[1] = ' '; - TEST_EQ(VbUserConfirms(&ctx, &cparams, + TEST_EQ(VbUserConfirms(&ctx, VB_CONFIRM_SPACE_MEANS_NO | VB_CONFIRM_MUST_TRUST_KEYBOARD), 0, "Untrusted keyboard"); ResetMocks(); mock_switches[0] = VB_INIT_FLAG_REC_BUTTON_PRESSED; - TEST_EQ(VbUserConfirms(&ctx, &cparams, + TEST_EQ(VbUserConfirms(&ctx, VB_CONFIRM_SPACE_MEANS_NO | VB_CONFIRM_MUST_TRUST_KEYBOARD), 1, "Recovery button"); @@ -265,7 +257,7 @@ static void VbUserConfirmsTest(void) mock_keypress[3] = ' '; mock_switches[0] = VB_INIT_FLAG_REC_BUTTON_PRESSED; mock_switches_are_stuck = 1; - TEST_EQ(VbUserConfirms(&ctx, &cparams, + TEST_EQ(VbUserConfirms(&ctx, VB_CONFIRM_SPACE_MEANS_NO | VB_CONFIRM_MUST_TRUST_KEYBOARD), 0, "Recovery button stuck"); |