From 9dfa4b4e4f468ef2b34e1f68155dde9c9da9c751 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Mon, 11 Dec 2023 15:24:44 -0500 Subject: [PATCH] rev180: Move TPM_CC_FIRST/LAST to TpmTypes.h Signed-off-by: Stefan Berger --- src/tpm2/TpmAlgorithmDefines.h | 2 -- src/tpm2/TpmTypes.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tpm2/TpmAlgorithmDefines.h b/src/tpm2/TpmAlgorithmDefines.h index 34e1d17c..2305b913 100644 --- a/src/tpm2/TpmAlgorithmDefines.h +++ b/src/tpm2/TpmAlgorithmDefines.h @@ -219,8 +219,6 @@ #endif #define MAX_TDES_BLOCK_SIZE_BYTES TDES_MAX_BLOCK_SIZE // Additional values for benefit of code -#define TPM_CC_FIRST 0x0000011F -#define TPM_CC_LAST 0x0000019A #if COMPRESSED_LISTS #define ADD_FILL 0 #else diff --git a/src/tpm2/TpmTypes.h b/src/tpm2/TpmTypes.h index 943c43ea..920150b5 100644 --- a/src/tpm2/TpmTypes.h +++ b/src/tpm2/TpmTypes.h @@ -172,6 +172,7 @@ typedef UINT16 TPM_ECC_CURVE; /* TPM 2.0 Part 2: Table 2:12 - Definition of TPM_CC Constants */ typedef UINT32 TPM_CC; #define TYPE_OF_TPM_CC UINT32 +#define TPM_CC_FIRST (TPM_CC)(0x0000011F) #define TPM_CC_NV_UndefineSpaceSpecial (TPM_CC)(0x0000011F) #define TPM_CC_EvictControl (TPM_CC)(0x00000120) #define TPM_CC_HierarchyControl (TPM_CC)(0x00000121) @@ -293,6 +294,7 @@ typedef UINT32 TPM_CC; #define TPM_CC_ACT_SetTimeout (TPM_CC)(0x00000198) #define TPM_CC_ECC_Encrypt (TPM_CC)(0x00000199) #define TPM_CC_ECC_Decrypt (TPM_CC)(0x0000019A) +#define TPM_CC_LAST (TPM_CC)(0x0000019A) #define CC_VEND 0x20000000 #define TPM_CC_Vendor_TCG_Test (TPM_CC)(0x20000000)