diff options
Diffstat (limited to 'firmware/lib20/misc.c')
-rw-r--r-- | firmware/lib20/misc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/firmware/lib20/misc.c b/firmware/lib20/misc.c index 70f3ab80..0d681799 100644 --- a/firmware/lib20/misc.c +++ b/firmware/lib20/misc.c @@ -172,8 +172,8 @@ vb2_error_t vb2_load_fw_keyblock(struct vb2_context *ctx) packed_key->key_size); /* Save the packed key offset and size */ - sd->workbuf_data_key_offset = vb2_offset_of(ctx->workbuf, key_data); - sd->workbuf_data_key_size = + sd->data_key_offset = vb2_offset_of(sd, key_data); + sd->data_key_size = packed_key->key_offset + packed_key->key_size; /* Preamble follows the keyblock in the vblock */ @@ -186,8 +186,8 @@ vb2_error_t vb2_load_fw_keyblock(struct vb2_context *ctx) * - vb2_shared_data * - packed firmware data key */ - vb2_set_workbuf_used(ctx, sd->workbuf_data_key_offset + - sd->workbuf_data_key_size); + vb2_set_workbuf_used(ctx, sd->data_key_offset + + sd->data_key_size); return VB2_SUCCESS; } @@ -198,8 +198,8 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) struct vb2_gbb_header *gbb = vb2_get_gbb(ctx); struct vb2_workbuf wb; - uint8_t *key_data = ctx->workbuf + sd->workbuf_data_key_offset; - uint32_t key_size = sd->workbuf_data_key_size; + uint8_t *key_data = vb2_member_of(sd, sd->data_key_offset); + uint32_t key_size = sd->data_key_size; struct vb2_public_key data_key; /* Preamble goes in the next unused chunk of work buffer */ @@ -211,7 +211,7 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) vb2_workbuf_from_ctx(ctx, &wb); /* Unpack the firmware data key */ - if (!sd->workbuf_data_key_size) + if (!sd->data_key_size) return VB2_ERROR_FW_PREAMBLE2_DATA_KEY; rv = vb2_unpack_key_buffer(&data_key, key_data, key_size); @@ -292,8 +292,8 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) } /* Keep track of where we put the preamble */ - sd->workbuf_preamble_offset = vb2_offset_of(ctx->workbuf, pre); - sd->workbuf_preamble_size = pre_size; + sd->preamble_offset = vb2_offset_of(sd, pre); + sd->preamble_size = pre_size; /* * Preamble will persist in work buffer after we return. @@ -307,7 +307,7 @@ vb2_error_t vb2_load_fw_preamble(struct vb2_context *ctx) * TODO: we could move the preamble down over the firmware data key * since we don't need it anymore. */ - vb2_set_workbuf_used(ctx, sd->workbuf_preamble_offset + pre_size); + vb2_set_workbuf_used(ctx, sd->preamble_offset + pre_size); return VB2_SUCCESS; } |