vboot: use standard memcmp, memcpy, memset

Originally, we didn't trust the firmware to provide these functions from
a standard library.  Now, with coreboot, we do.

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

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

20 files changed, 233 insertions, 233 deletions

diff --git a/tests/cgptlib_test.c b/tests/cgptlib_test.c
index 65022a20..f1a91cdc 100644
--- a/tests/cgptlib_test.c
+++ b/tests/cgptlib_test.c
@@ -73,7 +73,7 @@ static void SetGuid(void *dest, uint32_t num)
 {
 	Guid g = {{{num,0xd450,0x44bc,0xa6,0x93,
 		    {0xb8,0xac,0x75,0x5f,0xcd,0x48}}}};
-	Memcpy(dest, &g, sizeof(Guid));
+	memcpy(dest, &g, sizeof(Guid));
 }
 
 /*
@@ -105,14 +105,14 @@ static void RefreshCrc32(GptData *gpt)
 
 static void ZeroHeaders(GptData *gpt)
 {
-	Memset(gpt->primary_header, 0, MAX_SECTOR_SIZE);
-	Memset(gpt->secondary_header, 0, MAX_SECTOR_SIZE);
+	memset(gpt->primary_header, 0, MAX_SECTOR_SIZE);
+	memset(gpt->secondary_header, 0, MAX_SECTOR_SIZE);
 }
 
 static void ZeroEntries(GptData *gpt)
 {
-	Memset(gpt->primary_entries, 0, PARTITION_ENTRIES_SIZE);
-	Memset(gpt->secondary_entries, 0, PARTITION_ENTRIES_SIZE);
+	memset(gpt->primary_entries, 0, PARTITION_ENTRIES_SIZE);
+	memset(gpt->secondary_entries, 0, PARTITION_ENTRIES_SIZE);
 }
 
 static void ZeroHeadersEntries(GptData *gpt)
@@ -134,7 +134,7 @@ static GptData *GetEmptyGptData(void)
 	static uint8_t secondary_header[MAX_SECTOR_SIZE];
 	static uint8_t secondary_entries[PARTITION_ENTRIES_SIZE];
 
-	Memset(&gpt, 0, sizeof(gpt));
+	memset(&gpt, 0, sizeof(gpt));
 	gpt.primary_header = primary_header;
 	gpt.primary_entries = primary_entries;
 	gpt.secondary_header = secondary_header;
@@ -172,7 +172,7 @@ static void BuildTestGptData(GptData *gpt)
 	/* Build primary */
 	header = (GptHeader *)gpt->primary_header;
 	entries = (GptEntry *)gpt->primary_entries;
