diff options
Diffstat (limited to 'firmware/lib21/misc.c')
| -rw-r--r-- | firmware/lib21/misc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/firmware/lib21/misc.c b/firmware/lib21/misc.c index de7d4477..96071685 100644 --- a/firmware/lib21/misc.c +++ b/firmware/lib21/misc.c @@ -145,12 +145,12 @@ vb2_error_t vb21_load_fw_keyblock(struct vb2_context *ctx) packed_key = (struct vb21_packed_key *)key_data; /* Save the packed key offset and size */ - sd->workbuf_data_key_offset = vb2_offset_of(ctx->workbuf, key_data); - sd->workbuf_data_key_size = packed_key->c.total_size; + sd->data_key_offset = vb2_offset_of(sd, key_data); + sd->data_key_size = packed_key->c.total_size; /* Data key will persist in the workbuf after we return */ - 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; } @@ -161,8 +161,8 @@ vb2_error_t vb21_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 */ @@ -173,7 +173,7 @@ vb2_error_t vb21_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 = vb21_unpack_key(&data_key, key_data, key_size); @@ -201,7 +201,7 @@ vb2_error_t vb21_load_fw_preamble(struct vb2_context *ctx) pre = (struct vb21_fw_preamble *)key_data; /* Data key is now gone */ - sd->workbuf_data_key_offset = sd->workbuf_data_key_size = 0; + sd->data_key_offset = sd->data_key_size = 0; /* * Firmware version is the lower 16 bits of the composite firmware @@ -238,12 +238,12 @@ vb2_error_t vb21_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->c.total_size; + sd->preamble_offset = vb2_offset_of(sd, pre); + sd->preamble_size = pre->c.total_size; /* Preamble will persist in work buffer after we return */ - vb2_set_workbuf_used(ctx, sd->workbuf_preamble_offset + - sd->workbuf_preamble_size); + vb2_set_workbuf_used(ctx, sd->preamble_offset + + sd->preamble_size); return VB2_SUCCESS; } |