diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-09-09 10:49:37 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-09-15 16:16:13 -0700 |
| commit | f87aa72d4b49ff5fa2760227a99d9a5d90e557c1 (patch) | |
| tree | 03a537886887b7751a067baa22da3d0895f62764 /tests/vb20_common3_tests.c | |
| parent | b56b5f8e06b4cc4d4105a8141b3d2b8647eedff6 (diff) | |
| download | vboot-f87aa72d4b49ff5fa2760227a99d9a5d90e557c1.tar.gz | |
tests: Fix coverity warnings
Assorted minor code issues, which we should fix so any new errors stand
out more.
BUG=chromium:643769
BRANCH=none
TEST=make runtests
Change-Id: I927571f8a30794c70228506afe4da3eda86f765b
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/383953
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'tests/vb20_common3_tests.c')
| -rw-r--r-- | tests/vb20_common3_tests.c | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/tests/vb20_common3_tests.c b/tests/vb20_common3_tests.c index 62a36e45..fd15892a 100644 --- a/tests/vb20_common3_tests.c +++ b/tests/vb20_common3_tests.c @@ -327,6 +327,7 @@ static void test_verify_fw_preamble(struct vb2_packed_key *public_key, free(h); free(hdr); + free(body_sig); } static void resign_kernel_preamble(struct vb2_kernel_preamble *h, @@ -501,6 +502,7 @@ static void test_verify_kernel_preamble( free(h); free(hdr); + free(body_sig); } int test_permutation(int signing_key_algorithm, int data_key_algorithm, @@ -509,37 +511,45 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm, char filename[1024]; int signing_rsa_len = siglen_map[signing_key_algorithm] * 8; int data_rsa_len = siglen_map[data_key_algorithm] * 8; + int retval = 1; + + struct vb2_private_key *signing_private_key = NULL; + struct vb2_packed_key *signing_public_key = NULL; + struct vb2_packed_key *data_public_key = NULL; printf("***Testing signing algorithm: %s\n", algo_strings[signing_key_algorithm]); printf("***With data key algorithm: %s\n", algo_strings[data_key_algorithm]); - sprintf(filename, "%s/key_rsa%d.pem", keys_dir, signing_rsa_len); - struct vb2_private_key *signing_private_key = + snprintf(filename, sizeof(filename), + "%s/key_rsa%d.pem", keys_dir, signing_rsa_len); + signing_private_key = vb2_read_private_key_pem(filename, signing_key_algorithm); if (!signing_private_key) { fprintf(stderr, "Error reading signing_private_key: %s\n", filename); - return 1; + goto cleanup_permutation; } - sprintf(filename, "%s/key_rsa%d.keyb", keys_dir, signing_rsa_len); - struct vb2_packed_key *signing_public_key = + snprintf(filename, sizeof(filename), + "%s/key_rsa%d.keyb", keys_dir, signing_rsa_len); + signing_public_key = vb2_read_packed_keyb(filename, signing_key_algorithm, 1); if (!signing_public_key) { fprintf(stderr, "Error reading signing_public_key: %s\n", filename); - return 1; + goto cleanup_permutation; } - sprintf(filename, "%s/key_rsa%d.keyb", keys_dir, data_rsa_len); - struct vb2_packed_key *data_public_key = + snprintf(filename, sizeof(filename), + "%s/key_rsa%d.keyb", keys_dir, data_rsa_len); + data_public_key = vb2_read_packed_keyb(filename, data_key_algorithm, 1); if (!data_public_key) { fprintf(stderr, "Error reading data_public_key: %s\n", filename); - return 1; + goto cleanup_permutation; } /* Unpack public key */ @@ -551,7 +561,7 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm, signing_public_key->key_size)) { fprintf(stderr, "Error unpacking signing_public_key: %s\n", filename); - return 1; + goto cleanup_permutation; } test_check_keyblock(&signing_public_key2, signing_private_key, @@ -562,6 +572,9 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm, data_public_key); test_verify_kernel_preamble(signing_public_key, signing_private_key); + retval = 0; + +cleanup_permutation: if (signing_public_key) free(signing_public_key); if (signing_private_key) @@ -569,7 +582,7 @@ int test_permutation(int signing_key_algorithm, int data_key_algorithm, if (data_public_key) free(data_public_key); - return 0; + return retval; } struct test_perm |