vboot: move vb2_packed_key and several functions from lib20 to 2lib

* Move vb2_packed_key from vb2_struct.h to 2struct.h
* Move vb2_verify_member_inside from lib20/common.c to 2common.c
* Move vb2_packed_key_data and vb2_verify_packed_key_inside from
  lib20/packed_key.c to 2packed_key.c
* Relocate tests accordingly

BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none

Change-Id: I6a9338ffdb640aad071941c3768427e15cd2aa93
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1642773
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>

2 files changed, 108 insertions, 88 deletions

diff --git a/tests/vb20_common_tests.c b/tests/vb20_common_tests.c
index 9cc6dd7f..d4555f44 100644
--- a/tests/vb20_common_tests.c
+++ b/tests/vb20_common_tests.c
@@ -17,9 +17,6 @@
 static void test_struct_packing(void)
 {
 	/* Test vboot2 versions of vboot1 structs */
-	TEST_EQ(EXPECTED_VB2_PACKED_KEY_SIZE,
-		sizeof(struct vb2_packed_key),
-		"sizeof(vb2_packed_key)");
 	TEST_EQ(EXPECTED_VB2_SIGNATURE_SIZE,
 		sizeof(struct vb2_signature),
 		"sizeof(vb2_signature)");
@@ -29,14 +26,8 @@ static void test_struct_packing(void)
 	TEST_EQ(EXPECTED_VB2_FW_PREAMBLE_SIZE,
 		sizeof(struct vb2_fw_preamble),
 		"sizeof(vb2_fw_preamble)");
-	TEST_EQ(EXPECTED_VB2_GBB_HEADER_SIZE,
-		sizeof(struct vb2_gbb_header),
-		"sizeof(vb2_gbb_header)");
 
 	/* And make sure they're the same as their vboot1 equivalents */
-	TEST_EQ(EXPECTED_VB2_PACKED_KEY_SIZE,
-		EXPECTED_VBPUBLICKEY_SIZE,
-		"vboot1->2 packed key sizes same");
 	TEST_EQ(EXPECTED_VB2_SIGNATURE_SIZE,
 		EXPECTED_VBSIGNATURE_SIZE,
 		"vboot1->2 signature sizes same");
@@ -51,25 +42,6 @@ static void test_struct_packing(void)
 static void test_helper_functions(void)
 {
 	{
-		uint8_t *p = (uint8_t *)test_helper_functions;
-		TEST_EQ((int)vb2_offset_of(p, p), 0, "vb2_offset_of() equal");
-		TEST_EQ((int)vb2_offset_of(p, p+10), 10,
-			"vb2_offset_of() positive");
-	}
-
-	{
-		struct vb2_packed_key k = {.key_offset = sizeof(k)};
-		TEST_EQ((int)vb2_offset_of(&k, vb2_packed_key_data(&k)),
-			sizeof(k), "vb2_packed_key_data() adjacent");
-	}
-
-	{
-		struct vb2_packed_key k = {.key_offset = 123};
-		TEST_EQ((int)vb2_offset_of(&k, vb2_packed_key_data(&k)), 123,
-			"vb2_packed_key_data() spaced");
-	}
-
-	{
 		struct vb2_signature s = {.sig_offset = sizeof(s)};
 		TEST_EQ((int)vb2_offset_of(&s, vb2_signature_data(&s)),
 			sizeof(s), "vb2_signature_data() adjacent");
@@ -82,65 +54,6 @@ static void test_helper_functions(void)
 	}
 
 	{
-		uint8_t *p = (uint8_t *)test_helper_functions;
-		TEST_SUCC(vb2_verify_member_inside(p, 20, p, 6, 11, 3),
-			  "MemberInside ok 1");
-		TEST_SUCC(vb2_verify_member_inside(p, 20, p+4, 4, 8, 4),
-			  "MemberInside ok 2");
-		TEST_EQ(vb2_verify_member_inside(p, 20, p-4, 4, 8, 4),
-			VB2_ERROR_INSIDE_MEMBER_OUTSIDE,
-			"MemberInside member before parent");
-		TEST_EQ(vb2_verify_member_inside(p, 20, p+20, 4, 8, 4),
-			VB2_ERROR_INSIDE_MEMBER_OUTSIDE,
-			"MemberInside member after parent");
-		TEST_EQ(vb2_verify_member_inside(p, 20, p, 21, 0, 0),
-			VB2_ERROR_INSIDE_MEMBER_OUTSIDE,
-			"MemberInside member too big");
-		TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, 21, 0),
-			VB2_ERROR_INSIDE_DATA_OUTSIDE,
-			"MemberInside data after parent");
-		TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, SIZE_MAX, 0),
-			VB2_ERROR_INSIDE_DATA_OUTSIDE,
-			"MemberInside data before parent");
-		TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, 4, 17),
-			VB2_ERROR_INSIDE_DATA_OUTSIDE,
-			"MemberInside data too big");
-		TEST_EQ(vb2_verify_member_inside(p, 20, p, 8, 4, 8),
-			VB2_ERROR_INSIDE_DATA_OVERLAP,
-			"MemberInside data overlaps member");
-		TEST_EQ(vb2_verify_member_inside(p, -8, p, 12, 0, 0),
-			VB2_ERROR_INSIDE_PARENT_WRAPS,
-			"MemberInside wraparound 1");
-		TEST_EQ(vb2_verify_member_inside(p, 20, p, -8, 0, 0),
-			VB2_ERROR_INSIDE_MEMBER_WRAPS,
-			"MemberInside wraparound 2");
-		TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, 4, -12),
-			VB2_ERROR_INSIDE_DATA_WRAPS,
-			"MemberInside wraparound 3");
-	}
-
-	{
-		struct vb2_packed_key k = {.key_offset = sizeof(k),
-					   .key_size = 128};
-		TEST_SUCC(vb2_verify_packed_key_inside(&k, sizeof(k)+128, &k),
-			  "PublicKeyInside ok 1");
-		TEST_SUCC(vb2_verify_packed_key_inside(&k - 1,
-						       2*sizeof(k)+128, &k),
-			  "PublicKeyInside ok 2");
-		TEST_EQ(vb2_verify_packed_key_inside(&k, 128, &k),
-			VB2_ERROR_INSIDE_DATA_OUTSIDE,
-			"PublicKeyInside key too big");
-	}
-
-	{
-		struct vb2_packed_key k = {.key_offset = 100,
-					   .key_size = 4};
-		TEST_EQ(vb2_verify_packed_key_inside(&k, 99, &k),
-			VB2_ERROR_INSIDE_DATA_OUTSIDE,
-			"PublicKeyInside offset too big");
-	}
-
-	{
 		struct vb2_signature s = {.sig_offset = sizeof(s),
 					  .sig_size = 128};
 		TEST_SUCC(vb2_verify_signature_inside(&s, sizeof(s)+128, &s),
diff --git a/tests/vb2_common_tests.c b/tests/vb2_common_tests.c
index c7e99769..a9b25b61 100644
--- a/tests/vb2_common_tests.c
+++ b/tests/vb2_common_tests.c
@@ -5,9 +5,30 @@
  * Tests for firmware 2common.c
  */
 
-#include "2sysincludes.h"
 #include "2common.h"
+#include "2sysincludes.h"
 #include "test_common.h"
+#include "vboot_struct.h"  /* For old struct sizes */
+
+/*
+ * Test struct packing for vboot_struct.h structs which are passed between
+ * firmware and OS, or passed between different phases of firmware.
+ */
+static void test_struct_packing(void)
+{
+	/* Test vboot2 versions of vboot1 structs */
+	TEST_EQ(EXPECTED_VB2_PACKED_KEY_SIZE,
+		sizeof(struct vb2_packed_key),
+		"sizeof(vb2_packed_key)");
+	TEST_EQ(EXPECTED_VB2_GBB_HEADER_SIZE,
+		sizeof(struct vb2_gbb_header),
+		"sizeof(vb2_gbb_header)");
+
+	/* And make sure they're the same as their vboot1 equivalents */
+	TEST_EQ(EXPECTED_VB2_PACKED_KEY_SIZE,
+		EXPECTED_VBPUBLICKEY_SIZE,
+		"vboot1->2 packed key sizes same");
+}
 
 /**
  * Test memory compare functions
@@ -109,11 +130,97 @@ static void test_workbuf(void)
 	TEST_EQ(wb.size, 32, "  size");
 }
 
+/**
+ * Helper functions not dependent on specific key sizes
+ */
+static void test_helper_functions(void)
+{
+	{
+		struct vb2_packed_key k = {.key_offset = sizeof(k)};
+		TEST_EQ((int)vb2_offset_of(&k, vb2_packed_key_data(&k)),
+			sizeof(k), "vb2_packed_key_data() adjacent");
+	}
+
+	{
+		struct vb2_packed_key k = {.key_offset = 123};
+		TEST_EQ((int)vb2_offset_of(&k, vb2_packed_key_data(&k)), 123,
+			"vb2_packed_key_data() spaced");
+	}
+
+	{
+		uint8_t *p = (uint8_t *)test_helper_functions;
+		TEST_EQ((int)vb2_offset_of(p, p), 0, "vb2_offset_of() equal");
+		TEST_EQ((int)vb2_offset_of(p, p+10), 10,
+			"vb2_offset_of() positive");
+	}
+
+	{
+		uint8_t *p = (uint8_t *)test_helper_functions;
+		TEST_SUCC(vb2_verify_member_inside(p, 20, p, 6, 11, 3),
+			  "MemberInside ok 1");
+		TEST_SUCC(vb2_verify_member_inside(p, 20, p+4, 4, 8, 4),
+			  "MemberInside ok 2");
+		TEST_EQ(vb2_verify_member_inside(p, 20, p-4, 4, 8, 4),
+			VB2_ERROR_INSIDE_MEMBER_OUTSIDE,
+			"MemberInside member before parent");
+		TEST_EQ(vb2_verify_member_inside(p, 20, p+20, 4, 8, 4),
+			VB2_ERROR_INSIDE_MEMBER_OUTSIDE,
+			"MemberInside member after parent");
+		TEST_EQ(vb2_verify_member_inside(p, 20, p, 21, 0, 0),
+			VB2_ERROR_INSIDE_MEMBER_OUTSIDE,
+			"MemberInside member too big");
+		TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, 21, 0),
+			VB2_ERROR_INSIDE_DATA_OUTSIDE,
+			"MemberInside data after parent");
+		TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, SIZE_MAX, 0),
+			VB2_ERROR_INSIDE_DATA_OUTSIDE,
+			"MemberInside data before parent");
+		TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, 4, 17),
+			VB2_ERROR_INSIDE_DATA_OUTSIDE,
+			"MemberInside data too big");
+		TEST_EQ(vb2_verify_member_inside(p, 20, p, 8, 4, 8),
+			VB2_ERROR_INSIDE_DATA_OVERLAP,
+			"MemberInside data overlaps member");
+		TEST_EQ(vb2_verify_member_inside(p, -8, p, 12, 0, 0),
+			VB2_ERROR_INSIDE_PARENT_WRAPS,
+			"MemberInside wraparound 1");
+		TEST_EQ(vb2_verify_member_inside(p, 20, p, -8, 0, 0),
+			VB2_ERROR_INSIDE_MEMBER_WRAPS,
+			"MemberInside wraparound 2");
+		TEST_EQ(vb2_verify_member_inside(p, 20, p, 4, 4, -12),
+			VB2_ERROR_INSIDE_DATA_WRAPS,
+			"MemberInside wraparound 3");
+	}
+
+	{
+		struct vb2_packed_key k = {.key_offset = sizeof(k),
+					   .key_size = 128};
+		TEST_SUCC(vb2_verify_packed_key_inside(&k, sizeof(k)+128, &k),
+			  "PublicKeyInside ok 1");
+		TEST_SUCC(vb2_verify_packed_key_inside(&k - 1,
+						       2*sizeof(k)+128, &k),
+			  "PublicKeyInside ok 2");
+		TEST_EQ(vb2_verify_packed_key_inside(&k, 128, &k),
+			VB2_ERROR_INSIDE_DATA_OUTSIDE,
+			"PublicKeyInside key too big");
+	}
+
+	{
+		struct vb2_packed_key k = {.key_offset = 100,
+					   .key_size = 4};
+		TEST_EQ(vb2_verify_packed_key_inside(&k, 99, &k),
+			VB2_ERROR_INSIDE_DATA_OUTSIDE,
+			"PublicKeyInside offset too big");
+	}
+}
+
 int main(int argc, char* argv[])
 {
+	test_struct_packing();
 	test_memcmp();
 	test_align();
 	test_workbuf();
+	test_helper_functions();
 
 	return gTestSuccess ? 0 : 255;
 }