vboot: Disambiguate vb2.1 structs and functions
authorRandall Spangler <rspangler@chromium.org>
Wed, 25 May 2016 23:42:44 +0000 (16:42 -0700)
committerchrome-bot <chrome-bot@chromium.org>
Wed, 27 Jul 2016 00:31:54 +0000 (17:31 -0700)
commitca7251286655fe8865d0089bfc23b42ffececbf3
tree438e449305363449da687cf635cd35decba023e9
parent2afa87360d3a4c357e4bb2d37fdff9cdefbe0ffc
vboot: Disambiguate vb2.1 structs and functions

Futility needs to link against both vboot1/vboot2.0 and vboot2.1
functions.  This was easy in the past because it did (vboot1 +
vboot2.1) and there's no overlap.

In replacing vboot1 function calls and structs with vboot2.0, now there
are symbol collisions between vboot2.0 and vboot2.1.  For example, both
of them use a struct called vb2_signature, but the structs are defined
differently.  Functions which operate on those structs also overload.

Rename the vb2.1 structs to start with vb21_ instead of vb2_.  Do the
same for vb2.1 functions which operate on vb2.1 data.

BUG=chromium:611535
BRANCH=none
TEST=make runtests

Change-Id: I24defd87cbd9ef64239faf1a8e98ab2372d27539
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/347458
Reviewed-by: Daisuke Nojiri <dnojiri@google.com>
35 files changed:
firmware/2lib/include/2return_codes.h
firmware/lib21/api.c
firmware/lib21/common.c
firmware/lib21/include/vb21_common.h [moved from firmware/lib21/include/vb2_common.h with 73% similarity]
firmware/lib21/include/vb21_struct.h [moved from firmware/lib21/include/vb2_struct.h with 70% similarity]
firmware/lib21/misc.c
firmware/lib21/packed_key.c
futility/cmd_create.c
futility/cmd_show.c
futility/cmd_sign.c
futility/file_type.inc
futility/file_type_rwsig.c
futility/file_type_usbpd1.c
futility/futility_options.h
futility/vb2_helper.c
host/lib/include/host_misc.h
host/lib/include/util_misc.h
host/lib21/host_fw_preamble.c
host/lib21/host_key.c
host/lib21/host_keyblock.c
host/lib21/host_misc.c
host/lib21/host_signature.c
host/lib21/include/host_fw_preamble2.h
host/lib21/include/host_key2.h
host/lib21/include/host_keyblock2.h
host/lib21/include/host_signature2.h
tests/vb21_api_tests.c
tests/vb21_common2_tests.c
tests/vb21_common_tests.c
tests/vb21_host_fw_preamble_tests.c
tests/vb21_host_key_tests.c
tests/vb21_host_keyblock_tests.c
tests/vb21_host_misc_tests.c
tests/vb21_host_sig_tests.c
tests/vb21_misc_tests.c