diff options
| author | Randall Spangler <rspangler@chromium.org> | 2014-12-04 09:54:37 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-12-05 00:02:00 +0000 |
| commit | 308d2540929cd95e2a565be95ce0b1d45d2fbed2 (patch) | |
| tree | 8df30f986fd05e934ca3461398cfc63cda398026 /tests/vb21_host_sig_tests.c | |
| parent | 6f1b82ac14f341d9733d6e95d518b3ee352002ef (diff) | |
| download | vboot-308d2540929cd95e2a565be95ce0b1d45d2fbed2.tar.gz | |
vboot2: Get rid of extra '2' at end of new struct names
Now that lib20 and lib21 are distinct, they can have overlapping
struct names. This will be cleaner in the long run, since vboot 2.0
(lib20) is just a temporary stepping stone to vboot 2.1 (lib21). It
would be a shame to need to carry around the overhead of that extra
digit forever.
No functional changes, just a lot of renaming.
BUG=chromium:423882
BRANCH=none
TEST=make runtests && VBOOT2=1 make runtests (works with/withoug VBOOT2 flag)
And compile firmware for veyron_pinky
Change-Id: I25f348fd31e32d08ca576836dfdd1278828765a1
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/233183
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'tests/vb21_host_sig_tests.c')
| -rw-r--r-- | tests/vb21_host_sig_tests.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/vb21_host_sig_tests.c b/tests/vb21_host_sig_tests.c index 5c1176ab..66e91553 100644 --- a/tests/vb21_host_sig_tests.c +++ b/tests/vb21_host_sig_tests.c @@ -43,7 +43,7 @@ static void sig_tests(const struct alg_combo *combo, struct vb2_private_key *prik, prik2; const struct vb2_private_key *prihash, *priks[2]; struct vb2_public_key *pubk, pubhash; - struct vb2_signature2 *sig, *sig2; + struct vb2_signature *sig, *sig2; uint32_t size; uint8_t workbuf[VB2_VERIFY_DATA_WORKBUF_BYTES]; @@ -86,7 +86,7 @@ static void sig_tests(const struct alg_combo *combo, TEST_EQ(sig->data_size, test_size, " data_size"); TEST_SUCC(vb2_sig_size_for_key(&size, prik, NULL), "Sig size"); TEST_EQ(size, sig->c.total_size, " size"); - TEST_SUCC(vb2_verify_data2(test_data, test_size, sig, pubk, &wb), + TEST_SUCC(vb2_verify_data(test_data, test_size, sig, pubk, &wb), "Verify good"); free(sig); @@ -105,7 +105,7 @@ static void sig_tests(const struct alg_combo *combo, TEST_SUCC(vb2_sign_data(&sig, test_data, test_size, prihash, NULL), "Sign with hash"); - TEST_SUCC(vb2_verify_data2(test_data, test_size, sig, &pubhash, &wb), + TEST_SUCC(vb2_verify_data(test_data, test_size, sig, &pubhash, &wb), "Verify with hash"); free(sig); @@ -124,8 +124,8 @@ static void sig_tests(const struct alg_combo *combo, c->total_size = bufsize; TEST_SUCC(vb2_sign_object(buf, c_sig_offs, prik, NULL), "Sign object"); - sig = (struct vb2_signature2 *)(buf + c_sig_offs); - TEST_SUCC(vb2_verify_data2(buf, c_sig_offs, sig, pubk, &wb), + sig = (struct vb2_signature *)(buf + c_sig_offs); + TEST_SUCC(vb2_verify_data(buf, c_sig_offs, sig, pubk, &wb), "Verify object"); TEST_EQ(vb2_sign_object(buf, c_sig_offs + 4, prik, NULL), @@ -142,11 +142,11 @@ static void sig_tests(const struct alg_combo *combo, TEST_SUCC(vb2_sign_object_multiple(buf, c_sig_offs, priks, 2), "Sign multiple"); - sig = (struct vb2_signature2 *)(buf + c_sig_offs); - TEST_SUCC(vb2_verify_data2(buf, c_sig_offs, sig, pubk, &wb), + sig = (struct vb2_signature *)(buf + c_sig_offs); + TEST_SUCC(vb2_verify_data(buf, c_sig_offs, sig, pubk, &wb), "Verify object with sig 1"); - sig2 = (struct vb2_signature2 *)(buf + c_sig_offs + sig->c.total_size); - TEST_SUCC(vb2_verify_data2(buf, c_sig_offs, sig2, &pubhash, &wb), + sig2 = (struct vb2_signature *)(buf + c_sig_offs + sig->c.total_size); + TEST_SUCC(vb2_verify_data(buf, c_sig_offs, sig2, &pubhash, &wb), "Verify object with sig 2"); c->total_size -= 4; |