diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-05-25 16:42:44 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-07-26 17:31:54 -0700 |
| commit | ca7251286655fe8865d0089bfc23b42ffececbf3 (patch) | |
| tree | 438e449305363449da687cf635cd35decba023e9 /futility/futility_options.h | |
| parent | 2afa87360d3a4c357e4bb2d37fdff9cdefbe0ffc (diff) | |
| download | vboot-ca7251286655fe8865d0089bfc23b42ffececbf3.tar.gz | |
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>
Diffstat (limited to 'futility/futility_options.h')
| -rw-r--r-- | futility/futility_options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/futility/futility_options.h b/futility/futility_options.h index 3a6aecb6..e3ea4c04 100644 --- a/futility/futility_options.h +++ b/futility/futility_options.h @@ -17,7 +17,7 @@ #include "2rsa.h" struct vb2_private_key; -struct vb2_packed_key; +struct vb21_packed_key; struct show_option_s { VbPublicKey *k; @@ -27,7 +27,7 @@ struct show_option_s { int strict; int t_flag; enum futil_file_type type; - struct vb2_packed_key *pkey; + struct vb21_packed_key *pkey; uint32_t sig_size; }; extern struct show_option_s show_option; |