From b4d81572c15b504a4e60b4b46c91d3ec0a92c79e Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Wed, 6 Aug 2025 15:45:42 -0400 Subject: [PATCH] tpm2: Define TPMI_RH_NV_DEFINED_INDEX_H_UNMARSHAL and use it Signed-off-by: Stefan Berger --- src/tpm2/CommandDispatchData.h | 8 +++++--- src/tpm2/Unmarshal.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/tpm2/CommandDispatchData.h b/src/tpm2/CommandDispatchData.h index 213c81da..a236ffaf 100644 --- a/src/tpm2/CommandDispatchData.h +++ b/src/tpm2/CommandDispatchData.h @@ -111,7 +111,9 @@ const _UNMARSHAL_T_ unmarshalArray[] = { UNMARSHAL_DISPATCH(TPMI_RH_LOCKOUT), #define TPMI_RH_NV_AUTH_H_UNMARSHAL (TPMI_RH_LOCKOUT_H_UNMARSHAL + 1) UNMARSHAL_DISPATCH(TPMI_RH_NV_AUTH), -#define TPMI_RH_NV_INDEX_H_UNMARSHAL (TPMI_RH_NV_AUTH_H_UNMARSHAL + 1) +#define TPMI_RH_NV_DEFINED_INDEX_H_UNMARSHAL (TPMI_RH_NV_AUTH_H_UNMARSHAL + 1) + UNMARSHAL_DISPATCH(TPMI_RH_NV_DEFINED_INDEX), +#define TPMI_RH_NV_INDEX_H_UNMARSHAL (TPMI_RH_NV_DEFINED_INDEX_H_UNMARSHAL + 1) UNMARSHAL_DISPATCH(TPMI_RH_NV_INDEX), #define TPMI_RH_PLATFORM_H_UNMARSHAL (TPMI_RH_NV_INDEX_H_UNMARSHAL + 1) UNMARSHAL_DISPATCH(TPMI_RH_PLATFORM), @@ -4493,7 +4495,7 @@ NV_UndefineSpace_COMMAND_DESCRIPTOR_t _NV_UndefineSpaceData = { /* offsetOfTypes */ offsetof(NV_UndefineSpace_COMMAND_DESCRIPTOR_t, types), /* offsets */ {(UINT16)(offsetof(NV_UndefineSpace_In, nvIndex))}, /* types */ {TPMI_RH_PROVISION_H_UNMARSHAL, - TPMI_RH_NV_INDEX_H_UNMARSHAL, + TPMI_RH_NV_DEFINED_INDEX_H_UNMARSHAL, END_OF_LIST, END_OF_LIST} }; @@ -4527,7 +4529,7 @@ NV_UndefineSpaceSpecial_COMMAND_DESCRIPTOR_t _NV_UndefineSpaceSpecialData = { /* outSize */ 0, /* offsetOfTypes */ offsetof(NV_UndefineSpaceSpecial_COMMAND_DESCRIPTOR_t, types), /* offsets */ {(UINT16)(offsetof(NV_UndefineSpaceSpecial_In, platform))}, - /* types */ {TPMI_RH_NV_INDEX_H_UNMARSHAL, + /* types */ {TPMI_RH_NV_DEFINED_INDEX_H_UNMARSHAL, TPMI_RH_PLATFORM_H_UNMARSHAL, END_OF_LIST, END_OF_LIST} diff --git a/src/tpm2/Unmarshal.c b/src/tpm2/Unmarshal.c index 6f8fbb92..f3397326 100644 --- a/src/tpm2/Unmarshal.c +++ b/src/tpm2/Unmarshal.c @@ -1188,7 +1188,6 @@ TPMI_RH_NV_INDEX_Unmarshal(TPMI_RH_NV_INDEX *target, BYTE **buffer, INT32 *size) } /* Table 67 - Definition of (TPM_HANDLE) TPMI_RH_NV_DEFINED_INDEX Type */ -#if 0 // libtpms added TPM_RC TPMI_RH_NV_DEFINED_INDEX_Unmarshal(TPMI_RH_NV_DEFINED_INDEX *target, BYTE **buffer, INT32 *size) { @@ -1215,6 +1214,7 @@ TPMI_RH_NV_DEFINED_INDEX_Unmarshal(TPMI_RH_NV_DEFINED_INDEX *target, BYTE **buff return rc; } +#if 0 /* Table 68 - Definition of (TPM_HANDLE) TPMI_RH_NV_LEGACY_INDEX Type */ TPM_RC TPMI_RH_NV_LEGACY_INDEX_Unmarshal(TPMI_RH_NV_LEGACY_INDEX *target, BYTE **buffer, INT32 *size)