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

tpm2: Make exp. size of compile-time constants dependent on header version

Browse Source 
Make the expected array size of compile-time constants dependent on
the version of the header. This way we can add elements to the array
while bumping up the version of the header.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2021-08-04 13:49:34 -04:00 committed by Stefan Berger
parent 1d99fa711e
commit 5e97c2e78d
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -7,6 +7,7 @@ version 0.9.0:
has changed and cannot be downgraded.
- Applied work-around for Win 2016 & 2019 server related to
TPM2_ContextLoad (issue #217)
- Check for several more compile-time constants
version 0.8.0
- NOTE: Downgrade to previous versions is not possible. See below.

27
src/tpm2/NVMarshal.c
View File

@ -3843,24 +3843,41 @@ PACompileConstants_Unmarshal(BYTE **buffer, INT32 *size)
unsigned i;
NV_HEADER hdr;
UINT32 array_size;
UINT32 exp_array_size;
if (rc == TPM_RC_SUCCESS) {
rc = NV_HEADER_Unmarshal(&hdr, buffer, size,
PA_COMPILE_CONSTANTS_VERSION,
PA_COMPILE_CONSTANTS_MAGIC);
}
if (rc == TPM_RC_SUCCESS) {
switch (hdr.version) {
case 1:
case 2:
/* PA_COMPILE_CONSTANTS_VERSION 1 and 2 had 88 entries */
exp_array_size = 88;
break;
default:
/* we don't suport anything newer - no downgrade */
TPMLIB_LogTPM2Error("Unsupported PA_COMPILE_CONSTANTS version %d. "
"Supporting up to version %d.\n",
hdr.version, PA_COMPILE_CONSTANTS_VERSION);
rc = TPM_RC_BAD_VERSION;
}
}
if (rc == TPM_RC_SUCCESS) {
rc = UINT32_Unmarshal(&array_size, buffer, size);
}
if (rc == TPM_RC_SUCCESS &&
array_size != ARRAY_SIZE(pa_compile_constants)) {
TPMLIB_LogTPM2Error("PA_COMPILE_CONSTANTS has non-matching number of "
"elements; found %u, expected %zu\n",
array_size, ARRAY_SIZE(pa_compile_constants));
array_size != exp_array_size) {
TPMLIB_LogTPM2Error("PA_COMPILE_CONSTANTS v%d has non-matching number of "
"elements; found %u, expected %u\n",
hdr.version, array_size, exp_array_size);
}
for (i = 0; rc == TPM_RC_SUCCESS && i < ARRAY_SIZE(pa_compile_constants); i++)
for (i = 0; rc == TPM_RC_SUCCESS && i < exp_array_size; i++)
rc = UINT32_Unmarshal_CheckConstant(
buffer, size, pa_compile_constants[i].constant,
pa_compile_constants[i].name,