mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-11-24 02:05:01 +00:00
vboot2: Use new hostlib functions in unit tests
This removes the hacky conversion from old-style packed keys and signatures, which existed only because at the time we didn't have the ability in hostlib to create new-format key and signature structs directly. BUG=chromium:423882 BRANCH=none TEST=VBOOT2=1 make runtests Change-Id: Id7cb3dfce740f2546464a4caae2629af864d7b45 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/231543
This commit is contained in:
committed by
chrome-internal-fetch
parent
91852e7f58
commit
fc73f08765
@@ -198,8 +198,7 @@ int vb2_private_key_write(const struct vb2_private_key *key,
|
||||
|
||||
memcpy(&pkey.guid, &key->guid, sizeof(pkey.guid));
|
||||
|
||||
if (key->desc)
|
||||
pkey.c.desc_size = roundup32(strlen(key->desc) + 1);
|
||||
pkey.c.desc_size = vb2_desc_size(key->desc);
|
||||
|
||||
if (key->sig_alg != VB2_SIG_NONE) {
|
||||
/* Pack RSA key */
|
||||
@@ -437,10 +436,7 @@ int vb2_public_key_pack(struct vb2_packed_key2 **key_ptr,
|
||||
|
||||
/* Calculate sizes and offsets */
|
||||
key.c.fixed_size = sizeof(key);
|
||||
|
||||
if (pubk->desc && *pubk->desc)
|
||||
key.c.desc_size = roundup32(strlen(pubk->desc) + 1);
|
||||
|
||||
key.c.desc_size = vb2_desc_size(pubk->desc);
|
||||
key.key_offset = key.c.fixed_size + key.c.desc_size;
|
||||
|
||||
if (pubk->sig_alg != VB2_SIG_NONE) {
|
||||
|
||||
Reference in New Issue
Block a user