diff options
| author | Randall Spangler <rspangler@chromium.org> | 2018-01-04 17:58:01 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-09 14:14:17 -0800 |
| commit | b07b4b9c71fd54a923fa914a046fcf7183d65c22 (patch) | |
| tree | c214f67512f451953a40625655c9fa9af5b3cb8f /utility/load_kernel_test.c | |
| parent | 98616d79c6b60c719bc3e37f7f82028e77983d94 (diff) | |
| download | vboot-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 'utility/load_kernel_test.c')
| -rw-r--r-- | utility/load_kernel_test.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/utility/load_kernel_test.c b/utility/load_kernel_test.c index da1667b8..6606c425 100644 --- a/utility/load_kernel_test.c +++ b/utility/load_kernel_test.c @@ -29,7 +29,6 @@ /* Global variables for stub functions */ static LoadKernelParams lkp; -static VbCommonParams cparams; static FILE *image_file = NULL; @@ -96,7 +95,6 @@ int main(int argc, char* argv[]) { memset(&lkp, 0, sizeof(LoadKernelParams)); lkp.bytes_per_lba = LBA_BYTES; int boot_flags = BOOT_FLAG_RECOVERY; - memset(&cparams, 0, sizeof(VbCommonParams)); /* Parse options */ opterr = 0; @@ -162,9 +160,9 @@ int main(int argc, char* argv[]) { } /* Initialize the GBB */ - cparams.gbb_size = sizeof(GoogleBinaryBlockHeader) + key_size; - cparams.gbb_data = gbb = (GoogleBinaryBlockHeader*)malloc(cparams.gbb_size); - memset(gbb, 0, cparams.gbb_size); + uint32_t gbb_size = sizeof(GoogleBinaryBlockHeader) + key_size; + gbb = (GoogleBinaryBlockHeader*)malloc(gbb_size); + memset(gbb, 0, gbb_size); memcpy(gbb->signature, GBB_SIGNATURE, GBB_SIGNATURE_SIZE); gbb->major_version = GBB_MAJOR_VER; gbb->minor_version = GBB_MINOR_VER; @@ -180,10 +178,8 @@ int main(int argc, char* argv[]) { } /* Initialize the shared data area */ - cparams.shared_data_blob = malloc(VB_SHARED_DATA_REC_SIZE); - cparams.shared_data_size = VB_SHARED_DATA_REC_SIZE; - shared = (VbSharedDataHeader*)cparams.shared_data_blob; - if (0 != VbSharedDataInit(shared, cparams.shared_data_size)) { + shared = (VbSharedDataHeader*)malloc(VB_SHARED_DATA_REC_SIZE); + if (0 != VbSharedDataInit(shared, VB_SHARED_DATA_REC_SIZE)) { fprintf(stderr, "Unable to init shared data\n"); return 1; } @@ -251,7 +247,7 @@ int main(int argc, char* argv[]) { sd->vbsd = shared; /* Call LoadKernel() */ - rv = LoadKernel(&ctx, &lkp, &cparams); + rv = LoadKernel(&ctx, &lkp); printf("LoadKernel() returned %d\n", rv); if (VBERROR_SUCCESS == rv) { |