Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-08-11 04:09:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm2: Fix typos and error reporting inconsitencies in NVMarshal.c

Browse Source 
This patch addresses issue #177 by fixing some typos and error
reporting inconsistencies (how structures are spelled) in NVMarhsal.c.

Reported-by: Nicolas Iooss <nicolas.iooss@ledger.fr>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2021-02-13 08:18:59 -05:00 committed by Stefan Berger
parent f1740791c3
commit b2e3991057
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tpm2/NVMarshal.c
View File

@ -573,7 +573,7 @@ PCR_POLICY_Unmarshal(PCR_POLICY *data, BYTE **buffer, INT32 *size)
this allows us to downgrade state */
if (rc == TPM_RC_SUCCESS && hdr.version >= 2) {
BLOCK_SKIP_READ(skip_future_versions, FALSE, buffer, size,
"ORDERLY DATA", "version 3 or later");
"PCR_POLICY", "version 3 or later");
/* future versions nest-append here */
}
skip_future_versions:
@ -651,7 +651,7 @@ ORDERLY_DATA_Unmarshal(ORDERLY_DATA *data, BYTE **buffer, INT32 *size)
#endif
if (rc == TPM_RC_SUCCESS) {
BLOCK_SKIP_READ(skip_self_heal_timer, needs_block, buffer, size,
"ORDERLY DATA", "selfHealTimer");
"ORDERLY_DATA", "selfHealTimer");
}
#if ACCUMULATE_SELF_HEAL_TIMER
if (rc == TPM_RC_SUCCESS) {
@ -670,7 +670,7 @@ skip_self_heal_timer:
this allows us to downgrade state */
if (rc == TPM_RC_SUCCESS && hdr.version >= 2) {
BLOCK_SKIP_READ(skip_future_versions, FALSE, buffer, size,
"ORDERLY DATA", "version 3 or later");
"ORDERLY_DATA", "version 3 or later");
/* future versions nest-append here */
}
skip_future_versions:
@ -2094,7 +2094,7 @@ HASH_STATE_Unmarshal(HASH_STATE *data, BYTE **buffer, INT32 *size)
this allows us to downgrade state */
if (rc == TPM_RC_SUCCESS && hdr.version >= 2) {
BLOCK_SKIP_READ(skip_future_versions, FALSE, buffer, size,
"STATE_RESET_DATA", "version 3 or later");
"HASH_STATE", "version 3 or later");
/* future versions nest-append here */
}
@ -3967,11 +3967,11 @@ skip_num_policy_pcr_group:
this allows us to downgrade state */
if (rc == TPM_RC_SUCCESS && hdr.version >= 2) {
BLOCK_SKIP_READ(skip_future_versions, hdr.version >= 3, buffer, size,
"Volatile State", "version 3 or later");
"PERSISTENT_DATA", "version 3 or later");
rc = TPML_PCR_SELECTION_Unmarshal(&shadow.pcrAllocated, buffer, size);
BLOCK_SKIP_READ(skip_future_versions, FALSE, buffer, size,
"PERSISTENT DATA", "version 4 or later");
"PERSISTENT_DATA", "version 4 or later");
/* future versions nest-append here */
}
@ -4022,14 +4022,14 @@ INDEX_ORDERLY_RAM_Marshal(void *array, size_t array_size,
written += TPMA_NV_Marshal(&nrh.attributes, buffer, size);
if (offset + nrh.size > array_size) {
TPMLIB_LogTPM2Error("NV_ORDERLY_RAM: nrh->size corrupted: %d\n",
TPMLIB_LogTPM2Error("INDEX_ORDERLY_RAM: nrh->size corrupted: %d\n",
nrh.size);
break;
}
/* write data size before array */
if (nrh.size < sizeof(NV_RAM_HEADER)) {
TPMLIB_LogTPM2Error(
"NV_ORDERLY_RAM: nrh->size < sizeof(NV_RAM_HEADER): %d < %zu\n",
"INDEX_ORDERLY_RAM: nrh->size < sizeof(NV_RAM_HEADER): %d < %zu\n",
(int)nrh.size, sizeof(NV_RAM_HEADER));
break;
}
@ -4132,7 +4132,7 @@ INDEX_ORDERLY_RAM_Unmarshal(void *array, size_t array_size,
this allows us to downgrade state */
if (rc == TPM_RC_SUCCESS && hdr.version >= 2) {
BLOCK_SKIP_READ(skip_future_versions, FALSE, buffer, size,
"INDEX ORDERLY RAM", "version 3 or later");
"INDEX_ORDERLY_RAM", "version 3 or later");
/* future versions nest-append here */
}
@ -4194,7 +4194,7 @@ USER_NVRAM_Display(const char *msg)
fprintf(stderr, " sizeof(obj): %zu\n", sizeof(obj));
break;
default:
TPMLIB_LogTPM2Error("USER NVRAM: Corrupted handle: %08x\n", handle);
TPMLIB_LogTPM2Error("USER_NVRAM: Corrupted handle: %08x\n", handle);
}
/* advance to next entry */
entryRef += entrysize;
@ -4270,7 +4270,7 @@ USER_NVRAM_Marshal(BYTE **buffer, INT32 *size)
written += ANY_OBJECT_Marshal(&obj, buffer, size);
break;
default:
TPMLIB_LogTPM2Error("USER NVRAM: Corrupted handle: %08x\n", handle);
TPMLIB_LogTPM2Error("USER_NVRAM: Corrupted handle: %08x\n", handle);
}
/* advance to next entry */
entryRef += entrysize;
@ -4433,7 +4433,7 @@ USER_NVRAM_Unmarshal(BYTE **buffer, INT32 *size)
this allows us to downgrade state */
if (rc == TPM_RC_SUCCESS && hdr.version >= 2) {
BLOCK_SKIP_READ(skip_future_versions, FALSE, buffer, size,
"USER NVRAM", "version 3 or later");
"USER_NVRAM", "version 3 or later");
/* future versions nest-append here */
}