From 5679903b340beb4e8d15fd27e72c0e92836f381a Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Wed, 28 Feb 2024 09:42:10 -0500 Subject: [PATCH] rev180: Rearrange order of TPMI_ECC_CURVE_P_UNMARSHAL in unmarshalArray After adding BOOL allowNull parameter to TPMI_ECC_CURVE_Unmarshal rearrange the order in which this command is listed in the unmarshalArray so that the caller passes an addtional parameter to this function now. Also add a fuzzer test case. Fixes: 44f0cb0535c0 ("rev180: Sync TPMI_ECC_CURVE_Unmarshal") Signed-off-by: Stefan Berger --- src/tpm2/CommandDispatchData.h | 8 ++++---- .../ab82f1d5c94b0f18696d51382b70f9b9fc1877e5 | Bin 0 -> 12 bytes 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 tests/corpus-execute-command/ab82f1d5c94b0f18696d51382b70f9b9fc1877e5 diff --git a/src/tpm2/CommandDispatchData.h b/src/tpm2/CommandDispatchData.h index 9cf43936..efda240b 100644 --- a/src/tpm2/CommandDispatchData.h +++ b/src/tpm2/CommandDispatchData.h @@ -174,9 +174,7 @@ const _UNMARSHAL_T_ unmarshalArray[] = { UNMARSHAL_DISPATCH(TPMI_DH_CONTEXT), #define TPMI_DH_PERSISTENT_P_UNMARSHAL (TPMI_DH_CONTEXT_P_UNMARSHAL + 1) UNMARSHAL_DISPATCH(TPMI_DH_PERSISTENT), -#define TPMI_ECC_CURVE_P_UNMARSHAL (TPMI_DH_PERSISTENT_P_UNMARSHAL + 1) - UNMARSHAL_DISPATCH(TPMI_ECC_CURVE), -#define TPMI_YES_NO_P_UNMARSHAL (TPMI_ECC_CURVE_P_UNMARSHAL + 1) +#define TPMI_YES_NO_P_UNMARSHAL (TPMI_DH_PERSISTENT_P_UNMARSHAL + 1) UNMARSHAL_DISPATCH(TPMI_YES_NO), #define TPML_ALG_P_UNMARSHAL (TPMI_YES_NO_P_UNMARSHAL + 1) UNMARSHAL_DISPATCH(TPML_ALG), @@ -234,7 +232,9 @@ const _UNMARSHAL_T_ unmarshalArray[] = { #define TPMI_DH_PCR_P_UNMARSHAL \ (TPMI_ALG_MAC_SCHEME_P_UNMARSHAL + 1) UNMARSHAL_DISPATCH(TPMI_DH_PCR), -#define TPMI_ECC_KEY_EXCHANGE_P_UNMARSHAL (TPMI_DH_PCR_P_UNMARSHAL + 1) +#define TPMI_ECC_CURVE_P_UNMARSHAL (TPMI_DH_PCR_P_UNMARSHAL + 1) + UNMARSHAL_DISPATCH(TPMI_ECC_CURVE), +#define TPMI_ECC_KEY_EXCHANGE_P_UNMARSHAL (TPMI_ECC_CURVE_P_UNMARSHAL + 1) UNMARSHAL_DISPATCH(TPMI_ECC_KEY_EXCHANGE), #define TPMI_RH_ENABLES_P_UNMARSHAL \ (TPMI_ECC_KEY_EXCHANGE_P_UNMARSHAL + 1) diff --git a/tests/corpus-execute-command/ab82f1d5c94b0f18696d51382b70f9b9fc1877e5 b/tests/corpus-execute-command/ab82f1d5c94b0f18696d51382b70f9b9fc1877e5 new file mode 100755 index 0000000000000000000000000000000000000000..91b37606892fbfccccf15a8979148880aa69533c GIT binary patch literal 12 TcmZo*WME+6VPIhFV_*OP2pIt# literal 0 HcmV?d00001