vboot2: be consistent in use of sig_algorithm vs sig_alg in vboot2 structs
Previously, we had a mix of sig_algorithm and sig_alg member names,
and it was hard to remember which struct used which variant. Prefer
sig_alg because of the 80-column limit. Same with hash_alg
vs. hash_algorithm
BUG=chromium:423882
BRANCH=none
TEST=VBOOT2=1 make runtests
Change-Id: Ifbb60f3172549e29efc0fb1f7f693efa51eb7cc3
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/226943
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
diff --git a/tests/vb2_common2_tests.c b/tests/vb2_common2_tests.c
index 050695e..4dbc137 100644
--- a/tests/vb2_common2_tests.c
+++ b/tests/vb2_common2_tests.c
@@ -147,14 +147,14 @@
free(key2);
key2 = vb2_convert_packed_key2(key1, "Test key", &size);
- key2->sig_algorithm = VB2_SIG_INVALID;
+ key2->sig_alg = VB2_SIG_INVALID;
TEST_EQ(vb2_unpack_key2(&pubk, (uint8_t *)key2, size),
VB2_ERROR_UNPACK_KEY_SIG_ALGORITHM,
"vb2_unpack_key2() bad sig algorithm");
free(key2);
key2 = vb2_convert_packed_key2(key1, "Test key", &size);
- key2->hash_algorithm = VB2_HASH_INVALID;
+ key2->hash_alg = VB2_HASH_INVALID;
TEST_EQ(vb2_unpack_key2(&pubk, (uint8_t *)key2, size),
VB2_ERROR_UNPACK_KEY_HASH_ALGORITHM,
"vb2_unpack_key2() bad hash algorithm");