diff options
| author | Randall Spangler <rspangler@chromium.org> | 2014-11-06 11:27:46 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-11-06 22:17:49 +0000 |
| commit | fe21172cc315b6249e78ee8bc17d1470e8b6b02b (patch) | |
| tree | 6387e0bd1bf5a75d7c87c8605d0c452921294194 /tests | |
| parent | a063a43ad776c9831051e62565c0136ce36d0b09 (diff) | |
| download | vboot_reference-fe21172cc315b6249e78ee8bc17d1470e8b6b02b.tar.gz | |
vboot2: Change preamble to contain a list of signatures
Use struct vb2_signature2 objects to hold the hashes of firmware
components, rather than a separate vb2_fw_preamble2_hash struct.
Better for code reuse.
BUG=chromium:423882
BRANCH=none
TEST=VBOOT2=1 make runtests
Change-Id: Ia9e23c1488a884f2d6fab4c4be51b25d3ff25c2f
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/228241
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vb2_common_tests.c | 3 | ||||
| -rw-r--r-- | tests/vb2_convert_structs.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tests/vb2_common_tests.c b/tests/vb2_common_tests.c index e8c7d1f2..ad7635e0 100644 --- a/tests/vb2_common_tests.c +++ b/tests/vb2_common_tests.c @@ -165,9 +165,6 @@ static void test_struct_packing(void) TEST_EQ(EXPECTED_VB2_FW_PREAMBLE2_SIZE, sizeof(struct vb2_fw_preamble2), "sizeof(vb2_fw_preamble2)"); - TEST_EQ(EXPECTED_VB2_FW_PREAMBLE2_HASH_SIZE, - sizeof(struct vb2_fw_preamble2_hash), - "sizeof(vb2_fw_preamble2_hash)"); } /** diff --git a/tests/vb2_convert_structs.c b/tests/vb2_convert_structs.c index 777c7389..0c4a7ec3 100644 --- a/tests/vb2_convert_structs.c +++ b/tests/vb2_convert_structs.c @@ -84,11 +84,11 @@ struct vb2_signature2 *vb2_convert_signature2( if (key) { s2.sig_alg = key->sig_alg; s2.hash_alg = key->hash_alg; - memcpy(&s2.key_guid, &key->key_guid, GUID_SIZE); + memcpy(&s2.guid, &key->guid, GUID_SIZE); } else { s2.sig_alg = VB2_SIG_INVALID; s2.hash_alg = VB2_HASH_INVALID; - memset(&s2.key_guid, 0, GUID_SIZE); + memset(&s2.guid, 0, GUID_SIZE); } /* Allocate the new buffer */ @@ -135,7 +135,7 @@ struct vb2_signature2 *vb2_create_hash_sig(const uint8_t *data, if (!hash_guid || !s.sig_size) return NULL; - memcpy(&s.key_guid, hash_guid, sizeof(s.key_guid)); + memcpy(&s.guid, hash_guid, sizeof(s.guid)); s.sig_offset = s.c.fixed_size + s.c.desc_size; s.c.total_size = s.sig_offset + s.sig_size; |