diff options
| author | Joel Kitching <kitching@google.com> | 2019-08-27 17:13:55 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-31 20:49:16 +0000 |
| commit | fbde3aa0af045021c2bfd315ad59f10aab2543fc (patch) | |
| tree | abe4d0373a2a2b596f247a946aee5be51664ca0f /firmware/lib20 | |
| parent | f4a9bfb303b034639469f1f1fcf18d61357bd4fe (diff) | |
| download | vboot-fbde3aa0af045021c2bfd315ad59f10aab2543fc.tar.gz | |
vboot/secdata: rename secdata and secdatak
For clarity's sake, rename:
secdata -> secdata_firmware
secdatak -> secdata_kernel
secdata is now the general term to refer to any secure data
spaces: firmware, kernel, and FWMP.
Once coreboot code has been updated, the sections in 2api.h
and 2constants.h may be removed.
BUG=b:124141368, chromium:972956
TEST=make clean && make runtests
BRANCH=none
Change-Id: I376acee552e8be37c75c340626a95462f81e198b
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1773079
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware/lib20')
| -rw-r--r-- | firmware/lib20/api_kernel.c | 18 | ||||
| -rw-r--r-- | firmware/lib20/kernel.c | 4 | ||||
| -rw-r--r-- | firmware/lib20/misc.c | 3 |
3 files changed, 13 insertions, 12 deletions
diff --git a/firmware/lib20/api_kernel.c b/firmware/lib20/api_kernel.c index 7737f260..88e2a0b8 100644 --- a/firmware/lib20/api_kernel.c +++ b/firmware/lib20/api_kernel.c @@ -26,18 +26,18 @@ vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx) vb2_workbuf_from_ctx(ctx, &wb); /* Initialize secure kernel data and read version */ - rv = vb2_secdatak_init(ctx); + rv = vb2_secdata_kernel_init(ctx); if (!rv) { - rv = vb2_secdatak_get(ctx, VB2_SECDATAK_VERSIONS, - &sd->kernel_version_secdatak); + rv = vb2_secdata_kernel_get(ctx, VB2_SECDATA_KERNEL_VERSIONS, + &sd->kernel_version_secdata); } if (rv) { if (ctx->flags & VB2_CONTEXT_RECOVERY_MODE) { /* Ignore failure to get kernel version in recovery */ - sd->kernel_version_secdatak = 0; + sd->kernel_version_secdata = 0; } else { - vb2_fail(ctx, VB2_RECOVERY_SECDATAK_INIT, rv); + vb2_fail(ctx, VB2_RECOVERY_SECDATA_KERNEL_INIT, rv); return rv; } } @@ -257,15 +257,15 @@ vb2_error_t vb2api_kernel_phase3(struct vb2_context *ctx) * kernel signature is valid, and we're not in recovery mode, and we're * allowed to, roll forward the version in secure storage. */ - if (sd->kernel_version > sd->kernel_version_secdatak && + if (sd->kernel_version > sd->kernel_version_secdata && (sd->flags & VB2_SD_FLAG_KERNEL_SIGNED) && !(ctx->flags & VB2_CONTEXT_RECOVERY_MODE) && (ctx->flags & VB2_CONTEXT_ALLOW_KERNEL_ROLL_FORWARD)) { - rv = vb2_secdatak_set(ctx, VB2_SECDATAK_VERSIONS, - sd->kernel_version); + rv = vb2_secdata_kernel_set(ctx, VB2_SECDATA_KERNEL_VERSIONS, + sd->kernel_version); if (rv) return rv; - sd->kernel_version_secdatak = sd->kernel_version; + sd->kernel_version_secdata = sd->kernel_version; } return VB2_SUCCESS; diff --git a/firmware/lib20/kernel.c b/firmware/lib20/kernel.c index 10cf158f..a78920ff 100644 --- a/firmware/lib20/kernel.c +++ b/firmware/lib20/kernel.c @@ -192,7 +192,7 @@ vb2_error_t vb2_load_kernel_keyblock(struct vb2_context *ctx) return VB2_ERROR_KERNEL_KEYBLOCK_VERSION_RANGE; } if (!rec_switch && kb->data_key.key_version < - (sd->kernel_version_secdatak >> 16)) { + (sd->kernel_version_secdata >> 16)) { keyblock_is_valid = 0; if (need_keyblock_valid) return VB2_ERROR_KERNEL_KEYBLOCK_VERSION_ROLLBACK; @@ -427,7 +427,7 @@ vb2_error_t vb2_load_kernel_preamble(struct vb2_context *ctx) sd->kernel_version |= pre->kernel_version; if (vb2_need_signed_kernel(ctx) && - sd->kernel_version < sd->kernel_version_secdatak) + sd->kernel_version < sd->kernel_version_secdata) return VB2_ERROR_KERNEL_PREAMBLE_VERSION_ROLLBACK; /* Keep track of where we put the preamble */ diff --git a/firmware/lib20/misc.c b/firmware/lib20/misc.c index 0d681799..e95732ef 100644 --- a/firmware/lib20/misc.c +++ b/firmware/lib20/misc.c @@ -286,7 +286,8 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) sd->last_fw_result == VB2_FW_RESULT_SUCCESS) { sd->fw_version_secdata = sd->fw_version; - rv = vb2_secdata_set(ctx, VB2_SECDATA_VERSIONS, sd->fw_version); + rv = vb2_secdata_firmware_set( + ctx, VB2_SECDATA_FIRMWARE_VERSIONS, sd->fw_version); if (rv) return rv; } |