diff options
author | Joel Kitching <kitching@google.com> | 2019-07-31 14:12:30 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-08-13 04:36:52 +0000 |
commit | e6700f4c70fe72850ae4f3f5df19c9281ebcefc8 (patch) | |
tree | 0f2abff7be99bc140e288058fb2eeab6f8bb8b64 /tests/vb20_api_tests.c | |
parent | a5afd01feb0b4b45adbcd8ab38ab8a2ef2a2ef67 (diff) | |
download | vboot-e6700f4c70fe72850ae4f3f5df19c9281ebcefc8.tar.gz |
vboot: update vboot2 functions to use new vb2_error_t
To make explicit when vboot2 error codes should be returned,
use the new vb2_error_t type on all functions which return
VB2_ERROR_* constants.
BUG=b:124141368, chromium:988410
TEST=make clean && make runtests
BRANCH=none
Change-Id: Idd3ee8afe8c78347783ce5fa829cb78f1e5719e2
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1728113, chromium:1728499
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1728292
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests/vb20_api_tests.c')
-rw-r--r-- | tests/vb20_api_tests.c | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/tests/vb20_api_tests.c b/tests/vb20_api_tests.c index 1c96efa1..ae6a216c 100644 --- a/tests/vb20_api_tests.c +++ b/tests/vb20_api_tests.c @@ -38,10 +38,10 @@ static enum { HWCRYPTO_FORBIDDEN, } hwcrypto_state; -static int retval_vb2_load_fw_keyblock; -static int retval_vb2_load_fw_preamble; -static int retval_vb2_digest_finalize; -static int retval_vb2_verify_digest; +static vb2_error_t retval_vb2_load_fw_keyblock; +static vb2_error_t retval_vb2_load_fw_preamble; +static vb2_error_t retval_vb2_digest_finalize; +static vb2_error_t retval_vb2_verify_digest; /* Type of test to reset for */ enum reset_type { @@ -107,19 +107,18 @@ static void reset_common_data(enum reset_type t) /* Mocked functions */ -int vb2_load_fw_keyblock(struct vb2_context *c) +vb2_error_t vb2_load_fw_keyblock(struct vb2_context *c) { return retval_vb2_load_fw_keyblock; } -int vb2_load_fw_preamble(struct vb2_context *c) +vb2_error_t vb2_load_fw_preamble(struct vb2_context *c) { return retval_vb2_load_fw_preamble; } -int vb2_unpack_key_buffer(struct vb2_public_key *key, - const uint8_t *buf, - uint32_t size) +vb2_error_t vb2_unpack_key_buffer(struct vb2_public_key *key, + const uint8_t *buf, uint32_t size) { struct vb2_packed_key *k = (struct vb2_packed_key *)buf; @@ -132,8 +131,8 @@ int vb2_unpack_key_buffer(struct vb2_public_key *key, return VB2_SUCCESS; } -int vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg, - uint32_t data_size) +vb2_error_t vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg, + uint32_t data_size) { switch (hwcrypto_state) { case HWCRYPTO_DISABLED: @@ -149,8 +148,8 @@ int vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg, } } -int vb2ex_hwcrypto_digest_extend(const uint8_t *buf, - uint32_t size) +vb2_error_t vb2ex_hwcrypto_digest_extend(const uint8_t *buf, + uint32_t size) { if (hwcrypto_state != HWCRYPTO_ENABLED) return VB2_ERROR_UNKNOWN; @@ -164,7 +163,7 @@ static void fill_digest(uint8_t *digest, uint32_t digest_size) memset(digest, 0x0a, digest_size); } -int vb2ex_hwcrypto_digest_finalize(uint8_t *digest, +vb2_error_t vb2ex_hwcrypto_digest_finalize(uint8_t *digest, uint32_t digest_size) { if (hwcrypto_state != HWCRYPTO_ENABLED) @@ -176,7 +175,7 @@ int vb2ex_hwcrypto_digest_finalize(uint8_t *digest, return retval_vb2_digest_finalize; } -int vb2_digest_init(struct vb2_digest_context *dc, +vb2_error_t vb2_digest_init(struct vb2_digest_context *dc, enum vb2_hash_algorithm hash_alg) { if (hwcrypto_state == HWCRYPTO_ENABLED) @@ -190,9 +189,8 @@ int vb2_digest_init(struct vb2_digest_context *dc, return VB2_SUCCESS; } -int vb2_digest_extend(struct vb2_digest_context *dc, - const uint8_t *buf, - uint32_t size) +vb2_error_t vb2_digest_extend(struct vb2_digest_context *dc, const uint8_t *buf, + uint32_t size) { if (hwcrypto_state == HWCRYPTO_ENABLED) return VB2_ERROR_UNKNOWN; @@ -202,9 +200,8 @@ int vb2_digest_extend(struct vb2_digest_context *dc, return VB2_SUCCESS; } -int vb2_digest_finalize(struct vb2_digest_context *dc, - uint8_t *digest, - uint32_t digest_size) +vb2_error_t vb2_digest_finalize(struct vb2_digest_context *dc, uint8_t *digest, + uint32_t digest_size) { if (hwcrypto_state == HWCRYPTO_ENABLED) return VB2_ERROR_UNKNOWN; @@ -220,10 +217,9 @@ uint32_t vb2_rsa_sig_size(enum vb2_signature_algorithm sig_alg) return mock_sig_size; } -int vb2_rsa_verify_digest(const struct vb2_public_key *key, - uint8_t *sig, - const uint8_t *digest, - const struct vb2_workbuf *wb) +vb2_error_t vb2_rsa_verify_digest(const struct vb2_public_key *key, + uint8_t *sig, const uint8_t *digest, + const struct vb2_workbuf *wb) { return retval_vb2_verify_digest; } |