-	Memcpy(header->signature, GPT_HEADER_SIGNATURE,
+	memcpy(header->signature, GPT_HEADER_SIGNATURE,
 	       GPT_HEADER_SIGNATURE_SIZE);
 	header->revision = GPT_HEADER_REVISION;
 	header->size = sizeof(GptHeader);
@@ -185,19 +185,19 @@ static void BuildTestGptData(GptData *gpt)
 	  /* 512B / 128B * 32sectors = 128 entries */
 	header->number_of_entries = 128;
 	header->size_of_entry = 128;  /* bytes */
-	Memcpy(&entries[0].type, &chromeos_kernel, sizeof(chromeos_kernel));
+	memcpy(&entries[0].type, &chromeos_kernel, sizeof(chromeos_kernel));
 	SetGuid(&entries[0].unique, 0);
 	entries[0].starting_lba = 34;
 	entries[0].ending_lba = 133;
-	Memcpy(&entries[1].type, &chromeos_rootfs, sizeof(chromeos_rootfs));
+	memcpy(&entries[1].type, &chromeos_rootfs, sizeof(chromeos_rootfs));
 	SetGuid(&entries[1].unique, 1);
 	entries[1].starting_lba = 134;
 	entries[1].ending_lba = 232;
-	Memcpy(&entries[2].type, &chromeos_rootfs, sizeof(chromeos_rootfs));
+	memcpy(&entries[2].type, &chromeos_rootfs, sizeof(chromeos_rootfs));
 	SetGuid(&entries[2].unique, 2);
 	entries[2].starting_lba = 234;
 	entries[2].ending_lba = 331;
-	Memcpy(&entries[3].type, &chromeos_kernel, sizeof(chromeos_kernel));
+	memcpy(&entries[3].type, &chromeos_kernel, sizeof(chromeos_kernel));
 	SetGuid(&entries[3].unique, 3);
 	entries[3].starting_lba = 334;
 	entries[3].ending_lba = 430;
@@ -205,8 +205,8 @@ static void BuildTestGptData(GptData *gpt)
 	/* Build secondary */
 	header2 = (GptHeader *)gpt->secondary_header;
 	entries2 = (GptEntry *)gpt->secondary_entries;
-	Memcpy(header2, header, sizeof(GptHeader));
-	Memcpy(entries2, entries, PARTITION_ENTRIES_SIZE);
+	memcpy(header2, header, sizeof(GptHeader));
+	memcpy(entries2, entries, PARTITION_ENTRIES_SIZE);
 	header2->my_lba = DEFAULT_DRIVE_SECTORS - 1;  /* 466 */
 	header2->alternate_lba = 1;
 	header2->entries_lba = DEFAULT_DRIVE_SECTORS - 1 - 32;  /* 434 */
@@ -314,43 +314,43 @@ static int HeaderSameTest(void)
 
 	EXPECT(0 == HeaderFieldsSame(h1, h2));
 
-	Memcpy(&h3, h2, sizeof(h3));
+	memcpy(&h3, h2, sizeof(h3));
 	h3.signature[0] ^= 0xba;
 	EXPECT(1 == HeaderFieldsSame(h1, &h3));
 
-	Memcpy(&h3, h2, sizeof(h3));
+	memcpy(&h3, h2, sizeof(h3));
 	h3.revision++;
 	EXPECT(1 == HeaderFieldsSame(h1, &h3));
 
-	Memcpy(&h3, h2, sizeof(h3));
+	memcpy(&h3, h2, sizeof(h3));
 	h3.size++;
 	EXPECT(1 == HeaderFieldsSame(h1, &h3));
 
-	Memcpy(&h3, h2, sizeof(h3));
+	memcpy(&h3, h2, sizeof(h3));
 	h3.reserved_zero++;
 	EXPECT(1 == HeaderFieldsSame(h1, &h3));
 
-	Memcpy(&h3, h2, sizeof(h3));
+	memcpy(&h3, h2, sizeof(h3));
 	h3.first_usable_lba++;
 	EXPECT(1 == HeaderFieldsSame(h1, &h3));
 
-	Memcpy(&h3, h2, sizeof(h3));
+	memcpy(&h3, h2, sizeof(h3));
 	h3.last_usable_lba++;
 	EXPECT(1 == HeaderFieldsSame(h1, &h3));
 
-	Memcpy(&h3, h2, sizeof(h3));
+	memcpy(&h3, h2, sizeof(h3));
 	h3.disk_uuid.u.raw[0] ^= 0xba;
 	EXPECT(1 == HeaderFieldsSame(h1, &h3));
 
-	Memcpy(&h3, h2, sizeof(h3));
+	memcpy(&h3, h2, sizeof(h3));
 	h3.number_of_entries++;
 	EXPECT(1 == HeaderFieldsSame(h1, &h3));
 
-	Memcpy(&h3, h2, sizeof(h3));
+	memcpy(&h3, h2, sizeof(h3));
 	h3.size_of_entry++;
 	EXPECT(1 == HeaderFieldsSame(h1, &h3));
 
-	Memcpy(&h3, h2, sizeof(h3));
+	memcpy(&h3, h2, sizeof(h3));
 	h3.entries_crc32++;
 	EXPECT(1 == HeaderFieldsSame(h1, &h3));
 
@@ -738,7 +738,7 @@ static int ValidEntryTest(void)
 
 	/* case: non active entry should be ignored. */
 	BuildTestGptData(gpt);
-	Memset(&e1[1].type, 0, sizeof(e1[1].type));
+	memset(&e1[1].type, 0, sizeof(e1[1].type));
 	e1[1].starting_lba = e1[1].ending_lba + 1;
 	RefreshCrc32(gpt);
 	EXPECT(0 == CheckEntries(e1, h1));
@@ -809,7 +809,7 @@ static int OverlappedPartitionTest(void) {
 				break;
 
 			if (cases[i].entries[j].active) {
-				Memcpy(&e[j].type, &guid_kernel, sizeof(Guid));
+				memcpy(&e[j].type, &guid_kernel, sizeof(Guid));
 			}
 			SetGuid(&e[j].unique, j);
 			e[j].starting_lba = cases[i].entries[j].starting_lba;
@@ -1075,9 +1075,9 @@ static int SanityCheckTest(void)
 
 	/* Test correct recognition of IGNOREME in primary GPT. */
 	BuildTestGptData(gpt);
-	Memset(gpt->primary_entries, 0, PARTITION_ENTRIES_SIZE);
-	Memset(gpt->primary_header, 0, sizeof(GptHeader));
-	Memcpy(h1->signature, GPT_HEADER_SIGNATURE_IGNORED,
+	memset(gpt->primary_entries, 0, PARTITION_ENTRIES_SIZE);
+	memset(gpt->primary_header, 0, sizeof(GptHeader));
+	memcpy(h1->signature, GPT_HEADER_SIGNATURE_IGNORED,
 	       GPT_HEADER_SIGNATURE_SIZE);
 	EXPECT(GPT_SUCCESS == GptSanityCheck(gpt));
 	EXPECT(MASK_BOTH == gpt->valid_headers);
@@ -1087,9 +1087,9 @@ static int SanityCheckTest(void)
 
 	/* Test correct recognition of IGNOREME in secondary GPT. */
 	BuildTestGptData(gpt);
-	Memset(gpt->secondary_entries, 0, PARTITION_ENTRIES_SIZE);
-	Memset(gpt->secondary_header, 0, sizeof(GptHeader));
-	Memcpy(h2->signature, GPT_HEADER_SIGNATURE_IGNORED,
+	memset(gpt->secondary_entries, 0, PARTITION_ENTRIES_SIZE);
+	memset(gpt->secondary_header, 0, sizeof(GptHeader));
+	memcpy(h2->signature, GPT_HEADER_SIGNATURE_IGNORED,
 	       GPT_HEADER_SIGNATURE_SIZE);
 	EXPECT(GPT_SUCCESS == GptSanityCheck(gpt));
 	EXPECT(MASK_BOTH == gpt->valid_headers);
@@ -1099,9 +1099,9 @@ static int SanityCheckTest(void)
 
 	/* Test that two IGNOREME GPTs are invalid. */
 	ZeroHeadersEntries(gpt);
-	Memcpy(h1->signature, GPT_HEADER_SIGNATURE_IGNORED,
+	memcpy(h1->signature, GPT_HEADER_SIGNATURE_IGNORED,
 	       GPT_HEADER_SIGNATURE_SIZE);
-	Memcpy(h2->signature, GPT_HEADER_SIGNATURE_IGNORED,
+	memcpy(h2->signature, GPT_HEADER_SIGNATURE_IGNORED,
 	       GPT_HEADER_SIGNATURE_SIZE);
 	EXPECT(GPT_ERROR_INVALID_HEADERS == GptSanityCheck(gpt));
 	EXPECT(0 == gpt->valid_headers);
@@ -1111,9 +1111,9 @@ static int SanityCheckTest(void)
 
 	/* Test that one IGNOREME GPT and one corrupted one are invalid. */
 	BuildTestGptData(gpt);
-	Memset(gpt->primary_entries, 0, PARTITION_ENTRIES_SIZE);
-	Memset(gpt->primary_header, 0, sizeof(GptHeader));
-	Memcpy(h1->signature, GPT_HEADER_SIGNATURE_IGNORED,
+	memset(gpt->primary_entries, 0, PARTITION_ENTRIES_SIZE);
+	memset(gpt->primary_header, 0, sizeof(GptHeader));
+	memcpy(h1->signature, GPT_HEADER_SIGNATURE_IGNORED,
 	       GPT_HEADER_SIGNATURE_SIZE);
 	gpt->secondary_entries[0]++;
 	EXPECT(GPT_ERROR_INVALID_ENTRIES == GptSanityCheck(gpt));
@@ -1222,15 +1222,15 @@ static int EntryTypeTest(void)
 	GptData *gpt = GetEmptyGptData();
 	GptEntry *e = (GptEntry *)(gpt->primary_entries);
 
-	Memcpy(&e->type, &guid_zero, sizeof(Guid));
+	memcpy(&e->type, &guid_zero, sizeof(Guid));
 	EXPECT(1 == IsUnusedEntry(e));
 	EXPECT(0 == IsKernelEntry(e));
 
-	Memcpy(&e->type, &guid_kernel, sizeof(Guid));
+	memcpy(&e->type, &guid_kernel, sizeof(Guid));
 	EXPECT(0 == IsUnusedEntry(e));
 	EXPECT(1 == IsKernelEntry(e));
 
-	Memcpy(&e->type, &guid_rootfs, sizeof(Guid));
+	memcpy(&e->type, &guid_rootfs, sizeof(Guid));
 	EXPECT(0 == IsUnusedEntry(e));
 	EXPECT(0 == IsKernelEntry(e));
 
@@ -1240,14 +1240,14 @@ static int EntryTypeTest(void)
 /* Make an entry unused by clearing its type. */
 static void FreeEntry(GptEntry *e)
 {
-	Memset(&e->type, 0, sizeof(Guid));
+	memset(&e->type, 0, sizeof(Guid));
 }
 
 /* Set up an entry. */
 static void FillEntry(GptEntry *e, int is_kernel,
                       int priority, int successful, int tries)
 {
-	Memcpy(&e->type, (is_kernel ? &guid_kernel : &guid_zero), sizeof(Guid));
+	memcpy(&e->type, (is_kernel ? &guid_kernel : &guid_zero), sizeof(Guid));
 	SetEntryPriority(e, priority);
 	SetEntrySuccessful(e, successful);
 	SetEntryTries(e, tries);
@@ -1436,7 +1436,7 @@ static int GptUpdateTest(void)
 	EXPECT(0 == GetEntryTries(e + KERNEL_X));
 
 	/* Can't update if entry isn't a kernel, or there isn't an entry */
-	Memcpy(&e[KERNEL_X].type, &guid_rootfs, sizeof(guid_rootfs));
+	memcpy(&e[KERNEL_X].type, &guid_rootfs, sizeof(guid_rootfs));
 	EXPECT(GPT_ERROR_INVALID_UPDATE_TYPE ==
 	       GptUpdateKernelEntry(gpt, GPT_UPDATE_ENTRY_BAD));
 	gpt->current_kernel = CGPT_KERNEL_ENTRY_NOT_FOUND;
@@ -1566,10 +1566,10 @@ static int GetKernelGuidTest(void)
 	BuildTestGptData(gpt);
 	gpt->current_kernel = 0;
 	GetCurrentKernelUniqueGuid(gpt, &g);
-	EXPECT(!Memcmp(&g, &e[0].unique, sizeof(Guid)));
+	EXPECT(!memcmp(&g, &e[0].unique, sizeof(Guid)));
 	gpt->current_kernel = 1;
 	GetCurrentKernelUniqueGuid(gpt, &g);
-	EXPECT(!Memcmp(&g, &e[1].unique, sizeof(Guid)));
+	EXPECT(!memcmp(&g, &e[1].unique, sizeof(Guid)));
 
 	return TEST_OK;
 }
diff --git a/tests/rollback_index2_tests.c b/tests/rollback_index2_tests.c
index b170a969..ec36d24d 100644
--- a/tests/rollback_index2_tests.c
+++ b/tests/rollback_index2_tests.c
@@ -77,14 +77,14 @@ static void ResetMocks(int fail_on_call, uint32_t fail_with_err)
 	fail_at_count = fail_on_call;
 	fail_with_error = fail_with_err;
 	noise_count = 0;
-	Memset(&noise_on, 0, sizeof(noise_on));
+	memset(&noise_on, 0, sizeof(noise_on));
 
-	Memset(&mock_pflags, 0, sizeof(mock_pflags));
-	Memset(&mock_rsf, 0, sizeof(mock_rsf));
-	Memset(&mock_rsk, 0, sizeof(mock_rsk));
+	memset(&mock_pflags, 0, sizeof(mock_pflags));
+	memset(&mock_rsf, 0, sizeof(mock_rsf));
+	memset(&mock_rsk, 0, sizeof(mock_rsk));
 	mock_permissions = 0;
 
-	Memset(mock_fwmp.buf, 0, sizeof(mock_fwmp.buf));
+	memset(mock_fwmp.buf, 0, sizeof(mock_fwmp.buf));
 	mock_fwmp.fwmp.struct_size = sizeof(mock_fwmp.fwmp);
 	mock_fwmp.fwmp.struct_version = ROLLBACK_SPACE_FWMP_VERSION;
 	mock_fwmp.fwmp.flags = 0x1234;
@@ -151,20 +151,20 @@ uint32_t TlclRead(uint32_t index, void* data, uint32_t length)
 
 	if (FIRMWARE_NV_INDEX == index) {
 		TEST_EQ(length, sizeof(mock_rsf), "TlclRead rsf size");
-		Memcpy(data, &mock_rsf, length);
+		memcpy(data, &mock_rsf, length);
 		MaybeInjectNoise(data, length);
 	} else if (KERNEL_NV_INDEX == index) {
 		TEST_EQ(length, sizeof(mock_rsk), "TlclRead rsk size");
-		Memcpy(data, &mock_rsk, length);
+		memcpy(data, &mock_rsk, length);
 		MaybeInjectNoise(data, length);
 	} else if (FWMP_NV_INDEX == index) {
-		Memset(data, 0, length);
+		memset(data, 0, length);
 		if (length > sizeof(mock_fwmp))
 			length = sizeof(mock_fwmp);
-		Memcpy(data, &mock_fwmp, length);
+		memcpy(data, &mock_fwmp, length);
 		MaybeInjectNoise(data, length);
 	} else {
-		Memset(data, 0, length);
+		memset(data, 0, length);
 	}
 
 	return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS;
@@ -177,11 +177,11 @@ uint32_t TlclWrite(uint32_t index, const void *data, uint32_t length)
 
 	if (FIRMWARE_NV_INDEX == index) {
 		TEST_EQ(length, sizeof(mock_rsf), "TlclWrite rsf size");
-		Memcpy(&mock_rsf, data, length);
+		memcpy(&mock_rsf, data, length);
 		MaybeInjectNoise(&mock_rsf, length);
 	} else if (KERNEL_NV_INDEX == index) {
 		TEST_EQ(length, sizeof(mock_rsk), "TlclWrite rsk size");
-		Memcpy(&mock_rsk, data, length);
+		memcpy(&mock_rsk, data, length);
 		MaybeInjectNoise(&mock_rsk, length);
 	}
 
@@ -210,7 +210,7 @@ uint32_t TlclContinueSelfTest(void)
 uint32_t TlclGetPermanentFlags(TPM_PERMANENT_FLAGS *pflags)
 {
 	mock_cnext += sprintf(mock_cnext, "TlclGetPermanentFlags()\n");
-	Memcpy(pflags, &mock_pflags, sizeof(mock_pflags));
+	memcpy(pflags, &mock_pflags, sizeof(mock_pflags));
 	return (++mock_count == fail_at_count) ? fail_with_error : TPM_SUCCESS;
 }
 
@@ -307,7 +307,7 @@ static void CrcTestFirmware(void)
 
 	/* A write with version < 2 should convert to v2 and create the CRC */
 	ResetMocks(0, 0);
-	Memset(&rsf, 0, sizeof(rsf));
+	memset(&rsf, 0, sizeof(rsf));
 	TEST_EQ(WriteSpaceFirmware(&rsf), 0, "WriteSpaceFirmware(), v0");
 	TEST_EQ(mock_rsf.struct_version, 2, "WriteSpaceFirmware(), check v2");
 	TEST_STR_EQ(mock_calls,
@@ -317,7 +317,7 @@ static void CrcTestFirmware(void)
 
 	/* Same as above, but with some noise during the readback */
 	ResetMocks(0, 0);
-	Memset(&rsf, 0, sizeof(rsf));
+	memset(&rsf, 0, sizeof(rsf));
 	noise_on[1] = 1;
 	noise_on[2] = 1;
 	TEST_EQ(WriteSpaceFirmware(&rsf), 0,
@@ -331,7 +331,7 @@ static void CrcTestFirmware(void)
 
 	/* With noise during the write, we'll try the write again */
 	ResetMocks(0, 0);
-	Memset(&rsf, 0, sizeof(rsf));
+	memset(&rsf, 0, sizeof(rsf));
 	noise_on[0] = 1;
 	TEST_EQ(WriteSpaceFirmware(&rsf), 0,
 		"WriteSpaceFirmware(), write noise");
@@ -347,8 +347,8 @@ static void CrcTestFirmware(void)
 
 	/* Only if it just keeps on failing forever do we eventually give up */
 	ResetMocks(0, 0);
-	Memset(&rsf, 0, sizeof(rsf));
-	Memset(noise_on, 1, sizeof(noise_on));
+	memset(&rsf, 0, sizeof(rsf));
+	memset(noise_on, 1, sizeof(noise_on));
 	TEST_EQ(WriteSpaceFirmware(&rsf), TPM_E_CORRUPTED_STATE,
 		"WriteSpaceFirmware(), always noise");
 	TEST_STR_EQ(mock_calls,
@@ -409,7 +409,7 @@ static void CrcTestKernel(void)
 
 	/* A write with version < 2 should convert to v2 and create the CRC */
 	ResetMocks(0, 0);
-	Memset(&rsk, 0, sizeof(rsk));
+	memset(&rsk, 0, sizeof(rsk));
 	TEST_EQ(WriteSpaceKernel(&rsk), 0, "WriteSpaceKernel(), v0");
 	TEST_EQ(mock_rsk.struct_version, 2, "WriteSpaceKernel(), check v2");
 	TEST_STR_EQ(mock_calls,
@@ -419,7 +419,7 @@ static void CrcTestKernel(void)
 
 	/* Same as above, but with some noise during the readback */
 	ResetMocks(0, 0);
-	Memset(&rsk, 0, sizeof(rsk));
+	memset(&rsk, 0, sizeof(rsk));
 	noise_on[1] = 1;
 	noise_on[2] = 1;
 	TEST_EQ(WriteSpaceKernel(&rsk), 0, "WriteSpaceKernel(), read noise");
@@ -432,7 +432,7 @@ static void CrcTestKernel(void)
 
 	/* With noise during the write, we'll try the write again */
 	ResetMocks(0, 0);
-	Memset(&rsk, 0, sizeof(rsk));
+	memset(&rsk, 0, sizeof(rsk));
 	noise_on[0] = 1;
 	TEST_EQ(WriteSpaceKernel(&rsk), 0, "WriteSpaceKernel(), write noise");
 	TEST_EQ(mock_rsk.struct_version, 2, "WriteSpaceKernel(), check v2");
@@ -447,8 +447,8 @@ static void CrcTestKernel(void)
 
 	/* Only if it just keeps on failing forever do we eventually give up */
 	ResetMocks(0, 0);
-	Memset(&rsk, 0, sizeof(rsk));
-	Memset(noise_on, 1, sizeof(noise_on));
+	memset(&rsk, 0, sizeof(rsk));
+	memset(noise_on, 1, sizeof(noise_on));
 	TEST_EQ(WriteSpaceKernel(&rsk), TPM_E_CORRUPTED_STATE,
 		"WriteSpaceKernel(), always noise");
 	TEST_STR_EQ(mock_calls,
@@ -591,7 +591,7 @@ static void RollbackFwmpTest(void)
 	TEST_STR_EQ(mock_calls,
 		    "TlclRead(0x100a, 40)\n",
 		    "  tlcl calls");
-	TEST_EQ(0, Memcmp(&fwmp, &mock_fwmp, sizeof(fwmp)), "  data");
+	TEST_EQ(0, memcmp(&fwmp, &mock_fwmp, sizeof(fwmp)), "  data");
 
 	/* Read error */
 	ResetMocks(1, TPM_E_IOERROR);
@@ -600,7 +600,7 @@ static void RollbackFwmpTest(void)
 	TEST_STR_EQ(mock_calls,
 		    "TlclRead(0x100a, 40)\n",
 		    "  tlcl calls");
-	TEST_EQ(0, Memcmp(&fwmp, &fwmp_zero, sizeof(fwmp)), "  data clear");
+	TEST_EQ(0, memcmp(&fwmp, &fwmp_zero, sizeof(fwmp)), "  data clear");
 
 	/* Not present isn't an error; just returns empty data */
 	ResetMocks(1, TPM_E_BADINDEX);
@@ -608,7 +608,7 @@ static void RollbackFwmpTest(void)
 	TEST_STR_EQ(mock_calls,
 		    "TlclRead(0x100a, 40)\n",
 		    "  tlcl calls");
-	TEST_EQ(0, Memcmp(&fwmp, &fwmp_zero, sizeof(fwmp)), "  data clear");
+	TEST_EQ(0, memcmp(&fwmp, &fwmp_zero, sizeof(fwmp)), "  data clear");
 
 	/* Struct size too small */
 	ResetMocks(0, 0);
@@ -625,7 +625,7 @@ static void RollbackFwmpTest(void)
 		    "TlclRead(0x100a, 40)\n"
 		    "TlclRead(0x100a, 44)\n",
 		    "  tlcl calls");
-	TEST_EQ(0, Memcmp(&fwmp, &mock_fwmp, sizeof(fwmp)), "  data");
+	TEST_EQ(0, memcmp(&fwmp, &mock_fwmp, sizeof(fwmp)), "  data");
 
 	/* Bad CRC causes retry, then eventual failure */
 	ResetMocks(0, 0);
@@ -653,14 +653,14 @@ static void RollbackFwmpTest(void)
 		    "TlclRead(0x100a, 40)\n"
 		    "TlclRead(0x100a, 44)\n",
 		    "  tlcl calls");
-	TEST_EQ(0, Memcmp(&fwmp, &fwmp_zero, sizeof(fwmp)), "  data");
+	TEST_EQ(0, memcmp(&fwmp, &fwmp_zero, sizeof(fwmp)), "  data");
 
 	/* Minor version difference ok */
 	ResetMocks(0, 0);
 	mock_fwmp.fwmp.struct_version++;
 	RecalcFwmpCrc();
 	TEST_EQ(RollbackFwmpRead(&fwmp), 0, "RollbackFwmpRead() minor version");
-	TEST_EQ(0, Memcmp(&fwmp, &mock_fwmp, sizeof(fwmp)), "  data");
+	TEST_EQ(0, memcmp(&fwmp, &mock_fwmp, sizeof(fwmp)), "  data");
 
 	/* Major version difference not ok */
 	ResetMocks(0, 0);
diff --git a/tests/rsa_padding_test.c b/tests/rsa_padding_test.c
index 2f2423b9..c97acee0 100644
--- a/tests/rsa_padding_test.c
+++ b/tests/rsa_padding_test.c
@@ -50,12 +50,12 @@ static void TestRSAVerify(RSAPublicKey* key) {
                     test_message_sha1_hash), 0, "RSAVerify() wrong alg");
 
   /* Corrupt the signature near start and end */
-  Memcpy(sig, signatures[0], RSA1024NUMBYTES);
+  memcpy(sig, signatures[0], RSA1024NUMBYTES);
   sig[3] ^= 0x42;
   TEST_EQ(RSAVerify(key, sig, RSA1024NUMBYTES, 0, test_message_sha1_hash), 0,
           "RSAVerify() bad sig");
 
-  Memcpy(sig, signatures[0], RSA1024NUMBYTES);
+  memcpy(sig, signatures[0], RSA1024NUMBYTES);
   sig[RSA1024NUMBYTES - 3] ^= 0x56;
   TEST_EQ(RSAVerify(key, sig, RSA1024NUMBYTES, 0, test_message_sha1_hash), 0,
           "RSAVerify() bad sig end");
diff --git a/tests/rsa_utility_tests.c b/tests/rsa_utility_tests.c
index 0ac3f5e7..df1480ad 100644
--- a/tests/rsa_utility_tests.c
+++ b/tests/rsa_utility_tests.c
@@ -79,7 +79,7 @@ static void TestKeyFromBuffer(void) {
 
   for (i = 0; i < 4; i++) {
     uint32_t key_len = RSA1024NUMBYTES << i;
-    Memset(buf, 0xAB, 8 + 2 * RSA8192NUMBYTES);
+    memset(buf, 0xAB, 8 + 2 * RSA8192NUMBYTES);
     *buf_key_len = key_len / sizeof(uint32_t);
     *(buf_key_len + 1) = 0xF00D2345;  /* n0inv */
     buf[8] = 100;
diff --git a/tests/vb20_common3_tests.c b/tests/vb20_common3_tests.c
index 24029293..b4e5bf5e 100644
--- a/tests/vb20_common3_tests.c
+++ b/tests/vb20_common3_tests.c
@@ -47,67 +47,67 @@ static void test_check_keyblock(const struct vb2_public_key *public_key,
 	h = (struct vb2_keyblock *)malloc(hsize + 2048);
 	sig = &h->keyblock_signature;
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_SUCC(vb2_check_keyblock(h, hsize, sig),
 		  "vb2_check_keyblock() ok");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_EQ(vb2_check_keyblock(h, hsize - 1, sig),
 		VB2_ERROR_KEYBLOCK_SIZE, "vb2_check_keyblock() size--");
 
 	/* Buffer is allowed to be bigger than keyblock */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_SUCC(vb2_check_keyblock(h, hsize + 1, sig),
 		  "vb2_check_keyblock() size++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->magic[0] &= 0x12;
 	TEST_EQ(vb2_check_keyblock(h, hsize, sig),
 		VB2_ERROR_KEYBLOCK_MAGIC, "vb2_check_keyblock() magic");
 
 	/* Care about major version but not minor */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_major++;
 	resign_keyblock(h, private_key);
 	TEST_EQ(vb2_check_keyblock(h, hsize, sig),
 		VB2_ERROR_KEYBLOCK_HEADER_VERSION,
 		"vb2_check_keyblock() major++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_major--;
 	resign_keyblock(h, private_key);
 	TEST_EQ(vb2_check_keyblock(h, hsize, sig),
 		VB2_ERROR_KEYBLOCK_HEADER_VERSION,
 		"vb2_check_keyblock() major--");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_minor++;
 	resign_keyblock(h, private_key);
 	TEST_SUCC(vb2_check_keyblock(h, hsize, sig),
 		  "vb2_check_keyblock() minor++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_minor--;
 	resign_keyblock(h, private_key);
 	TEST_SUCC(vb2_check_keyblock(h, hsize, sig),
 		  "vb2_check_keyblock() minor--");
 
 	/* Check signature */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->keyblock_signature.sig_offset = hsize;
 	resign_keyblock(h, private_key);
 	TEST_EQ(vb2_check_keyblock(h, hsize, sig),
 		VB2_ERROR_KEYBLOCK_SIG_OUTSIDE,
 		"vb2_check_keyblock() sig off end");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->keyblock_signature.data_size = h->keyblock_size + 1;
 	TEST_EQ(vb2_check_keyblock(h, hsize, sig),
 		VB2_ERROR_KEYBLOCK_SIGNED_TOO_MUCH,
 		"vb2_check_keyblock() sig data past end of block");
 
 	/* Check that we signed header and data key */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->keyblock_signature.data_size = 4;
 	h->data_key.key_offset = 0;
 	h->data_key.key_size = 0;
@@ -116,7 +116,7 @@ static void test_check_keyblock(const struct vb2_public_key *public_key,
 		VB2_ERROR_KEYBLOCK_SIGNED_TOO_LITTLE,
 		"vb2_check_keyblock() didn't sign header");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->data_key.key_offset = hsize;
 	resign_keyblock(h, private_key);
 	TEST_EQ(vb2_check_keyblock(h, hsize, sig),
@@ -157,24 +157,24 @@ static void test_verify_keyblock(const struct vb2_public_key *public_key,
 	hsize = hdr->keyblock_size;
 	h = (struct vb2_keyblock *)malloc(hsize + 2048);
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_SUCC(vb2_verify_keyblock(h, hsize, public_key, &wb),
 		  "vb2_verify_keyblock() ok using key");
 
 	/* Failures in keyblock check also cause verify to fail */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_EQ(vb2_verify_keyblock(h, hsize - 1, public_key, &wb),
 		VB2_ERROR_KEYBLOCK_SIZE, "vb2_verify_keyblock() check");
 
 	/* Check signature */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->keyblock_signature.sig_size--;
 	resign_keyblock(h, private_key);
 	TEST_EQ(vb2_verify_keyblock(h, hsize, public_key, &wb),
 		VB2_ERROR_KEYBLOCK_SIG_INVALID,
 		"vb2_verify_keyblock() sig too small");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	((uint8_t *)vb2_packed_key_data(&h->data_key))[0] ^= 0x34;
 	TEST_EQ(vb2_verify_keyblock(h, hsize, public_key, &wb),
 		VB2_ERROR_KEYBLOCK_SIG_INVALID,
@@ -232,47 +232,47 @@ static void test_verify_fw_preamble(struct vb2_packed_key *public_key,
 	hsize = (uint32_t) hdr->preamble_size;
 	h = (struct vb2_fw_preamble *)malloc(hsize + 16384);
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_SUCC(vb2_verify_fw_preamble(h, hsize, &rsa, &wb),
 		  "vb2_verify_fw_preamble() ok using key");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_EQ(vb2_verify_fw_preamble(h, 4, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_TOO_SMALL_FOR_HEADER,
 		"vb2_verify_fw_preamble() size tiny");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_EQ(vb2_verify_fw_preamble(h, hsize - 1, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_SIZE,
 		"vb2_verify_fw_preamble() size--");
 
 	/* Buffer is allowed to be bigger than preamble */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_SUCC(vb2_verify_fw_preamble(h, hsize + 1, &rsa, &wb),
 		  "vb2_verify_fw_preamble() size++");
 
 	/* Care about major version but not minor */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_major++;
 	resign_fw_preamble(h, private_key);
 	TEST_EQ(vb2_verify_fw_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_HEADER_VERSION
 		, "vb2_verify_fw_preamble() major++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_major--;
 	resign_fw_preamble(h, private_key);
 	TEST_EQ(vb2_verify_fw_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_HEADER_VERSION,
 		"vb2_verify_fw_preamble() major--");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_minor++;
 	resign_fw_preamble(h, private_key);
 	TEST_SUCC(vb2_verify_fw_preamble(h, hsize, &rsa, &wb),
 		  "vb2_verify_fw_preamble() minor++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_minor--;
 	resign_fw_preamble(h, private_key);
 	TEST_EQ(vb2_verify_fw_preamble(h, hsize, &rsa, &wb),
@@ -280,28 +280,28 @@ static void test_verify_fw_preamble(struct vb2_packed_key *public_key,
 		"vb2_verify_fw_preamble() 2.0 not supported");
 
 	/* Check signature */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->preamble_signature.sig_offset = hsize;
 	resign_fw_preamble(h, private_key);
 	TEST_EQ(vb2_verify_fw_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_SIG_OUTSIDE,
 		"vb2_verify_fw_preamble() sig off end");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->preamble_signature.sig_size--;
 	resign_fw_preamble(h, private_key);
 	TEST_EQ(vb2_verify_fw_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_SIG_INVALID,
 		"vb2_verify_fw_preamble() sig too small");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	((uint8_t *)vb2_packed_key_data(&h->kernel_subkey))[0] ^= 0x34;
 	TEST_EQ(vb2_verify_fw_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_SIG_INVALID,
 		"vb2_verify_fw_preamble() sig mismatch");
 
 	/* Check that we signed header, kernel subkey, and body sig */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->preamble_signature.data_size = 4;
 	h->kernel_subkey.key_offset = 0;
 	h->kernel_subkey.key_size = 0;
@@ -312,14 +312,14 @@ static void test_verify_fw_preamble(struct vb2_packed_key *public_key,
 		VB2_ERROR_PREAMBLE_SIGNED_TOO_LITTLE,
 		"vb2_verify_fw_preamble() didn't sign header");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->kernel_subkey.key_offset = hsize;
 	resign_fw_preamble(h, private_key);
 	TEST_EQ(vb2_verify_fw_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_KERNEL_SUBKEY_OUTSIDE,
 		"vb2_verify_fw_preamble() kernel subkey off end");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->body_signature.sig_offset = hsize;
 	resign_fw_preamble(h, private_key);
 	TEST_EQ(vb2_verify_fw_preamble(h, hsize, &rsa, &wb),
@@ -378,69 +378,69 @@ static void test_verify_kernel_preamble(
 	struct vb2_kernel_preamble *h =
 		(struct vb2_kernel_preamble *)malloc(hsize + 16384);
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_SUCC(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb),
 		  "vb2_verify_kernel_preamble() ok using key");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_EQ(vb2_verify_kernel_preamble(h, 4, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_TOO_SMALL_FOR_HEADER,
 		"vb2_verify_kernel_preamble() size tiny");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_EQ(vb2_verify_kernel_preamble(h, hsize - 1, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_SIZE,
 		"vb2_verify_kernel_preamble() size--");
 
 	/* Buffer is allowed to be bigger than preamble */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	TEST_SUCC(vb2_verify_kernel_preamble(h, hsize + 1, &rsa, &wb),
 		  "vb2_verify_kernel_preamble() size++");
 
 	/* Care about major version but not minor */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_major++;
 	resign_kernel_preamble(h, private_key);
 	TEST_EQ(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_HEADER_VERSION
 		, "vb2_verify_kernel_preamble() major++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_major--;
 	resign_kernel_preamble(h, private_key);
 	TEST_EQ(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_HEADER_VERSION,
 		"vb2_verify_kernel_preamble() major--");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_minor++;
 	resign_kernel_preamble(h, private_key);
 	TEST_SUCC(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb),
 		  "vb2_verify_kernel_preamble() minor++");
 
 	/* Check signature */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->preamble_signature.sig_offset = hsize;
 	resign_kernel_preamble(h, private_key);
 	TEST_EQ(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_SIG_OUTSIDE,
 		"vb2_verify_kernel_preamble() sig off end");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->preamble_signature.sig_size--;
 	resign_kernel_preamble(h, private_key);
 	TEST_EQ(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_SIG_INVALID,
 		"vb2_verify_kernel_preamble() sig too small");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->flags++;
 	TEST_EQ(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_SIG_INVALID,
 		"vb2_verify_kernel_preamble() sig mismatch");
 
 	/* Check that we signed header and body sig */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->preamble_signature.data_size = 4;
 	h->body_signature.sig_offset = 0;
 	h->body_signature.sig_size = 0;
@@ -449,7 +449,7 @@ static void test_verify_kernel_preamble(
 		VB2_ERROR_PREAMBLE_SIGNED_TOO_LITTLE,
 		"vb2_verify_kernel_preamble() didn't sign header");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->body_signature.sig_offset = hsize;
 	resign_kernel_preamble(h, private_key);
 	TEST_EQ(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb),
@@ -457,14 +457,14 @@ static void test_verify_kernel_preamble(
 		"vb2_verify_kernel_preamble() body sig off end");
 
 	/* Check bootloader inside signed body */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->bootloader_address = h->body_load_address - 1;
 	resign_kernel_preamble(h, private_key);
 	TEST_EQ(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_BOOTLOADER_OUTSIDE,
 		"vb2_verify_kernel_preamble() bootloader before body");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->bootloader_address = h->body_load_address +
 		h->body_signature.data_size + 1;
 	resign_kernel_preamble(h, private_key);
@@ -472,7 +472,7 @@ static void test_verify_kernel_preamble(
 		VB2_ERROR_PREAMBLE_BOOTLOADER_OUTSIDE,
 		"vb2_verify_kernel_preamble() bootloader off end of body");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->bootloader_address = h->body_load_address +
 		h->body_signature.data_size + 1;
 	h->bootloader_size = 0;
@@ -481,14 +481,14 @@ static void test_verify_kernel_preamble(
 		  "vb2_verify_kernel_preamble() no bootloader");
 
 	/* Check vmlinuz inside signed body */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->vmlinuz_header_address = h->body_load_address - 1;
 	resign_kernel_preamble(h, private_key);
 	TEST_EQ(vb2_verify_kernel_preamble(h, hsize, &rsa, &wb),
 		VB2_ERROR_PREAMBLE_VMLINUZ_HEADER_OUTSIDE,
 		"vb2_verify_kernel_preamble() vmlinuz_header before body");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->vmlinuz_header_address = h->body_load_address +
 		h->body_signature.data_size + 1;
 	resign_kernel_preamble(h, private_key);
@@ -496,7 +496,7 @@ static void test_verify_kernel_preamble(
 		VB2_ERROR_PREAMBLE_VMLINUZ_HEADER_OUTSIDE,
 		"vb2_verify_kernel_preamble() vmlinuz_header off end of body");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->vmlinuz_header_address = h->body_load_address +
 		h->body_signature.data_size + 1;
 	h->vmlinuz_header_size = 0;
diff --git a/tests/vb20_rsa_padding_tests.c b/tests/vb20_rsa_padding_tests.c
index 3bbebcf6..6fe2e970 100644
--- a/tests/vb20_rsa_padding_tests.c
+++ b/tests/vb20_rsa_padding_tests.c
@@ -52,14 +52,14 @@ static void test_signatures(const struct vb2_public_key *key)
 	vb2_workbuf_init(&wb, workbuf, sizeof(workbuf));
 
 	/* The first test signature is valid. */
-	Memcpy(sig, signatures[0], sizeof(sig));
+	memcpy(sig, signatures[0], sizeof(sig));
 	TEST_SUCC(vb2_rsa_verify_digest(key, sig, test_message_sha1_hash, &wb),
 		  "RSA Padding Test valid sig");
 
 	/* All other signatures should fail verification. */
 	unexpected_success = 0;
 	for (i = 1; i < sizeof(signatures) / sizeof(signatures[0]); i++) {
-		Memcpy(sig, signatures[i], sizeof(sig));
+		memcpy(sig, signatures[i], sizeof(sig));
 		if (!vb2_rsa_verify_digest(key, sig,
 					   test_message_sha1_hash, &wb)) {
 			fprintf(stderr,
@@ -83,11 +83,11 @@ static void test_verify_digest(struct vb2_public_key *key) {
 
 	vb2_workbuf_init(&wb, workbuf, sizeof(workbuf));
 
-	Memcpy(sig, signatures[0], sizeof(sig));
+	memcpy(sig, signatures[0], sizeof(sig));
 	TEST_SUCC(vb2_rsa_verify_digest(key, sig, test_message_sha1_hash, &wb),
 		  "vb2_rsa_verify_digest() good");
 
-	Memcpy(sig, signatures[0], sizeof(sig));
+	memcpy(sig, signatures[0], sizeof(sig));
 	vb2_workbuf_init(&wb, workbuf, sizeof(sig) * 3 - 1);
 	TEST_EQ(vb2_rsa_verify_digest(key, sig, test_message_sha1_hash, &wb),
 		VB2_ERROR_RSA_VERIFY_WORKBUF,
@@ -95,26 +95,26 @@ static void test_verify_digest(struct vb2_public_key *key) {
 	vb2_workbuf_init(&wb, workbuf, sizeof(workbuf));
 
 	key->sig_alg = VB2_SIG_INVALID;
-	Memcpy(sig, signatures[0], sizeof(sig));
+	memcpy(sig, signatures[0], sizeof(sig));
 	TEST_EQ(vb2_rsa_verify_digest(key, sig, test_message_sha1_hash, &wb),
 		VB2_ERROR_RSA_VERIFY_ALGORITHM,
 		"vb2_rsa_verify_digest() bad key alg");
 	key->sig_alg = orig_key_alg;
 
 	key->arrsize *= 2;
-	Memcpy(sig, signatures[0], sizeof(sig));
+	memcpy(sig, signatures[0], sizeof(sig));
 	TEST_EQ(vb2_rsa_verify_digest(key, sig, test_message_sha1_hash, &wb),
 		VB2_ERROR_RSA_VERIFY_SIG_LEN,
 		"vb2_rsa_verify_digest() bad sig len");
 	key->arrsize /= 2;
 
 	/* Corrupt the signature near start and end */
-	Memcpy(sig, signatures[0], sizeof(sig));
+	memcpy(sig, signatures[0], sizeof(sig));
 	sig[3] ^= 0x42;
 	TEST_EQ(vb2_rsa_verify_digest(key, sig, test_message_sha1_hash, &wb),
 		VB2_ERROR_RSA_PADDING, "vb2_rsa_verify_digest() bad sig");
 
-	Memcpy(sig, signatures[0], sizeof(sig));
+	memcpy(sig, signatures[0], sizeof(sig));
 	sig[RSA1024NUMBYTES - 3] ^= 0x56;
 	TEST_EQ(vb2_rsa_verify_digest(key, sig, test_message_sha1_hash, &wb),
 		VB2_ERROR_RSA_PADDING, "vb2_rsa_verify_digest() bad sig end");
diff --git a/tests/vb2_rsa_utility_tests.c b/tests/vb2_rsa_utility_tests.c
index 1293d50f..99282bf7 100644
--- a/tests/vb2_rsa_utility_tests.c
+++ b/tests/vb2_rsa_utility_tests.c
@@ -87,7 +87,7 @@ static void test_utils(void)
 		"Packed key size no signing algorithm");
 
 	/* Test padding check with bad algorithm */
-	Memcpy(sig, signatures[0], sizeof(sig));
+	memcpy(sig, signatures[0], sizeof(sig));
 	TEST_EQ(vb2_check_padding(sig, &kbad),
 		VB2_ERROR_RSA_PADDING_SIZE,
 		"vb2_check_padding() bad padding algorithm/size");
diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c
index cd927a88..be8cdf94 100644
--- a/tests/vboot_api_devmode_tests.c
+++ b/tests/vboot_api_devmode_tests.c
@@ -149,23 +149,23 @@ static note_event_t *expected_event;
 /* Reset mock data (for use before each test) */
 static void ResetMocks(void) {
 
-  Memset(&cparams, 0, sizeof(cparams));
+  memset(&cparams, 0, sizeof(cparams));
   cparams.shared_data_size = sizeof(shared_data);
   cparams.shared_data_blob = shared_data;
   cparams.gbb_data = &gbb;
   cparams.gbb = &gbb;
 
-  Memset(&lkparams, 0, sizeof(lkparams));
+  memset(&lkparams, 0, sizeof(lkparams));
 
-  Memset(&vnc, 0, sizeof(vnc));
+  memset(&vnc, 0, sizeof(vnc));
   VbNvSetup(&vnc);
   VbNvTeardown(&vnc);  /* So CRC gets generated */
 
-  Memset(&shared_data, 0, sizeof(shared_data));
+  memset(&shared_data, 0, sizeof(shared_data));
   VbSharedDataInit(shared, sizeof(shared_data));
   shared->fw_keyblock_flags = 0xABCDE0;
 
-  Memset(&gbb, 0, sizeof(gbb));
+  memset(&gbb, 0, sizeof(gbb));
   gbb.major_version = GBB_MAJOR_VER;
   gbb.minor_version = GBB_MINOR_VER;
   gbb.flags = 0;
@@ -187,12 +187,12 @@ static void ResetMocks(void) {
 /* Mocked verification functions */
 
 VbError_t VbExNvStorageRead(uint8_t* buf) {
-  Memcpy(buf, vnc.raw, sizeof(vnc.raw));
+  memcpy(buf, vnc.raw, sizeof(vnc.raw));
   return VBERROR_SUCCESS;
 }
 
 VbError_t VbExNvStorageWrite(const uint8_t* buf) {
-  Memcpy(vnc.raw, buf, sizeof(vnc.raw));
+  memcpy(vnc.raw, buf, sizeof(vnc.raw));
   return VBERROR_SUCCESS;
 }
 
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c
index c0965a65..c0f31b46 100644
--- a/tests/vboot_api_kernel2_tests.c
+++ b/tests/vboot_api_kernel2_tests.c
@@ -51,13 +51,13 @@ extern struct RollbackSpaceFwmp *VbApiKernelGetFwmp(void);
 /* Reset mock data (for use before each test) */
 static void ResetMocks(void)
 {
-	Memset(&cparams, 0, sizeof(cparams));
+	memset(&cparams, 0, sizeof(cparams));
 	cparams.shared_data_size = sizeof(shared_data);
 	cparams.shared_data_blob = shared_data;
 	cparams.gbb_data = &gbb;
 	cparams.gbb = &gbb;
 
-	Memset(&gbb, 0, sizeof(gbb));
+	memset(&gbb, 0, sizeof(gbb));
 	gbb.major_version = GBB_MAJOR_VER;
 	gbb.minor_version = GBB_MINOR_VER;
 	gbb.flags = 0;
@@ -66,16 +66,16 @@ static void ResetMocks(void)
 	 * Only the outermost vboot_api_kernel call sets vboot_api_kernel's
 	 * vnc.  So clear it here too.
 	 */
-	Memset(VbApiKernelGetVnc(), 0, sizeof(VbNvContext));
+	memset(VbApiKernelGetVnc(), 0, sizeof(VbNvContext));
 	VbNvSetup(VbApiKernelGetVnc());
 	VbNvTeardown(VbApiKernelGetVnc()); /* So CRC gets generated */
 
-	Memset(VbApiKernelGetFwmp(), 0, sizeof(struct RollbackSpaceFwmp));
+	memset(VbApiKernelGetFwmp(), 0, sizeof(struct RollbackSpaceFwmp));
 
-	Memset(&shared_data, 0, sizeof(shared_data));
+	memset(&shared_data, 0, sizeof(shared_data));
 	VbSharedDataInit(shared, sizeof(shared_data));
 
-	Memset(&lkp, 0, sizeof(lkp));
+	memset(&lkp, 0, sizeof(lkp));
 
 	shutdown_request_calls_left = -1;
 	audio_looping_calls_left = 30;
@@ -85,18 +85,18 @@ static void ResetMocks(void)
 	virtdev_set = 0;
 	virtdev_retval = 0;
 
-	Memset(screens_displayed, 0, sizeof(screens_displayed));
+	memset(screens_displayed, 0, sizeof(screens_displayed));
 	screens_count = 0;
 
-	Memset(mock_keypress, 0, sizeof(mock_keypress));
-	Memset(mock_keyflags, 0, sizeof(mock_keyflags));
+	memset(mock_keypress, 0, sizeof(mock_keypress));
+	memset(mock_keyflags, 0, sizeof(mock_keyflags));
 	mock_keypress_count = 0;
 
-	Memset(mock_switches, 0, sizeof(mock_switches));
+	memset(mock_switches, 0, sizeof(mock_switches));
 	mock_switches_count = 0;
 	mock_switches_are_stuck = 0;
 
-	Memset(mock_num_disks, 0, sizeof(mock_num_disks));
+	memset(mock_num_disks, 0, sizeof(mock_num_disks));
 	mock_num_disks_count = 0;
 }
 
diff --git a/tests/vboot_api_kernel3_tests.c b/tests/vboot_api_kernel3_tests.c
index 6ca58f21..0a47fa8b 100644
--- a/tests/vboot_api_kernel3_tests.c
+++ b/tests/vboot_api_kernel3_tests.c
@@ -54,12 +54,12 @@ static uint32_t screens_count = 0;
 /* Reset mock data (for use before each test) */
 static void ResetMocks(void)
 {
-	Memset(&cparams, 0, sizeof(cparams));
+	memset(&cparams, 0, sizeof(cparams));
 	cparams.shared_data_size = sizeof(shared_data);
 	cparams.shared_data_blob = shared_data;
 	cparams.gbb_data = &gbb;
 
-	Memset(&gbb, 0, sizeof(gbb));
+	memset(&gbb, 0, sizeof(gbb));
 	gbb.major_version = GBB_MAJOR_VER;
 	gbb.minor_version = GBB_MINOR_VER;
 	gbb.flags = 0;
@@ -68,11 +68,11 @@ static void ResetMocks(void)
 	 * Only the outermost vboot_api_kernel call sets vboot_api_kernel's
 	 * vnc.  So clear it here too.
 	 */
-	Memset(VbApiKernelGetVnc(), 0, sizeof(VbNvContext));
+	memset(VbApiKernelGetVnc(), 0, sizeof(VbNvContext));
 	VbNvSetup(VbApiKernelGetVnc());
 	VbNvTeardown(VbApiKernelGetVnc()); /* So CRC gets generated */
 
-	Memset(&shared_data, 0, sizeof(shared_data));
+	memset(&shared_data, 0, sizeof(shared_data));
 	VbSharedDataInit(shared, sizeof(shared_data));
 
 	trust_ec = 0;
@@ -89,15 +89,15 @@ static void ResetMocks(void)
 	get_expected_retval = VBERROR_SUCCESS;
 	shutdown_request_calls_left = -1;
 
-	Memset(mock_ec_ro_hash, 0, sizeof(mock_ec_ro_hash));
+	memset(mock_ec_ro_hash, 0, sizeof(mock_ec_ro_hash));
 	mock_ec_ro_hash[0] = 42;
 	mock_ec_ro_hash_size = sizeof(mock_ec_ro_hash);
 
-	Memset(mock_ec_rw_hash, 0, sizeof(mock_ec_rw_hash));
+	memset(mock_ec_rw_hash, 0, sizeof(mock_ec_rw_hash));
 	mock_ec_rw_hash[0] = 42;
 	mock_ec_rw_hash_size = sizeof(mock_ec_rw_hash);
 
-	Memset(want_ec_hash, 0, sizeof(want_ec_hash));
+	memset(want_ec_hash, 0, sizeof(want_ec_hash));
 	want_ec_hash[0] = 42;
 	want_ec_hash_size = sizeof(want_ec_hash);
 
@@ -105,7 +105,7 @@ static void ResetMocks(void)
 
 	// TODO: ensure these are actually needed
 
-	Memset(screens_displayed, 0, sizeof(screens_displayed));
+	memset(screens_displayed, 0, sizeof(screens_displayed));
 	screens_count = 0;
 }
 
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c
index c1ba3d9d..26f92726 100644
--- a/tests/vboot_api_kernel4_tests.c
+++ b/tests/vboot_api_kernel4_tests.c
@@ -38,27 +38,27 @@ static VbError_t vbboot_retval;
 /* Reset mock data (for use before each test) */
 static void ResetMocks(void)
 {
-	Memset(&cparams, 0, sizeof(cparams));
+	memset(&cparams, 0, sizeof(cparams));
 	cparams.shared_data_size = sizeof(shared_data);
 	cparams.shared_data_blob = shared_data;
 	cparams.gbb_data = &gbb;
 	cparams.gbb_size = sizeof(gbb);
 
-	Memset(&kparams, 0, sizeof(kparams));
+	memset(&kparams, 0, sizeof(kparams));
 
-	Memset(&gbb, 0, sizeof(gbb));
+	memset(&gbb, 0, sizeof(gbb));
 	gbb.major_version = GBB_MAJOR_VER;
 	gbb.minor_version = GBB_MINOR_VER;
 	gbb.flags = 0;
 
-	Memset(&vnc, 0, sizeof(vnc));
+	memset(&vnc, 0, sizeof(vnc));
 	VbNvSetup(&vnc);
 	VbNvTeardown(&vnc);                   /* So CRC gets generated */
 
-	Memset(&shared_data, 0, sizeof(shared_data));
+	memset(&shared_data, 0, sizeof(shared_data));
 	VbSharedDataInit(shared, sizeof(shared_data));
 
-	Memset(&rfr_fwmp, 0, sizeof(rfr_fwmp));
+	memset(&rfr_fwmp, 0, sizeof(rfr_fwmp));
 	rfr_retval = TPM_SUCCESS;
 
 	ecsync_retval = VBERROR_SUCCESS;
@@ -71,13 +71,13 @@ static void ResetMocks(void)
 
 VbError_t VbExNvStorageRead(uint8_t *buf)
 {
-	Memcpy(buf, vnc.raw, sizeof(vnc.raw));
+	memcpy(buf, vnc.raw, sizeof(vnc.raw));
 	return VBERROR_SUCCESS;
 }
 
 VbError_t VbExNvStorageWrite(const uint8_t *buf)
 {
-	Memcpy(vnc.raw, buf, sizeof(vnc.raw));
+	memcpy(vnc.raw, buf, sizeof(vnc.raw));
 	return VBERROR_SUCCESS;
 }
 
@@ -106,7 +106,7 @@ uint32_t RollbackKernelLock(int recovery_mode)
 
 uint32_t RollbackFwmpRead(struct RollbackSpaceFwmp *fwmp)
 {
-	Memcpy(fwmp, &rfr_fwmp, sizeof(*fwmp));
+	memcpy(fwmp, &rfr_fwmp, sizeof(*fwmp));
 	return rfr_retval;
 }
 
diff --git a/tests/vboot_api_kernel5_tests.c b/tests/vboot_api_kernel5_tests.c
index a372e178..04ee7669 100644
--- a/tests/vboot_api_kernel5_tests.c
+++ b/tests/vboot_api_kernel5_tests.c
@@ -45,15 +45,15 @@ static int hash_only_check;
  */
 static void ResetMocks(void)
 {
-	Memset(&cparams, 0, sizeof(cparams));
+	memset(&cparams, 0, sizeof(cparams));
 	cparams.shared_data_size = sizeof(shared_data);
 	cparams.shared_data_blob = shared_data;
 	cparams.gbb_data = &gbb;
 	cparams.gbb_size = sizeof(gbb);
 
-	Memset(&kparams, 0, sizeof(kparams));
+	memset(&kparams, 0, sizeof(kparams));
 
-	Memset(&gbb, 0, sizeof(gbb));
+	memset(&gbb, 0, sizeof(gbb));
 	gbb.major_version = GBB_MAJOR_VER;
 	gbb.minor_version = GBB_MINOR_VER;
 	gbb.flags = 0;
@@ -147,7 +147,7 @@ int VerifyData(const uint8_t *data, uint64_t size, const VbSignature *sig,
 
 VbError_t VbExNvStorageRead(uint8_t *buf)
 {
-	Memcpy(buf, vnc.raw, sizeof(vnc.raw));
+	memcpy(buf, vnc.raw, sizeof(vnc.raw));
 	return VBERROR_SUCCESS;
 }
 
diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c
index 05662f52..78cc6cf6 100644
--- a/tests/vboot_api_kernel_tests.c
+++ b/tests/vboot_api_kernel_tests.c
@@ -193,8 +193,8 @@ static uint32_t got_external_mismatch;
  */
 static void ResetMocks(int i)
 {
-	Memset(&lkparams, 0, sizeof(lkparams));
-	Memset(&mock_disks, 0, sizeof(mock_disks));
+	memset(&lkparams, 0, sizeof(lkparams));
+	memset(&mock_disks, 0, sizeof(mock_disks));
 	load_kernel_calls = 0;
 
 	got_recovery_request_val = VBNV_RECOVERY_NOT_REQUESTED;
diff --git a/tests/vboot_audio_tests.c b/tests/vboot_audio_tests.c
index bc6a3efc..4cc6ab28 100644
--- a/tests/vboot_audio_tests.c
+++ b/tests/vboot_audio_tests.c
@@ -60,17 +60,17 @@ void FixChecksum(VbDevMusic *hdr) {
 /* Reset mock data (for use before each test) */
 static void ResetMocks(void) {
   VBDEBUG(("ResetMocks()\n"));
-  Memset(&cparams, 0, sizeof(cparams));
+  memset(&cparams, 0, sizeof(cparams));
   cparams.gbb_data = &gbb;
   cparams.gbb = &gbb;
-  Memset(&gbb, 0, sizeof(gbb));
+  memset(&gbb, 0, sizeof(gbb));
   gbb.major_version = GBB_MAJOR_VER;
   gbb.minor_version = GBB_MINOR_VER;
   gbb.flags = 0;
   use_hdr = (VbDevMusic *)notebuf;
   use_notes = use_hdr->notes;
-  Memcpy(use_hdr, &good_header, sizeof(good_header));
-  Memcpy(use_notes, good_notes, sizeof(good_notes));
+  memcpy(use_hdr, &good_header, sizeof(good_header));
+  memcpy(use_notes, good_notes, sizeof(good_notes));
   FixChecksum(use_hdr);
   use_size = sizeof(notebuf);
 }
diff --git a/tests/vboot_common2_tests.c b/tests/vboot_common2_tests.c
index b5b4b5bf..386f487f 100644
--- a/tests/vboot_common2_tests.c
+++ b/tests/vboot_common2_tests.c
@@ -161,50 +161,50 @@ static void VerifyKernelPreambleTest(const VbPublicKey *public_key,
 		"VerifyKernelPreamble() size++");
 
 	/* Care about major version but not minor */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_major++;
 	ReSignKernelPreamble(h, private_key);
 	TEST_NEQ(VerifyKernelPreamble(h, hsize, rsa), 0,
 		 "VerifyKernelPreamble() major++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_major--;
 	ReSignKernelPreamble(h, private_key);
 	TEST_NEQ(VerifyKernelPreamble(h, hsize, rsa), 0,
 		 "VerifyKernelPreamble() major--");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_minor++;
 	ReSignKernelPreamble(h, private_key);
 	TEST_EQ(VerifyKernelPreamble(h, hsize, rsa), 0,
 		"VerifyKernelPreamble() minor++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_minor--;
 	ReSignKernelPreamble(h, private_key);
 	TEST_EQ(VerifyKernelPreamble(h, hsize, rsa), 0,
 		"VerifyKernelPreamble() minor--");
 
 	/* Check signature */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->preamble_signature.sig_offset = hsize;
 	ReSignKernelPreamble(h, private_key);
 	TEST_NEQ(VerifyKernelPreamble(h, hsize, rsa), 0,
 		 "VerifyKernelPreamble() sig off end");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->preamble_signature.sig_size--;
 	ReSignKernelPreamble(h, private_key);
 	TEST_NEQ(VerifyKernelPreamble(h, hsize, rsa), 0,
 		 "VerifyKernelPreamble() sig too small");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	GetSignatureData(&h->body_signature)[0] ^= 0x34;
 	TEST_NEQ(VerifyKernelPreamble(h, hsize, rsa), 0,
 		 "VerifyKernelPreamble() sig mismatch");
 
 	/* Check that we signed header and body sig */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->preamble_signature.data_size = 4;
 	h->body_signature.sig_offset = 0;
 	h->body_signature.sig_size = 0;
@@ -212,7 +212,7 @@ static void VerifyKernelPreambleTest(const VbPublicKey *public_key,
 	TEST_NEQ(VerifyKernelPreamble(h, hsize, rsa), 0,
 		 "VerifyKernelPreamble() didn't sign header");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->body_signature.sig_offset = hsize;
 	ReSignKernelPreamble(h, private_key);
 	TEST_NEQ(VerifyKernelPreamble(h, hsize, rsa), 0,
diff --git a/tests/vboot_common3_tests.c b/tests/vboot_common3_tests.c
index d146e9e7..390b7f30 100644
--- a/tests/vboot_common3_tests.c
+++ b/tests/vboot_common3_tests.c
@@ -59,79 +59,79 @@ static void KeyBlockVerifyTest(const VbPublicKey *public_key,
 	TEST_EQ(KeyBlockVerify(hdr, hsize + 1, NULL, 1), 0,
 		"KeyBlockVerify() size++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->magic[0] &= 0x12;
 	TEST_NEQ(KeyBlockVerify(h, hsize, NULL, 1), 0,
 		 "KeyBlockVerify() magic");
 
 	/* Care about major version but not minor */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_major++;
 	ReChecksumKeyBlock(h);
 	TEST_NEQ(KeyBlockVerify(h, hsize, NULL, 1), 0,
 		 "KeyBlockVerify() major++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_major--;
 	ReChecksumKeyBlock(h);
 	TEST_NEQ(KeyBlockVerify(h, hsize, NULL, 1), 0,
 		 "KeyBlockVerify() major--");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_minor++;
 	ReChecksumKeyBlock(h);
 	TEST_EQ(KeyBlockVerify(h, hsize, NULL, 1), 0,
 		"KeyBlockVerify() minor++");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->header_version_minor--;
 	ReChecksumKeyBlock(h);
 	TEST_EQ(KeyBlockVerify(h, hsize, NULL, 1), 0,
 		"KeyBlockVerify() minor--");
 
 	/* Check hash */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->key_block_checksum.sig_offset = hsize;
 	ReChecksumKeyBlock(h);
 	TEST_NEQ(KeyBlockVerify(h, hsize, NULL, 1), 0,
 		 "KeyBlockVerify() checksum off end");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->key_block_checksum.sig_size /= 2;
 	ReChecksumKeyBlock(h);
 	TEST_NEQ(KeyBlockVerify(h, hsize, NULL, 1), 0,
 		 "KeyBlockVerify() checksum too small");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	GetPublicKeyData(&h->data_key)[0] ^= 0x34;
 	TEST_NEQ(KeyBlockVerify(h, hsize, NULL, 1), 0,
 		 "KeyBlockVerify() checksum mismatch");
 
 	/* Check signature */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->key_block_signature.sig_offset = hsize;
 	ReChecksumKeyBlock(h);
 	TEST_NEQ(KeyBlockVerify(h, hsize, public_key, 0), 0,
 		 "KeyBlockVerify() sig off end");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->key_block_signature.sig_size--;
 	ReChecksumKeyBlock(h);
 	TEST_NEQ(KeyBlockVerify(h, hsize, public_key, 0), 0,
 		 "KeyBlockVerify() sig too small");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	GetPublicKeyData(&h->data_key)[0] ^= 0x34;
 	TEST_NEQ(KeyBlockVerify(h, hsize, public_key, 0), 0,
 		 "KeyBlockVerify() sig mismatch");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->key_block_checksum.data_size = h->key_block_size + 1;
 	TEST_NEQ(KeyBlockVerify(h, hsize, public_key, 1), 0,
 		 "KeyBlockVerify() checksum data past end of block");
 
 	/* Check that we signed header and data key */
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->key_block_checksum.data_size = 4;
 	h->data_key.key_offset = 0;
 	h->data_key.key_size = 0;
@@ -139,7 +139,7 @@ static void KeyBlockVerifyTest(const VbPublicKey *public_key,
 	TEST_NEQ(KeyBlockVerify(h, hsize, NULL, 1), 0,
 		 "KeyBlockVerify() didn't sign header");
 
-	Memcpy(h, hdr, hsize);
+	memcpy(h, hdr, hsize);
 	h->data_key.key_offset = hsize;
 	ReChecksumKeyBlock(h);
 	TEST_NEQ(KeyBlockVerify(h, hsize, NULL, 1), 0,
diff --git a/tests/vboot_common_tests.c b/tests/vboot_common_tests.c
index 875180b5..d5494d42 100644
--- a/tests/vboot_common_tests.c
+++ b/tests/vboot_common_tests.c
@@ -146,8 +146,8 @@ static void PublicKeyTest(void)
 	VbPublicKey j[5];
 
 	/* Fill some bits of the public key data */
-	Memset(j, 0, sizeof(j));
-	Memset(k, 0x42, sizeof(k));
+	memset(j, 0, sizeof(j));
+	memset(k, 0x42, sizeof(k));
 	k[1].key_size = 12345;
 	k[2].key_version = 67;
 
@@ -178,7 +178,7 @@ static void PublicKeyTest(void)
 	TEST_EQ(k->key_version, j->key_version, "PublicKeyCopy key_version");
 	/* Data should have been copied */
 	TEST_EQ(0,
-		Memcmp(GetPublicKeyData(k), GetPublicKeyData(j), k->key_size),
+		memcmp(GetPublicKeyData(k), GetPublicKeyData(j), k->key_size),
 		"PublicKeyCopy data");
 }
 
@@ -198,7 +198,7 @@ static void VbSharedDataTest(void)
 		 VbSharedDataInit(NULL, VB_SHARED_DATA_MIN_SIZE),
 		 "VbSharedDataInit null");
 
-	Memset(buf, 0x68, sizeof(buf));
+	memset(buf, 0x68, sizeof(buf));
 	TEST_EQ(VBOOT_SUCCESS, VbSharedDataInit(d, VB_SHARED_DATA_MIN_SIZE),
 		"VbSharedDataInit");
 
diff --git a/tests/vboot_display_tests.c b/tests/vboot_display_tests.c
index 6e36f647..99d14f21 100644
--- a/tests/vboot_display_tests.c
+++ b/tests/vboot_display_tests.c
@@ -35,7 +35,7 @@ static void ResetMocks(void)
 {
 	int gbb_used;
 
-	Memset(gbb_data, 0, sizeof(gbb_data));
+	memset(gbb_data, 0, sizeof(gbb_data));
 	gbb->major_version = GBB_MAJOR_VER;
 	gbb->minor_version = GBB_MINOR_VER;
 	gbb->flags = 0;
@@ -55,7 +55,7 @@ static void ResetMocks(void)
 	bhdr->minor_version = BMPBLOCK_MINOR_VERSION;
 	bhdr->number_of_localizations = 3;
 
-	Memset(&cparams, 0, sizeof(cparams));
+	memset(&cparams, 0, sizeof(cparams));
 	cparams.shared_data_size = sizeof(shared_data);
 	cparams.shared_data_blob = shared_data;
 	cparams.gbb_data = gbb;
@@ -75,11 +75,11 @@ static void ResetMocks(void)
 	gbb_used += 64;
 	memcpy(cparams.gbb, gbb, sizeof(*gbb));
 
-	Memset(&vnc, 0, sizeof(vnc));
+	memset(&vnc, 0, sizeof(vnc));
 	VbNvSetup(&vnc);
 	VbNvTeardown(&vnc);                   /* So CRC gets generated */
 
-	Memset(&shared_data, 0, sizeof(shared_data));
+	memset(&shared_data, 0, sizeof(shared_data));
 	VbSharedDataInit(shared, sizeof(shared_data));
 
 	*debug_info = 0;
@@ -235,9 +235,9 @@ static void FontTest(void)
 
 	/* Create font data */
 	h.num_entries = ARRAY_SIZE(eh);
-	Memcpy(buf, &h, sizeof(h));
+	memcpy(buf, &h, sizeof(h));
 	eptr = (FontArrayEntryHeader *)(buf + sizeof(h));
-	Memcpy(eptr, eh, sizeof(eh));
+	memcpy(eptr, eh, sizeof(eh));
 
 	fptr = VbInternalizeFontData((FontArrayHeader *)buf);
 	TEST_PTR_EQ(fptr, buf, "Internalize");
diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c
index 5818db26..e3695ab1 100644
--- a/tests/vboot_kernel_tests.c
+++ b/tests/vboot_kernel_tests.c
@@ -81,7 +81,7 @@ static uint8_t mock_digest[VB2_SHA256_DIGEST_SIZE] = {12, 34, 56, 78};
  */
 static void SetupGptHeader(GptHeader *h, int is_secondary)
 {
-	Memset(h, '\0', MOCK_SECTOR_SIZE);
+	memset(h, '\0', MOCK_SECTOR_SIZE);
 
 	/* "EFI PART" */
 	memcpy(h->signature, GPT_HEADER_SIGNATURE, GPT_HEADER_SIGNATURE_SIZE);
@@ -302,7 +302,7 @@ int vb2_digest_buffer(const uint8_t *buf,
 		      uint8_t *digest,
 		      uint32_t digest_size)
 {
-	Memcpy(digest, mock_digest, sizeof(mock_digest));
+	memcpy(digest, mock_digest, sizeof(mock_digest));
 	return VB2_SUCCESS;
 }
 
@@ -329,7 +329,7 @@ static void ReadWriteGptTest(void)
 	 * Valgrind complains about access to uninitialized memory here, so
 	 * zero the primary header before each test.
 	 */
-	Memset(g.primary_header, '\0', g.sector_bytes);
+	memset(g.primary_header, '\0', g.sector_bytes);
 	TEST_EQ(WriteAndFreeGptData(handle, &g), 0, "WriteAndFree");
 	TEST_CALLS("");
 
@@ -338,7 +338,7 @@ static void ReadWriteGptTest(void)
 	 * check that AllocAndReadGptData still succeeds
 	 */
 	ResetMocks();
-	Memset(mock_gpt_primary, '\0', sizeof(*mock_gpt_primary));
+	memset(mock_gpt_primary, '\0', sizeof(*mock_gpt_primary));
 	TEST_EQ(AllocAndReadGptData(handle, &g), 0,
 		"AllocAndRead primary invalid");
 	TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors,
@@ -357,7 +357,7 @@ static void ReadWriteGptTest(void)
 	 * check that AllocAndReadGptData still succeeds
 	 */
 	ResetMocks();
-	Memset(mock_gpt_secondary, '\0', sizeof(*mock_gpt_secondary));
+	memset(mock_gpt_secondary, '\0', sizeof(*mock_gpt_secondary));
 	TEST_EQ(AllocAndReadGptData(handle, &g), 0,
 		"AllocAndRead secondary invalid");
 	TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors,
@@ -376,8 +376,8 @@ static void ReadWriteGptTest(void)
 	 * check that AllocAndReadGptData fails.
 	 */
 	ResetMocks();
-	Memset(mock_gpt_primary, '\0', sizeof(*mock_gpt_primary));
-	Memset(mock_gpt_secondary, '\0', sizeof(*mock_gpt_secondary));
+	memset(mock_gpt_primary, '\0', sizeof(*mock_gpt_primary));
+	memset(mock_gpt_secondary, '\0', sizeof(*mock_gpt_secondary));
 	TEST_EQ(AllocAndReadGptData(handle, &g), 1,
 		"AllocAndRead primary and secondary invalid");
 	TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors,
@@ -398,7 +398,7 @@ static void ReadWriteGptTest(void)
 	 * but this callback is mocked in these tests.
 	 */
 	ResetMocks();
-	Memset(mock_gpt_primary, '\0', sizeof(*mock_gpt_primary));
+	memset(mock_gpt_primary, '\0', sizeof(*mock_gpt_primary));
 	TEST_EQ(AllocAndReadGptData(handle, &g), 0,
 		"Fix Primary GPT: AllocAndRead");
 	/* Call GptRepair() with input indicating secondary GPT is valid */
@@ -423,7 +423,7 @@ static void ReadWriteGptTest(void)
 	 * but this callback is mocked in these tests.
 	 */
 	ResetMocks();
-	Memset(mock_gpt_secondary, '\0', sizeof(*mock_gpt_secondary));
+	memset(mock_gpt_secondary, '\0', sizeof(*mock_gpt_secondary));
 	TEST_EQ(AllocAndReadGptData(handle, &g), 0,
 		"Fix Secondary GPT: AllocAndRead");
 	/* Call GptRepair() with input indicating primary GPT is valid */
@@ -445,7 +445,7 @@ static void ReadWriteGptTest(void)
 	AllocAndReadGptData(handle, &g);
 	g.modified |= GPT_MODIFIED_HEADER1 | GPT_MODIFIED_ENTRIES1;
 	ResetCallLog();
-	Memset(g.primary_header, '\0', g.sector_bytes);
+	memset(g.primary_header, '\0', g.sector_bytes);
 	h = (GptHeader*)g.primary_header;
 	h->entries_lba = 2;
 	h->number_of_entries = MAX_NUMBER_OF_ENTRIES;
@@ -459,7 +459,7 @@ static void ReadWriteGptTest(void)
 	AllocAndReadGptData(handle, &g);
 	g.modified = -1;
 	ResetCallLog();
-	Memset(g.primary_header, '\0', g.sector_bytes);
+	memset(g.primary_header, '\0', g.sector_bytes);
 	h = (GptHeader*)g.primary_header;
 	h->entries_lba = 2;
 	h->number_of_entries = MAX_NUMBER_OF_ENTRIES;
@@ -529,14 +529,14 @@ static void ReadWriteGptTest(void)
 	disk_write_to_fail = 1;
 	AllocAndReadGptData(handle, &g);
 	g.modified = -1;
-	Memset(g.primary_header, '\0', g.sector_bytes);
+	memset(g.primary_header, '\0', g.sector_bytes);
 	TEST_NEQ(WriteAndFreeGptData(handle, &g), 0, "WriteAndFree disk fail");
 
 	ResetMocks();
 	disk_write_to_fail = 2;
 	AllocAndReadGptData(handle, &g);
 	g.modified = -1;
-	Memset(g.primary_header, '\0', g.sector_bytes);
+	memset(g.primary_header, '\0', g.sector_bytes);
 	h = (GptHeader*)g.primary_header;
 	h->entries_lba = 2;
 	TEST_NEQ(WriteAndFreeGptData(handle, &g), 0, "WriteAndFree disk fail");
@@ -545,14 +545,14 @@ static void ReadWriteGptTest(void)
 	disk_write_to_fail = 991;
 	AllocAndReadGptData(handle, &g);
 	g.modified = -1;
-	Memset(g.primary_header, '\0', g.sector_bytes);
+	memset(g.primary_header, '\0', g.sector_bytes);
 	TEST_NEQ(WriteAndFreeGptData(handle, &g), 0, "WriteAndFree disk fail");
 
 	ResetMocks();
 	disk_write_to_fail = 1023;
 	AllocAndReadGptData(handle, &g);
 	g.modified = -1;
-	Memset(g.primary_header, '\0', g.sector_bytes);
+	memset(g.primary_header, '\0', g.sector_bytes);
 	TEST_NEQ(WriteAndFreeGptData(handle, &g), 0, "WriteAndFree disk fail");
 
 }
diff --git a/tests/vboot_region_tests.c b/tests/vboot_region_tests.c
index 6dd6b624..d087f0ad 100644
--- a/tests/vboot_region_tests.c
+++ b/tests/vboot_region_tests.c
@@ -45,17 +45,17 @@ static void ResetMocks(void) {
 	ScreenLayout *layout;
 	int gbb_used;
 
-	Memset(&vnc, 0, sizeof(vnc));
+	memset(&vnc, 0, sizeof(vnc));
 	VbNvSetup(&vnc);
 	VbNvTeardown(&vnc);                   /* So CRC gets generated */
 
-	Memset(&cparams, 0, sizeof(cparams));
+	memset(&cparams, 0, sizeof(cparams));
 	cparams.shared_data_size = sizeof(shared_data);
 	cparams.shared_data_blob = shared_data;
 
-	Memset(&fparams, 0, sizeof(fparams));
+	memset(&fparams, 0, sizeof(fparams));
 
-	Memset(gbb_data, 0, sizeof(gbb_data));
+	memset(gbb_data, 0, sizeof(gbb_data));
 	gbb = (GoogleBinaryBlockHeader *)gbb_data;
 	gbb->major_version = GBB_MAJOR_VER;
 	gbb->minor_version = GBB_MINOR_VER;
@@ -102,7 +102,7 @@ static void ResetMocks(void) {
 	image_info->compression = COMPRESS_LZMA1;
 	gbb_used += sizeof(*image_info) + COMPRESSED_SIZE;
 
-	Memset(&shared_data, 0, sizeof(shared_data));
+	memset(&shared_data, 0, sizeof(shared_data));
 	VbSharedDataInit(shared, sizeof(shared_data));
 	shared->fw_keyblock_flags = 0xABCDE0;
 
@@ -116,12 +116,12 @@ static void ResetMocks(void) {
 /* Mocked verification functions */
 
 VbError_t VbExNvStorageRead(uint8_t* buf) {
-  Memcpy(buf, vnc.raw, sizeof(vnc.raw));
+  memcpy(buf, vnc.raw, sizeof(vnc.raw));
   return VBERROR_SUCCESS;
 }
 
 VbError_t VbExNvStorageWrite(const uint8_t* buf) {
-  Memcpy(vnc.raw, buf, sizeof(vnc.raw));
+  memcpy(vnc.raw, buf, sizeof(vnc.raw));
   return VBERROR_SUCCESS;
 }