vboot: use vb2_safe_memcmp instead of SafeMemcmp

No need to have two implementations of this now.

BUG=chromium:611535
BRANCH=none
TEST=make runtests; emerge-kevin coreboot depthcharge

Change-Id: I18bac928eb09971c37f3e1d7cbfd2009999b1f31
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/400899
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>

1 files changed, 35 insertions, 53 deletions

diff --git a/tests/utility_tests.c b/tests/utility_tests.c
index 978f768c..88fe1194 100644
--- a/tests/utility_tests.c
+++ b/tests/utility_tests.c
@@ -10,67 +10,49 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define _STUB_IMPLEMENTATION_  /* So we can use memset() ourselves */
-
 #include "test_common.h"
 #include "utility.h"
 #include "vboot_common.h"
 
-
 /* Test utility.h and sysincludes.h macros */
-static void MacrosTest(void) {
-  int64_t a = -10, b = -20;
-  uint64_t u = (0xABCD00000000ULL);
-  uint64_t v = (0xABCD000000ULL);
-
-  TEST_EQ(CombineUint16Pair(1, 2), 0x00010002, "CombineUint16Pair");
-  TEST_EQ(CombineUint16Pair(0xFFFE, 0xFFFF), 0xFFFEFFFF,
-          "CombineUint16Pair 2");
-  TEST_EQ(CombineUint16Pair(-4, -16), 0xFFFCFFF0,
-          "CombineUint16Pair big negative");
-  TEST_EQ(CombineUint16Pair(0x10003, 0x10004), 0x00030004,
-          "CombineUint16Pair overflow");
-
-  TEST_EQ(Min(1, 2), 1, "Min 1");
-  TEST_EQ(Min(4, 3), 3, "Min 2");
-  TEST_EQ(Min(5, 5), 5, "Min 5");
-  TEST_EQ(Min(a, b), b, "Min uint64 1");
-  TEST_EQ(Min(b, a), b, "Min uint64 2");
-  TEST_EQ(Min(b, b), b, "Min uint64 same");
-
-  TEST_EQ(u >> 8, v, "uint64_t >> 8");
-  TEST_EQ(u >> 0, u, "uint64_t >> 0");
-  TEST_EQ(u >> 36, (uint64_t)0xABC, "uint64_t >> 36");
-
-  TEST_EQ(v * (uint32_t)0, 0, "uint64_t * uint32_t 0");
-  TEST_EQ(v * (uint32_t)1, v, "uint64_t * uint32_t 1");
-  TEST_EQ(v * (uint32_t)256, u, "uint64_t * uint32_t 256");
+static void MacrosTest(void)
+{
+	int64_t a = -10, b = -20;
+	uint64_t u = (0xABCD00000000ULL);
+	uint64_t v = (0xABCD000000ULL);
+
+	TEST_EQ(CombineUint16Pair(1, 2), 0x00010002, "CombineUint16Pair");
+	TEST_EQ(CombineUint16Pair(0xFFFE, 0xFFFF), 0xFFFEFFFF,
+		"CombineUint16Pair 2");
+	TEST_EQ(CombineUint16Pair(-4, -16), 0xFFFCFFF0,
+		"CombineUint16Pair big negative");
+	TEST_EQ(CombineUint16Pair(0x10003, 0x10004), 0x00030004,
+		"CombineUint16Pair overflow");
+
+	TEST_EQ(Min(1, 2), 1, "Min 1");
+	TEST_EQ(Min(4, 3), 3, "Min 2");
+	TEST_EQ(Min(5, 5), 5, "Min 5");
+	TEST_EQ(Min(a, b), b, "Min uint64 1");
+	TEST_EQ(Min(b, a), b, "Min uint64 2");
+	TEST_EQ(Min(b, b), b, "Min uint64 same");
+
+	TEST_EQ(u >> 8, v, "uint64_t >> 8");
+	TEST_EQ(u >> 0, u, "uint64_t >> 0");
+	TEST_EQ(u >> 36, (uint64_t)0xABC, "uint64_t >> 36");
+
+	TEST_EQ(v * (uint32_t)0, 0, "uint64_t * uint32_t 0");
+	TEST_EQ(v * (uint32_t)1, v, "uint64_t * uint32_t 1");
+	TEST_EQ(v * (uint32_t)256, u, "uint64_t * uint32_t 256");
 }
 
+int main(int argc, char* argv[])
+{
+	int error_code = 0;
 
-/* Test SafeMemcmp */
-static void SafeMemcmpTest(void) {
-  /* Zero-length strings are equal */
-  TEST_EQ(0, SafeMemcmp("APPLE", "TIGER", 0), "SafeMemcmp() size=0");
-
-  /* Test equal arrays */
-  TEST_EQ(0, SafeMemcmp("clonebob", "clonebob", 8), "SafeMemcmp() equal");
-  /* Inequality past end of array doesn't affect result */
-  TEST_EQ(0, SafeMemcmp("clonebob", "clonedan", 5), "SafeMemcmp() equal2");
-
-  TEST_EQ(1, SafeMemcmp("APPLE", "TIGER", 5), "SafeMemcmp() unequal");
-  TEST_EQ(1, SafeMemcmp("APPLE", "APPLe", 5), "SafeMemcmp() unequal 2");
-}
-
-
-int main(int argc, char* argv[]) {
-  int error_code = 0;
-
-  MacrosTest();
-  SafeMemcmpTest();
+	MacrosTest();
 
-  if (!gTestSuccess)
-    error_code = 255;
+	if (!gTestSuccess)
+		error_code = 255;
 
-  return error_code;
+	return error_code;
 }