diff options
| author | Joel Kitching <kitching@google.com> | 2019-08-30 16:02:24 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-23 16:28:17 +0000 |
| commit | 1ff5597e282df81fb2cddcf4b7b47a01553a86fc (patch) | |
| tree | 74bd0832b75af2f6bb9511b6b7521a9a41755118 /host/lib | |
| parent | d3b2117f9abe2f7413f6315867ae3c3dbfaf5db1 (diff) | |
| download | vboot-1ff5597e282df81fb2cddcf4b7b47a01553a86fc.tar.gz | |
vboot: relocate vb2_signature and vb2_keybock structs
Move from vboot20 to vboot2.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Change-Id: Ib1fe0e2cfb0865fffe33ad35e7bd67d416da4589
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1776291
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/host_keyblock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/host/lib/host_keyblock.c b/host/lib/host_keyblock.c index 53a382e4..42b3a71d 100644 --- a/host/lib/host_keyblock.c +++ b/host/lib/host_keyblock.c @@ -40,9 +40,9 @@ struct vb2_keyblock *vb2_create_keyblock( uint8_t *block_chk_dest = data_key_dest + data_key->key_size; uint8_t *block_sig_dest = block_chk_dest + VB2_SHA512_DIGEST_SIZE; - memcpy(h->magic, KEYBLOCK_MAGIC, KEYBLOCK_MAGIC_SIZE); - h->header_version_major = KEYBLOCK_HEADER_VERSION_MAJOR; - h->header_version_minor = KEYBLOCK_HEADER_VERSION_MINOR; + memcpy(h->magic, VB2_KEYBLOCK_MAGIC, VB2_KEYBLOCK_MAGIC_SIZE); + h->header_version_major = VB2_KEYBLOCK_VERSION_MAJOR; + h->header_version_minor = VB2_KEYBLOCK_VERSION_MINOR; h->keyblock_size = block_size; h->keyblock_flags = flags; @@ -108,9 +108,9 @@ struct vb2_keyblock *vb2_create_keyblock_external( uint8_t *block_chk_dest = data_key_dest + data_key->key_size; uint8_t *block_sig_dest = block_chk_dest + VB2_SHA512_DIGEST_SIZE; - memcpy(h->magic, KEYBLOCK_MAGIC, KEYBLOCK_MAGIC_SIZE); - h->header_version_major = KEYBLOCK_HEADER_VERSION_MAJOR; - h->header_version_minor = KEYBLOCK_HEADER_VERSION_MINOR; + memcpy(h->magic, VB2_KEYBLOCK_MAGIC, VB2_KEYBLOCK_MAGIC_SIZE); + h->header_version_major = VB2_KEYBLOCK_VERSION_MAJOR; + h->header_version_minor = VB2_KEYBLOCK_VERSION_MINOR; h->keyblock_size = block_size; h->keyblock_flags = flags; |