diff options
| author | Randall Spangler <rspangler@chromium.org> | 2014-10-23 15:55:21 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-10-28 22:30:04 +0000 |
| commit | f18038b750c43c2185e64db38d0d244c6810083b (patch) | |
| tree | 76a572d4cbc053398591ab10f0bc76ef011ee50d /firmware/2lib/include | |
| parent | c8c2f023a4914a498c11b855210ef05d4e035d41 (diff) | |
| download | vboot-f18038b750c43c2185e64db38d0d244c6810083b.tar.gz | |
vboot2: Move and rename functions
Move packed key functions to their own file, in preparation for
introducing support for vb2_packed_key2.
Rename the awfully-named vb2_verify_fw_preamble2() function to
vb2_load_fw_premable(), since the new structs actually have a
vb2_fw_preamble2 struct and that would be very confusing.
Rename vb2_verify_fw_keyblock() to vb2_load_fw_keyblock(), so it
matches.
No functional changes, just renaming.
BUG=chromium:423882
BRANCH=none
TEST=VBOOT2=1 make runtests
Change-Id: Ia914e48e6c5814ab3205b999ceda1aa2452206ff
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/225458
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'firmware/2lib/include')
| -rw-r--r-- | firmware/2lib/include/2misc.h | 4 | ||||
| -rw-r--r-- | firmware/2lib/include/2return_codes.h | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/firmware/2lib/include/2misc.h b/firmware/2lib/include/2misc.h index d6f48e86..d50ed319 100644 --- a/firmware/2lib/include/2misc.h +++ b/firmware/2lib/include/2misc.h @@ -128,7 +128,7 @@ int vb2_select_fw_slot(struct vb2_context *ctx); * @param ctx Vboot context * @return VB2_SUCCESS, or error code on error. */ -int vb2_verify_fw_keyblock(struct vb2_context *ctx); +int vb2_load_fw_keyblock(struct vb2_context *ctx); /** * Verify the firmware preamble using the data subkey from the keyblock. @@ -138,6 +138,6 @@ int vb2_verify_fw_keyblock(struct vb2_context *ctx); * @param ctx Vboot context * @return VB2_SUCCESS, or error code on error. */ -int vb2_verify_fw_preamble2(struct vb2_context *ctx); +int vb2_load_fw_preamble(struct vb2_context *ctx); #endif /* VBOOT_REFERENCE_VBOOT_2MISC_H_ */ diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h index 9f41b8b8..ee6c91fe 100644 --- a/firmware/2lib/include/2return_codes.h +++ b/firmware/2lib/include/2return_codes.h @@ -263,34 +263,34 @@ enum vb2_return_code { /* Header size too small in vb2_read_gbb_header() */ VB2_ERROR_GBB_HEADER_SIZE, - /* Work buffer too small for root key in vb2_verify_fw_keyblock() */ + /* Work buffer too small for root key in vb2_load_fw_keyblock() */ VB2_ERROR_FW_KEYBLOCK_WORKBUF_ROOT_KEY, - /* Work buffer too small for header in vb2_verify_fw_keyblock() */ + /* Work buffer too small for header in vb2_load_fw_keyblock() */ VB2_ERROR_FW_KEYBLOCK_WORKBUF_HEADER, - /* Work buffer too small for keyblock in vb2_verify_fw_keyblock() */ + /* Work buffer too small for keyblock in vb2_load_fw_keyblock() */ VB2_ERROR_FW_KEYBLOCK_WORKBUF, - /* Keyblock version out of range in vb2_verify_fw_keyblock() */ + /* Keyblock version out of range in vb2_load_fw_keyblock() */ VB2_ERROR_FW_KEYBLOCK_VERSION_RANGE, - /* Keyblock version rollback in vb2_verify_fw_keyblock() */ + /* Keyblock version rollback in vb2_load_fw_keyblock() */ VB2_ERROR_FW_KEYBLOCK_VERSION_ROLLBACK, - /* Missing firmware data key in vb2_verify_fw_preamble2() */ + /* Missing firmware data key in vb2_load_fw_preamble() */ VB2_ERROR_FW_PREAMBLE2_DATA_KEY, - /* Work buffer too small for header in vb2_verify_fw_preamble2() */ + /* Work buffer too small for header in vb2_load_fw_preamble() */ VB2_ERROR_FW_PREAMBLE2_WORKBUF_HEADER, - /* Work buffer too small for preamble in vb2_verify_fw_preamble2() */ + /* Work buffer too small for preamble in vb2_load_fw_preamble() */ VB2_ERROR_FW_PREAMBLE2_WORKBUF, - /* Firmware version out of range in vb2_verify_fw_preamble2() */ + /* Firmware version out of range in vb2_load_fw_preamble() */ VB2_ERROR_FW_PREAMBLE2_VERSION_RANGE, - /* Firmware version rollback in vb2_verify_fw_preamble2() */ + /* Firmware version rollback in vb2_load_fw_preamble() */ VB2_ERROR_FW_PREAMBLE2_VERSION_ROLLBACK, /********************************************************************** |