diff options
Diffstat (limited to 'host/lib21/host_keyblock.c')
| -rw-r--r-- | host/lib21/host_keyblock.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/host/lib21/host_keyblock.c b/host/lib21/host_keyblock.c index 42b91c77..cb8c3127 100644 --- a/host/lib21/host_keyblock.c +++ b/host/lib21/host_keyblock.c @@ -8,30 +8,30 @@ #include "2sysincludes.h" #include "2common.h" #include "2rsa.h" -#include "vb2_common.h" +#include "vb21_common.h" #include "host_common.h" #include "host_key2.h" #include "host_keyblock2.h" #include "host_misc.h" #include "host_signature2.h" -int vb2_keyblock_create(struct vb2_keyblock **kb_ptr, - const struct vb2_public_key *data_key, - const struct vb2_private_key **signing_keys, - uint32_t signing_key_count, - uint32_t flags, - const char *desc) +int vb21_keyblock_create(struct vb21_keyblock **kb_ptr, + const struct vb2_public_key *data_key, + const struct vb2_private_key **signing_keys, + uint32_t signing_key_count, + uint32_t flags, + const char *desc) { - struct vb2_keyblock kb = { - .c.magic = VB2_MAGIC_KEYBLOCK, - .c.struct_version_major = VB2_KEYBLOCK_VERSION_MAJOR, - .c.struct_version_minor = VB2_KEYBLOCK_VERSION_MAJOR, + struct vb21_keyblock kb = { + .c.magic = VB21_MAGIC_KEYBLOCK, + .c.struct_version_major = VB21_KEYBLOCK_VERSION_MAJOR, + .c.struct_version_minor = VB21_KEYBLOCK_VERSION_MAJOR, .c.fixed_size = sizeof(kb), .flags = flags, .sig_count = signing_key_count, }; - struct vb2_packed_key *key = NULL; + struct vb21_packed_key *key = NULL; uint32_t sig_size; uint8_t *buf; @@ -43,10 +43,10 @@ int vb2_keyblock_create(struct vb2_keyblock **kb_ptr, kb.c.desc_size = vb2_desc_size(desc); kb.key_offset = kb.c.fixed_size + kb.c.desc_size; - if (vb2_sig_size_for_keys(&sig_size, signing_keys, signing_key_count)) + if (vb21_sig_size_for_keys(&sig_size, signing_keys, signing_key_count)) return VB2_KEYBLOCK_CREATE_SIG_SIZE; - if (vb2_public_key_pack(&key, data_key)) + if (vb21_public_key_pack(&key, data_key)) return VB2_KEYBLOCK_CREATE_DATA_KEY; kb.sig_offset = kb.key_offset + key->c.total_size; @@ -66,12 +66,12 @@ int vb2_keyblock_create(struct vb2_keyblock **kb_ptr, free(key); /* Sign the keyblock */ - if (vb2_sign_object_multiple(buf, kb.sig_offset, signing_keys, - signing_key_count)) { + if (vb21_sign_object_multiple(buf, kb.sig_offset, signing_keys, + signing_key_count)) { free(buf); return VB2_KEYBLOCK_CREATE_SIGN; } - *kb_ptr = (struct vb2_keyblock *)buf; + *kb_ptr = (struct vb21_keyblock *)buf; return VB2_SUCCESS; } |