diff options
Diffstat (limited to 'firmware/lib')
-rw-r--r-- | firmware/lib/cgptlib/cgptlib.c | 2 | ||||
-rw-r--r-- | firmware/lib/cgptlib/cgptlib_internal.c | 26 | ||||
-rw-r--r-- | firmware/lib/cryptolib/rsa.c | 2 | ||||
-rw-r--r-- | firmware/lib/gpt_misc.c | 12 | ||||
-rw-r--r-- | firmware/lib/include/sysincludes.h | 1 | ||||
-rw-r--r-- | firmware/lib/include/utility.h | 28 | ||||
-rw-r--r-- | firmware/lib/mocked_rollback_index.c | 2 | ||||
-rw-r--r-- | firmware/lib/region-init.c | 2 | ||||
-rw-r--r-- | firmware/lib/region-kernel.c | 2 | ||||
-rw-r--r-- | firmware/lib/rollback_index.c | 14 | ||||
-rw-r--r-- | firmware/lib/stateful_util.c | 6 | ||||
-rw-r--r-- | firmware/lib/tpm2_lite/marshaling.c | 16 | ||||
-rw-r--r-- | firmware/lib/tpm2_lite/tlcl.c | 10 | ||||
-rw-r--r-- | firmware/lib/tpm_lite/mocked_tlcl.c | 12 | ||||
-rw-r--r-- | firmware/lib/tpm_lite/tlcl.c | 34 | ||||
-rw-r--r-- | firmware/lib/utility_string.c | 2 | ||||
-rw-r--r-- | firmware/lib/vboot_api_kernel.c | 10 | ||||
-rw-r--r-- | firmware/lib/vboot_audio.c | 6 | ||||
-rw-r--r-- | firmware/lib/vboot_common.c | 2 | ||||
-rw-r--r-- | firmware/lib/vboot_common_init.c | 2 | ||||
-rw-r--r-- | firmware/lib/vboot_display.c | 2 | ||||
-rw-r--r-- | firmware/lib/vboot_kernel.c | 6 | ||||
-rw-r--r-- | firmware/lib/vboot_nvstorage.c | 2 |
23 files changed, 88 insertions, 113 deletions
diff --git a/firmware/lib/cgptlib/cgptlib.c b/firmware/lib/cgptlib/cgptlib.c index 11512a0e..954ca5fa 100644 --- a/firmware/lib/cgptlib/cgptlib.c +++ b/firmware/lib/cgptlib/cgptlib.c @@ -220,7 +220,7 @@ GptEntry *GptFindNthEntry(GptData *gpt, const Guid *guid, unsigned int n) int i; for (i = 0, e = entries; i < header->number_of_entries; i++, e++) { - if (!Memcmp(&e->type, guid, sizeof(*guid))) { + if (!memcmp(&e->type, guid, sizeof(*guid))) { if (n == 0) return e; n--; diff --git a/firmware/lib/cgptlib/cgptlib_internal.c b/firmware/lib/cgptlib/cgptlib_internal.c index d09fa090..9f37def6 100644 --- a/firmware/lib/cgptlib/cgptlib_internal.c +++ b/firmware/lib/cgptlib/cgptlib_internal.c @@ -75,9 +75,9 @@ int CheckHeader(GptHeader *h, int is_secondary, * Make sure we're looking at a header of reasonable size before * attempting to calculate CRC. */ - if (Memcmp(h->signature, GPT_HEADER_SIGNATURE, + if (memcmp(h->signature, GPT_HEADER_SIGNATURE, GPT_HEADER_SIGNATURE_SIZE) && - Memcmp(h->signature, GPT_HEADER_SIGNATURE2, + memcmp(h->signature, GPT_HEADER_SIGNATURE2, GPT_HEADER_SIGNATURE_SIZE)) return 1; if (h->revision != GPT_HEADER_REVISION) @@ -154,7 +154,7 @@ int CheckHeader(GptHeader *h, int is_secondary, int IsKernelEntry(const GptEntry *e) { static Guid chromeos_kernel = GPT_ENT_TYPE_CHROMEOS_KERNEL; - return !Memcmp(&e->type, &chromeos_kernel, sizeof(Guid)); + return !memcmp(&e->type, &chromeos_kernel, sizeof(Guid)); } int CheckEntries(GptEntry *entries, GptHeader *h) @@ -199,7 +199,7 @@ int CheckEntries(GptEntry *entries, GptHeader *h) return GPT_ERROR_END_LBA_OVERLAP; /* UniqueGuid field must be unique. */ - if (0 == Memcmp(&entry->unique, &e2->unique, + if (0 == memcmp(&entry->unique, &e2->unique, sizeof(Guid))) return GPT_ERROR_DUP_GUID; } @@ -211,7 +211,7 @@ int CheckEntries(GptEntry *entries, GptHeader *h) int HeaderFieldsSame(GptHeader *h1, GptHeader *h2) { - if (Memcmp(h1->signature, h2->signature, sizeof(h1->signature))) + if (memcmp(h1->signature, h2->signature, sizeof(h1->signature))) return 1; if (h1->revision != h2->revision) return 1; @@ -223,7 +223,7 @@ int HeaderFieldsSame(GptHeader *h1, GptHeader *h2) return 1; if (h1->last_usable_lba != h2->last_usable_lba) return 1; - if (Memcmp(&h1->disk_uuid, &h2->disk_uuid, sizeof(Guid))) + if (memcmp(&h1->disk_uuid, &h2->disk_uuid, sizeof(Guid))) return 1; if (h1->number_of_entries != h2->number_of_entries) return 1; @@ -257,7 +257,7 @@ int GptSanityCheck(GptData *gpt) gpt->gpt_drive_sectors, gpt->flags)) { gpt->valid_headers |= MASK_PRIMARY; goodhdr = header1; - } else if (header1 && !Memcmp(header1->signature, + } else if (header1 && !memcmp(header1->signature, GPT_HEADER_SIGNATURE_IGNORED, GPT_HEADER_SIGNATURE_SIZE)) { gpt->ignored |= MASK_PRIMARY; } @@ -266,7 +266,7 @@ int GptSanityCheck(GptData *gpt) gpt->valid_headers |= MASK_SECONDARY; if (!goodhdr) goodhdr = header2; - } else if (header2 && !Memcmp(header2->signature, + } else if (header2 && !memcmp(header2->signature, GPT_HEADER_SIGNATURE_IGNORED, GPT_HEADER_SIGNATURE_SIZE)) { gpt->ignored |= MASK_SECONDARY; } @@ -344,7 +344,7 @@ void GptRepair(GptData *gpt) /* Repair headers if necessary */ if (MASK_PRIMARY == gpt->valid_headers) { /* Primary is good, secondary is bad */ - Memcpy(header2, header1, sizeof(GptHeader)); + memcpy(header2, header1, sizeof(GptHeader)); header2->my_lba = gpt->gpt_drive_sectors - GPT_HEADER_SECTORS; header2->alternate_lba = GPT_PMBR_SECTORS; /* Second sector. */ header2->entries_lba = header2->my_lba - CalculateEntriesSectors(header1); @@ -353,7 +353,7 @@ void GptRepair(GptData *gpt) } else if (MASK_SECONDARY == gpt->valid_headers) { /* Secondary is good, primary is bad */ - Memcpy(header1, header2, sizeof(GptHeader)); + memcpy(header1, header2, sizeof(GptHeader)); header1->my_lba = GPT_PMBR_SECTORS; /* Second sector. */ header1->alternate_lba = gpt->streaming_drive_sectors - GPT_HEADER_SECTORS; @@ -368,12 +368,12 @@ void GptRepair(GptData *gpt) entries_size = header1->size_of_entry * header1->number_of_entries; if (MASK_PRIMARY == gpt->valid_entries) { /* Primary is good, secondary is bad */ - Memcpy(entries2, entries1, entries_size); + memcpy(entries2, entries1, entries_size); gpt->modified |= GPT_MODIFIED_ENTRIES2; } else if (MASK_SECONDARY == gpt->valid_entries) { /* Secondary is good, primary is bad */ - Memcpy(entries1, entries2, entries_size); + memcpy(entries1, entries2, entries_size); gpt->modified |= GPT_MODIFIED_ENTRIES1; } gpt->valid_entries = MASK_BOTH; @@ -440,7 +440,7 @@ void GetCurrentKernelUniqueGuid(GptData *gpt, void *dest) { GptEntry *entries = (GptEntry *)gpt->primary_entries; GptEntry *e = entries + gpt->current_kernel; - Memcpy(dest, &e->unique, sizeof(Guid)); + memcpy(dest, &e->unique, sizeof(Guid)); } void GptModified(GptData *gpt) { diff --git a/firmware/lib/cryptolib/rsa.c b/firmware/lib/cryptolib/rsa.c index 6d61a216..db60d2d2 100644 --- a/firmware/lib/cryptolib/rsa.c +++ b/firmware/lib/cryptolib/rsa.c @@ -158,7 +158,7 @@ int RSAVerify(const RSAPublicKey *key, buf = (uint8_t*) VbExMalloc(sig_len); if (!buf) return 0; - Memcpy(buf, sig, sig_len); + memcpy(buf, sig, sig_len); modpowF4(key, buf); diff --git a/firmware/lib/gpt_misc.c b/firmware/lib/gpt_misc.c index 3957cb89..d843b21e 100644 --- a/firmware/lib/gpt_misc.c +++ b/firmware/lib/gpt_misc.c @@ -47,7 +47,7 @@ int AllocAndReadGptData(VbExDiskHandle_t disk_handle, GptData *gptdata) /* Read primary header from the drive, skipping the protective MBR */ if (0 != VbExDiskRead(disk_handle, 1, 1, gptdata->primary_header)) { VBDEBUG(("Read error in primary GPT header\n")); - Memset(gptdata->primary_header, 0, gptdata->sector_bytes); + memset(gptdata->primary_header, 0, gptdata->sector_bytes); } /* Only read primary GPT if the primary header is valid */ @@ -71,7 +71,7 @@ int AllocAndReadGptData(VbExDiskHandle_t disk_handle, GptData *gptdata) } } else { VBDEBUG(("Primary GPT header is %s\n", - Memcmp(primary_header->signature, + memcmp(primary_header->signature, GPT_HEADER_SIGNATURE_IGNORED, GPT_HEADER_SIGNATURE_SIZE) ? "invalid" : "being ignored")); @@ -81,7 +81,7 @@ int AllocAndReadGptData(VbExDiskHandle_t disk_handle, GptData *gptdata) if (0 != VbExDiskRead(disk_handle, gptdata->gpt_drive_sectors - 1, 1, gptdata->secondary_header)) { VBDEBUG(("Read error in secondary GPT header\n")); - Memset(gptdata->secondary_header, 0, gptdata->sector_bytes); + memset(gptdata->secondary_header, 0, gptdata->sector_bytes); } /* Only read secondary GPT if the secondary header is valid */ @@ -105,7 +105,7 @@ int AllocAndReadGptData(VbExDiskHandle_t disk_handle, GptData *gptdata) } } else { VBDEBUG(("Secondary GPT header is %s\n", - Memcmp(secondary_header->signature, + memcmp(secondary_header->signature, GPT_HEADER_SIGNATURE_IGNORED, GPT_HEADER_SIGNATURE_SIZE) ? "invalid" : "being ignored")); @@ -151,7 +151,7 @@ int WriteAndFreeGptData(VbExDiskHandle_t disk_handle, GptData *gptdata) "marked to be ignored.\n")); skip_primary = 1; } else if (gptdata->modified & GPT_MODIFIED_HEADER1) { - if (!Memcmp(h->signature, GPT_HEADER_SIGNATURE2, + if (!memcmp(h->signature, GPT_HEADER_SIGNATURE2, GPT_HEADER_SIGNATURE_SIZE)) { VBDEBUG(("Not updating primary GPT: " "legacy mode is enabled.\n")); @@ -219,7 +219,7 @@ fail: int IsUnusedEntry(const GptEntry *e) { static Guid zero = {{{0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0}}}}; - return !Memcmp(&zero, (const uint8_t*)(&e->type), sizeof(zero)); + return !memcmp(&zero, (const uint8_t*)(&e->type), sizeof(zero)); } /* diff --git a/firmware/lib/include/sysincludes.h b/firmware/lib/include/sysincludes.h index 490b51cc..7a9139c0 100644 --- a/firmware/lib/include/sysincludes.h +++ b/firmware/lib/include/sysincludes.h @@ -19,6 +19,7 @@ #include <stddef.h> #include <stdint.h> #include <stdlib.h> +#include <string.h> #if defined(HAVE_ENDIAN_H) && defined(HAVE_LITTLE_ENDIAN) #include <byteswap.h> diff --git a/firmware/lib/include/utility.h b/firmware/lib/include/utility.h index 66093781..aaddb8c8 100644 --- a/firmware/lib/include/utility.h +++ b/firmware/lib/include/utility.h @@ -47,36 +47,13 @@ #define Min(a, b) (((a) < (b)) ? (a) : (b)) /** - * Compare [n] bytes in [src1] and [src2]. - * - * Returns an integer less than, equal to, or greater than zero if the first - * [n] bytes of [src1] is found, respectively, to be less than, to match, or be - * greater than the first n bytes of [src2]. */ -int Memcmp(const void *src1, const void *src2, size_t n); - -/** - * Copy [n] bytes from [src] to [dest]. - */ -void *Memcpy(void *dest, const void *src, uint64_t n); - -/* - * Implementations of the functions below must be built as part of the firmware - * and defined in lib/utility.c. - */ - -/** - * Set [n] bytes starting at [s] to [c]. Returns dest. - */ -void *Memset(void *dest, const uint8_t c, uint64_t n); - -/** * Compare [n] bytes starting at [s1] with [s2] and return 0 if they * match, 1 if they don't. Returns 0 if n=0, since no bytes mismatched. * * Time taken to perform the comparison is only dependent on [n] and * not on the relationship of the match between [s1] and [s2]. * - * Note that unlike Memcmp(), this only indicates inequality, not + * Note that unlike memcmp(), this only indicates inequality, not * whether s1 is less than or greater than s2. */ int SafeMemcmp(const void *s1, const void *s2, size_t n); @@ -108,9 +85,6 @@ uint32_t StrnAppend(char *dest, const char *src, uint32_t destlen); #ifndef _STUB_IMPLEMENTATION_ #define malloc _do_not_use_standard_malloc #define free _do_not_use_standard_free -#define memcmp _do_not_use_standard_memcmp -#define memcpy _do_not_use_standard_memcpy -#define memset _do_not_use_standard_memset #endif #endif /* VBOOT_REFERENCE_UTILITY_H_ */ diff --git a/firmware/lib/mocked_rollback_index.c b/firmware/lib/mocked_rollback_index.c index e8c1fdbb..a4b0ceb0 100644 --- a/firmware/lib/mocked_rollback_index.c +++ b/firmware/lib/mocked_rollback_index.c @@ -42,6 +42,6 @@ uint32_t RollbackKernelLock(int recovery_mode) uint32_t RollbackFwmpRead(struct RollbackSpaceFwmp *fwmp) { - Memset(fwmp, 0, sizeof(*fwmp)); + memset(fwmp, 0, sizeof(*fwmp)); return TPM_SUCCESS; } diff --git a/firmware/lib/region-init.c b/firmware/lib/region-init.c index bec0450d..26602b54 100644 --- a/firmware/lib/region-init.c +++ b/firmware/lib/region-init.c @@ -25,7 +25,7 @@ VbError_t VbRegionReadData(VbCommonParams *cparams, if (region == VB_REGION_GBB && cparams->gbb_data) { if (offset + size > cparams->gbb_size) return VBERROR_INVALID_GBB; - Memcpy(buf, cparams->gbb_data + offset, size); + memcpy(buf, cparams->gbb_data + offset, size); } else #ifdef REGION_READ { diff --git a/firmware/lib/region-kernel.c b/firmware/lib/region-kernel.c index e6303978..c87db427 100644 --- a/firmware/lib/region-kernel.c +++ b/firmware/lib/region-kernel.c @@ -45,7 +45,7 @@ VbError_t VbGbbReadBmpHeader(VbCommonParams *cparams, BmpBlockHeader *hdr_ret) } /* Sanity-check the bitmap block header */ - if ((0 != Memcmp(hdr->signature, BMPBLOCK_SIGNATURE, + if ((0 != memcmp(hdr->signature, BMPBLOCK_SIGNATURE, BMPBLOCK_SIGNATURE_SIZE)) || (hdr->major_version > BMPBLOCK_MAJOR_VERSION) || ((hdr->major_version == BMPBLOCK_MAJOR_VERSION) && diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c index cf446d98..2ba44ec3 100644 --- a/firmware/lib/rollback_index.c +++ b/firmware/lib/rollback_index.c @@ -257,7 +257,7 @@ uint32_t RollbackKernelLock(int recovery_mode) uint32_t RollbackFwmpRead(struct RollbackSpaceFwmp *fwmp) { - Memset(fwmp, 0, sizeof(*fwmp)); + memset(fwmp, 0, sizeof(*fwmp)); return TPM_SUCCESS; } @@ -285,13 +285,13 @@ uint32_t RollbackKernelRead(uint32_t* version) uint32_t perms, uid; RETURN_ON_FAILURE(TlclGetPermissions(KERNEL_NV_INDEX, &perms)); - Memcpy(&uid, &rsk.uid, sizeof(uid)); + memcpy(&uid, &rsk.uid, sizeof(uid)); if (TPM_NV_PER_PPWRITE != perms || ROLLBACK_SPACE_KERNEL_UID != uid) return TPM_E_CORRUPTED_STATE; } #endif - Memcpy(version, &rsk.kernel_versions, sizeof(*version)); + memcpy(version, &rsk.kernel_versions, sizeof(*version)); VBDEBUG(("TPM: RollbackKernelRead %x\n", (int)*version)); return TPM_SUCCESS; } @@ -301,10 +301,10 @@ uint32_t RollbackKernelWrite(uint32_t version) RollbackSpaceKernel rsk; uint32_t old_version; RETURN_ON_FAILURE(ReadSpaceKernel(&rsk)); - Memcpy(&old_version, &rsk.kernel_versions, sizeof(old_version)); + memcpy(&old_version, &rsk.kernel_versions, sizeof(old_version)); VBDEBUG(("TPM: RollbackKernelWrite %x --> %x\n", (int)old_version, (int)version)); - Memcpy(&rsk.kernel_versions, &version, sizeof(version)); + memcpy(&rsk.kernel_versions, &version, sizeof(version)); return WriteSpaceKernel(&rsk); } @@ -337,7 +337,7 @@ uint32_t RollbackFwmpRead(struct RollbackSpaceFwmp *fwmp) int attempts = 3; /* Clear destination in case error or FWMP not present */ - Memset(fwmp, 0, sizeof(*fwmp)); + memset(fwmp, 0, sizeof(*fwmp)); while (attempts--) { /* Try to read entire 1.0 struct */ @@ -390,7 +390,7 @@ uint32_t RollbackFwmpRead(struct RollbackSpaceFwmp *fwmp) * we would need to take care of initializing the extra fields * added in 1.1+. But that's not an issue yet. */ - Memcpy(fwmp, &u.bf, sizeof(*fwmp)); + memcpy(fwmp, &u.bf, sizeof(*fwmp)); return TPM_SUCCESS; } diff --git a/firmware/lib/stateful_util.c b/firmware/lib/stateful_util.c index fbbc48c9..f0718f6d 100644 --- a/firmware/lib/stateful_util.c +++ b/firmware/lib/stateful_util.c @@ -38,7 +38,7 @@ void *StatefulMemcpy(MemcpyState *state, void *dst, uint64_t len) state->overrun = 1; return NULL; } - Memcpy(dst, state->remaining_buf, len); + memcpy(dst, state->remaining_buf, len); state->remaining_buf += len; state->remaining_len -= len; return dst; @@ -52,7 +52,7 @@ const void *StatefulMemcpy_r(MemcpyState *state, const void *src, uint64_t len) state->overrun = 1; return NULL; } - Memcpy(state->remaining_buf, src, len); + memcpy(state->remaining_buf, src, len); state->remaining_buf += len; state->remaining_len -= len; return src; @@ -67,7 +67,7 @@ const void *StatefulMemset_r(MemcpyState *state, const uint8_t val, state->overrun = 1; return NULL; } - Memset(state->remaining_buf, val, len); + memset(state->remaining_buf, val, len); state->remaining_buf += len; state->remaining_len -= len; return state; /* Must return something non-NULL. */ diff --git a/firmware/lib/tpm2_lite/marshaling.c b/firmware/lib/tpm2_lite/marshaling.c index 786bfc0b..a51c1f66 100644 --- a/firmware/lib/tpm2_lite/marshaling.c +++ b/firmware/lib/tpm2_lite/marshaling.c @@ -221,7 +221,7 @@ static void marshal_blob(void **buffer, void *blob, return; } - Memcpy(*buffer, blob, blob_size); + memcpy(*buffer, blob, blob_size); buffer_space -= blob_size; *buffer = (void *)((uintptr_t)(*buffer) + blob_size); } @@ -307,7 +307,7 @@ static void marshal_TPM2B(void **buffer, return; } marshal_u16(buffer, data->size, buffer_space); - Memcpy(*buffer, data->buffer, data->size); + memcpy(*buffer, data->buffer, data->size); *buffer = ((uint8_t *)(*buffer)) + data->size; *buffer_space -= data->size; } @@ -320,7 +320,7 @@ static void marshal_nv_write(void **buffer, marshal_TPM_HANDLE(buffer, TPM_RH_PLATFORM, buffer_space); marshal_TPM_HANDLE(buffer, command_body->nvIndex, buffer_space); - Memset(&session_header, 0, sizeof(session_header)); + memset(&session_header, 0, sizeof(session_header)); session_header.session_handle = TPM_RS_PW; marshal_session_header(buffer, &session_header, buffer_space); tpm_tag = TPM_ST_SESSIONS; @@ -341,7 +341,7 @@ static void marshal_nv_read(void **buffer, else marshal_TPM_HANDLE(buffer, TPM_RH_PLATFORM, buffer_space); marshal_TPM_HANDLE(buffer, command_body->nvIndex, buffer_space); - Memset(&session_header, 0, sizeof(session_header)); + memset(&session_header, 0, sizeof(session_header)); session_header.session_handle = TPM_RS_PW; marshal_session_header(buffer, &session_header, buffer_space); tpm_tag = TPM_ST_SESSIONS; @@ -358,7 +358,7 @@ static void marshal_nv_read_lock(void **buffer, tpm_tag = TPM_ST_SESSIONS; marshal_TPM_HANDLE(buffer, TPM_RH_PLATFORM, buffer_space); marshal_TPM_HANDLE(buffer, command_body->nvIndex, buffer_space); - Memset(&session_header, 0, sizeof(session_header)); + memset(&session_header, 0, sizeof(session_header)); session_header.session_handle = TPM_RS_PW; marshal_session_header(buffer, &session_header, buffer_space); } @@ -372,7 +372,7 @@ static void marshal_nv_write_lock(void **buffer, tpm_tag = TPM_ST_SESSIONS; marshal_TPM_HANDLE(buffer, TPM_RH_PLATFORM, buffer_space); marshal_TPM_HANDLE(buffer, command_body->nvIndex, buffer_space); - Memset(&session_header, 0, sizeof(session_header)); + memset(&session_header, 0, sizeof(session_header)); session_header.session_handle = TPM_RS_PW; marshal_session_header(buffer, &session_header, buffer_space); } @@ -386,7 +386,7 @@ static void marshal_hierarchy_control(void **buffer, tpm_tag = TPM_ST_SESSIONS; marshal_TPM_HANDLE(buffer, TPM_RH_PLATFORM, buffer_space); - Memset(&session_header, 0, sizeof(session_header)); + memset(&session_header, 0, sizeof(session_header)); session_header.session_handle = TPM_RS_PW; marshal_session_header(buffer, &session_header, buffer_space); @@ -414,7 +414,7 @@ static void marshal_clear(void **buffer, tpm_tag = TPM_ST_SESSIONS; marshal_TPM_HANDLE(buffer, TPM_RH_PLATFORM, buffer_space); - Memset(&session_header, 0, sizeof(session_header)); + memset(&session_header, 0, sizeof(session_header)); session_header.session_handle = TPM_RS_PW; marshal_session_header(buffer, &session_header, buffer_space); } diff --git a/firmware/lib/tpm2_lite/tlcl.c b/firmware/lib/tpm2_lite/tlcl.c index 938fdd66..96900b07 100644 --- a/firmware/lib/tpm2_lite/tlcl.c +++ b/firmware/lib/tpm2_lite/tlcl.c @@ -381,7 +381,7 @@ uint32_t TlclRead(uint32_t index, void* data, uint32_t length) struct tpm2_nv_read_cmd nv_readc; struct tpm2_response *response; - Memset(&nv_readc, 0, sizeof(nv_readc)); + memset(&nv_readc, 0, sizeof(nv_readc)); nv_readc.nvIndex = HR_NV_INDEX + index; nv_readc.size = length; @@ -409,7 +409,7 @@ uint32_t TlclRead(uint32_t index, void* data, uint32_t length) if (length < response->nvr.buffer.t.size) return TPM_E_READ_EMPTY; - Memcpy(data, response->nvr.buffer.t.buffer, length); + memcpy(data, response->nvr.buffer.t.buffer, length); return TPM_SUCCESS; } @@ -419,7 +419,7 @@ uint32_t TlclWrite(uint32_t index, const void *data, uint32_t length) struct tpm2_nv_write_cmd nv_writec; struct tpm2_response *response; - Memset(&nv_writec, 0, sizeof(nv_writec)); + memset(&nv_writec, 0, sizeof(nv_writec)); nv_writec.nvIndex = HR_NV_INDEX + index; nv_writec.data.t.size = length; @@ -445,7 +445,7 @@ uint32_t TlclWriteLock(uint32_t index) struct tpm2_nv_write_lock_cmd nv_writelockc; struct tpm2_response *response; - Memset(&nv_writelockc, 0, sizeof(nv_writelockc)); + memset(&nv_writelockc, 0, sizeof(nv_writelockc)); nv_writelockc.nvIndex = HR_NV_INDEX | index; @@ -463,7 +463,7 @@ uint32_t TlclReadLock(uint32_t index) struct tpm2_nv_read_lock_cmd nv_readlockc; struct tpm2_response *response; - Memset(&nv_readlockc, 0, sizeof(nv_readlockc)); + memset(&nv_readlockc, 0, sizeof(nv_readlockc)); nv_readlockc.nvIndex = HR_NV_INDEX | index; diff --git a/firmware/lib/tpm_lite/mocked_tlcl.c b/firmware/lib/tpm_lite/mocked_tlcl.c index 38d0deac..01762964 100644 --- a/firmware/lib/tpm_lite/mocked_tlcl.c +++ b/firmware/lib/tpm_lite/mocked_tlcl.c @@ -57,13 +57,13 @@ uint32_t TlclWrite(uint32_t index, const void* data, uint32_t length) uint32_t TlclRead(uint32_t index, void* data, uint32_t length) { - Memset(data, '\0', length); + memset(data, '\0', length); return TPM_SUCCESS; } uint32_t TlclPCRRead(uint32_t index, void* data, uint32_t length) { - Memset(data, '\0', length); + memset(data, '\0', length); return TPM_SUCCESS; } @@ -134,13 +134,13 @@ uint32_t TlclSetDeactivated(uint8_t flag) uint32_t TlclGetPermanentFlags(TPM_PERMANENT_FLAGS* pflags) { - Memset(pflags, '\0', sizeof(*pflags)); + memset(pflags, '\0', sizeof(*pflags)); return TPM_SUCCESS; } uint32_t TlclGetSTClearFlags(TPM_STCLEAR_FLAGS* vflags) { - Memset(vflags, '\0', sizeof(*vflags)); + memset(vflags, '\0', sizeof(*vflags)); return TPM_SUCCESS; } @@ -162,7 +162,7 @@ uint32_t TlclSetGlobalLock(void) uint32_t TlclExtend(int pcr_num, const uint8_t* in_digest, uint8_t* out_digest) { - Memcpy(out_digest, in_digest, kPcrDigestLength); + memcpy(out_digest, in_digest, kPcrDigestLength); return TPM_SUCCESS; } @@ -182,7 +182,7 @@ uint32_t TlclGetRandom(uint8_t* data, uint32_t length, uint32_t *size) { *size = length; /* http://dilbert.com/strips/comic/2001-10-25/ */ - Memset(data, '\x9', *size); + memset(data, '\x9', *size); return TPM_SUCCESS; } diff --git a/firmware/lib/tpm_lite/tlcl.c b/firmware/lib/tpm_lite/tlcl.c index 7da5e14e..70fce2b9 100644 --- a/firmware/lib/tpm_lite/tlcl.c +++ b/firmware/lib/tpm_lite/tlcl.c @@ -200,7 +200,7 @@ uint32_t TlclDefineSpace(uint32_t index, uint32_t perm, uint32_t size) { struct s_tpm_nv_definespace_cmd cmd; VBDEBUG(("TPM: TlclDefineSpace(0x%x, 0x%x, %d)\n", index, perm, size)); - Memcpy(&cmd, &tpm_nv_definespace_cmd, sizeof(cmd)); + memcpy(&cmd, &tpm_nv_definespace_cmd, sizeof(cmd)); ToTpmUint32(cmd.buffer + tpm_nv_definespace_cmd.index, index); ToTpmUint32(cmd.buffer + tpm_nv_definespace_cmd.perm, perm); ToTpmUint32(cmd.buffer + tpm_nv_definespace_cmd.size, size); @@ -215,13 +215,13 @@ uint32_t TlclWrite(uint32_t index, const void* data, uint32_t length) kTpmRequestHeaderLength + kWriteInfoLength + length; VBDEBUG(("TPM: TlclWrite(0x%x, %d)\n", index, length)); - Memcpy(&cmd, &tpm_nv_write_cmd, sizeof(cmd)); + memcpy(&cmd, &tpm_nv_write_cmd, sizeof(cmd)); VbAssert(total_length <= TPM_LARGE_ENOUGH_COMMAND_SIZE); SetTpmCommandSize(cmd.buffer, total_length); ToTpmUint32(cmd.buffer + tpm_nv_write_cmd.index, index); ToTpmUint32(cmd.buffer + tpm_nv_write_cmd.length, length); - Memcpy(cmd.buffer + tpm_nv_write_cmd.data, data, length); + memcpy(cmd.buffer + tpm_nv_write_cmd.data, data, length); return TlclSendReceive(cmd.buffer, response, sizeof(response)); } @@ -234,7 +234,7 @@ uint32_t TlclRead(uint32_t index, void* data, uint32_t length) uint32_t result; VBDEBUG(("TPM: TlclRead(0x%x, %d)\n", index, length)); - Memcpy(&cmd, &tpm_nv_read_cmd, sizeof(cmd)); + memcpy(&cmd, &tpm_nv_read_cmd, sizeof(cmd)); ToTpmUint32(cmd.buffer + tpm_nv_read_cmd.index, index); ToTpmUint32(cmd.buffer + tpm_nv_read_cmd.length, length); @@ -245,7 +245,7 @@ uint32_t TlclRead(uint32_t index, void* data, uint32_t length) if (result_length > length) result_length = length; /* Truncate to fit buffer */ nv_read_cursor += sizeof(uint32_t); - Memcpy(data, nv_read_cursor, result_length); + memcpy(data, nv_read_cursor, result_length); } return result; @@ -261,13 +261,13 @@ uint32_t TlclPCRRead(uint32_t index, void* data, uint32_t length) if (length < kPcrDigestLength) { return TPM_E_IOERROR; } - Memcpy(&cmd, &tpm_pcr_read_cmd, sizeof(cmd)); + memcpy(&cmd, &tpm_pcr_read_cmd, sizeof(cmd)); ToTpmUint32(cmd.buffer + tpm_pcr_read_cmd.pcrNum, index); result = TlclSendReceive(cmd.buffer, response, sizeof(response)); if (result == TPM_SUCCESS) { uint8_t* pcr_read_cursor = response + kTpmResponseHeaderLength; - Memcpy(data, pcr_read_cursor, kPcrDigestLength); + memcpy(data, pcr_read_cursor, kPcrDigestLength); } return result; @@ -353,7 +353,7 @@ uint32_t TlclSetDeactivated(uint8_t flag) { struct s_tpm_physicalsetdeactivated_cmd cmd; VBDEBUG(("TPM: SetDeactivated(%d)\n", flag)); - Memcpy(&cmd, &tpm_physicalsetdeactivated_cmd, sizeof(cmd)); + memcpy(&cmd, &tpm_physicalsetdeactivated_cmd, sizeof(cmd)); *(cmd.buffer + cmd.deactivated) = flag; return Send(cmd.buffer); } @@ -370,7 +370,7 @@ uint32_t TlclGetPermanentFlags(TPM_PERMANENT_FLAGS* pflags) /* TODO(crbug.com/379255): This fails. Find out why. * VbAssert(size == sizeof(TPM_PERMANENT_FLAGS)); */ - Memcpy(pflags, + memcpy(pflags, response + kTpmResponseHeaderLength + sizeof(size), sizeof(TPM_PERMANENT_FLAGS)); return result; @@ -389,7 +389,7 @@ uint32_t TlclGetSTClearFlags(TPM_STCLEAR_FLAGS* vflags) /* TODO(crbug.com/379255): This fails. Find out why. * VbAssert(size == 7 && sizeof(TPM_STCLEAR_FLAGS) - 1 == 7); */ - Memcpy(vflags, + memcpy(vflags, response + kTpmResponseHeaderLength + sizeof(size), sizeof(TPM_STCLEAR_FLAGS)); return result; @@ -429,15 +429,15 @@ uint32_t TlclExtend(int pcr_num, const uint8_t* in_digest, uint8_t response[kTpmResponseHeaderLength + kPcrDigestLength]; uint32_t result; - Memcpy(&cmd, &tpm_extend_cmd, sizeof(cmd)); + memcpy(&cmd, &tpm_extend_cmd, sizeof(cmd)); ToTpmUint32(cmd.buffer + tpm_extend_cmd.pcrNum, pcr_num); - Memcpy(cmd.buffer + cmd.inDigest, in_digest, kPcrDigestLength); + memcpy(cmd.buffer + cmd.inDigest, in_digest, kPcrDigestLength); result = TlclSendReceive(cmd.buffer, response, sizeof(response)); if (result != TPM_SUCCESS) return result; - Memcpy(out_digest, response + kTpmResponseHeaderLength, + memcpy(out_digest, response + kTpmResponseHeaderLength, kPcrDigestLength); return result; } @@ -450,7 +450,7 @@ uint32_t TlclGetPermissions(uint32_t index, uint32_t* permissions) uint32_t result; uint32_t size; - Memcpy(&cmd, &tpm_getpermissions_cmd, sizeof(cmd)); + memcpy(&cmd, &tpm_getpermissions_cmd, sizeof(cmd)); ToTpmUint32(cmd.buffer + tpm_getpermissions_cmd.index, index); result = TlclSendReceive(cmd.buffer, response, sizeof(response)); if (result != TPM_SUCCESS) @@ -473,7 +473,7 @@ uint32_t TlclGetOwnership(uint8_t* owned) /* TODO(crbug.com/379255): This fails. Find out why. * VbAssert(size == sizeof(*owned)); */ - Memcpy(owned, + memcpy(owned, response + kTpmResponseHeaderLength + sizeof(size), sizeof(*owned)); return result; @@ -486,7 +486,7 @@ uint32_t TlclGetRandom(uint8_t* data, uint32_t length, uint32_t *size) uint32_t result; VBDEBUG(("TPM: TlclGetRandom(%d)\n", length)); - Memcpy(&cmd, &tpm_get_random_cmd, sizeof(cmd)); + memcpy(&cmd, &tpm_get_random_cmd, sizeof(cmd)); ToTpmUint32(cmd.buffer + tpm_get_random_cmd.bytesRequested, length); /* There must be room in the response buffer for the bytes. */ if (length > TPM_LARGE_ENOUGH_COMMAND_SIZE - kTpmResponseHeaderLength @@ -505,7 +505,7 @@ uint32_t TlclGetRandom(uint8_t* data, uint32_t length, uint32_t *size) } get_random_cursor = response + kTpmResponseHeaderLength + sizeof(uint32_t); - Memcpy(data, get_random_cursor, *size); + memcpy(data, get_random_cursor, *size); } return result; diff --git a/firmware/lib/utility_string.c b/firmware/lib/utility_string.c index 361d1809..63e43c68 100644 --- a/firmware/lib/utility_string.c +++ b/firmware/lib/utility_string.c @@ -47,7 +47,7 @@ uint32_t Uint64ToString(char *buf, uint32_t bufsize, uint64_t value, } /* Now copy the string back to the input buffer. */ - Memcpy(buf, s, usedsize); + memcpy(buf, s, usedsize); /* Don't count the terminating null in the bytes used */ return usedsize - 1; diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 4aa2fbdc..6a2aba32 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -1082,7 +1082,7 @@ VbError_t VbSelectAndLoadKernel(VbCommonParams *cparams, VbNvSetup(&vnc); /* Fill in params for calls to LoadKernel() */ - Memset(&p, 0, sizeof(p)); + memset(&p, 0, sizeof(p)); p.shared_data_blob = cparams->shared_data_blob; p.shared_data_size = cparams->shared_data_size; p.gbb_data = cparams->gbb_data; @@ -1103,7 +1103,7 @@ VbError_t VbSelectAndLoadKernel(VbCommonParams *cparams, kparams->bootloader_address = 0; kparams->bootloader_size = 0; kparams->flags = 0; - Memset(kparams->partition_guid, 0, sizeof(kparams->partition_guid)); + memset(kparams->partition_guid, 0, sizeof(kparams->partition_guid)); cparams->bmp = NULL; cparams->gbb = VbExMalloc(sizeof(*cparams->gbb)); @@ -1171,7 +1171,7 @@ VbError_t VbSelectAndLoadKernel(VbCommonParams *cparams, /* Read FWMP. Ignore errors in recovery mode. */ if (cparams->gbb->flags & GBB_FLAG_DISABLE_FWMP) { - Memset(&fwmp, 0, sizeof(fwmp)); + memset(&fwmp, 0, sizeof(fwmp)); tpm_status = 0; } else { tpm_status = RollbackFwmpRead(&fwmp); @@ -1290,7 +1290,7 @@ VbError_t VbSelectAndLoadKernel(VbCommonParams *cparams, kparams->bootloader_address = p.bootloader_address; kparams->bootloader_size = (uint32_t)p.bootloader_size; kparams->flags = p.flags; - Memcpy(kparams->partition_guid, p.partition_guid, + memcpy(kparams->partition_guid, p.partition_guid, sizeof(kparams->partition_guid)); /* Lock the kernel versions. Ignore errors in recovery mode. */ @@ -1349,7 +1349,7 @@ VbError_t VbVerifyMemoryBootImage(VbCommonParams *cparams, kparams->bootloader_address = 0; kparams->bootloader_size = 0; kparams->flags = 0; - Memset(kparams->partition_guid, 0, sizeof(kparams->partition_guid)); + memset(kparams->partition_guid, 0, sizeof(kparams->partition_guid)); kbuf = boot_image; diff --git a/firmware/lib/vboot_audio.c b/firmware/lib/vboot_audio.c index 6071b0db..bc974953 100644 --- a/firmware/lib/vboot_audio.c +++ b/firmware/lib/vboot_audio.c @@ -88,7 +88,7 @@ static void VbGetDevMusicNotes(VbAudioContext *audio, int use_short) if (!hdr || maxsize < sizeof(VbDevMusic)) goto nope; - if (0 != Memcmp(hdr->sig, "$SND", sizeof(hdr->sig))) { + if (0 != memcmp(hdr->sig, "$SND", sizeof(hdr->sig))) { VBDEBUG(("VbGetDevMusicNotes: bad sig\n")); goto nope; } @@ -171,7 +171,7 @@ static void VbGetDevMusicNotes(VbAudioContext *audio, int use_short) /* Looks good. Allocate the space (plus one) and copy it over. */ notebuf = VbExMalloc((hdr->count + 1) * sizeof(VbDevMusicNote)); - Memcpy(notebuf, hdr->notes, hdr->count * sizeof(VbDevMusicNote)); + memcpy(notebuf, hdr->notes, hdr->count * sizeof(VbDevMusicNote)); count = hdr->count; /* We also require at least 30 seconds of delay. */ @@ -224,7 +224,7 @@ VbAudioContext *VbAudioOpen(VbCommonParams *cparams) ticks_per_msec)); /* Initialize */ - Memset(audio, 0, sizeof(*audio)); + memset(audio, 0, sizeof(*audio)); audio->background_beep = 1; audio->play_until = b; /* "zero" starts now */ diff --git a/firmware/lib/vboot_common.c b/firmware/lib/vboot_common.c index 49929151..b691fc36 100644 --- a/firmware/lib/vboot_common.c +++ b/firmware/lib/vboot_common.c @@ -119,7 +119,7 @@ int PublicKeyCopy(VbPublicKey *dest, const VbPublicKey *src) dest->key_size = src->key_size; dest->algorithm = src->algorithm; dest->key_version = src->key_version; - Memcpy(GetPublicKeyData(dest), GetPublicKeyDataC(src), src->key_size); + memcpy(GetPublicKeyData(dest), GetPublicKeyDataC(src), src->key_size); return 0; } diff --git a/firmware/lib/vboot_common_init.c b/firmware/lib/vboot_common_init.c index 2f3cf385..90edae68 100644 --- a/firmware/lib/vboot_common_init.c +++ b/firmware/lib/vboot_common_init.c @@ -30,7 +30,7 @@ int VbSharedDataInit(VbSharedDataHeader *header, uint64_t size) return VBOOT_SHARED_DATA_INVALID; /* Zero the header */ - Memset(header, 0, sizeof(VbSharedDataHeader)); + memset(header, 0, sizeof(VbSharedDataHeader)); /* Initialize fields */ header->magic = VB_SHARED_DATA_MAGIC; diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index 2ef87034..2f3a15e1 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -726,7 +726,7 @@ VbError_t VbCheckDisplayKey(VbCommonParams *cparams, uint32_t key, return VbDisplayScreen(cparams, disp_current_screen, 1, vncptr); } - if (0 == Memcmp(MagicBuffer, MAGIC_WORD, MAGIC_WORD_LEN)) { + if (0 == memcmp(MagicBuffer, MAGIC_WORD, MAGIC_WORD_LEN)) { if (VBEASTEREGG) (void)VbDisplayScreen(cparams, disp_current_screen, 1, vncptr); diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c index 4a7154ed..1e7b7d0d 100644 --- a/firmware/lib/vboot_kernel.c +++ b/firmware/lib/vboot_kernel.c @@ -94,7 +94,7 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams) */ shcall = shared->lk_calls + (shared->lk_call_count & (VBSD_MAX_KERNEL_CALLS - 1)); - Memset(shcall, 0, sizeof(VbSharedDataKernelCall)); + memset(shcall, 0, sizeof(VbSharedDataKernelCall)); shcall->boot_flags = (uint32_t)params->boot_flags; shcall->boot_mode = boot_mode; shcall->sector_size = (uint32_t)params->bytes_per_lba; @@ -168,7 +168,7 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams) */ shpart = shcall->parts + (shcall->kernel_parts_found & (VBSD_MAX_KERNEL_PARTS - 1)); - Memset(shpart, 0, sizeof(VbSharedDataKernelPart)); + memset(shpart, 0, sizeof(VbSharedDataKernelPart)); shpart->sector_start = part_start; shpart->sector_count = part_size; /* @@ -422,7 +422,7 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams) if (body_copied > body_toread) body_copied = body_toread; - Memcpy(body_readptr, kbuf + body_offset, body_copied); + memcpy(body_readptr, kbuf + body_offset, body_copied); body_toread -= body_copied; body_readptr += body_copied; } diff --git a/firmware/lib/vboot_nvstorage.c b/firmware/lib/vboot_nvstorage.c index c131f088..69feef29 100644 --- a/firmware/lib/vboot_nvstorage.c +++ b/firmware/lib/vboot_nvstorage.c @@ -81,7 +81,7 @@ int VbNvSetup(VbNvContext *context) if ((HEADER_SIGNATURE != (raw[HEADER_OFFSET] & HEADER_MASK)) || (Crc8(raw, CRC_OFFSET) != raw[CRC_OFFSET])) { /* Data is inconsistent (bad CRC or header); reset defaults */ - Memset(raw, 0, VBNV_BLOCK_SIZE); + memset(raw, 0, VBNV_BLOCK_SIZE); raw[HEADER_OFFSET] = (HEADER_SIGNATURE | HEADER_FIRMWARE_SETTINGS_RESET | HEADER_KERNEL_SETTINGS_RESET); |