diff options
| author | Joel Kitching <kitching@google.com> | 2019-09-28 14:09:29 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-02 21:48:15 +0000 |
| commit | 873433516b3456222f10f726a000ae68c048b1ae (patch) | |
| tree | 724d0767cb20d1c7ff935b9f02cc86c7e9020524 /firmware/lib20 | |
| parent | b2c8984d37e378b2faad170d4ec9b378c0c2b145 (diff) | |
| download | vboot-873433516b3456222f10f726a000ae68c048b1ae.tar.gz | |
vboot: join vb2_fail and vb2api_fail
As previously discussed with jwerner@, API functions should not
distinguish between "internal" and "external" versions.
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: Iea4fb430dbd56110639f52bdb7d8d3aaae7ee293
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1830240
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware/lib20')
| -rw-r--r-- | firmware/lib20/api.c | 6 | ||||
| -rw-r--r-- | firmware/lib20/api_kernel.c | 2 | ||||
| -rw-r--r-- | firmware/lib20/misc.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/firmware/lib20/api.c b/firmware/lib20/api.c index 13f26bfd..f70e2625 100644 --- a/firmware/lib20/api.c +++ b/firmware/lib20/api.c @@ -22,14 +22,14 @@ vb2_error_t vb2api_fw_phase3(struct vb2_context *ctx) /* Verify firmware keyblock */ rv = vb2_load_fw_keyblock(ctx); if (rv) { - vb2_fail(ctx, VB2_RECOVERY_RO_INVALID_RW, rv); + vb2api_fail(ctx, VB2_RECOVERY_RO_INVALID_RW, rv); return rv; } /* Verify firmware preamble */ rv = vb2_load_fw_preamble(ctx); if (rv) { - vb2_fail(ctx, VB2_RECOVERY_RO_INVALID_RW, rv); + vb2api_fail(ctx, VB2_RECOVERY_RO_INVALID_RW, rv); return rv; } @@ -199,7 +199,7 @@ vb2_error_t vb2api_check_hash_get_digest(struct vb2_context *ctx, */ rv = vb2_verify_digest(&key, &pre->body_signature, digest, &wb); if (rv) - vb2_fail(ctx, VB2_RECOVERY_FW_BODY, rv); + vb2api_fail(ctx, VB2_RECOVERY_FW_BODY, rv); if (digest_out != NULL) { if (digest_out_size < digest_size) diff --git a/firmware/lib20/api_kernel.c b/firmware/lib20/api_kernel.c index 555a7c47..3aad5967 100644 --- a/firmware/lib20/api_kernel.c +++ b/firmware/lib20/api_kernel.c @@ -37,7 +37,7 @@ vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx) /* Ignore failure to get kernel version in recovery */ sd->kernel_version_secdata = 0; } else { - vb2_fail(ctx, VB2_RECOVERY_SECDATA_KERNEL_INIT, rv); + vb2api_fail(ctx, VB2_RECOVERY_SECDATA_KERNEL_INIT, rv); return rv; } } diff --git a/firmware/lib20/misc.c b/firmware/lib20/misc.c index 01fd717f..330453b2 100644 --- a/firmware/lib20/misc.c +++ b/firmware/lib20/misc.c @@ -130,7 +130,7 @@ vb2_error_t vb2_load_fw_keyblock(struct vb2_context *ctx) /* Verify the keyblock */ rv = vb2_verify_keyblock(kb, block_size, &root_key, &wb); if (rv) { - vb2_fail(ctx, VB2_RECOVERY_FW_KEYBLOCK, rv); + vb2api_fail(ctx, VB2_RECOVERY_FW_KEYBLOCK, rv); return rv; } @@ -144,7 +144,7 @@ vb2_error_t vb2_load_fw_keyblock(struct vb2_context *ctx) rv = VB2_ERROR_FW_KEYBLOCK_VERSION_ROLLBACK; } if (rv) { - vb2_fail(ctx, VB2_RECOVERY_FW_KEY_ROLLBACK, rv); + vb2api_fail(ctx, VB2_RECOVERY_FW_KEY_ROLLBACK, rv); return rv; } @@ -247,7 +247,7 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) /* Verify the preamble */ rv = vb2_verify_fw_preamble(pre, pre_size, &data_key, &wb); if (rv) { - vb2_fail(ctx, VB2_RECOVERY_FW_PREAMBLE, rv); + vb2api_fail(ctx, VB2_RECOVERY_FW_PREAMBLE, rv); return rv; } @@ -266,7 +266,7 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) rv = VB2_ERROR_FW_PREAMBLE_VERSION_ROLLBACK; } if (rv) { - vb2_fail(ctx, VB2_RECOVERY_FW_ROLLBACK, rv); + vb2api_fail(ctx, VB2_RECOVERY_FW_ROLLBACK, rv); return rv; } |