diff options
| author | Joel Kitching <kitching@google.com> | 2019-09-04 15:53:52 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-29 21:27:37 +0000 |
| commit | a5c7821afa3cdbcf5a622f28e2277354de87453d (patch) | |
| tree | 9b4fdadcafcee6b931efba7ae85e08c1915d1c13 | |
| parent | 3d8dcc853a98bb8aae91d9a30862541a38581b2d (diff) | |
| download | vboot-a5c7821afa3cdbcf5a622f28e2277354de87453d.tar.gz | |
vboot: remove unused PublicKey and Signature helper functions
Functions are replaced by their vboot2 equivalents:
GetPublicKeyData --> vb2_packed_key_data
GetSignatureData --> vb2_signature_data
VerifyPublicKeyInside --> vb2_verify_packed_key_inside
VerifySignatureInside --> vb2_verify_signature_inside
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Change-Id: Idcae0510070242315bdcd843f29d0662ed0ea3ad
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1786387
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | firmware/lib/include/vboot_common.h | 20 | ||||
| -rw-r--r-- | firmware/lib/vboot_common.c | 43 |
2 files changed, 0 insertions, 63 deletions
diff --git a/firmware/lib/include/vboot_common.h b/firmware/lib/include/vboot_common.h index 6a63cac6..e150854d 100644 --- a/firmware/lib/include/vboot_common.h +++ b/firmware/lib/include/vboot_common.h @@ -12,26 +12,6 @@ #include "2struct.h" #include "vboot_struct.h" -/* - * Helper functions to get data pointed to by a public key or signature. - */ - -uint8_t *GetPublicKeyData(struct vb2_packed_key *key); -const uint8_t *GetPublicKeyDataC(const struct vb2_packed_key *key); -uint8_t *GetSignatureData(struct vb2_signature *sig); -const uint8_t *GetSignatureDataC(const struct vb2_signature *sig); - -/* - * Helper functions to verify the data pointed to by a subfield is inside the - * parent data. - */ - -vb2_error_t VerifyPublicKeyInside(const void *parent, uint64_t parent_size, - const struct vb2_packed_key *key); - -vb2_error_t VerifySignatureInside(const void *parent, uint64_t parent_size, - const struct vb2_signature *sig); - /** * Initialize a public key to refer to [key_data]. */ diff --git a/firmware/lib/vboot_common.c b/firmware/lib/vboot_common.c index 31e2bb64..c77141dd 100644 --- a/firmware/lib/vboot_common.c +++ b/firmware/lib/vboot_common.c @@ -15,49 +15,6 @@ #include "vboot_api.h" #include "vboot_common.h" -/* Helper functions to get data pointed to by a public key or signature. */ - -uint8_t *GetPublicKeyData(struct vb2_packed_key *key) -{ - return (uint8_t *)key + key->key_offset; -} - -const uint8_t *GetPublicKeyDataC(const struct vb2_packed_key *key) -{ - return (const uint8_t *)key + key->key_offset; -} - -uint8_t *GetSignatureData(struct vb2_signature *sig) -{ - return (uint8_t *)sig + sig->sig_offset; -} - -const uint8_t *GetSignatureDataC(const struct vb2_signature *sig) -{ - return (const uint8_t *)sig + sig->sig_offset; -} - -/* - * Helper functions to verify the data pointed to by a subfield is inside - * the parent data. - */ - -vb2_error_t VerifyPublicKeyInside(const void *parent, uint64_t parent_size, - const struct vb2_packed_key *key) -{ - return vb2_verify_member_inside(parent, parent_size, - key, sizeof(struct vb2_packed_key), - key->key_offset, key->key_size); -} - -vb2_error_t VerifySignatureInside(const void *parent, uint64_t parent_size, - const struct vb2_signature *sig) -{ - return vb2_verify_member_inside(parent, parent_size, - sig, sizeof(struct vb2_signature), - sig->sig_offset, sig->sig_size); -} - void PublicKeyInit(struct vb2_packed_key *key, uint8_t *key_data, uint64_t key_size) { |