summaryrefslogtreecommitdiff
path: root/firmware/lib/vboot_common.c
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-09-04 15:52:25 +0800
committerCommit Bot <commit-bot@chromium.org>2019-10-29 21:27:35 +0000
commit3d8dcc853a98bb8aae91d9a30862541a38581b2d (patch)
tree934ad41cc209cc3161e2fa3581e8f20298107329 /firmware/lib/vboot_common.c
parent6d43a1925a3f88b4fb8ac3fc9dcfc42ccd934063 (diff)
downloadvboot-3d8dcc853a98bb8aae91d9a30862541a38581b2d.tar.gz
vboot: keep const and non-const signature and key accessors
Keep const (default) and non-const (_mutable suffix) versions of `data` field accessors for vb2_signature and vb2_packed_key. No need for separate 2packed_key.c file -- just static inline the functions. vb2_verify_packed_key_inside should return type vb2_error_t. BUG=b:124141368, chromium:968464 TEST=make clean && make runtests BRANCH=none Change-Id: I96722a746f26abbb6e19a365ce74f0bfda0da381 Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1786386 Tested-by: Joel Kitching <kitching@chromium.org> Commit-Queue: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'firmware/lib/vboot_common.c')
-rw-r--r--firmware/lib/vboot_common.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/firmware/lib/vboot_common.c b/firmware/lib/vboot_common.c
index 88385c74..31e2bb64 100644
--- a/firmware/lib/vboot_common.c
+++ b/firmware/lib/vboot_common.c
@@ -75,7 +75,9 @@ int PublicKeyCopy(struct vb2_packed_key *dest, const struct vb2_packed_key *src)
dest->key_size = src->key_size;
dest->algorithm = src->algorithm;
dest->key_version = src->key_version;
- memcpy(GetPublicKeyData(dest), GetPublicKeyDataC(src), src->key_size);
+ memcpy(vb2_packed_key_data_mutable(dest),
+ vb2_packed_key_data(src),
+ src->key_size);
return 0;
}