diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-06-02 16:05:49 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-07-26 19:42:38 -0700 |
| commit | 98263a1b17397032b3f7d747d48f8fd914217237 (patch) | |
| tree | 5a9ce0f9da372f8a8d3ce49990d2d7de47e96a6a /firmware/lib21 | |
| parent | bba272a8776c61f308aafa5ed7d8bbd1f99f5282 (diff) | |
| download | vboot-98263a1b17397032b3f7d747d48f8fd914217237.tar.gz | |
vboot: Upgrade VerifyFirmwarePreamble() to vboot2.0
This replaces all calls to vboot1 VerifyFirmwarePreamble() with
equivalent vb2.0 functions. No effect on ToT firmware, which already
uses the vboot2.0 functions.
BUG=chromium:611535
BRANCH=none
TEST=make runtests
Change-Id: I5c84e9ed0e0c75e2ea8dbd9bfcde0597bc457f24
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/349322
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'firmware/lib21')
| -rw-r--r-- | firmware/lib21/api.c | 10 | ||||
| -rw-r--r-- | firmware/lib21/misc.c | 24 |
2 files changed, 17 insertions, 17 deletions
diff --git a/firmware/lib21/api.c b/firmware/lib21/api.c index a7938b9e..c9774863 100644 --- a/firmware/lib21/api.c +++ b/firmware/lib21/api.c @@ -16,19 +16,19 @@ #include "2rsa.h" #include "vb21_common.h" -int vb2api_fw_phase3(struct vb2_context *ctx) +int vb21api_fw_phase3(struct vb2_context *ctx) { int rv; /* Verify firmware keyblock */ - rv = vb2_load_fw_keyblock(ctx); + rv = vb21_load_fw_keyblock(ctx); if (rv) { vb2_fail(ctx, VB2_RECOVERY_RO_INVALID_RW, rv); return rv; } /* Verify firmware preamble */ - rv = vb2_load_fw_preamble(ctx); + rv = vb21_load_fw_preamble(ctx); if (rv) { vb2_fail(ctx, VB2_RECOVERY_RO_INVALID_RW, rv); return rv; @@ -37,7 +37,7 @@ int vb2api_fw_phase3(struct vb2_context *ctx) return VB2_SUCCESS; } -int vb2api_init_hash2(struct vb2_context *ctx, +int vb21api_init_hash(struct vb2_context *ctx, const struct vb2_id *id, uint32_t *size) { @@ -113,7 +113,7 @@ int vb2api_init_hash2(struct vb2_context *ctx, return vb2_digest_init(dc, sig->hash_alg); } -int vb2api_check_hash(struct vb2_context *ctx) +int vb21api_check_hash(struct vb2_context *ctx) { struct vb2_shared_data *sd = vb2_get_sd(ctx); struct vb2_digest_context *dc = (struct vb2_digest_context *) diff --git a/firmware/lib21/misc.c b/firmware/lib21/misc.c index 2d2cb594..cb6da77e 100644 --- a/firmware/lib21/misc.c +++ b/firmware/lib21/misc.c @@ -28,11 +28,11 @@ * @param buf_ptr Destination for object pointer * @return VB2_SUCCESS, or error code on error. */ -int vb2_read_resource_object(struct vb2_context *ctx, - enum vb2_resource_index index, - uint32_t offset, - struct vb2_workbuf *wb, - void **buf_ptr) +static int vb21_read_resource_object(struct vb2_context *ctx, + enum vb2_resource_index index, + uint32_t offset, + struct vb2_workbuf *wb, + void **buf_ptr) { struct vb21_struct_common c; void *buf; @@ -62,7 +62,7 @@ int vb2_read_resource_object(struct vb2_context *ctx, return VB2_SUCCESS; } -int vb2_load_fw_keyblock(struct vb2_context *ctx) +int vb21_load_fw_keyblock(struct vb2_context *ctx) { struct vb2_shared_data *sd = vb2_get_sd(ctx); struct vb2_workbuf wb; @@ -97,8 +97,8 @@ int vb2_load_fw_keyblock(struct vb2_context *ctx) * Load the firmware keyblock common header into the work buffer after * the root key. */ - rv = vb2_read_resource_object(ctx, VB2_RES_FW_VBLOCK, 0, &wb, - (void **)&kb); + rv = vb21_read_resource_object(ctx, VB2_RES_FW_VBLOCK, 0, &wb, + (void **)&kb); if (rv) return rv; @@ -154,7 +154,7 @@ int vb2_load_fw_keyblock(struct vb2_context *ctx) return VB2_SUCCESS; } -int vb2_load_fw_preamble(struct vb2_context *ctx) +int vb21_load_fw_preamble(struct vb2_context *ctx) { struct vb2_shared_data *sd = vb2_get_sd(ctx); struct vb2_workbuf wb; @@ -179,9 +179,9 @@ int vb2_load_fw_preamble(struct vb2_context *ctx) return rv; /* Load the firmware preamble */ - rv = vb2_read_resource_object(ctx, VB2_RES_FW_VBLOCK, - sd->vblock_preamble_offset, &wb, - (void **)&pre); + rv = vb21_read_resource_object(ctx, VB2_RES_FW_VBLOCK, + sd->vblock_preamble_offset, &wb, + (void **)&pre); if (rv) return rv; |