]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdePkg/Include/IndustryStandard/Tpm20.h
MdePkg: Apply uncrustify changes
[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Tpm20.h
index 8a431bcd9f92f67764c77685b7eb13e8c871c5b7..4440f3769f26da8e6e052b78bf65fb772a08e9f6 100644 (file)
@@ -10,7 +10,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #ifndef _TPM20_H_\r
 #define _TPM20_H_\r
 \r
@@ -21,121 +20,121 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // Annex A Algorithm Constants\r
 \r
 // Table 205 - Defines for SHA1 Hash Values\r
-#define SHA1_DIGEST_SIZE 20\r
-#define SHA1_BLOCK_SIZE  64\r
+#define SHA1_DIGEST_SIZE  20\r
+#define SHA1_BLOCK_SIZE   64\r
 \r
 // Table 206 - Defines for SHA256 Hash Values\r
-#define SHA256_DIGEST_SIZE 32\r
-#define SHA256_BLOCK_SIZE  64\r
+#define SHA256_DIGEST_SIZE  32\r
+#define SHA256_BLOCK_SIZE   64\r
 \r
 // Table 207 - Defines for SHA384 Hash Values\r
-#define SHA384_DIGEST_SIZE 48\r
-#define SHA384_BLOCK_SIZE  128\r
+#define SHA384_DIGEST_SIZE  48\r
+#define SHA384_BLOCK_SIZE   128\r
 \r
 // Table 208 - Defines for SHA512 Hash Values\r
-#define SHA512_DIGEST_SIZE 64\r
-#define SHA512_BLOCK_SIZE  128\r
+#define SHA512_DIGEST_SIZE  64\r
+#define SHA512_BLOCK_SIZE   128\r
 \r
 // Table 209 - Defines for SM3_256 Hash Values\r
-#define SM3_256_DIGEST_SIZE 32\r
-#define SM3_256_BLOCK_SIZE  64\r
+#define SM3_256_DIGEST_SIZE  32\r
+#define SM3_256_BLOCK_SIZE   64\r
 \r
 // Table 210 - Defines for Architectural Limits Values\r
-#define MAX_SESSION_NUMBER 3\r
+#define MAX_SESSION_NUMBER  3\r
 \r
 // Annex B Implementation Definitions\r
 \r
 // Table 211 - Defines for Logic Values\r
-#define YES   1\r
-#define NO    0\r
-#define SET   1\r
-#define CLEAR 0\r
+#define YES    1\r
+#define NO     0\r
+#define SET    1\r
+#define CLEAR  0\r
 \r
 // Table 215 - Defines for RSA Algorithm Constants\r
-#define MAX_RSA_KEY_BITS  2048\r
-#define MAX_RSA_KEY_BYTES ((MAX_RSA_KEY_BITS + 7) / 8)\r
+#define MAX_RSA_KEY_BITS   2048\r
+#define MAX_RSA_KEY_BYTES  ((MAX_RSA_KEY_BITS + 7) / 8)\r
 \r
 // Table 216 - Defines for ECC Algorithm Constants\r
-#define MAX_ECC_KEY_BITS  256\r
-#define MAX_ECC_KEY_BYTES ((MAX_ECC_KEY_BITS + 7) / 8)\r
+#define MAX_ECC_KEY_BITS   256\r
+#define MAX_ECC_KEY_BYTES  ((MAX_ECC_KEY_BITS + 7) / 8)\r
 \r
 // Table 217 - Defines for AES Algorithm Constants\r
-#define MAX_AES_KEY_BITS         128\r
-#define MAX_AES_BLOCK_SIZE_BYTES 16\r
-#define MAX_AES_KEY_BYTES        ((MAX_AES_KEY_BITS + 7) / 8)\r
+#define MAX_AES_KEY_BITS          128\r
+#define MAX_AES_BLOCK_SIZE_BYTES  16\r
+#define MAX_AES_KEY_BYTES         ((MAX_AES_KEY_BITS + 7) / 8)\r
 \r
 // Table 218 - Defines for SM4 Algorithm Constants\r
-#define MAX_SM4_KEY_BITS         128\r
-#define MAX_SM4_BLOCK_SIZE_BYTES 16\r
-#define MAX_SM4_KEY_BYTES        ((MAX_SM4_KEY_BITS + 7) / 8)\r
+#define MAX_SM4_KEY_BITS          128\r
+#define MAX_SM4_BLOCK_SIZE_BYTES  16\r
+#define MAX_SM4_KEY_BYTES         ((MAX_SM4_KEY_BITS + 7) / 8)\r
 \r
 // Table 219 - Defines for Symmetric Algorithm Constants\r
-#define MAX_SYM_KEY_BITS   MAX_AES_KEY_BITS\r
-#define MAX_SYM_KEY_BYTES  MAX_AES_KEY_BYTES\r
-#define MAX_SYM_BLOCK_SIZE MAX_AES_BLOCK_SIZE_BYTES\r
+#define MAX_SYM_KEY_BITS    MAX_AES_KEY_BITS\r
+#define MAX_SYM_KEY_BYTES   MAX_AES_KEY_BYTES\r
+#define MAX_SYM_BLOCK_SIZE  MAX_AES_BLOCK_SIZE_BYTES\r
 \r
 // Table 220 - Defines for Implementation Values\r
-typedef UINT16                        BSIZE;\r
-#define BUFFER_ALIGNMENT              4\r
-#define IMPLEMENTATION_PCR            24\r
-#define PLATFORM_PCR                  24\r
-#define DRTM_PCR                      17\r
-#define NUM_LOCALITIES                5\r
-#define MAX_HANDLE_NUM                3\r
-#define MAX_ACTIVE_SESSIONS           64\r
-typedef UINT16                        CONTEXT_SLOT;\r
-typedef UINT64                        CONTEXT_COUNTER;\r
-#define MAX_LOADED_SESSIONS           3\r
-#define MAX_SESSION_NUM               3\r
-#define MAX_LOADED_OBJECTS            3\r
-#define MIN_EVICT_OBJECTS             2\r
-#define PCR_SELECT_MIN                ((PLATFORM_PCR + 7) / 8)\r
-#define PCR_SELECT_MAX                ((IMPLEMENTATION_PCR + 7) / 8)\r
-#define NUM_POLICY_PCR_GROUP          1\r
-#define NUM_AUTHVALUE_PCR_GROUP       1\r
-#define MAX_CONTEXT_SIZE              4000\r
-#define MAX_DIGEST_BUFFER             1024\r
-#define MAX_NV_INDEX_SIZE             1024\r
-#define MAX_CAP_BUFFER                1024\r
-#define NV_MEMORY_SIZE                16384\r
-#define NUM_STATIC_PCR                16\r
-#define MAX_ALG_LIST_SIZE             64\r
-#define TIMER_PRESCALE                100000\r
-#define PRIMARY_SEED_SIZE             32\r
-#define CONTEXT_ENCRYPT_ALG           TPM_ALG_AES\r
-#define CONTEXT_ENCRYPT_KEY_BITS      MAX_SYM_KEY_BITS\r
-#define CONTEXT_ENCRYPT_KEY_BYTES     ((CONTEXT_ENCRYPT_KEY_BITS + 7) / 8)\r
-#define CONTEXT_INTEGRITY_HASH_ALG    TPM_ALG_SHA256\r
-#define CONTEXT_INTEGRITY_HASH_SIZE   SHA256_DIGEST_SIZE\r
-#define PROOF_SIZE                    CONTEXT_INTEGRITY_HASH_SIZE\r
-#define NV_CLOCK_UPDATE_INTERVAL      12\r
-#define NUM_POLICY_PCR                1\r
-#define MAX_COMMAND_SIZE              4096\r
-#define MAX_RESPONSE_SIZE             4096\r
-#define ORDERLY_BITS                  8\r
-#define MAX_ORDERLY_COUNT             ((1 << ORDERLY_BITS) - 1)\r
-#define ALG_ID_FIRST                  TPM_ALG_FIRST\r
-#define ALG_ID_LAST                   TPM_ALG_LAST\r
-#define MAX_SYM_DATA                  128\r
-#define MAX_RNG_ENTROPY_SIZE          64\r
-#define RAM_INDEX_SPACE               512\r
-#define RSA_DEFAULT_PUBLIC_EXPONENT   0x00010001\r
-#define CRT_FORMAT_RSA                YES\r
-#define PRIVATE_VENDOR_SPECIFIC_BYTES ((MAX_RSA_KEY_BYTES / 2) * ( 3 + CRT_FORMAT_RSA * 2))\r
+typedef UINT16 BSIZE;\r
+#define BUFFER_ALIGNMENT     4\r
+#define IMPLEMENTATION_PCR   24\r
+#define PLATFORM_PCR         24\r
+#define DRTM_PCR             17\r
+#define NUM_LOCALITIES       5\r
+#define MAX_HANDLE_NUM       3\r
+#define MAX_ACTIVE_SESSIONS  64\r
+typedef UINT16 CONTEXT_SLOT;\r
+typedef UINT64 CONTEXT_COUNTER;\r
+#define MAX_LOADED_SESSIONS            3\r
+#define MAX_SESSION_NUM                3\r
+#define MAX_LOADED_OBJECTS             3\r
+#define MIN_EVICT_OBJECTS              2\r
+#define PCR_SELECT_MIN                 ((PLATFORM_PCR + 7) / 8)\r
+#define PCR_SELECT_MAX                 ((IMPLEMENTATION_PCR + 7) / 8)\r
+#define NUM_POLICY_PCR_GROUP           1\r
+#define NUM_AUTHVALUE_PCR_GROUP        1\r
+#define MAX_CONTEXT_SIZE               4000\r
+#define MAX_DIGEST_BUFFER              1024\r
+#define MAX_NV_INDEX_SIZE              1024\r
+#define MAX_CAP_BUFFER                 1024\r
+#define NV_MEMORY_SIZE                 16384\r
+#define NUM_STATIC_PCR                 16\r
+#define MAX_ALG_LIST_SIZE              64\r
+#define TIMER_PRESCALE                 100000\r
+#define PRIMARY_SEED_SIZE              32\r
+#define CONTEXT_ENCRYPT_ALG            TPM_ALG_AES\r
+#define CONTEXT_ENCRYPT_KEY_BITS       MAX_SYM_KEY_BITS\r
+#define CONTEXT_ENCRYPT_KEY_BYTES      ((CONTEXT_ENCRYPT_KEY_BITS + 7) / 8)\r
+#define CONTEXT_INTEGRITY_HASH_ALG     TPM_ALG_SHA256\r
+#define CONTEXT_INTEGRITY_HASH_SIZE    SHA256_DIGEST_SIZE\r
+#define PROOF_SIZE                     CONTEXT_INTEGRITY_HASH_SIZE\r
+#define NV_CLOCK_UPDATE_INTERVAL       12\r
+#define NUM_POLICY_PCR                 1\r
+#define MAX_COMMAND_SIZE               4096\r
+#define MAX_RESPONSE_SIZE              4096\r
+#define ORDERLY_BITS                   8\r
+#define MAX_ORDERLY_COUNT              ((1 << ORDERLY_BITS) - 1)\r
+#define ALG_ID_FIRST                   TPM_ALG_FIRST\r
+#define ALG_ID_LAST                    TPM_ALG_LAST\r
+#define MAX_SYM_DATA                   128\r
+#define MAX_RNG_ENTROPY_SIZE           64\r
+#define RAM_INDEX_SPACE                512\r
+#define RSA_DEFAULT_PUBLIC_EXPONENT    0x00010001\r
+#define CRT_FORMAT_RSA                 YES\r
+#define PRIVATE_VENDOR_SPECIFIC_BYTES  ((MAX_RSA_KEY_BYTES / 2) * ( 3 + CRT_FORMAT_RSA * 2))\r
 \r
 // Capability related MAX_ value\r
-#define MAX_CAP_DATA       (MAX_CAP_BUFFER - sizeof(TPM_CAP) - sizeof(UINT32))\r
-#define MAX_CAP_ALGS       (MAX_CAP_DATA / sizeof(TPMS_ALG_PROPERTY))\r
-#define MAX_CAP_HANDLES    (MAX_CAP_DATA / sizeof(TPM_HANDLE))\r
-#define MAX_CAP_CC         (MAX_CAP_DATA / sizeof(TPM_CC))\r
-#define MAX_TPM_PROPERTIES (MAX_CAP_DATA / sizeof(TPMS_TAGGED_PROPERTY))\r
-#define MAX_PCR_PROPERTIES (MAX_CAP_DATA / sizeof(TPMS_TAGGED_PCR_SELECT))\r
-#define MAX_ECC_CURVES     (MAX_CAP_DATA / sizeof(TPM_ECC_CURVE))\r
+#define MAX_CAP_DATA        (MAX_CAP_BUFFER - sizeof(TPM_CAP) - sizeof(UINT32))\r
+#define MAX_CAP_ALGS        (MAX_CAP_DATA / sizeof(TPMS_ALG_PROPERTY))\r
+#define MAX_CAP_HANDLES     (MAX_CAP_DATA / sizeof(TPM_HANDLE))\r
+#define MAX_CAP_CC          (MAX_CAP_DATA / sizeof(TPM_CC))\r
+#define MAX_TPM_PROPERTIES  (MAX_CAP_DATA / sizeof(TPMS_TAGGED_PROPERTY))\r
+#define MAX_PCR_PROPERTIES  (MAX_CAP_DATA / sizeof(TPMS_TAGGED_PCR_SELECT))\r
+#define MAX_ECC_CURVES      (MAX_CAP_DATA / sizeof(TPM_ECC_CURVE))\r
 \r
 //\r
 // Always set 5 here, because we want to support all hash algo in BIOS.\r
 //\r
-#define HASH_COUNT 5\r
+#define HASH_COUNT  5\r
 \r
 // 5 Base Types\r
 \r
@@ -146,8 +145,8 @@ typedef UINT8 BYTE;
 //\r
 // NOTE: Comment because it has same name as TPM1.2 (value is same, so not runtime issue)\r
 //\r
-//typedef UINT32 TPM_ALGORITHM_ID;\r
-//typedef UINT32 TPM_MODIFIER_INDICATOR;\r
+// typedef UINT32 TPM_ALGORITHM_ID;\r
+// typedef UINT32 TPM_MODIFIER_INDICATOR;\r
 typedef UINT32 TPM_AUTHORIZATION_SIZE;\r
 typedef UINT32 TPM_PARAMETER_SIZE;\r
 typedef UINT16 TPM_KEY_SIZE;\r
@@ -157,481 +156,481 @@ typedef UINT16 TPM_KEY_BITS;
 \r
 // Table 6 - TPM_GENERATED Constants\r
 typedef UINT32 TPM_GENERATED;\r
-#define TPM_GENERATED_VALUE (TPM_GENERATED)(0xff544347)\r
+#define TPM_GENERATED_VALUE  (TPM_GENERATED)(0xff544347)\r
 \r
 // Table 7 - TPM_ALG_ID Constants\r
 typedef UINT16 TPM_ALG_ID;\r
 //\r
 // NOTE: Comment some algo which has same name as TPM1.2 (value is same, so not runtime issue)\r
 //\r
-#define TPM_ALG_ERROR          (TPM_ALG_ID)(0x0000)\r
-#define TPM_ALG_FIRST          (TPM_ALG_ID)(0x0001)\r
-//#define TPM_ALG_RSA            (TPM_ALG_ID)(0x0001)\r
-//#define TPM_ALG_SHA            (TPM_ALG_ID)(0x0004)\r
-#define TPM_ALG_SHA1           (TPM_ALG_ID)(0x0004)\r
-//#define TPM_ALG_HMAC           (TPM_ALG_ID)(0x0005)\r
-#define TPM_ALG_AES            (TPM_ALG_ID)(0x0006)\r
-//#define TPM_ALG_MGF1           (TPM_ALG_ID)(0x0007)\r
-#define TPM_ALG_KEYEDHASH      (TPM_ALG_ID)(0x0008)\r
-//#define TPM_ALG_XOR            (TPM_ALG_ID)(0x000A)\r
-#define TPM_ALG_SHA256         (TPM_ALG_ID)(0x000B)\r
-#define TPM_ALG_SHA384         (TPM_ALG_ID)(0x000C)\r
-#define TPM_ALG_SHA512         (TPM_ALG_ID)(0x000D)\r
-#define TPM_ALG_NULL           (TPM_ALG_ID)(0x0010)\r
-#define TPM_ALG_SM3_256        (TPM_ALG_ID)(0x0012)\r
-#define TPM_ALG_SM4            (TPM_ALG_ID)(0x0013)\r
-#define TPM_ALG_RSASSA         (TPM_ALG_ID)(0x0014)\r
-#define TPM_ALG_RSAES          (TPM_ALG_ID)(0x0015)\r
-#define TPM_ALG_RSAPSS         (TPM_ALG_ID)(0x0016)\r
-#define TPM_ALG_OAEP           (TPM_ALG_ID)(0x0017)\r
-#define TPM_ALG_ECDSA          (TPM_ALG_ID)(0x0018)\r
-#define TPM_ALG_ECDH           (TPM_ALG_ID)(0x0019)\r
-#define TPM_ALG_ECDAA          (TPM_ALG_ID)(0x001A)\r
-#define TPM_ALG_SM2            (TPM_ALG_ID)(0x001B)\r
-#define TPM_ALG_ECSCHNORR      (TPM_ALG_ID)(0x001C)\r
-#define TPM_ALG_ECMQV          (TPM_ALG_ID)(0x001D)\r
-#define TPM_ALG_KDF1_SP800_56a (TPM_ALG_ID)(0x0020)\r
-#define TPM_ALG_KDF2           (TPM_ALG_ID)(0x0021)\r
-#define TPM_ALG_KDF1_SP800_108 (TPM_ALG_ID)(0x0022)\r
-#define TPM_ALG_ECC            (TPM_ALG_ID)(0x0023)\r
-#define TPM_ALG_SYMCIPHER      (TPM_ALG_ID)(0x0025)\r
-#define TPM_ALG_CTR            (TPM_ALG_ID)(0x0040)\r
-#define TPM_ALG_OFB            (TPM_ALG_ID)(0x0041)\r
-#define TPM_ALG_CBC            (TPM_ALG_ID)(0x0042)\r
-#define TPM_ALG_CFB            (TPM_ALG_ID)(0x0043)\r
-#define TPM_ALG_ECB            (TPM_ALG_ID)(0x0044)\r
-#define TPM_ALG_LAST           (TPM_ALG_ID)(0x0044)\r
+#define TPM_ALG_ERROR  (TPM_ALG_ID)(0x0000)\r
+#define TPM_ALG_FIRST  (TPM_ALG_ID)(0x0001)\r
+// #define TPM_ALG_RSA            (TPM_ALG_ID)(0x0001)\r
+// #define TPM_ALG_SHA            (TPM_ALG_ID)(0x0004)\r
+#define TPM_ALG_SHA1  (TPM_ALG_ID)(0x0004)\r
+// #define TPM_ALG_HMAC           (TPM_ALG_ID)(0x0005)\r
+#define TPM_ALG_AES  (TPM_ALG_ID)(0x0006)\r
+// #define TPM_ALG_MGF1           (TPM_ALG_ID)(0x0007)\r
+#define TPM_ALG_KEYEDHASH  (TPM_ALG_ID)(0x0008)\r
+// #define TPM_ALG_XOR            (TPM_ALG_ID)(0x000A)\r
+#define TPM_ALG_SHA256          (TPM_ALG_ID)(0x000B)\r
+#define TPM_ALG_SHA384          (TPM_ALG_ID)(0x000C)\r
+#define TPM_ALG_SHA512          (TPM_ALG_ID)(0x000D)\r
+#define TPM_ALG_NULL            (TPM_ALG_ID)(0x0010)\r
+#define TPM_ALG_SM3_256         (TPM_ALG_ID)(0x0012)\r
+#define TPM_ALG_SM4             (TPM_ALG_ID)(0x0013)\r
+#define TPM_ALG_RSASSA          (TPM_ALG_ID)(0x0014)\r
+#define TPM_ALG_RSAES           (TPM_ALG_ID)(0x0015)\r
+#define TPM_ALG_RSAPSS          (TPM_ALG_ID)(0x0016)\r
+#define TPM_ALG_OAEP            (TPM_ALG_ID)(0x0017)\r
+#define TPM_ALG_ECDSA           (TPM_ALG_ID)(0x0018)\r
+#define TPM_ALG_ECDH            (TPM_ALG_ID)(0x0019)\r
+#define TPM_ALG_ECDAA           (TPM_ALG_ID)(0x001A)\r
+#define TPM_ALG_SM2             (TPM_ALG_ID)(0x001B)\r
+#define TPM_ALG_ECSCHNORR       (TPM_ALG_ID)(0x001C)\r
+#define TPM_ALG_ECMQV           (TPM_ALG_ID)(0x001D)\r
+#define TPM_ALG_KDF1_SP800_56a  (TPM_ALG_ID)(0x0020)\r
+#define TPM_ALG_KDF2            (TPM_ALG_ID)(0x0021)\r
+#define TPM_ALG_KDF1_SP800_108  (TPM_ALG_ID)(0x0022)\r
+#define TPM_ALG_ECC             (TPM_ALG_ID)(0x0023)\r
+#define TPM_ALG_SYMCIPHER       (TPM_ALG_ID)(0x0025)\r
+#define TPM_ALG_CTR             (TPM_ALG_ID)(0x0040)\r
+#define TPM_ALG_OFB             (TPM_ALG_ID)(0x0041)\r
+#define TPM_ALG_CBC             (TPM_ALG_ID)(0x0042)\r
+#define TPM_ALG_CFB             (TPM_ALG_ID)(0x0043)\r
+#define TPM_ALG_ECB             (TPM_ALG_ID)(0x0044)\r
+#define TPM_ALG_LAST            (TPM_ALG_ID)(0x0044)\r
 \r
 // Table 8 - TPM_ECC_CURVE Constants\r
 typedef UINT16 TPM_ECC_CURVE;\r
-#define TPM_ECC_NONE      (TPM_ECC_CURVE)(0x0000)\r
-#define TPM_ECC_NIST_P192 (TPM_ECC_CURVE)(0x0001)\r
-#define TPM_ECC_NIST_P224 (TPM_ECC_CURVE)(0x0002)\r
-#define TPM_ECC_NIST_P256 (TPM_ECC_CURVE)(0x0003)\r
-#define TPM_ECC_NIST_P384 (TPM_ECC_CURVE)(0x0004)\r
-#define TPM_ECC_NIST_P521 (TPM_ECC_CURVE)(0x0005)\r
-#define TPM_ECC_BN_P256   (TPM_ECC_CURVE)(0x0010)\r
-#define TPM_ECC_BN_P638   (TPM_ECC_CURVE)(0x0011)\r
-#define TPM_ECC_SM2_P256  (TPM_ECC_CURVE)(0x0020)\r
+#define TPM_ECC_NONE       (TPM_ECC_CURVE)(0x0000)\r
+#define TPM_ECC_NIST_P192  (TPM_ECC_CURVE)(0x0001)\r
+#define TPM_ECC_NIST_P224  (TPM_ECC_CURVE)(0x0002)\r
+#define TPM_ECC_NIST_P256  (TPM_ECC_CURVE)(0x0003)\r
+#define TPM_ECC_NIST_P384  (TPM_ECC_CURVE)(0x0004)\r
+#define TPM_ECC_NIST_P521  (TPM_ECC_CURVE)(0x0005)\r
+#define TPM_ECC_BN_P256    (TPM_ECC_CURVE)(0x0010)\r
+#define TPM_ECC_BN_P638    (TPM_ECC_CURVE)(0x0011)\r
+#define TPM_ECC_SM2_P256   (TPM_ECC_CURVE)(0x0020)\r
 \r
 // Table 11 - TPM_CC Constants (Numeric Order)\r
 typedef UINT32 TPM_CC;\r
-#define TPM_CC_FIRST                      (TPM_CC)(0x0000011F)\r
-#define TPM_CC_PP_FIRST                   (TPM_CC)(0x0000011F)\r
-#define TPM_CC_NV_UndefineSpaceSpecial    (TPM_CC)(0x0000011F)\r
-#define TPM_CC_EvictControl               (TPM_CC)(0x00000120)\r
-#define TPM_CC_HierarchyControl           (TPM_CC)(0x00000121)\r
-#define TPM_CC_NV_UndefineSpace           (TPM_CC)(0x00000122)\r
-#define TPM_CC_ChangeEPS                  (TPM_CC)(0x00000124)\r
-#define TPM_CC_ChangePPS                  (TPM_CC)(0x00000125)\r
-#define TPM_CC_Clear                      (TPM_CC)(0x00000126)\r
-#define TPM_CC_ClearControl               (TPM_CC)(0x00000127)\r
-#define TPM_CC_ClockSet                   (TPM_CC)(0x00000128)\r
-#define TPM_CC_HierarchyChangeAuth        (TPM_CC)(0x00000129)\r
-#define TPM_CC_NV_DefineSpace             (TPM_CC)(0x0000012A)\r
-#define TPM_CC_PCR_Allocate               (TPM_CC)(0x0000012B)\r
-#define TPM_CC_PCR_SetAuthPolicy          (TPM_CC)(0x0000012C)\r
-#define TPM_CC_PP_Commands                (TPM_CC)(0x0000012D)\r
-#define TPM_CC_SetPrimaryPolicy           (TPM_CC)(0x0000012E)\r
-#define TPM_CC_FieldUpgradeStart          (TPM_CC)(0x0000012F)\r
-#define TPM_CC_ClockRateAdjust            (TPM_CC)(0x00000130)\r
-#define TPM_CC_CreatePrimary              (TPM_CC)(0x00000131)\r
-#define TPM_CC_NV_GlobalWriteLock         (TPM_CC)(0x00000132)\r
-#define TPM_CC_PP_LAST                    (TPM_CC)(0x00000132)\r
-#define TPM_CC_GetCommandAuditDigest      (TPM_CC)(0x00000133)\r
-#define TPM_CC_NV_Increment               (TPM_CC)(0x00000134)\r
-#define TPM_CC_NV_SetBits                 (TPM_CC)(0x00000135)\r
-#define TPM_CC_NV_Extend                  (TPM_CC)(0x00000136)\r
-#define TPM_CC_NV_Write                   (TPM_CC)(0x00000137)\r
-#define TPM_CC_NV_WriteLock               (TPM_CC)(0x00000138)\r
-#define TPM_CC_DictionaryAttackLockReset  (TPM_CC)(0x00000139)\r
-#define TPM_CC_DictionaryAttackParameters (TPM_CC)(0x0000013A)\r
-#define TPM_CC_NV_ChangeAuth              (TPM_CC)(0x0000013B)\r
-#define TPM_CC_PCR_Event                  (TPM_CC)(0x0000013C)\r
-#define TPM_CC_PCR_Reset                  (TPM_CC)(0x0000013D)\r
-#define TPM_CC_SequenceComplete           (TPM_CC)(0x0000013E)\r
-#define TPM_CC_SetAlgorithmSet            (TPM_CC)(0x0000013F)\r
-#define TPM_CC_SetCommandCodeAuditStatus  (TPM_CC)(0x00000140)\r
-#define TPM_CC_FieldUpgradeData           (TPM_CC)(0x00000141)\r
-#define TPM_CC_IncrementalSelfTest        (TPM_CC)(0x00000142)\r
-#define TPM_CC_SelfTest                   (TPM_CC)(0x00000143)\r
-#define TPM_CC_Startup                    (TPM_CC)(0x00000144)\r
-#define TPM_CC_Shutdown                   (TPM_CC)(0x00000145)\r
-#define TPM_CC_StirRandom                 (TPM_CC)(0x00000146)\r
-#define TPM_CC_ActivateCredential         (TPM_CC)(0x00000147)\r
-#define TPM_CC_Certify                    (TPM_CC)(0x00000148)\r
-#define TPM_CC_PolicyNV                   (TPM_CC)(0x00000149)\r
-#define TPM_CC_CertifyCreation            (TPM_CC)(0x0000014A)\r
-#define TPM_CC_Duplicate                  (TPM_CC)(0x0000014B)\r
-#define TPM_CC_GetTime                    (TPM_CC)(0x0000014C)\r
-#define TPM_CC_GetSessionAuditDigest      (TPM_CC)(0x0000014D)\r
-#define TPM_CC_NV_Read                    (TPM_CC)(0x0000014E)\r
-#define TPM_CC_NV_ReadLock                (TPM_CC)(0x0000014F)\r
-#define TPM_CC_ObjectChangeAuth           (TPM_CC)(0x00000150)\r
-#define TPM_CC_PolicySecret               (TPM_CC)(0x00000151)\r
-#define TPM_CC_Rewrap                     (TPM_CC)(0x00000152)\r
-#define TPM_CC_Create                     (TPM_CC)(0x00000153)\r
-#define TPM_CC_ECDH_ZGen                  (TPM_CC)(0x00000154)\r
-#define TPM_CC_HMAC                       (TPM_CC)(0x00000155)\r
-#define TPM_CC_Import                     (TPM_CC)(0x00000156)\r
-#define TPM_CC_Load                       (TPM_CC)(0x00000157)\r
-#define TPM_CC_Quote                      (TPM_CC)(0x00000158)\r
-#define TPM_CC_RSA_Decrypt                (TPM_CC)(0x00000159)\r
-#define TPM_CC_HMAC_Start                 (TPM_CC)(0x0000015B)\r
-#define TPM_CC_SequenceUpdate             (TPM_CC)(0x0000015C)\r
-#define TPM_CC_Sign                       (TPM_CC)(0x0000015D)\r
-#define TPM_CC_Unseal                     (TPM_CC)(0x0000015E)\r
-#define TPM_CC_PolicySigned               (TPM_CC)(0x00000160)\r
-#define TPM_CC_ContextLoad                (TPM_CC)(0x00000161)\r
-#define TPM_CC_ContextSave                (TPM_CC)(0x00000162)\r
-#define TPM_CC_ECDH_KeyGen                (TPM_CC)(0x00000163)\r
-#define TPM_CC_EncryptDecrypt             (TPM_CC)(0x00000164)\r
-#define TPM_CC_FlushContext               (TPM_CC)(0x00000165)\r
-#define TPM_CC_LoadExternal               (TPM_CC)(0x00000167)\r
-#define TPM_CC_MakeCredential             (TPM_CC)(0x00000168)\r
-#define TPM_CC_NV_ReadPublic              (TPM_CC)(0x00000169)\r
-#define TPM_CC_PolicyAuthorize            (TPM_CC)(0x0000016A)\r
-#define TPM_CC_PolicyAuthValue            (TPM_CC)(0x0000016B)\r
-#define TPM_CC_PolicyCommandCode          (TPM_CC)(0x0000016C)\r
-#define TPM_CC_PolicyCounterTimer         (TPM_CC)(0x0000016D)\r
-#define TPM_CC_PolicyCpHash               (TPM_CC)(0x0000016E)\r
-#define TPM_CC_PolicyLocality             (TPM_CC)(0x0000016F)\r
-#define TPM_CC_PolicyNameHash             (TPM_CC)(0x00000170)\r
-#define TPM_CC_PolicyOR                   (TPM_CC)(0x00000171)\r
-#define TPM_CC_PolicyTicket               (TPM_CC)(0x00000172)\r
-#define TPM_CC_ReadPublic                 (TPM_CC)(0x00000173)\r
-#define TPM_CC_RSA_Encrypt                (TPM_CC)(0x00000174)\r
-#define TPM_CC_StartAuthSession           (TPM_CC)(0x00000176)\r
-#define TPM_CC_VerifySignature            (TPM_CC)(0x00000177)\r
-#define TPM_CC_ECC_Parameters             (TPM_CC)(0x00000178)\r
-#define TPM_CC_FirmwareRead               (TPM_CC)(0x00000179)\r
-#define TPM_CC_GetCapability              (TPM_CC)(0x0000017A)\r
-#define TPM_CC_GetRandom                  (TPM_CC)(0x0000017B)\r
-#define TPM_CC_GetTestResult              (TPM_CC)(0x0000017C)\r
-#define TPM_CC_Hash                       (TPM_CC)(0x0000017D)\r
-#define TPM_CC_PCR_Read                   (TPM_CC)(0x0000017E)\r
-#define TPM_CC_PolicyPCR                  (TPM_CC)(0x0000017F)\r
-#define TPM_CC_PolicyRestart              (TPM_CC)(0x00000180)\r
-#define TPM_CC_ReadClock                  (TPM_CC)(0x00000181)\r
-#define TPM_CC_PCR_Extend                 (TPM_CC)(0x00000182)\r
-#define TPM_CC_PCR_SetAuthValue           (TPM_CC)(0x00000183)\r
-#define TPM_CC_NV_Certify                 (TPM_CC)(0x00000184)\r
-#define TPM_CC_EventSequenceComplete      (TPM_CC)(0x00000185)\r
-#define TPM_CC_HashSequenceStart          (TPM_CC)(0x00000186)\r
-#define TPM_CC_PolicyPhysicalPresence     (TPM_CC)(0x00000187)\r
-#define TPM_CC_PolicyDuplicationSelect    (TPM_CC)(0x00000188)\r
-#define TPM_CC_PolicyGetDigest            (TPM_CC)(0x00000189)\r
-#define TPM_CC_TestParms                  (TPM_CC)(0x0000018A)\r
-#define TPM_CC_Commit                     (TPM_CC)(0x0000018B)\r
-#define TPM_CC_PolicyPassword             (TPM_CC)(0x0000018C)\r
-#define TPM_CC_ZGen_2Phase                (TPM_CC)(0x0000018D)\r
-#define TPM_CC_EC_Ephemeral               (TPM_CC)(0x0000018E)\r
-#define TPM_CC_LAST                       (TPM_CC)(0x0000018E)\r
+#define TPM_CC_FIRST                       (TPM_CC)(0x0000011F)\r
+#define TPM_CC_PP_FIRST                    (TPM_CC)(0x0000011F)\r
+#define TPM_CC_NV_UndefineSpaceSpecial     (TPM_CC)(0x0000011F)\r
+#define TPM_CC_EvictControl                (TPM_CC)(0x00000120)\r
+#define TPM_CC_HierarchyControl            (TPM_CC)(0x00000121)\r
+#define TPM_CC_NV_UndefineSpace            (TPM_CC)(0x00000122)\r
+#define TPM_CC_ChangeEPS                   (TPM_CC)(0x00000124)\r
+#define TPM_CC_ChangePPS                   (TPM_CC)(0x00000125)\r
+#define TPM_CC_Clear                       (TPM_CC)(0x00000126)\r
+#define TPM_CC_ClearControl                (TPM_CC)(0x00000127)\r
+#define TPM_CC_ClockSet                    (TPM_CC)(0x00000128)\r
+#define TPM_CC_HierarchyChangeAuth         (TPM_CC)(0x00000129)\r
+#define TPM_CC_NV_DefineSpace              (TPM_CC)(0x0000012A)\r
+#define TPM_CC_PCR_Allocate                (TPM_CC)(0x0000012B)\r
+#define TPM_CC_PCR_SetAuthPolicy           (TPM_CC)(0x0000012C)\r
+#define TPM_CC_PP_Commands                 (TPM_CC)(0x0000012D)\r
+#define TPM_CC_SetPrimaryPolicy            (TPM_CC)(0x0000012E)\r
+#define TPM_CC_FieldUpgradeStart           (TPM_CC)(0x0000012F)\r
+#define TPM_CC_ClockRateAdjust             (TPM_CC)(0x00000130)\r
+#define TPM_CC_CreatePrimary               (TPM_CC)(0x00000131)\r
+#define TPM_CC_NV_GlobalWriteLock          (TPM_CC)(0x00000132)\r
+#define TPM_CC_PP_LAST                     (TPM_CC)(0x00000132)\r
+#define TPM_CC_GetCommandAuditDigest       (TPM_CC)(0x00000133)\r
+#define TPM_CC_NV_Increment                (TPM_CC)(0x00000134)\r
+#define TPM_CC_NV_SetBits                  (TPM_CC)(0x00000135)\r
+#define TPM_CC_NV_Extend                   (TPM_CC)(0x00000136)\r
+#define TPM_CC_NV_Write                    (TPM_CC)(0x00000137)\r
+#define TPM_CC_NV_WriteLock                (TPM_CC)(0x00000138)\r
+#define TPM_CC_DictionaryAttackLockReset   (TPM_CC)(0x00000139)\r
+#define TPM_CC_DictionaryAttackParameters  (TPM_CC)(0x0000013A)\r
+#define TPM_CC_NV_ChangeAuth               (TPM_CC)(0x0000013B)\r
+#define TPM_CC_PCR_Event                   (TPM_CC)(0x0000013C)\r
+#define TPM_CC_PCR_Reset                   (TPM_CC)(0x0000013D)\r
+#define TPM_CC_SequenceComplete            (TPM_CC)(0x0000013E)\r
+#define TPM_CC_SetAlgorithmSet             (TPM_CC)(0x0000013F)\r
+#define TPM_CC_SetCommandCodeAuditStatus   (TPM_CC)(0x00000140)\r
+#define TPM_CC_FieldUpgradeData            (TPM_CC)(0x00000141)\r
+#define TPM_CC_IncrementalSelfTest         (TPM_CC)(0x00000142)\r
+#define TPM_CC_SelfTest                    (TPM_CC)(0x00000143)\r
+#define TPM_CC_Startup                     (TPM_CC)(0x00000144)\r
+#define TPM_CC_Shutdown                    (TPM_CC)(0x00000145)\r
+#define TPM_CC_StirRandom                  (TPM_CC)(0x00000146)\r
+#define TPM_CC_ActivateCredential          (TPM_CC)(0x00000147)\r
+#define TPM_CC_Certify                     (TPM_CC)(0x00000148)\r
+#define TPM_CC_PolicyNV                    (TPM_CC)(0x00000149)\r
+#define TPM_CC_CertifyCreation             (TPM_CC)(0x0000014A)\r
+#define TPM_CC_Duplicate                   (TPM_CC)(0x0000014B)\r
+#define TPM_CC_GetTime                     (TPM_CC)(0x0000014C)\r
+#define TPM_CC_GetSessionAuditDigest       (TPM_CC)(0x0000014D)\r
+#define TPM_CC_NV_Read                     (TPM_CC)(0x0000014E)\r
+#define TPM_CC_NV_ReadLock                 (TPM_CC)(0x0000014F)\r
+#define TPM_CC_ObjectChangeAuth            (TPM_CC)(0x00000150)\r
+#define TPM_CC_PolicySecret                (TPM_CC)(0x00000151)\r
+#define TPM_CC_Rewrap                      (TPM_CC)(0x00000152)\r
+#define TPM_CC_Create                      (TPM_CC)(0x00000153)\r
+#define TPM_CC_ECDH_ZGen                   (TPM_CC)(0x00000154)\r
+#define TPM_CC_HMAC                        (TPM_CC)(0x00000155)\r
+#define TPM_CC_Import                      (TPM_CC)(0x00000156)\r
+#define TPM_CC_Load                        (TPM_CC)(0x00000157)\r
+#define TPM_CC_Quote                       (TPM_CC)(0x00000158)\r
+#define TPM_CC_RSA_Decrypt                 (TPM_CC)(0x00000159)\r
+#define TPM_CC_HMAC_Start                  (TPM_CC)(0x0000015B)\r
+#define TPM_CC_SequenceUpdate              (TPM_CC)(0x0000015C)\r
+#define TPM_CC_Sign                        (TPM_CC)(0x0000015D)\r
+#define TPM_CC_Unseal                      (TPM_CC)(0x0000015E)\r
+#define TPM_CC_PolicySigned                (TPM_CC)(0x00000160)\r
+#define TPM_CC_ContextLoad                 (TPM_CC)(0x00000161)\r
+#define TPM_CC_ContextSave                 (TPM_CC)(0x00000162)\r
+#define TPM_CC_ECDH_KeyGen                 (TPM_CC)(0x00000163)\r
+#define TPM_CC_EncryptDecrypt              (TPM_CC)(0x00000164)\r
+#define TPM_CC_FlushContext                (TPM_CC)(0x00000165)\r
+#define TPM_CC_LoadExternal                (TPM_CC)(0x00000167)\r
+#define TPM_CC_MakeCredential              (TPM_CC)(0x00000168)\r
+#define TPM_CC_NV_ReadPublic               (TPM_CC)(0x00000169)\r
+#define TPM_CC_PolicyAuthorize             (TPM_CC)(0x0000016A)\r
+#define TPM_CC_PolicyAuthValue             (TPM_CC)(0x0000016B)\r
+#define TPM_CC_PolicyCommandCode           (TPM_CC)(0x0000016C)\r
+#define TPM_CC_PolicyCounterTimer          (TPM_CC)(0x0000016D)\r
+#define TPM_CC_PolicyCpHash                (TPM_CC)(0x0000016E)\r
+#define TPM_CC_PolicyLocality              (TPM_CC)(0x0000016F)\r
+#define TPM_CC_PolicyNameHash              (TPM_CC)(0x00000170)\r
+#define TPM_CC_PolicyOR                    (TPM_CC)(0x00000171)\r
+#define TPM_CC_PolicyTicket                (TPM_CC)(0x00000172)\r
+#define TPM_CC_ReadPublic                  (TPM_CC)(0x00000173)\r
+#define TPM_CC_RSA_Encrypt                 (TPM_CC)(0x00000174)\r
+#define TPM_CC_StartAuthSession            (TPM_CC)(0x00000176)\r
+#define TPM_CC_VerifySignature             (TPM_CC)(0x00000177)\r
+#define TPM_CC_ECC_Parameters              (TPM_CC)(0x00000178)\r
+#define TPM_CC_FirmwareRead                (TPM_CC)(0x00000179)\r
+#define TPM_CC_GetCapability               (TPM_CC)(0x0000017A)\r
+#define TPM_CC_GetRandom                   (TPM_CC)(0x0000017B)\r
+#define TPM_CC_GetTestResult               (TPM_CC)(0x0000017C)\r
+#define TPM_CC_Hash                        (TPM_CC)(0x0000017D)\r
+#define TPM_CC_PCR_Read                    (TPM_CC)(0x0000017E)\r
+#define TPM_CC_PolicyPCR                   (TPM_CC)(0x0000017F)\r
+#define TPM_CC_PolicyRestart               (TPM_CC)(0x00000180)\r
+#define TPM_CC_ReadClock                   (TPM_CC)(0x00000181)\r
+#define TPM_CC_PCR_Extend                  (TPM_CC)(0x00000182)\r
+#define TPM_CC_PCR_SetAuthValue            (TPM_CC)(0x00000183)\r
+#define TPM_CC_NV_Certify                  (TPM_CC)(0x00000184)\r
+#define TPM_CC_EventSequenceComplete       (TPM_CC)(0x00000185)\r
+#define TPM_CC_HashSequenceStart           (TPM_CC)(0x00000186)\r
+#define TPM_CC_PolicyPhysicalPresence      (TPM_CC)(0x00000187)\r
+#define TPM_CC_PolicyDuplicationSelect     (TPM_CC)(0x00000188)\r
+#define TPM_CC_PolicyGetDigest             (TPM_CC)(0x00000189)\r
+#define TPM_CC_TestParms                   (TPM_CC)(0x0000018A)\r
+#define TPM_CC_Commit                      (TPM_CC)(0x0000018B)\r
+#define TPM_CC_PolicyPassword              (TPM_CC)(0x0000018C)\r
+#define TPM_CC_ZGen_2Phase                 (TPM_CC)(0x0000018D)\r
+#define TPM_CC_EC_Ephemeral                (TPM_CC)(0x0000018E)\r
+#define TPM_CC_LAST                        (TPM_CC)(0x0000018E)\r
 \r
 // Table 15 - TPM_RC Constants (Actions)\r
 typedef UINT32 TPM_RC;\r
-#define TPM_RC_SUCCESS           (TPM_RC)(0x000)\r
-#define TPM_RC_BAD_TAG           (TPM_RC)(0x030)\r
-#define RC_VER1                  (TPM_RC)(0x100)\r
-#define TPM_RC_INITIALIZE        (TPM_RC)(RC_VER1 + 0x000)\r
-#define TPM_RC_FAILURE           (TPM_RC)(RC_VER1 + 0x001)\r
-#define TPM_RC_SEQUENCE          (TPM_RC)(RC_VER1 + 0x003)\r
-#define TPM_RC_PRIVATE           (TPM_RC)(RC_VER1 + 0x00B)\r
-#define TPM_RC_HMAC              (TPM_RC)(RC_VER1 + 0x019)\r
-#define TPM_RC_DISABLED          (TPM_RC)(RC_VER1 + 0x020)\r
-#define TPM_RC_EXCLUSIVE         (TPM_RC)(RC_VER1 + 0x021)\r
-#define TPM_RC_AUTH_TYPE         (TPM_RC)(RC_VER1 + 0x024)\r
-#define TPM_RC_AUTH_MISSING      (TPM_RC)(RC_VER1 + 0x025)\r
-#define TPM_RC_POLICY            (TPM_RC)(RC_VER1 + 0x026)\r
-#define TPM_RC_PCR               (TPM_RC)(RC_VER1 + 0x027)\r
-#define TPM_RC_PCR_CHANGED       (TPM_RC)(RC_VER1 + 0x028)\r
-#define TPM_RC_UPGRADE           (TPM_RC)(RC_VER1 + 0x02D)\r
-#define TPM_RC_TOO_MANY_CONTEXTS (TPM_RC)(RC_VER1 + 0x02E)\r
-#define TPM_RC_AUTH_UNAVAILABLE  (TPM_RC)(RC_VER1 + 0x02F)\r
-#define TPM_RC_REBOOT            (TPM_RC)(RC_VER1 + 0x030)\r
-#define TPM_RC_UNBALANCED        (TPM_RC)(RC_VER1 + 0x031)\r
-#define TPM_RC_COMMAND_SIZE      (TPM_RC)(RC_VER1 + 0x042)\r
-#define TPM_RC_COMMAND_CODE      (TPM_RC)(RC_VER1 + 0x043)\r
-#define TPM_RC_AUTHSIZE          (TPM_RC)(RC_VER1 + 0x044)\r
-#define TPM_RC_AUTH_CONTEXT      (TPM_RC)(RC_VER1 + 0x045)\r
-#define TPM_RC_NV_RANGE          (TPM_RC)(RC_VER1 + 0x046)\r
-#define TPM_RC_NV_SIZE           (TPM_RC)(RC_VER1 + 0x047)\r
-#define TPM_RC_NV_LOCKED         (TPM_RC)(RC_VER1 + 0x048)\r
-#define TPM_RC_NV_AUTHORIZATION  (TPM_RC)(RC_VER1 + 0x049)\r
-#define TPM_RC_NV_UNINITIALIZED  (TPM_RC)(RC_VER1 + 0x04A)\r
-#define TPM_RC_NV_SPACE          (TPM_RC)(RC_VER1 + 0x04B)\r
-#define TPM_RC_NV_DEFINED        (TPM_RC)(RC_VER1 + 0x04C)\r
-#define TPM_RC_BAD_CONTEXT       (TPM_RC)(RC_VER1 + 0x050)\r
-#define TPM_RC_CPHASH            (TPM_RC)(RC_VER1 + 0x051)\r
-#define TPM_RC_PARENT            (TPM_RC)(RC_VER1 + 0x052)\r
-#define TPM_RC_NEEDS_TEST        (TPM_RC)(RC_VER1 + 0x053)\r
-#define TPM_RC_NO_RESULT         (TPM_RC)(RC_VER1 + 0x054)\r
-#define TPM_RC_SENSITIVE         (TPM_RC)(RC_VER1 + 0x055)\r
-#define RC_MAX_FM0               (TPM_RC)(RC_VER1 + 0x07F)\r
-#define RC_FMT1                  (TPM_RC)(0x080)\r
-#define TPM_RC_ASYMMETRIC        (TPM_RC)(RC_FMT1 + 0x001)\r
-#define TPM_RC_ATTRIBUTES        (TPM_RC)(RC_FMT1 + 0x002)\r
-#define TPM_RC_HASH              (TPM_RC)(RC_FMT1 + 0x003)\r
-#define TPM_RC_VALUE             (TPM_RC)(RC_FMT1 + 0x004)\r
-#define TPM_RC_HIERARCHY         (TPM_RC)(RC_FMT1 + 0x005)\r
-#define TPM_RC_KEY_SIZE          (TPM_RC)(RC_FMT1 + 0x007)\r
-#define TPM_RC_MGF               (TPM_RC)(RC_FMT1 + 0x008)\r
-#define TPM_RC_MODE              (TPM_RC)(RC_FMT1 + 0x009)\r
-#define TPM_RC_TYPE              (TPM_RC)(RC_FMT1 + 0x00A)\r
-#define TPM_RC_HANDLE            (TPM_RC)(RC_FMT1 + 0x00B)\r
-#define TPM_RC_KDF               (TPM_RC)(RC_FMT1 + 0x00C)\r
-#define TPM_RC_RANGE             (TPM_RC)(RC_FMT1 + 0x00D)\r
-#define TPM_RC_AUTH_FAIL         (TPM_RC)(RC_FMT1 + 0x00E)\r
-#define TPM_RC_NONCE             (TPM_RC)(RC_FMT1 + 0x00F)\r
-#define TPM_RC_PP                (TPM_RC)(RC_FMT1 + 0x010)\r
-#define TPM_RC_SCHEME            (TPM_RC)(RC_FMT1 + 0x012)\r
-#define TPM_RC_SIZE              (TPM_RC)(RC_FMT1 + 0x015)\r
-#define TPM_RC_SYMMETRIC         (TPM_RC)(RC_FMT1 + 0x016)\r
-#define TPM_RC_TAG               (TPM_RC)(RC_FMT1 + 0x017)\r
-#define TPM_RC_SELECTOR          (TPM_RC)(RC_FMT1 + 0x018)\r
-#define TPM_RC_INSUFFICIENT      (TPM_RC)(RC_FMT1 + 0x01A)\r
-#define TPM_RC_SIGNATURE         (TPM_RC)(RC_FMT1 + 0x01B)\r
-#define TPM_RC_KEY               (TPM_RC)(RC_FMT1 + 0x01C)\r
-#define TPM_RC_POLICY_FAIL       (TPM_RC)(RC_FMT1 + 0x01D)\r
-#define TPM_RC_INTEGRITY         (TPM_RC)(RC_FMT1 + 0x01F)\r
-#define TPM_RC_TICKET            (TPM_RC)(RC_FMT1 + 0x020)\r
-#define TPM_RC_RESERVED_BITS     (TPM_RC)(RC_FMT1 + 0x021)\r
-#define TPM_RC_BAD_AUTH          (TPM_RC)(RC_FMT1 + 0x022)\r
-#define TPM_RC_EXPIRED           (TPM_RC)(RC_FMT1 + 0x023)\r
-#define TPM_RC_POLICY_CC         (TPM_RC)(RC_FMT1 + 0x024 )\r
-#define TPM_RC_BINDING           (TPM_RC)(RC_FMT1 + 0x025)\r
-#define TPM_RC_CURVE             (TPM_RC)(RC_FMT1 + 0x026)\r
-#define TPM_RC_ECC_POINT         (TPM_RC)(RC_FMT1 + 0x027)\r
-#define RC_WARN                  (TPM_RC)(0x900)\r
-#define TPM_RC_CONTEXT_GAP       (TPM_RC)(RC_WARN + 0x001)\r
-#define TPM_RC_OBJECT_MEMORY     (TPM_RC)(RC_WARN + 0x002)\r
-#define TPM_RC_SESSION_MEMORY    (TPM_RC)(RC_WARN + 0x003)\r
-#define TPM_RC_MEMORY            (TPM_RC)(RC_WARN + 0x004)\r
-#define TPM_RC_SESSION_HANDLES   (TPM_RC)(RC_WARN + 0x005)\r
-#define TPM_RC_OBJECT_HANDLES    (TPM_RC)(RC_WARN + 0x006)\r
-#define TPM_RC_LOCALITY          (TPM_RC)(RC_WARN + 0x007)\r
-#define TPM_RC_YIELDED           (TPM_RC)(RC_WARN + 0x008)\r
-#define TPM_RC_CANCELED          (TPM_RC)(RC_WARN + 0x009)\r
-#define TPM_RC_TESTING           (TPM_RC)(RC_WARN + 0x00A)\r
-#define TPM_RC_REFERENCE_H0      (TPM_RC)(RC_WARN + 0x010)\r
-#define TPM_RC_REFERENCE_H1      (TPM_RC)(RC_WARN + 0x011)\r
-#define TPM_RC_REFERENCE_H2      (TPM_RC)(RC_WARN + 0x012)\r
-#define TPM_RC_REFERENCE_H3      (TPM_RC)(RC_WARN + 0x013)\r
-#define TPM_RC_REFERENCE_H4      (TPM_RC)(RC_WARN + 0x014)\r
-#define TPM_RC_REFERENCE_H5      (TPM_RC)(RC_WARN + 0x015)\r
-#define TPM_RC_REFERENCE_H6      (TPM_RC)(RC_WARN + 0x016)\r
-#define TPM_RC_REFERENCE_S0      (TPM_RC)(RC_WARN + 0x018)\r
-#define TPM_RC_REFERENCE_S1      (TPM_RC)(RC_WARN + 0x019)\r
-#define TPM_RC_REFERENCE_S2      (TPM_RC)(RC_WARN + 0x01A)\r
-#define TPM_RC_REFERENCE_S3      (TPM_RC)(RC_WARN + 0x01B)\r
-#define TPM_RC_REFERENCE_S4      (TPM_RC)(RC_WARN + 0x01C)\r
-#define TPM_RC_REFERENCE_S5      (TPM_RC)(RC_WARN + 0x01D)\r
-#define TPM_RC_REFERENCE_S6      (TPM_RC)(RC_WARN + 0x01E)\r
-#define TPM_RC_NV_RATE           (TPM_RC)(RC_WARN + 0x020)\r
-#define TPM_RC_LOCKOUT           (TPM_RC)(RC_WARN + 0x021)\r
-#define TPM_RC_RETRY             (TPM_RC)(RC_WARN + 0x022)\r
-#define TPM_RC_NV_UNAVAILABLE    (TPM_RC)(RC_WARN + 0x023)\r
-#define TPM_RC_NOT_USED          (TPM_RC)(RC_WARN + 0x7F)\r
-#define TPM_RC_H                 (TPM_RC)(0x000)\r
-#define TPM_RC_P                 (TPM_RC)(0x040)\r
-#define TPM_RC_S                 (TPM_RC)(0x800)\r
-#define TPM_RC_1                 (TPM_RC)(0x100)\r
-#define TPM_RC_2                 (TPM_RC)(0x200)\r
-#define TPM_RC_3                 (TPM_RC)(0x300)\r
-#define TPM_RC_4                 (TPM_RC)(0x400)\r
-#define TPM_RC_5                 (TPM_RC)(0x500)\r
-#define TPM_RC_6                 (TPM_RC)(0x600)\r
-#define TPM_RC_7                 (TPM_RC)(0x700)\r
-#define TPM_RC_8                 (TPM_RC)(0x800)\r
-#define TPM_RC_9                 (TPM_RC)(0x900)\r
-#define TPM_RC_A                 (TPM_RC)(0xA00)\r
-#define TPM_RC_B                 (TPM_RC)(0xB00)\r
-#define TPM_RC_C                 (TPM_RC)(0xC00)\r
-#define TPM_RC_D                 (TPM_RC)(0xD00)\r
-#define TPM_RC_E                 (TPM_RC)(0xE00)\r
-#define TPM_RC_F                 (TPM_RC)(0xF00)\r
-#define TPM_RC_N_MASK            (TPM_RC)(0xF00)\r
+#define TPM_RC_SUCCESS            (TPM_RC)(0x000)\r
+#define TPM_RC_BAD_TAG            (TPM_RC)(0x030)\r
+#define RC_VER1                   (TPM_RC)(0x100)\r
+#define TPM_RC_INITIALIZE         (TPM_RC)(RC_VER1 + 0x000)\r
+#define TPM_RC_FAILURE            (TPM_RC)(RC_VER1 + 0x001)\r
+#define TPM_RC_SEQUENCE           (TPM_RC)(RC_VER1 + 0x003)\r
+#define TPM_RC_PRIVATE            (TPM_RC)(RC_VER1 + 0x00B)\r
+#define TPM_RC_HMAC               (TPM_RC)(RC_VER1 + 0x019)\r
+#define TPM_RC_DISABLED           (TPM_RC)(RC_VER1 + 0x020)\r
+#define TPM_RC_EXCLUSIVE          (TPM_RC)(RC_VER1 + 0x021)\r
+#define TPM_RC_AUTH_TYPE          (TPM_RC)(RC_VER1 + 0x024)\r
+#define TPM_RC_AUTH_MISSING       (TPM_RC)(RC_VER1 + 0x025)\r
+#define TPM_RC_POLICY             (TPM_RC)(RC_VER1 + 0x026)\r
+#define TPM_RC_PCR                (TPM_RC)(RC_VER1 + 0x027)\r
+#define TPM_RC_PCR_CHANGED        (TPM_RC)(RC_VER1 + 0x028)\r
+#define TPM_RC_UPGRADE            (TPM_RC)(RC_VER1 + 0x02D)\r
+#define TPM_RC_TOO_MANY_CONTEXTS  (TPM_RC)(RC_VER1 + 0x02E)\r
+#define TPM_RC_AUTH_UNAVAILABLE   (TPM_RC)(RC_VER1 + 0x02F)\r
+#define TPM_RC_REBOOT             (TPM_RC)(RC_VER1 + 0x030)\r
+#define TPM_RC_UNBALANCED         (TPM_RC)(RC_VER1 + 0x031)\r
+#define TPM_RC_COMMAND_SIZE       (TPM_RC)(RC_VER1 + 0x042)\r
+#define TPM_RC_COMMAND_CODE       (TPM_RC)(RC_VER1 + 0x043)\r
+#define TPM_RC_AUTHSIZE           (TPM_RC)(RC_VER1 + 0x044)\r
+#define TPM_RC_AUTH_CONTEXT       (TPM_RC)(RC_VER1 + 0x045)\r
+#define TPM_RC_NV_RANGE           (TPM_RC)(RC_VER1 + 0x046)\r
+#define TPM_RC_NV_SIZE            (TPM_RC)(RC_VER1 + 0x047)\r
+#define TPM_RC_NV_LOCKED          (TPM_RC)(RC_VER1 + 0x048)\r
+#define TPM_RC_NV_AUTHORIZATION   (TPM_RC)(RC_VER1 + 0x049)\r
+#define TPM_RC_NV_UNINITIALIZED   (TPM_RC)(RC_VER1 + 0x04A)\r
+#define TPM_RC_NV_SPACE           (TPM_RC)(RC_VER1 + 0x04B)\r
+#define TPM_RC_NV_DEFINED         (TPM_RC)(RC_VER1 + 0x04C)\r
+#define TPM_RC_BAD_CONTEXT        (TPM_RC)(RC_VER1 + 0x050)\r
+#define TPM_RC_CPHASH             (TPM_RC)(RC_VER1 + 0x051)\r
+#define TPM_RC_PARENT             (TPM_RC)(RC_VER1 + 0x052)\r
+#define TPM_RC_NEEDS_TEST         (TPM_RC)(RC_VER1 + 0x053)\r
+#define TPM_RC_NO_RESULT          (TPM_RC)(RC_VER1 + 0x054)\r
+#define TPM_RC_SENSITIVE          (TPM_RC)(RC_VER1 + 0x055)\r
+#define RC_MAX_FM0                (TPM_RC)(RC_VER1 + 0x07F)\r
+#define RC_FMT1                   (TPM_RC)(0x080)\r
+#define TPM_RC_ASYMMETRIC         (TPM_RC)(RC_FMT1 + 0x001)\r
+#define TPM_RC_ATTRIBUTES         (TPM_RC)(RC_FMT1 + 0x002)\r
+#define TPM_RC_HASH               (TPM_RC)(RC_FMT1 + 0x003)\r
+#define TPM_RC_VALUE              (TPM_RC)(RC_FMT1 + 0x004)\r
+#define TPM_RC_HIERARCHY          (TPM_RC)(RC_FMT1 + 0x005)\r
+#define TPM_RC_KEY_SIZE           (TPM_RC)(RC_FMT1 + 0x007)\r
+#define TPM_RC_MGF                (TPM_RC)(RC_FMT1 + 0x008)\r
+#define TPM_RC_MODE               (TPM_RC)(RC_FMT1 + 0x009)\r
+#define TPM_RC_TYPE               (TPM_RC)(RC_FMT1 + 0x00A)\r
+#define TPM_RC_HANDLE             (TPM_RC)(RC_FMT1 + 0x00B)\r
+#define TPM_RC_KDF                (TPM_RC)(RC_FMT1 + 0x00C)\r
+#define TPM_RC_RANGE              (TPM_RC)(RC_FMT1 + 0x00D)\r
+#define TPM_RC_AUTH_FAIL          (TPM_RC)(RC_FMT1 + 0x00E)\r
+#define TPM_RC_NONCE              (TPM_RC)(RC_FMT1 + 0x00F)\r
+#define TPM_RC_PP                 (TPM_RC)(RC_FMT1 + 0x010)\r
+#define TPM_RC_SCHEME             (TPM_RC)(RC_FMT1 + 0x012)\r
+#define TPM_RC_SIZE               (TPM_RC)(RC_FMT1 + 0x015)\r
+#define TPM_RC_SYMMETRIC          (TPM_RC)(RC_FMT1 + 0x016)\r
+#define TPM_RC_TAG                (TPM_RC)(RC_FMT1 + 0x017)\r
+#define TPM_RC_SELECTOR           (TPM_RC)(RC_FMT1 + 0x018)\r
+#define TPM_RC_INSUFFICIENT       (TPM_RC)(RC_FMT1 + 0x01A)\r
+#define TPM_RC_SIGNATURE          (TPM_RC)(RC_FMT1 + 0x01B)\r
+#define TPM_RC_KEY                (TPM_RC)(RC_FMT1 + 0x01C)\r
+#define TPM_RC_POLICY_FAIL        (TPM_RC)(RC_FMT1 + 0x01D)\r
+#define TPM_RC_INTEGRITY          (TPM_RC)(RC_FMT1 + 0x01F)\r
+#define TPM_RC_TICKET             (TPM_RC)(RC_FMT1 + 0x020)\r
+#define TPM_RC_RESERVED_BITS      (TPM_RC)(RC_FMT1 + 0x021)\r
+#define TPM_RC_BAD_AUTH           (TPM_RC)(RC_FMT1 + 0x022)\r
+#define TPM_RC_EXPIRED            (TPM_RC)(RC_FMT1 + 0x023)\r
+#define TPM_RC_POLICY_CC          (TPM_RC)(RC_FMT1 + 0x024 )\r
+#define TPM_RC_BINDING            (TPM_RC)(RC_FMT1 + 0x025)\r
+#define TPM_RC_CURVE              (TPM_RC)(RC_FMT1 + 0x026)\r
+#define TPM_RC_ECC_POINT          (TPM_RC)(RC_FMT1 + 0x027)\r
+#define RC_WARN                   (TPM_RC)(0x900)\r
+#define TPM_RC_CONTEXT_GAP        (TPM_RC)(RC_WARN + 0x001)\r
+#define TPM_RC_OBJECT_MEMORY      (TPM_RC)(RC_WARN + 0x002)\r
+#define TPM_RC_SESSION_MEMORY     (TPM_RC)(RC_WARN + 0x003)\r
+#define TPM_RC_MEMORY             (TPM_RC)(RC_WARN + 0x004)\r
+#define TPM_RC_SESSION_HANDLES    (TPM_RC)(RC_WARN + 0x005)\r
+#define TPM_RC_OBJECT_HANDLES     (TPM_RC)(RC_WARN + 0x006)\r
+#define TPM_RC_LOCALITY           (TPM_RC)(RC_WARN + 0x007)\r
+#define TPM_RC_YIELDED            (TPM_RC)(RC_WARN + 0x008)\r
+#define TPM_RC_CANCELED           (TPM_RC)(RC_WARN + 0x009)\r
+#define TPM_RC_TESTING            (TPM_RC)(RC_WARN + 0x00A)\r
+#define TPM_RC_REFERENCE_H0       (TPM_RC)(RC_WARN + 0x010)\r
+#define TPM_RC_REFERENCE_H1       (TPM_RC)(RC_WARN + 0x011)\r
+#define TPM_RC_REFERENCE_H2       (TPM_RC)(RC_WARN + 0x012)\r
+#define TPM_RC_REFERENCE_H3       (TPM_RC)(RC_WARN + 0x013)\r
+#define TPM_RC_REFERENCE_H4       (TPM_RC)(RC_WARN + 0x014)\r
+#define TPM_RC_REFERENCE_H5       (TPM_RC)(RC_WARN + 0x015)\r
+#define TPM_RC_REFERENCE_H6       (TPM_RC)(RC_WARN + 0x016)\r
+#define TPM_RC_REFERENCE_S0       (TPM_RC)(RC_WARN + 0x018)\r
+#define TPM_RC_REFERENCE_S1       (TPM_RC)(RC_WARN + 0x019)\r
+#define TPM_RC_REFERENCE_S2       (TPM_RC)(RC_WARN + 0x01A)\r
+#define TPM_RC_REFERENCE_S3       (TPM_RC)(RC_WARN + 0x01B)\r
+#define TPM_RC_REFERENCE_S4       (TPM_RC)(RC_WARN + 0x01C)\r
+#define TPM_RC_REFERENCE_S5       (TPM_RC)(RC_WARN + 0x01D)\r
+#define TPM_RC_REFERENCE_S6       (TPM_RC)(RC_WARN + 0x01E)\r
+#define TPM_RC_NV_RATE            (TPM_RC)(RC_WARN + 0x020)\r
+#define TPM_RC_LOCKOUT            (TPM_RC)(RC_WARN + 0x021)\r
+#define TPM_RC_RETRY              (TPM_RC)(RC_WARN + 0x022)\r
+#define TPM_RC_NV_UNAVAILABLE     (TPM_RC)(RC_WARN + 0x023)\r
+#define TPM_RC_NOT_USED           (TPM_RC)(RC_WARN + 0x7F)\r
+#define TPM_RC_H                  (TPM_RC)(0x000)\r
+#define TPM_RC_P                  (TPM_RC)(0x040)\r
+#define TPM_RC_S                  (TPM_RC)(0x800)\r
+#define TPM_RC_1                  (TPM_RC)(0x100)\r
+#define TPM_RC_2                  (TPM_RC)(0x200)\r
+#define TPM_RC_3                  (TPM_RC)(0x300)\r
+#define TPM_RC_4                  (TPM_RC)(0x400)\r
+#define TPM_RC_5                  (TPM_RC)(0x500)\r
+#define TPM_RC_6                  (TPM_RC)(0x600)\r
+#define TPM_RC_7                  (TPM_RC)(0x700)\r
+#define TPM_RC_8                  (TPM_RC)(0x800)\r
+#define TPM_RC_9                  (TPM_RC)(0x900)\r
+#define TPM_RC_A                  (TPM_RC)(0xA00)\r
+#define TPM_RC_B                  (TPM_RC)(0xB00)\r
+#define TPM_RC_C                  (TPM_RC)(0xC00)\r
+#define TPM_RC_D                  (TPM_RC)(0xD00)\r
+#define TPM_RC_E                  (TPM_RC)(0xE00)\r
+#define TPM_RC_F                  (TPM_RC)(0xF00)\r
+#define TPM_RC_N_MASK             (TPM_RC)(0xF00)\r
 \r
 // Table 16 - TPM_CLOCK_ADJUST Constants\r
 typedef INT8 TPM_CLOCK_ADJUST;\r
-#define TPM_CLOCK_COARSE_SLOWER (TPM_CLOCK_ADJUST)(-3)\r
-#define TPM_CLOCK_MEDIUM_SLOWER (TPM_CLOCK_ADJUST)(-2)\r
-#define TPM_CLOCK_FINE_SLOWER   (TPM_CLOCK_ADJUST)(-1)\r
-#define TPM_CLOCK_NO_CHANGE     (TPM_CLOCK_ADJUST)(0)\r
-#define TPM_CLOCK_FINE_FASTER   (TPM_CLOCK_ADJUST)(1)\r
-#define TPM_CLOCK_MEDIUM_FASTER (TPM_CLOCK_ADJUST)(2)\r
-#define TPM_CLOCK_COARSE_FASTER (TPM_CLOCK_ADJUST)(3)\r
+#define TPM_CLOCK_COARSE_SLOWER  (TPM_CLOCK_ADJUST)(-3)\r
+#define TPM_CLOCK_MEDIUM_SLOWER  (TPM_CLOCK_ADJUST)(-2)\r
+#define TPM_CLOCK_FINE_SLOWER    (TPM_CLOCK_ADJUST)(-1)\r
+#define TPM_CLOCK_NO_CHANGE      (TPM_CLOCK_ADJUST)(0)\r
+#define TPM_CLOCK_FINE_FASTER    (TPM_CLOCK_ADJUST)(1)\r
+#define TPM_CLOCK_MEDIUM_FASTER  (TPM_CLOCK_ADJUST)(2)\r
+#define TPM_CLOCK_COARSE_FASTER  (TPM_CLOCK_ADJUST)(3)\r
 \r
 // Table 17 - TPM_EO Constants\r
 typedef UINT16 TPM_EO;\r
-#define TPM_EO_EQ          (TPM_EO)(0x0000)\r
-#define TPM_EO_NEQ         (TPM_EO)(0x0001)\r
-#define TPM_EO_SIGNED_GT   (TPM_EO)(0x0002)\r
-#define TPM_EO_UNSIGNED_GT (TPM_EO)(0x0003)\r
-#define TPM_EO_SIGNED_LT   (TPM_EO)(0x0004)\r
-#define TPM_EO_UNSIGNED_LT (TPM_EO)(0x0005)\r
-#define TPM_EO_SIGNED_GE   (TPM_EO)(0x0006)\r
-#define TPM_EO_UNSIGNED_GE (TPM_EO)(0x0007)\r
-#define TPM_EO_SIGNED_LE   (TPM_EO)(0x0008)\r
-#define TPM_EO_UNSIGNED_LE (TPM_EO)(0x0009)\r
-#define TPM_EO_BITSET      (TPM_EO)(0x000A)\r
-#define TPM_EO_BITCLEAR    (TPM_EO)(0x000B)\r
+#define TPM_EO_EQ           (TPM_EO)(0x0000)\r
+#define TPM_EO_NEQ          (TPM_EO)(0x0001)\r
+#define TPM_EO_SIGNED_GT    (TPM_EO)(0x0002)\r
+#define TPM_EO_UNSIGNED_GT  (TPM_EO)(0x0003)\r
+#define TPM_EO_SIGNED_LT    (TPM_EO)(0x0004)\r
+#define TPM_EO_UNSIGNED_LT  (TPM_EO)(0x0005)\r
+#define TPM_EO_SIGNED_GE    (TPM_EO)(0x0006)\r
+#define TPM_EO_UNSIGNED_GE  (TPM_EO)(0x0007)\r
+#define TPM_EO_SIGNED_LE    (TPM_EO)(0x0008)\r
+#define TPM_EO_UNSIGNED_LE  (TPM_EO)(0x0009)\r
+#define TPM_EO_BITSET       (TPM_EO)(0x000A)\r
+#define TPM_EO_BITCLEAR     (TPM_EO)(0x000B)\r
 \r
 // Table 18 - TPM_ST Constants\r
 typedef UINT16 TPM_ST;\r
-#define TPM_ST_RSP_COMMAND          (TPM_ST)(0x00C4)\r
-#define TPM_ST_NULL                 (TPM_ST)(0X8000)\r
-#define TPM_ST_NO_SESSIONS          (TPM_ST)(0x8001)\r
-#define TPM_ST_SESSIONS             (TPM_ST)(0x8002)\r
-#define TPM_ST_ATTEST_NV            (TPM_ST)(0x8014)\r
-#define TPM_ST_ATTEST_COMMAND_AUDIT (TPM_ST)(0x8015)\r
-#define TPM_ST_ATTEST_SESSION_AUDIT (TPM_ST)(0x8016)\r
-#define TPM_ST_ATTEST_CERTIFY       (TPM_ST)(0x8017)\r
-#define TPM_ST_ATTEST_QUOTE         (TPM_ST)(0x8018)\r
-#define TPM_ST_ATTEST_TIME          (TPM_ST)(0x8019)\r
-#define TPM_ST_ATTEST_CREATION      (TPM_ST)(0x801A)\r
-#define TPM_ST_CREATION             (TPM_ST)(0x8021)\r
-#define TPM_ST_VERIFIED             (TPM_ST)(0x8022)\r
-#define TPM_ST_AUTH_SECRET          (TPM_ST)(0x8023)\r
-#define TPM_ST_HASHCHECK            (TPM_ST)(0x8024)\r
-#define TPM_ST_AUTH_SIGNED          (TPM_ST)(0x8025)\r
-#define TPM_ST_FU_MANIFEST          (TPM_ST)(0x8029)\r
+#define TPM_ST_RSP_COMMAND           (TPM_ST)(0x00C4)\r
+#define TPM_ST_NULL                  (TPM_ST)(0X8000)\r
+#define TPM_ST_NO_SESSIONS           (TPM_ST)(0x8001)\r
+#define TPM_ST_SESSIONS              (TPM_ST)(0x8002)\r
+#define TPM_ST_ATTEST_NV             (TPM_ST)(0x8014)\r
+#define TPM_ST_ATTEST_COMMAND_AUDIT  (TPM_ST)(0x8015)\r
+#define TPM_ST_ATTEST_SESSION_AUDIT  (TPM_ST)(0x8016)\r
+#define TPM_ST_ATTEST_CERTIFY        (TPM_ST)(0x8017)\r
+#define TPM_ST_ATTEST_QUOTE          (TPM_ST)(0x8018)\r
+#define TPM_ST_ATTEST_TIME           (TPM_ST)(0x8019)\r
+#define TPM_ST_ATTEST_CREATION       (TPM_ST)(0x801A)\r
+#define TPM_ST_CREATION              (TPM_ST)(0x8021)\r
+#define TPM_ST_VERIFIED              (TPM_ST)(0x8022)\r
+#define TPM_ST_AUTH_SECRET           (TPM_ST)(0x8023)\r
+#define TPM_ST_HASHCHECK             (TPM_ST)(0x8024)\r
+#define TPM_ST_AUTH_SIGNED           (TPM_ST)(0x8025)\r
+#define TPM_ST_FU_MANIFEST           (TPM_ST)(0x8029)\r
 \r
 // Table 19 - TPM_SU Constants\r
 typedef UINT16 TPM_SU;\r
-#define TPM_SU_CLEAR (TPM_SU)(0x0000)\r
-#define TPM_SU_STATE (TPM_SU)(0x0001)\r
+#define TPM_SU_CLEAR  (TPM_SU)(0x0000)\r
+#define TPM_SU_STATE  (TPM_SU)(0x0001)\r
 \r
 // Table 20 - TPM_SE Constants\r
 typedef UINT8 TPM_SE;\r
-#define TPM_SE_HMAC   (TPM_SE)(0x00)\r
-#define TPM_SE_POLICY (TPM_SE)(0x01)\r
-#define TPM_SE_TRIAL  (TPM_SE)(0x03)\r
+#define TPM_SE_HMAC    (TPM_SE)(0x00)\r
+#define TPM_SE_POLICY  (TPM_SE)(0x01)\r
+#define TPM_SE_TRIAL   (TPM_SE)(0x03)\r
 \r
 // Table 21 - TPM_CAP Constants\r
 typedef UINT32 TPM_CAP;\r
-#define TPM_CAP_FIRST           (TPM_CAP)(0x00000000)\r
-#define TPM_CAP_ALGS            (TPM_CAP)(0x00000000)\r
-#define TPM_CAP_HANDLES         (TPM_CAP)(0x00000001)\r
-#define TPM_CAP_COMMANDS        (TPM_CAP)(0x00000002)\r
-#define TPM_CAP_PP_COMMANDS     (TPM_CAP)(0x00000003)\r
-#define TPM_CAP_AUDIT_COMMANDS  (TPM_CAP)(0x00000004)\r
-#define TPM_CAP_PCRS            (TPM_CAP)(0x00000005)\r
-#define TPM_CAP_TPM_PROPERTIES  (TPM_CAP)(0x00000006)\r
-#define TPM_CAP_PCR_PROPERTIES  (TPM_CAP)(0x00000007)\r
-#define TPM_CAP_ECC_CURVES      (TPM_CAP)(0x00000008)\r
-#define TPM_CAP_LAST            (TPM_CAP)(0x00000008)\r
-#define TPM_CAP_VENDOR_PROPERTY (TPM_CAP)(0x00000100)\r
+#define TPM_CAP_FIRST            (TPM_CAP)(0x00000000)\r
+#define TPM_CAP_ALGS             (TPM_CAP)(0x00000000)\r
+#define TPM_CAP_HANDLES          (TPM_CAP)(0x00000001)\r
+#define TPM_CAP_COMMANDS         (TPM_CAP)(0x00000002)\r
+#define TPM_CAP_PP_COMMANDS      (TPM_CAP)(0x00000003)\r
+#define TPM_CAP_AUDIT_COMMANDS   (TPM_CAP)(0x00000004)\r
+#define TPM_CAP_PCRS             (TPM_CAP)(0x00000005)\r
+#define TPM_CAP_TPM_PROPERTIES   (TPM_CAP)(0x00000006)\r
+#define TPM_CAP_PCR_PROPERTIES   (TPM_CAP)(0x00000007)\r
+#define TPM_CAP_ECC_CURVES       (TPM_CAP)(0x00000008)\r
+#define TPM_CAP_LAST             (TPM_CAP)(0x00000008)\r
+#define TPM_CAP_VENDOR_PROPERTY  (TPM_CAP)(0x00000100)\r
 \r
 // Table 22 - TPM_PT Constants\r
 typedef UINT32 TPM_PT;\r
-#define TPM_PT_NONE                (TPM_PT)(0x00000000)\r
-#define PT_GROUP                   (TPM_PT)(0x00000100)\r
-#define PT_FIXED                   (TPM_PT)(PT_GROUP * 1)\r
-#define TPM_PT_FAMILY_INDICATOR    (TPM_PT)(PT_FIXED + 0)\r
-#define TPM_PT_LEVEL               (TPM_PT)(PT_FIXED + 1)\r
-#define TPM_PT_REVISION            (TPM_PT)(PT_FIXED + 2)\r
-#define TPM_PT_DAY_OF_YEAR         (TPM_PT)(PT_FIXED + 3)\r
-#define TPM_PT_YEAR                (TPM_PT)(PT_FIXED + 4)\r
-#define TPM_PT_MANUFACTURER        (TPM_PT)(PT_FIXED + 5)\r
-#define TPM_PT_VENDOR_STRING_1     (TPM_PT)(PT_FIXED + 6)\r
-#define TPM_PT_VENDOR_STRING_2     (TPM_PT)(PT_FIXED + 7)\r
-#define TPM_PT_VENDOR_STRING_3     (TPM_PT)(PT_FIXED + 8)\r
-#define TPM_PT_VENDOR_STRING_4     (TPM_PT)(PT_FIXED + 9)\r
-#define TPM_PT_VENDOR_TPM_TYPE     (TPM_PT)(PT_FIXED + 10)\r
-#define TPM_PT_FIRMWARE_VERSION_1  (TPM_PT)(PT_FIXED + 11)\r
-#define TPM_PT_FIRMWARE_VERSION_2  (TPM_PT)(PT_FIXED + 12)\r
-#define TPM_PT_INPUT_BUFFER        (TPM_PT)(PT_FIXED + 13)\r
-#define TPM_PT_HR_TRANSIENT_MIN    (TPM_PT)(PT_FIXED + 14)\r
-#define TPM_PT_HR_PERSISTENT_MIN   (TPM_PT)(PT_FIXED + 15)\r
-#define TPM_PT_HR_LOADED_MIN       (TPM_PT)(PT_FIXED + 16)\r
-#define TPM_PT_ACTIVE_SESSIONS_MAX (TPM_PT)(PT_FIXED + 17)\r
-#define TPM_PT_PCR_COUNT           (TPM_PT)(PT_FIXED + 18)\r
-#define TPM_PT_PCR_SELECT_MIN      (TPM_PT)(PT_FIXED + 19)\r
-#define TPM_PT_CONTEXT_GAP_MAX     (TPM_PT)(PT_FIXED + 20)\r
-#define TPM_PT_NV_COUNTERS_MAX     (TPM_PT)(PT_FIXED + 22)\r
-#define TPM_PT_NV_INDEX_MAX        (TPM_PT)(PT_FIXED + 23)\r
-#define TPM_PT_MEMORY              (TPM_PT)(PT_FIXED + 24)\r
-#define TPM_PT_CLOCK_UPDATE        (TPM_PT)(PT_FIXED + 25)\r
-#define TPM_PT_CONTEXT_HASH        (TPM_PT)(PT_FIXED + 26)\r
-#define TPM_PT_CONTEXT_SYM         (TPM_PT)(PT_FIXED + 27)\r
-#define TPM_PT_CONTEXT_SYM_SIZE    (TPM_PT)(PT_FIXED + 28)\r
-#define TPM_PT_ORDERLY_COUNT       (TPM_PT)(PT_FIXED + 29)\r
-#define TPM_PT_MAX_COMMAND_SIZE    (TPM_PT)(PT_FIXED + 30)\r
-#define TPM_PT_MAX_RESPONSE_SIZE   (TPM_PT)(PT_FIXED + 31)\r
-#define TPM_PT_MAX_DIGEST          (TPM_PT)(PT_FIXED + 32)\r
-#define TPM_PT_MAX_OBJECT_CONTEXT  (TPM_PT)(PT_FIXED + 33)\r
-#define TPM_PT_MAX_SESSION_CONTEXT (TPM_PT)(PT_FIXED + 34)\r
-#define TPM_PT_PS_FAMILY_INDICATOR (TPM_PT)(PT_FIXED + 35)\r
-#define TPM_PT_PS_LEVEL            (TPM_PT)(PT_FIXED + 36)\r
-#define TPM_PT_PS_REVISION         (TPM_PT)(PT_FIXED + 37)\r
-#define TPM_PT_PS_DAY_OF_YEAR      (TPM_PT)(PT_FIXED + 38)\r
-#define TPM_PT_PS_YEAR             (TPM_PT)(PT_FIXED + 39)\r
-#define TPM_PT_SPLIT_MAX           (TPM_PT)(PT_FIXED + 40)\r
-#define TPM_PT_TOTAL_COMMANDS      (TPM_PT)(PT_FIXED + 41)\r
-#define TPM_PT_LIBRARY_COMMANDS    (TPM_PT)(PT_FIXED + 42)\r
-#define TPM_PT_VENDOR_COMMANDS     (TPM_PT)(PT_FIXED + 43)\r
-#define PT_VAR                     (TPM_PT)(PT_GROUP * 2)\r
-#define TPM_PT_PERMANENT           (TPM_PT)(PT_VAR + 0)\r
-#define TPM_PT_STARTUP_CLEAR       (TPM_PT)(PT_VAR + 1)\r
-#define TPM_PT_HR_NV_INDEX         (TPM_PT)(PT_VAR + 2)\r
-#define TPM_PT_HR_LOADED           (TPM_PT)(PT_VAR + 3)\r
-#define TPM_PT_HR_LOADED_AVAIL     (TPM_PT)(PT_VAR + 4)\r
-#define TPM_PT_HR_ACTIVE           (TPM_PT)(PT_VAR + 5)\r
-#define TPM_PT_HR_ACTIVE_AVAIL     (TPM_PT)(PT_VAR + 6)\r
-#define TPM_PT_HR_TRANSIENT_AVAIL  (TPM_PT)(PT_VAR + 7)\r
-#define TPM_PT_HR_PERSISTENT       (TPM_PT)(PT_VAR + 8)\r
-#define TPM_PT_HR_PERSISTENT_AVAIL (TPM_PT)(PT_VAR + 9)\r
-#define TPM_PT_NV_COUNTERS         (TPM_PT)(PT_VAR + 10)\r
-#define TPM_PT_NV_COUNTERS_AVAIL   (TPM_PT)(PT_VAR + 11)\r
-#define TPM_PT_ALGORITHM_SET       (TPM_PT)(PT_VAR + 12)\r
-#define TPM_PT_LOADED_CURVES       (TPM_PT)(PT_VAR + 13)\r
-#define TPM_PT_LOCKOUT_COUNTER     (TPM_PT)(PT_VAR + 14)\r
-#define TPM_PT_MAX_AUTH_FAIL       (TPM_PT)(PT_VAR + 15)\r
-#define TPM_PT_LOCKOUT_INTERVAL    (TPM_PT)(PT_VAR + 16)\r
-#define TPM_PT_LOCKOUT_RECOVERY    (TPM_PT)(PT_VAR + 17)\r
-#define TPM_PT_NV_WRITE_RECOVERY   (TPM_PT)(PT_VAR + 18)\r
-#define TPM_PT_AUDIT_COUNTER_0     (TPM_PT)(PT_VAR + 19)\r
-#define TPM_PT_AUDIT_COUNTER_1     (TPM_PT)(PT_VAR + 20)\r
+#define TPM_PT_NONE                 (TPM_PT)(0x00000000)\r
+#define PT_GROUP                    (TPM_PT)(0x00000100)\r
+#define PT_FIXED                    (TPM_PT)(PT_GROUP * 1)\r
+#define TPM_PT_FAMILY_INDICATOR     (TPM_PT)(PT_FIXED + 0)\r
+#define TPM_PT_LEVEL                (TPM_PT)(PT_FIXED + 1)\r
+#define TPM_PT_REVISION             (TPM_PT)(PT_FIXED + 2)\r
+#define TPM_PT_DAY_OF_YEAR          (TPM_PT)(PT_FIXED + 3)\r
+#define TPM_PT_YEAR                 (TPM_PT)(PT_FIXED + 4)\r
+#define TPM_PT_MANUFACTURER         (TPM_PT)(PT_FIXED + 5)\r
+#define TPM_PT_VENDOR_STRING_1      (TPM_PT)(PT_FIXED + 6)\r
+#define TPM_PT_VENDOR_STRING_2      (TPM_PT)(PT_FIXED + 7)\r
+#define TPM_PT_VENDOR_STRING_3      (TPM_PT)(PT_FIXED + 8)\r
+#define TPM_PT_VENDOR_STRING_4      (TPM_PT)(PT_FIXED + 9)\r
+#define TPM_PT_VENDOR_TPM_TYPE      (TPM_PT)(PT_FIXED + 10)\r
+#define TPM_PT_FIRMWARE_VERSION_1   (TPM_PT)(PT_FIXED + 11)\r
+#define TPM_PT_FIRMWARE_VERSION_2   (TPM_PT)(PT_FIXED + 12)\r
+#define TPM_PT_INPUT_BUFFER         (TPM_PT)(PT_FIXED + 13)\r
+#define TPM_PT_HR_TRANSIENT_MIN     (TPM_PT)(PT_FIXED + 14)\r
+#define TPM_PT_HR_PERSISTENT_MIN    (TPM_PT)(PT_FIXED + 15)\r
+#define TPM_PT_HR_LOADED_MIN        (TPM_PT)(PT_FIXED + 16)\r
+#define TPM_PT_ACTIVE_SESSIONS_MAX  (TPM_PT)(PT_FIXED + 17)\r
+#define TPM_PT_PCR_COUNT            (TPM_PT)(PT_FIXED + 18)\r
+#define TPM_PT_PCR_SELECT_MIN       (TPM_PT)(PT_FIXED + 19)\r
+#define TPM_PT_CONTEXT_GAP_MAX      (TPM_PT)(PT_FIXED + 20)\r
+#define TPM_PT_NV_COUNTERS_MAX      (TPM_PT)(PT_FIXED + 22)\r
+#define TPM_PT_NV_INDEX_MAX         (TPM_PT)(PT_FIXED + 23)\r
+#define TPM_PT_MEMORY               (TPM_PT)(PT_FIXED + 24)\r
+#define TPM_PT_CLOCK_UPDATE         (TPM_PT)(PT_FIXED + 25)\r
+#define TPM_PT_CONTEXT_HASH         (TPM_PT)(PT_FIXED + 26)\r
+#define TPM_PT_CONTEXT_SYM          (TPM_PT)(PT_FIXED + 27)\r
+#define TPM_PT_CONTEXT_SYM_SIZE     (TPM_PT)(PT_FIXED + 28)\r
+#define TPM_PT_ORDERLY_COUNT        (TPM_PT)(PT_FIXED + 29)\r
+#define TPM_PT_MAX_COMMAND_SIZE     (TPM_PT)(PT_FIXED + 30)\r
+#define TPM_PT_MAX_RESPONSE_SIZE    (TPM_PT)(PT_FIXED + 31)\r
+#define TPM_PT_MAX_DIGEST           (TPM_PT)(PT_FIXED + 32)\r
+#define TPM_PT_MAX_OBJECT_CONTEXT   (TPM_PT)(PT_FIXED + 33)\r
+#define TPM_PT_MAX_SESSION_CONTEXT  (TPM_PT)(PT_FIXED + 34)\r
+#define TPM_PT_PS_FAMILY_INDICATOR  (TPM_PT)(PT_FIXED + 35)\r
+#define TPM_PT_PS_LEVEL             (TPM_PT)(PT_FIXED + 36)\r
+#define TPM_PT_PS_REVISION          (TPM_PT)(PT_FIXED + 37)\r
+#define TPM_PT_PS_DAY_OF_YEAR       (TPM_PT)(PT_FIXED + 38)\r
+#define TPM_PT_PS_YEAR              (TPM_PT)(PT_FIXED + 39)\r
+#define TPM_PT_SPLIT_MAX            (TPM_PT)(PT_FIXED + 40)\r
+#define TPM_PT_TOTAL_COMMANDS       (TPM_PT)(PT_FIXED + 41)\r
+#define TPM_PT_LIBRARY_COMMANDS     (TPM_PT)(PT_FIXED + 42)\r
+#define TPM_PT_VENDOR_COMMANDS      (TPM_PT)(PT_FIXED + 43)\r
+#define PT_VAR                      (TPM_PT)(PT_GROUP * 2)\r
+#define TPM_PT_PERMANENT            (TPM_PT)(PT_VAR + 0)\r
+#define TPM_PT_STARTUP_CLEAR        (TPM_PT)(PT_VAR + 1)\r
+#define TPM_PT_HR_NV_INDEX          (TPM_PT)(PT_VAR + 2)\r
+#define TPM_PT_HR_LOADED            (TPM_PT)(PT_VAR + 3)\r
+#define TPM_PT_HR_LOADED_AVAIL      (TPM_PT)(PT_VAR + 4)\r
+#define TPM_PT_HR_ACTIVE            (TPM_PT)(PT_VAR + 5)\r
+#define TPM_PT_HR_ACTIVE_AVAIL      (TPM_PT)(PT_VAR + 6)\r
+#define TPM_PT_HR_TRANSIENT_AVAIL   (TPM_PT)(PT_VAR + 7)\r
+#define TPM_PT_HR_PERSISTENT        (TPM_PT)(PT_VAR + 8)\r
+#define TPM_PT_HR_PERSISTENT_AVAIL  (TPM_PT)(PT_VAR + 9)\r
+#define TPM_PT_NV_COUNTERS          (TPM_PT)(PT_VAR + 10)\r
+#define TPM_PT_NV_COUNTERS_AVAIL    (TPM_PT)(PT_VAR + 11)\r
+#define TPM_PT_ALGORITHM_SET        (TPM_PT)(PT_VAR + 12)\r
+#define TPM_PT_LOADED_CURVES        (TPM_PT)(PT_VAR + 13)\r
+#define TPM_PT_LOCKOUT_COUNTER      (TPM_PT)(PT_VAR + 14)\r
+#define TPM_PT_MAX_AUTH_FAIL        (TPM_PT)(PT_VAR + 15)\r
+#define TPM_PT_LOCKOUT_INTERVAL     (TPM_PT)(PT_VAR + 16)\r
+#define TPM_PT_LOCKOUT_RECOVERY     (TPM_PT)(PT_VAR + 17)\r
+#define TPM_PT_NV_WRITE_RECOVERY    (TPM_PT)(PT_VAR + 18)\r
+#define TPM_PT_AUDIT_COUNTER_0      (TPM_PT)(PT_VAR + 19)\r
+#define TPM_PT_AUDIT_COUNTER_1      (TPM_PT)(PT_VAR + 20)\r
 \r
 // Table 23 - TPM_PT_PCR Constants\r
 typedef UINT32 TPM_PT_PCR;\r
-#define TPM_PT_PCR_FIRST        (TPM_PT_PCR)(0x00000000)\r
-#define TPM_PT_PCR_SAVE         (TPM_PT_PCR)(0x00000000)\r
-#define TPM_PT_PCR_EXTEND_L0    (TPM_PT_PCR)(0x00000001)\r
-#define TPM_PT_PCR_RESET_L0     (TPM_PT_PCR)(0x00000002)\r
-#define TPM_PT_PCR_EXTEND_L1    (TPM_PT_PCR)(0x00000003)\r
-#define TPM_PT_PCR_RESET_L1     (TPM_PT_PCR)(0x00000004)\r
-#define TPM_PT_PCR_EXTEND_L2    (TPM_PT_PCR)(0x00000005)\r
-#define TPM_PT_PCR_RESET_L2     (TPM_PT_PCR)(0x00000006)\r
-#define TPM_PT_PCR_EXTEND_L3    (TPM_PT_PCR)(0x00000007)\r
-#define TPM_PT_PCR_RESET_L3     (TPM_PT_PCR)(0x00000008)\r
-#define TPM_PT_PCR_EXTEND_L4    (TPM_PT_PCR)(0x00000009)\r
-#define TPM_PT_PCR_RESET_L4     (TPM_PT_PCR)(0x0000000A)\r
-#define TPM_PT_PCR_NO_INCREMENT (TPM_PT_PCR)(0x00000011)\r
-#define TPM_PT_PCR_DRTM_RESET   (TPM_PT_PCR)(0x00000012)\r
-#define TPM_PT_PCR_POLICY       (TPM_PT_PCR)(0x00000013)\r
-#define TPM_PT_PCR_AUTH         (TPM_PT_PCR)(0x00000014)\r
-#define TPM_PT_PCR_LAST         (TPM_PT_PCR)(0x00000014)\r
+#define TPM_PT_PCR_FIRST         (TPM_PT_PCR)(0x00000000)\r
+#define TPM_PT_PCR_SAVE          (TPM_PT_PCR)(0x00000000)\r
+#define TPM_PT_PCR_EXTEND_L0     (TPM_PT_PCR)(0x00000001)\r
+#define TPM_PT_PCR_RESET_L0      (TPM_PT_PCR)(0x00000002)\r
+#define TPM_PT_PCR_EXTEND_L1     (TPM_PT_PCR)(0x00000003)\r
+#define TPM_PT_PCR_RESET_L1      (TPM_PT_PCR)(0x00000004)\r
+#define TPM_PT_PCR_EXTEND_L2     (TPM_PT_PCR)(0x00000005)\r
+#define TPM_PT_PCR_RESET_L2      (TPM_PT_PCR)(0x00000006)\r
+#define TPM_PT_PCR_EXTEND_L3     (TPM_PT_PCR)(0x00000007)\r
+#define TPM_PT_PCR_RESET_L3      (TPM_PT_PCR)(0x00000008)\r
+#define TPM_PT_PCR_EXTEND_L4     (TPM_PT_PCR)(0x00000009)\r
+#define TPM_PT_PCR_RESET_L4      (TPM_PT_PCR)(0x0000000A)\r
+#define TPM_PT_PCR_NO_INCREMENT  (TPM_PT_PCR)(0x00000011)\r
+#define TPM_PT_PCR_DRTM_RESET    (TPM_PT_PCR)(0x00000012)\r
+#define TPM_PT_PCR_POLICY        (TPM_PT_PCR)(0x00000013)\r
+#define TPM_PT_PCR_AUTH          (TPM_PT_PCR)(0x00000014)\r
+#define TPM_PT_PCR_LAST          (TPM_PT_PCR)(0x00000014)\r
 \r
 // Table 24 - TPM_PS Constants\r
 typedef UINT32 TPM_PS;\r
-#define TPM_PS_MAIN           (TPM_PS)(0x00000000)\r
-#define TPM_PS_PC             (TPM_PS)(0x00000001)\r
-#define TPM_PS_PDA            (TPM_PS)(0x00000002)\r
-#define TPM_PS_CELL_PHONE     (TPM_PS)(0x00000003)\r
-#define TPM_PS_SERVER         (TPM_PS)(0x00000004)\r
-#define TPM_PS_PERIPHERAL     (TPM_PS)(0x00000005)\r
-#define TPM_PS_TSS            (TPM_PS)(0x00000006)\r
-#define TPM_PS_STORAGE        (TPM_PS)(0x00000007)\r
-#define TPM_PS_AUTHENTICATION (TPM_PS)(0x00000008)\r
-#define TPM_PS_EMBEDDED       (TPM_PS)(0x00000009)\r
-#define TPM_PS_HARDCOPY       (TPM_PS)(0x0000000A)\r
-#define TPM_PS_INFRASTRUCTURE (TPM_PS)(0x0000000B)\r
-#define TPM_PS_VIRTUALIZATION (TPM_PS)(0x0000000C)\r
-#define TPM_PS_TNC            (TPM_PS)(0x0000000D)\r
-#define TPM_PS_MULTI_TENANT   (TPM_PS)(0x0000000E)\r
-#define TPM_PS_TC             (TPM_PS)(0x0000000F)\r
+#define TPM_PS_MAIN            (TPM_PS)(0x00000000)\r
+#define TPM_PS_PC              (TPM_PS)(0x00000001)\r
+#define TPM_PS_PDA             (TPM_PS)(0x00000002)\r
+#define TPM_PS_CELL_PHONE      (TPM_PS)(0x00000003)\r
+#define TPM_PS_SERVER          (TPM_PS)(0x00000004)\r
+#define TPM_PS_PERIPHERAL      (TPM_PS)(0x00000005)\r
+#define TPM_PS_TSS             (TPM_PS)(0x00000006)\r
+#define TPM_PS_STORAGE         (TPM_PS)(0x00000007)\r
+#define TPM_PS_AUTHENTICATION  (TPM_PS)(0x00000008)\r
+#define TPM_PS_EMBEDDED        (TPM_PS)(0x00000009)\r
+#define TPM_PS_HARDCOPY        (TPM_PS)(0x0000000A)\r
+#define TPM_PS_INFRASTRUCTURE  (TPM_PS)(0x0000000B)\r
+#define TPM_PS_VIRTUALIZATION  (TPM_PS)(0x0000000C)\r
+#define TPM_PS_TNC             (TPM_PS)(0x0000000D)\r
+#define TPM_PS_MULTI_TENANT    (TPM_PS)(0x0000000E)\r
+#define TPM_PS_TC              (TPM_PS)(0x0000000F)\r
 \r
 // 7 Handles\r
 \r
@@ -639,117 +638,117 @@ typedef UINT32 TPM_PS;
 //\r
 // NOTE: Comment because it has same name as TPM1.2 (value is same, so not runtime issue)\r
 //\r
-//typedef UINT32    TPM_HANDLE;\r
+// typedef UINT32    TPM_HANDLE;\r
 \r
 // Table 26 - TPM_HT Constants\r
 typedef UINT8 TPM_HT;\r
-#define TPM_HT_PCR            (TPM_HT)(0x00)\r
-#define TPM_HT_NV_INDEX       (TPM_HT)(0x01)\r
-#define TPM_HT_HMAC_SESSION   (TPM_HT)(0x02)\r
-#define TPM_HT_LOADED_SESSION (TPM_HT)(0x02)\r
-#define TPM_HT_POLICY_SESSION (TPM_HT)(0x03)\r
-#define TPM_HT_ACTIVE_SESSION (TPM_HT)(0x03)\r
-#define TPM_HT_PERMANENT      (TPM_HT)(0x40)\r
-#define TPM_HT_TRANSIENT      (TPM_HT)(0x80)\r
-#define TPM_HT_PERSISTENT     (TPM_HT)(0x81)\r
+#define TPM_HT_PCR             (TPM_HT)(0x00)\r
+#define TPM_HT_NV_INDEX        (TPM_HT)(0x01)\r
+#define TPM_HT_HMAC_SESSION    (TPM_HT)(0x02)\r
+#define TPM_HT_LOADED_SESSION  (TPM_HT)(0x02)\r
+#define TPM_HT_POLICY_SESSION  (TPM_HT)(0x03)\r
+#define TPM_HT_ACTIVE_SESSION  (TPM_HT)(0x03)\r
+#define TPM_HT_PERMANENT       (TPM_HT)(0x40)\r
+#define TPM_HT_TRANSIENT       (TPM_HT)(0x80)\r
+#define TPM_HT_PERSISTENT      (TPM_HT)(0x81)\r
 \r
 // Table 27 - TPM_RH Constants\r
 typedef UINT32 TPM_RH;\r
-#define TPM_RH_FIRST       (TPM_RH)(0x40000000)\r
-#define TPM_RH_SRK         (TPM_RH)(0x40000000)\r
-#define TPM_RH_OWNER       (TPM_RH)(0x40000001)\r
-#define TPM_RH_REVOKE      (TPM_RH)(0x40000002)\r
-#define TPM_RH_TRANSPORT   (TPM_RH)(0x40000003)\r
-#define TPM_RH_OPERATOR    (TPM_RH)(0x40000004)\r
-#define TPM_RH_ADMIN       (TPM_RH)(0x40000005)\r
-#define TPM_RH_EK          (TPM_RH)(0x40000006)\r
-#define TPM_RH_NULL        (TPM_RH)(0x40000007)\r
-#define TPM_RH_UNASSIGNED  (TPM_RH)(0x40000008)\r
-#define TPM_RS_PW          (TPM_RH)(0x40000009)\r
-#define TPM_RH_LOCKOUT     (TPM_RH)(0x4000000A)\r
-#define TPM_RH_ENDORSEMENT (TPM_RH)(0x4000000B)\r
-#define TPM_RH_PLATFORM    (TPM_RH)(0x4000000C)\r
-#define TPM_RH_PLATFORM_NV (TPM_RH)(0x4000000D)\r
-#define TPM_RH_AUTH_00     (TPM_RH)(0x40000010)\r
-#define TPM_RH_AUTH_FF     (TPM_RH)(0x4000010F)\r
-#define TPM_RH_LAST        (TPM_RH)(0x4000010F)\r
+#define TPM_RH_FIRST        (TPM_RH)(0x40000000)\r
+#define TPM_RH_SRK          (TPM_RH)(0x40000000)\r
+#define TPM_RH_OWNER        (TPM_RH)(0x40000001)\r
+#define TPM_RH_REVOKE       (TPM_RH)(0x40000002)\r
+#define TPM_RH_TRANSPORT    (TPM_RH)(0x40000003)\r
+#define TPM_RH_OPERATOR     (TPM_RH)(0x40000004)\r
+#define TPM_RH_ADMIN        (TPM_RH)(0x40000005)\r
+#define TPM_RH_EK           (TPM_RH)(0x40000006)\r
+#define TPM_RH_NULL         (TPM_RH)(0x40000007)\r
+#define TPM_RH_UNASSIGNED   (TPM_RH)(0x40000008)\r
+#define TPM_RS_PW           (TPM_RH)(0x40000009)\r
+#define TPM_RH_LOCKOUT      (TPM_RH)(0x4000000A)\r
+#define TPM_RH_ENDORSEMENT  (TPM_RH)(0x4000000B)\r
+#define TPM_RH_PLATFORM     (TPM_RH)(0x4000000C)\r
+#define TPM_RH_PLATFORM_NV  (TPM_RH)(0x4000000D)\r
+#define TPM_RH_AUTH_00      (TPM_RH)(0x40000010)\r
+#define TPM_RH_AUTH_FF      (TPM_RH)(0x4000010F)\r
+#define TPM_RH_LAST         (TPM_RH)(0x4000010F)\r
 \r
 // Table 28 - TPM_HC Constants\r
 typedef TPM_HANDLE TPM_HC;\r
-#define HR_HANDLE_MASK       (TPM_HC)(0x00FFFFFF)\r
-#define HR_RANGE_MASK        (TPM_HC)(0xFF000000)\r
-#define HR_SHIFT             (TPM_HC)(24)\r
-#define HR_PCR               (TPM_HC)((TPM_HC)TPM_HT_PCR << HR_SHIFT)\r
-#define HR_HMAC_SESSION      (TPM_HC)((TPM_HC)TPM_HT_HMAC_SESSION << HR_SHIFT)\r
-#define HR_POLICY_SESSION    (TPM_HC)((TPM_HC)TPM_HT_POLICY_SESSION << HR_SHIFT)\r
-#define HR_TRANSIENT         (TPM_HC)((TPM_HC)TPM_HT_TRANSIENT << HR_SHIFT)\r
-#define HR_PERSISTENT        (TPM_HC)((TPM_HC)TPM_HT_PERSISTENT << HR_SHIFT)\r
-#define HR_NV_INDEX          (TPM_HC)((TPM_HC)TPM_HT_NV_INDEX << HR_SHIFT)\r
-#define HR_PERMANENT         (TPM_HC)((TPM_HC)TPM_HT_PERMANENT << HR_SHIFT)\r
-#define PCR_FIRST            (TPM_HC)(HR_PCR + 0)\r
-#define PCR_LAST             (TPM_HC)(PCR_FIRST + IMPLEMENTATION_PCR - 1)\r
-#define HMAC_SESSION_FIRST   (TPM_HC)(HR_HMAC_SESSION + 0)\r
-#define HMAC_SESSION_LAST    (TPM_HC)(HMAC_SESSION_FIRST + MAX_ACTIVE_SESSIONS - 1)\r
-#define LOADED_SESSION_FIRST (TPM_HC)(HMAC_SESSION_FIRST)\r
-#define LOADED_SESSION_LAST  (TPM_HC)(HMAC_SESSION_LAST)\r
-#define POLICY_SESSION_FIRST (TPM_HC)(HR_POLICY_SESSION + 0)\r
-#define POLICY_SESSION_LAST  (TPM_HC)(POLICY_SESSION_FIRST + MAX_ACTIVE_SESSIONS - 1)\r
-#define TRANSIENT_FIRST      (TPM_HC)(HR_TRANSIENT + 0)\r
-#define ACTIVE_SESSION_FIRST (TPM_HC)(POLICY_SESSION_FIRST)\r
-#define ACTIVE_SESSION_LAST  (TPM_HC)(POLICY_SESSION_LAST)\r
-#define TRANSIENT_LAST       (TPM_HC)(TRANSIENT_FIRST+MAX_LOADED_OBJECTS - 1)\r
-#define PERSISTENT_FIRST     (TPM_HC)(HR_PERSISTENT + 0)\r
-#define PERSISTENT_LAST      (TPM_HC)(PERSISTENT_FIRST + 0x00FFFFFF)\r
-#define PLATFORM_PERSISTENT  (TPM_HC)(PERSISTENT_FIRST + 0x00800000)\r
-#define NV_INDEX_FIRST       (TPM_HC)(HR_NV_INDEX + 0)\r
-#define NV_INDEX_LAST        (TPM_HC)(NV_INDEX_FIRST + 0x00FFFFFF)\r
-#define PERMANENT_FIRST      (TPM_HC)(TPM_RH_FIRST)\r
-#define PERMANENT_LAST       (TPM_HC)(TPM_RH_LAST)\r
+#define HR_HANDLE_MASK        (TPM_HC)(0x00FFFFFF)\r
+#define HR_RANGE_MASK         (TPM_HC)(0xFF000000)\r
+#define HR_SHIFT              (TPM_HC)(24)\r
+#define HR_PCR                (TPM_HC)((TPM_HC)TPM_HT_PCR << HR_SHIFT)\r
+#define HR_HMAC_SESSION       (TPM_HC)((TPM_HC)TPM_HT_HMAC_SESSION << HR_SHIFT)\r
+#define HR_POLICY_SESSION     (TPM_HC)((TPM_HC)TPM_HT_POLICY_SESSION << HR_SHIFT)\r
+#define HR_TRANSIENT          (TPM_HC)((TPM_HC)TPM_HT_TRANSIENT << HR_SHIFT)\r
+#define HR_PERSISTENT         (TPM_HC)((TPM_HC)TPM_HT_PERSISTENT << HR_SHIFT)\r
+#define HR_NV_INDEX           (TPM_HC)((TPM_HC)TPM_HT_NV_INDEX << HR_SHIFT)\r
+#define HR_PERMANENT          (TPM_HC)((TPM_HC)TPM_HT_PERMANENT << HR_SHIFT)\r
+#define PCR_FIRST             (TPM_HC)(HR_PCR + 0)\r
+#define PCR_LAST              (TPM_HC)(PCR_FIRST + IMPLEMENTATION_PCR - 1)\r
+#define HMAC_SESSION_FIRST    (TPM_HC)(HR_HMAC_SESSION + 0)\r
+#define HMAC_SESSION_LAST     (TPM_HC)(HMAC_SESSION_FIRST + MAX_ACTIVE_SESSIONS - 1)\r
+#define LOADED_SESSION_FIRST  (TPM_HC)(HMAC_SESSION_FIRST)\r
+#define LOADED_SESSION_LAST   (TPM_HC)(HMAC_SESSION_LAST)\r
+#define POLICY_SESSION_FIRST  (TPM_HC)(HR_POLICY_SESSION + 0)\r
+#define POLICY_SESSION_LAST   (TPM_HC)(POLICY_SESSION_FIRST + MAX_ACTIVE_SESSIONS - 1)\r
+#define TRANSIENT_FIRST       (TPM_HC)(HR_TRANSIENT + 0)\r
+#define ACTIVE_SESSION_FIRST  (TPM_HC)(POLICY_SESSION_FIRST)\r
+#define ACTIVE_SESSION_LAST   (TPM_HC)(POLICY_SESSION_LAST)\r
+#define TRANSIENT_LAST        (TPM_HC)(TRANSIENT_FIRST+MAX_LOADED_OBJECTS - 1)\r
+#define PERSISTENT_FIRST      (TPM_HC)(HR_PERSISTENT + 0)\r
+#define PERSISTENT_LAST       (TPM_HC)(PERSISTENT_FIRST + 0x00FFFFFF)\r
+#define PLATFORM_PERSISTENT   (TPM_HC)(PERSISTENT_FIRST + 0x00800000)\r
+#define NV_INDEX_FIRST        (TPM_HC)(HR_NV_INDEX + 0)\r
+#define NV_INDEX_LAST         (TPM_HC)(NV_INDEX_FIRST + 0x00FFFFFF)\r
+#define PERMANENT_FIRST       (TPM_HC)(TPM_RH_FIRST)\r
+#define PERMANENT_LAST        (TPM_HC)(TPM_RH_LAST)\r
 \r
 // 8 Attribute Structures\r
 \r
 // Table 29 - TPMA_ALGORITHM Bits\r
 typedef struct {\r
-  UINT32 asymmetric    : 1;\r
-  UINT32 symmetric     : 1;\r
-  UINT32 hash          : 1;\r
-  UINT32 object        : 1;\r
-  UINT32 reserved4_7   : 4;\r
-  UINT32 signing       : 1;\r
-  UINT32 encrypting    : 1;\r
-  UINT32 method        : 1;\r
-  UINT32 reserved11_31 : 21;\r
+  UINT32    asymmetric    : 1;\r
+  UINT32    symmetric     : 1;\r
+  UINT32    hash          : 1;\r
+  UINT32    object        : 1;\r
+  UINT32    reserved4_7   : 4;\r
+  UINT32    signing       : 1;\r
+  UINT32    encrypting    : 1;\r
+  UINT32    method        : 1;\r
+  UINT32    reserved11_31 : 21;\r
 } TPMA_ALGORITHM;\r
 \r
 // Table 30 - TPMA_OBJECT Bits\r
 typedef struct {\r
-  UINT32 reserved1            : 1;\r
-  UINT32 fixedTPM             : 1;\r
-  UINT32 stClear              : 1;\r
-  UINT32 reserved4            : 1;\r
-  UINT32 fixedParent          : 1;\r
-  UINT32 sensitiveDataOrigin  : 1;\r
-  UINT32 userWithAuth         : 1;\r
-  UINT32 adminWithPolicy      : 1;\r
-  UINT32 reserved8_9          : 2;\r
-  UINT32 noDA                 : 1;\r
-  UINT32 encryptedDuplication : 1;\r
-  UINT32 reserved12_15        : 4;\r
-  UINT32 restricted           : 1;\r
-  UINT32 decrypt              : 1;\r
-  UINT32 sign                 : 1;\r
-  UINT32 reserved19_31        : 13;\r
+  UINT32    reserved1            : 1;\r
+  UINT32    fixedTPM             : 1;\r
+  UINT32    stClear              : 1;\r
+  UINT32    reserved4            : 1;\r
+  UINT32    fixedParent          : 1;\r
+  UINT32    sensitiveDataOrigin  : 1;\r
+  UINT32    userWithAuth         : 1;\r
+  UINT32    adminWithPolicy      : 1;\r
+  UINT32    reserved8_9          : 2;\r
+  UINT32    noDA                 : 1;\r
+  UINT32    encryptedDuplication : 1;\r
+  UINT32    reserved12_15        : 4;\r
+  UINT32    restricted           : 1;\r
+  UINT32    decrypt              : 1;\r
+  UINT32    sign                 : 1;\r
+  UINT32    reserved19_31        : 13;\r
 } TPMA_OBJECT;\r
 \r
 // Table 31 - TPMA_SESSION Bits\r
 typedef struct {\r
-  UINT8 continueSession : 1;\r
-  UINT8 auditExclusive  : 1;\r
-  UINT8 auditReset      : 1;\r
-  UINT8 reserved3_4     : 2;\r
-  UINT8 decrypt         : 1;\r
-  UINT8 encrypt         : 1;\r
-  UINT8 audit           : 1;\r
+  UINT8    continueSession : 1;\r
+  UINT8    auditExclusive  : 1;\r
+  UINT8    auditReset      : 1;\r
+  UINT8    reserved3_4     : 2;\r
+  UINT8    decrypt         : 1;\r
+  UINT8    encrypt         : 1;\r
+  UINT8    audit           : 1;\r
 } TPMA_SESSION;\r
 \r
 // Table 32 - TPMA_LOCALITY Bits\r
@@ -757,54 +756,54 @@ typedef struct {
 // NOTE: Use low case here to resolve conflict\r
 //\r
 typedef struct {\r
-  UINT8 locZero  : 1;\r
-  UINT8 locOne   : 1;\r
-  UINT8 locTwo   : 1;\r
-  UINT8 locThree : 1;\r
-  UINT8 locFour  : 1;\r
-  UINT8 Extended : 3;\r
+  UINT8    locZero  : 1;\r
+  UINT8    locOne   : 1;\r
+  UINT8    locTwo   : 1;\r
+  UINT8    locThree : 1;\r
+  UINT8    locFour  : 1;\r
+  UINT8    Extended : 3;\r
 } TPMA_LOCALITY;\r
 \r
 // Table 33 - TPMA_PERMANENT Bits\r
 typedef struct {\r
-  UINT32 ownerAuthSet       : 1;\r
-  UINT32 endorsementAuthSet : 1;\r
-  UINT32 lockoutAuthSet     : 1;\r
-  UINT32 reserved3_7        : 5;\r
-  UINT32 disableClear       : 1;\r
-  UINT32 inLockout          : 1;\r
-  UINT32 tpmGeneratedEPS    : 1;\r
-  UINT32 reserved11_31      : 21;\r
+  UINT32    ownerAuthSet       : 1;\r
+  UINT32    endorsementAuthSet : 1;\r
+  UINT32    lockoutAuthSet     : 1;\r
+  UINT32    reserved3_7        : 5;\r
+  UINT32    disableClear       : 1;\r
+  UINT32    inLockout          : 1;\r
+  UINT32    tpmGeneratedEPS    : 1;\r
+  UINT32    reserved11_31      : 21;\r
 } TPMA_PERMANENT;\r
 \r
 // Table 34 - TPMA_STARTUP_CLEAR Bits\r
 typedef struct {\r
-  UINT32 phEnable     : 1;\r
-  UINT32 shEnable     : 1;\r
-  UINT32 ehEnable     : 1;\r
-  UINT32 reserved3_30 : 28;\r
-  UINT32 orderly      : 1;\r
+  UINT32    phEnable     : 1;\r
+  UINT32    shEnable     : 1;\r
+  UINT32    ehEnable     : 1;\r
+  UINT32    reserved3_30 : 28;\r
+  UINT32    orderly      : 1;\r
 } TPMA_STARTUP_CLEAR;\r
 \r
 // Table 35 - TPMA_MEMORY Bits\r
 typedef struct {\r
-  UINT32 sharedRAM         : 1;\r
-  UINT32 sharedNV          : 1;\r
-  UINT32 objectCopiedToRam : 1;\r
-  UINT32 reserved3_31      : 29;\r
+  UINT32    sharedRAM         : 1;\r
+  UINT32    sharedNV          : 1;\r
+  UINT32    objectCopiedToRam : 1;\r
+  UINT32    reserved3_31      : 29;\r
 } TPMA_MEMORY;\r
 \r
 // Table 36 - TPMA_CC Bits\r
 typedef struct {\r
-  UINT32 commandIndex  : 16;\r
-  UINT32 reserved16_21 : 6;\r
-  UINT32 nv            : 1;\r
-  UINT32 extensive     : 1;\r
-  UINT32 flushed       : 1;\r
-  UINT32 cHandles      : 3;\r
-  UINT32 rHandle       : 1;\r
-  UINT32 V             : 1;\r
-  UINT32 Res           : 2;\r
+  UINT32    commandIndex  : 16;\r
+  UINT32    reserved16_21 : 6;\r
+  UINT32    nv            : 1;\r
+  UINT32    extensive     : 1;\r
+  UINT32    flushed       : 1;\r
+  UINT32    cHandles      : 3;\r
+  UINT32    rHandle       : 1;\r
+  UINT32    V             : 1;\r
+  UINT32    Res           : 2;\r
 } TPMA_CC;\r
 \r
 // 9 Interface Types\r
@@ -897,35 +896,35 @@ typedef TPM_ST TPMI_ST_COMMAND_TAG;
 \r
 // Table 65 - TPMS_ALGORITHM_DESCRIPTION Structure\r
 typedef struct {\r
-  TPM_ALG_ID     alg;\r
-  TPMA_ALGORITHM attributes;\r
+  TPM_ALG_ID        alg;\r
+  TPMA_ALGORITHM    attributes;\r
 } TPMS_ALGORITHM_DESCRIPTION;\r
 \r
 // Table 66 - TPMU_HA Union\r
 typedef union {\r
-  BYTE sha1[SHA1_DIGEST_SIZE];\r
-  BYTE sha256[SHA256_DIGEST_SIZE];\r
-  BYTE sm3_256[SM3_256_DIGEST_SIZE];\r
-  BYTE sha384[SHA384_DIGEST_SIZE];\r
-  BYTE sha512[SHA512_DIGEST_SIZE];\r
+  BYTE    sha1[SHA1_DIGEST_SIZE];\r
+  BYTE    sha256[SHA256_DIGEST_SIZE];\r
+  BYTE    sm3_256[SM3_256_DIGEST_SIZE];\r
+  BYTE    sha384[SHA384_DIGEST_SIZE];\r
+  BYTE    sha512[SHA512_DIGEST_SIZE];\r
 } TPMU_HA;\r
 \r
 // Table 67 - TPMT_HA Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hashAlg;\r
-  TPMU_HA       digest;\r
+  TPMI_ALG_HASH    hashAlg;\r
+  TPMU_HA          digest;\r
 } TPMT_HA;\r
 \r
 // Table 68 - TPM2B_DIGEST Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[sizeof(TPMU_HA)];\r
+  UINT16    size;\r
+  BYTE      buffer[sizeof (TPMU_HA)];\r
 } TPM2B_DIGEST;\r
 \r
 // Table 69 - TPM2B_DATA Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[sizeof(TPMT_HA)];\r
+  UINT16    size;\r
+  BYTE      buffer[sizeof (TPMT_HA)];\r
 } TPM2B_DATA;\r
 \r
 // Table 70 - TPM2B_NONCE Types\r
@@ -939,254 +938,254 @@ typedef TPM2B_DIGEST TPM2B_OPERAND;
 \r
 // Table 73 - TPM2B_EVENT Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[1024];\r
+  UINT16    size;\r
+  BYTE      buffer[1024];\r
 } TPM2B_EVENT;\r
 \r
 // Table 74 - TPM2B_MAX_BUFFER Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[MAX_DIGEST_BUFFER];\r
+  UINT16    size;\r
+  BYTE      buffer[MAX_DIGEST_BUFFER];\r
 } TPM2B_MAX_BUFFER;\r
 \r
 // Table 75 - TPM2B_MAX_NV_BUFFER Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[MAX_NV_INDEX_SIZE];\r
+  UINT16    size;\r
+  BYTE      buffer[MAX_NV_INDEX_SIZE];\r
 } TPM2B_MAX_NV_BUFFER;\r
 \r
 // Table 76 - TPM2B_TIMEOUT Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[sizeof(UINT64)];\r
+  UINT16    size;\r
+  BYTE      buffer[sizeof (UINT64)];\r
 } TPM2B_TIMEOUT;\r
 \r
 // Table 77 -- TPM2B_IV Structure <I/O>\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[MAX_SYM_BLOCK_SIZE];\r
+  UINT16    size;\r
+  BYTE      buffer[MAX_SYM_BLOCK_SIZE];\r
 } TPM2B_IV;\r
 \r
 // Table 78 - TPMU_NAME Union\r
 typedef union {\r
-  TPMT_HA    digest;\r
-  TPM_HANDLE handle;\r
+  TPMT_HA       digest;\r
+  TPM_HANDLE    handle;\r
 } TPMU_NAME;\r
 \r
 // Table 79 - TPM2B_NAME Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   name[sizeof(TPMU_NAME)];\r
+  UINT16    size;\r
+  BYTE      name[sizeof (TPMU_NAME)];\r
 } TPM2B_NAME;\r
 \r
 // Table 80 - TPMS_PCR_SELECT Structure\r
 typedef struct {\r
-  UINT8 sizeofSelect;\r
-  BYTE  pcrSelect[PCR_SELECT_MAX];\r
+  UINT8    sizeofSelect;\r
+  BYTE     pcrSelect[PCR_SELECT_MAX];\r
 } TPMS_PCR_SELECT;\r
 \r
 // Table 81 - TPMS_PCR_SELECTION Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hash;\r
-  UINT8         sizeofSelect;\r
-  BYTE          pcrSelect[PCR_SELECT_MAX];\r
+  TPMI_ALG_HASH    hash;\r
+  UINT8            sizeofSelect;\r
+  BYTE             pcrSelect[PCR_SELECT_MAX];\r
 } TPMS_PCR_SELECTION;\r
 \r
 // Table 84 - TPMT_TK_CREATION Structure\r
 typedef struct {\r
-  TPM_ST            tag;\r
-  TPMI_RH_HIERARCHY hierarchy;\r
-  TPM2B_DIGEST      digest;\r
+  TPM_ST               tag;\r
+  TPMI_RH_HIERARCHY    hierarchy;\r
+  TPM2B_DIGEST         digest;\r
 } TPMT_TK_CREATION;\r
 \r
 // Table 85 - TPMT_TK_VERIFIED Structure\r
 typedef struct {\r
-  TPM_ST            tag;\r
-  TPMI_RH_HIERARCHY hierarchy;\r
-  TPM2B_DIGEST      digest;\r
+  TPM_ST               tag;\r
+  TPMI_RH_HIERARCHY    hierarchy;\r
+  TPM2B_DIGEST         digest;\r
 } TPMT_TK_VERIFIED;\r
 \r
 // Table 86 - TPMT_TK_AUTH Structure\r
 typedef struct {\r
-  TPM_ST            tag;\r
-  TPMI_RH_HIERARCHY hierarchy;\r
-  TPM2B_DIGEST      digest;\r
+  TPM_ST               tag;\r
+  TPMI_RH_HIERARCHY    hierarchy;\r
+  TPM2B_DIGEST         digest;\r
 } TPMT_TK_AUTH;\r
 \r
 // Table 87 - TPMT_TK_HASHCHECK Structure\r
 typedef struct {\r
-  TPM_ST            tag;\r
-  TPMI_RH_HIERARCHY hierarchy;\r
-  TPM2B_DIGEST      digest;\r
+  TPM_ST               tag;\r
+  TPMI_RH_HIERARCHY    hierarchy;\r
+  TPM2B_DIGEST         digest;\r
 } TPMT_TK_HASHCHECK;\r
 \r
 // Table 88 - TPMS_ALG_PROPERTY Structure\r
 typedef struct {\r
-  TPM_ALG_ID     alg;\r
-  TPMA_ALGORITHM algProperties;\r
+  TPM_ALG_ID        alg;\r
+  TPMA_ALGORITHM    algProperties;\r
 } TPMS_ALG_PROPERTY;\r
 \r
 // Table 89 - TPMS_TAGGED_PROPERTY Structure\r
 typedef struct {\r
-  TPM_PT property;\r
-  UINT32 value;\r
+  TPM_PT    property;\r
+  UINT32    value;\r
 } TPMS_TAGGED_PROPERTY;\r
 \r
 // Table 90 - TPMS_TAGGED_PCR_SELECT Structure\r
 typedef struct {\r
-  TPM_PT tag;\r
-  UINT8  sizeofSelect;\r
-  BYTE   pcrSelect[PCR_SELECT_MAX];\r
+  TPM_PT    tag;\r
+  UINT8     sizeofSelect;\r
+  BYTE      pcrSelect[PCR_SELECT_MAX];\r
 } TPMS_TAGGED_PCR_SELECT;\r
 \r
 // Table 91 - TPML_CC Structure\r
 typedef struct {\r
-  UINT32 count;\r
-  TPM_CC commandCodes[MAX_CAP_CC];\r
+  UINT32    count;\r
+  TPM_CC    commandCodes[MAX_CAP_CC];\r
 } TPML_CC;\r
 \r
 // Table 92 - TPML_CCA Structure\r
 typedef struct {\r
-  UINT32  count;\r
-  TPMA_CC commandAttributes[MAX_CAP_CC];\r
+  UINT32     count;\r
+  TPMA_CC    commandAttributes[MAX_CAP_CC];\r
 } TPML_CCA;\r
 \r
 // Table 93 - TPML_ALG Structure\r
 typedef struct {\r
-  UINT32     count;\r
-  TPM_ALG_ID algorithms[MAX_ALG_LIST_SIZE];\r
+  UINT32        count;\r
+  TPM_ALG_ID    algorithms[MAX_ALG_LIST_SIZE];\r
 } TPML_ALG;\r
 \r
 // Table 94 - TPML_HANDLE Structure\r
 typedef struct {\r
-  UINT32     count;\r
-  TPM_HANDLE handle[MAX_CAP_HANDLES];\r
+  UINT32        count;\r
+  TPM_HANDLE    handle[MAX_CAP_HANDLES];\r
 } TPML_HANDLE;\r
 \r
 // Table 95 - TPML_DIGEST Structure\r
 typedef struct {\r
-  UINT32       count;\r
-  TPM2B_DIGEST digests[8];\r
+  UINT32          count;\r
+  TPM2B_DIGEST    digests[8];\r
 } TPML_DIGEST;\r
 \r
 // Table 96 -- TPML_DIGEST_VALUES Structure <I/O>\r
 typedef struct {\r
-  UINT32  count;\r
-  TPMT_HA digests[HASH_COUNT];\r
+  UINT32     count;\r
+  TPMT_HA    digests[HASH_COUNT];\r
 } TPML_DIGEST_VALUES;\r
 \r
 // Table 97 - TPM2B_DIGEST_VALUES Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[sizeof(TPML_DIGEST_VALUES)];\r
+  UINT16    size;\r
+  BYTE      buffer[sizeof (TPML_DIGEST_VALUES)];\r
 } TPM2B_DIGEST_VALUES;\r
 \r
 // Table 98 - TPML_PCR_SELECTION Structure\r
 typedef struct {\r
-  UINT32             count;\r
-  TPMS_PCR_SELECTION pcrSelections[HASH_COUNT];\r
+  UINT32                count;\r
+  TPMS_PCR_SELECTION    pcrSelections[HASH_COUNT];\r
 } TPML_PCR_SELECTION;\r
 \r
 // Table 99 - TPML_ALG_PROPERTY Structure\r
 typedef struct {\r
-  UINT32            count;\r
-  TPMS_ALG_PROPERTY algProperties[MAX_CAP_ALGS];\r
+  UINT32               count;\r
+  TPMS_ALG_PROPERTY    algProperties[MAX_CAP_ALGS];\r
 } TPML_ALG_PROPERTY;\r
 \r
 // Table 100 - TPML_TAGGED_TPM_PROPERTY Structure\r
 typedef struct {\r
-  UINT32               count;\r
-  TPMS_TAGGED_PROPERTY tpmProperty[MAX_TPM_PROPERTIES];\r
+  UINT32                  count;\r
+  TPMS_TAGGED_PROPERTY    tpmProperty[MAX_TPM_PROPERTIES];\r
 } TPML_TAGGED_TPM_PROPERTY;\r
 \r
 // Table 101 - TPML_TAGGED_PCR_PROPERTY Structure\r
 typedef struct {\r
-  UINT32                 count;\r
-  TPMS_TAGGED_PCR_SELECT pcrProperty[MAX_PCR_PROPERTIES];\r
+  UINT32                    count;\r
+  TPMS_TAGGED_PCR_SELECT    pcrProperty[MAX_PCR_PROPERTIES];\r
 } TPML_TAGGED_PCR_PROPERTY;\r
 \r
 // Table 102 - TPML_ECC_CURVE Structure\r
 typedef struct {\r
-  UINT32        count;\r
-  TPM_ECC_CURVE eccCurves[MAX_ECC_CURVES];\r
+  UINT32           count;\r
+  TPM_ECC_CURVE    eccCurves[MAX_ECC_CURVES];\r
 } TPML_ECC_CURVE;\r
 \r
 // Table 103 - TPMU_CAPABILITIES Union\r
 typedef union {\r
-  TPML_ALG_PROPERTY        algorithms;\r
-  TPML_HANDLE              handles;\r
-  TPML_CCA                 command;\r
-  TPML_CC                  ppCommands;\r
-  TPML_CC                  auditCommands;\r
-  TPML_PCR_SELECTION       assignedPCR;\r
-  TPML_TAGGED_TPM_PROPERTY tpmProperties;\r
-  TPML_TAGGED_PCR_PROPERTY pcrProperties;\r
-  TPML_ECC_CURVE           eccCurves;\r
+  TPML_ALG_PROPERTY           algorithms;\r
+  TPML_HANDLE                 handles;\r
+  TPML_CCA                    command;\r
+  TPML_CC                     ppCommands;\r
+  TPML_CC                     auditCommands;\r
+  TPML_PCR_SELECTION          assignedPCR;\r
+  TPML_TAGGED_TPM_PROPERTY    tpmProperties;\r
+  TPML_TAGGED_PCR_PROPERTY    pcrProperties;\r
+  TPML_ECC_CURVE              eccCurves;\r
 } TPMU_CAPABILITIES;\r
 \r
 // Table 104 - TPMS_CAPABILITY_DATA Structure\r
 typedef struct {\r
-  TPM_CAP           capability;\r
-  TPMU_CAPABILITIES data;\r
+  TPM_CAP              capability;\r
+  TPMU_CAPABILITIES    data;\r
 } TPMS_CAPABILITY_DATA;\r
 \r
 // Table 105 - TPMS_CLOCK_INFO Structure\r
 typedef struct {\r
-  UINT64      clock;\r
-  UINT32      resetCount;\r
-  UINT32      restartCount;\r
-  TPMI_YES_NO safe;\r
+  UINT64         clock;\r
+  UINT32         resetCount;\r
+  UINT32         restartCount;\r
+  TPMI_YES_NO    safe;\r
 } TPMS_CLOCK_INFO;\r
 \r
 // Table 106 - TPMS_TIME_INFO Structure\r
 typedef struct {\r
-  UINT64          time;\r
-  TPMS_CLOCK_INFO clockInfo;\r
+  UINT64             time;\r
+  TPMS_CLOCK_INFO    clockInfo;\r
 } TPMS_TIME_INFO;\r
 \r
 // Table 107 - TPMS_TIME_ATTEST_INFO Structure\r
 typedef struct {\r
-  TPMS_TIME_INFO time;\r
-  UINT64         firmwareVersion;\r
+  TPMS_TIME_INFO    time;\r
+  UINT64            firmwareVersion;\r
 } TPMS_TIME_ATTEST_INFO;\r
 \r
 // Table 108 - TPMS_CERTIFY_INFO Structure\r
 typedef struct {\r
-  TPM2B_NAME name;\r
-  TPM2B_NAME qualifiedName;\r
+  TPM2B_NAME    name;\r
+  TPM2B_NAME    qualifiedName;\r
 } TPMS_CERTIFY_INFO;\r
 \r
 // Table 109 - TPMS_QUOTE_INFO Structure\r
 typedef struct {\r
-  TPML_PCR_SELECTION pcrSelect;\r
-  TPM2B_DIGEST       pcrDigest;\r
+  TPML_PCR_SELECTION    pcrSelect;\r
+  TPM2B_DIGEST          pcrDigest;\r
 } TPMS_QUOTE_INFO;\r
 \r
 // Table 110 - TPMS_COMMAND_AUDIT_INFO Structure\r
 typedef struct {\r
-  UINT64       auditCounter;\r
-  TPM_ALG_ID   digestAlg;\r
-  TPM2B_DIGEST auditDigest;\r
-  TPM2B_DIGEST commandDigest;\r
+  UINT64          auditCounter;\r
+  TPM_ALG_ID      digestAlg;\r
+  TPM2B_DIGEST    auditDigest;\r
+  TPM2B_DIGEST    commandDigest;\r
 } TPMS_COMMAND_AUDIT_INFO;\r
 \r
 // Table 111 - TPMS_SESSION_AUDIT_INFO Structure\r
 typedef struct {\r
-  TPMI_YES_NO  exclusiveSession;\r
-  TPM2B_DIGEST sessionDigest;\r
+  TPMI_YES_NO     exclusiveSession;\r
+  TPM2B_DIGEST    sessionDigest;\r
 } TPMS_SESSION_AUDIT_INFO;\r
 \r
 // Table 112 - TPMS_CREATION_INFO Structure\r
 typedef struct {\r
-  TPM2B_NAME   objectName;\r
-  TPM2B_DIGEST creationHash;\r
+  TPM2B_NAME      objectName;\r
+  TPM2B_DIGEST    creationHash;\r
 } TPMS_CREATION_INFO;\r
 \r
 // Table 113 - TPMS_NV_CERTIFY_INFO Structure\r
 typedef struct {\r
-  TPM2B_NAME          indexName;\r
-  UINT16              offset;\r
-  TPM2B_MAX_NV_BUFFER nvContents;\r
+  TPM2B_NAME             indexName;\r
+  UINT16                 offset;\r
+  TPM2B_MAX_NV_BUFFER    nvContents;\r
 } TPMS_NV_CERTIFY_INFO;\r
 \r
 // Table 114 - TPMI_ST_ATTEST Type\r
@@ -1194,45 +1193,45 @@ typedef TPM_ST TPMI_ST_ATTEST;
 \r
 // Table 115 - TPMU_ATTEST Union\r
 typedef union {\r
-  TPMS_CERTIFY_INFO       certify;\r
-  TPMS_CREATION_INFO      creation;\r
-  TPMS_QUOTE_INFO         quote;\r
-  TPMS_COMMAND_AUDIT_INFO commandAudit;\r
-  TPMS_SESSION_AUDIT_INFO sessionAudit;\r
-  TPMS_TIME_ATTEST_INFO   time;\r
-  TPMS_NV_CERTIFY_INFO    nv;\r
+  TPMS_CERTIFY_INFO          certify;\r
+  TPMS_CREATION_INFO         creation;\r
+  TPMS_QUOTE_INFO            quote;\r
+  TPMS_COMMAND_AUDIT_INFO    commandAudit;\r
+  TPMS_SESSION_AUDIT_INFO    sessionAudit;\r
+  TPMS_TIME_ATTEST_INFO      time;\r
+  TPMS_NV_CERTIFY_INFO       nv;\r
 } TPMU_ATTEST;\r
 \r
 // Table 116 - TPMS_ATTEST Structure\r
 typedef struct {\r
-  TPM_GENERATED   magic;\r
-  TPMI_ST_ATTEST  type;\r
-  TPM2B_NAME      qualifiedSigner;\r
-  TPM2B_DATA      extraData;\r
-  TPMS_CLOCK_INFO clockInfo;\r
-  UINT64          firmwareVersion;\r
-  TPMU_ATTEST     attested;\r
+  TPM_GENERATED      magic;\r
+  TPMI_ST_ATTEST     type;\r
+  TPM2B_NAME         qualifiedSigner;\r
+  TPM2B_DATA         extraData;\r
+  TPMS_CLOCK_INFO    clockInfo;\r
+  UINT64             firmwareVersion;\r
+  TPMU_ATTEST        attested;\r
 } TPMS_ATTEST;\r
 \r
 // Table 117 - TPM2B_ATTEST Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   attestationData[sizeof(TPMS_ATTEST)];\r
+  UINT16    size;\r
+  BYTE      attestationData[sizeof (TPMS_ATTEST)];\r
 } TPM2B_ATTEST;\r
 \r
 // Table 118 - TPMS_AUTH_COMMAND Structure\r
 typedef struct {\r
-  TPMI_SH_AUTH_SESSION sessionHandle;\r
-  TPM2B_NONCE          nonce;\r
-  TPMA_SESSION         sessionAttributes;\r
-  TPM2B_AUTH           hmac;\r
+  TPMI_SH_AUTH_SESSION    sessionHandle;\r
+  TPM2B_NONCE             nonce;\r
+  TPMA_SESSION            sessionAttributes;\r
+  TPM2B_AUTH              hmac;\r
 } TPMS_AUTH_COMMAND;\r
 \r
 // Table 119 - TPMS_AUTH_RESPONSE Structure\r
 typedef struct {\r
-  TPM2B_NONCE  nonce;\r
-  TPMA_SESSION sessionAttributes;\r
-  TPM2B_AUTH   hmac;\r
+  TPM2B_NONCE     nonce;\r
+  TPMA_SESSION    sessionAttributes;\r
+  TPM2B_AUTH      hmac;\r
 } TPMS_AUTH_RESPONSE;\r
 \r
 // 11 Algorithm Parameters and Structures\r
@@ -1245,65 +1244,65 @@ typedef TPM_KEY_BITS TPMI_SM4_KEY_BITS;
 \r
 // Table 122 - TPMU_SYM_KEY_BITS Union\r
 typedef union {\r
-  TPMI_AES_KEY_BITS aes;\r
-  TPMI_SM4_KEY_BITS SM4;\r
-  TPM_KEY_BITS      sym;\r
+  TPMI_AES_KEY_BITS    aes;\r
+  TPMI_SM4_KEY_BITS    SM4;\r
+  TPM_KEY_BITS         sym;\r
   TPMI_ALG_HASH     xor;\r
 } TPMU_SYM_KEY_BITS;\r
 \r
 // Table 123 - TPMU_SYM_MODE Union\r
 typedef union {\r
-  TPMI_ALG_SYM_MODE aes;\r
-  TPMI_ALG_SYM_MODE SM4;\r
-  TPMI_ALG_SYM_MODE sym;\r
+  TPMI_ALG_SYM_MODE    aes;\r
+  TPMI_ALG_SYM_MODE    SM4;\r
+  TPMI_ALG_SYM_MODE    sym;\r
 } TPMU_SYM_MODE;\r
 \r
 // Table 125 - TPMT_SYM_DEF Structure\r
 typedef struct {\r
-  TPMI_ALG_SYM      algorithm;\r
-  TPMU_SYM_KEY_BITS keyBits;\r
-  TPMU_SYM_MODE     mode;\r
+  TPMI_ALG_SYM         algorithm;\r
+  TPMU_SYM_KEY_BITS    keyBits;\r
+  TPMU_SYM_MODE        mode;\r
 } TPMT_SYM_DEF;\r
 \r
 // Table 126 - TPMT_SYM_DEF_OBJECT Structure\r
 typedef struct {\r
-  TPMI_ALG_SYM_OBJECT algorithm;\r
-  TPMU_SYM_KEY_BITS   keyBits;\r
-  TPMU_SYM_MODE       mode;\r
+  TPMI_ALG_SYM_OBJECT    algorithm;\r
+  TPMU_SYM_KEY_BITS      keyBits;\r
+  TPMU_SYM_MODE          mode;\r
 } TPMT_SYM_DEF_OBJECT;\r
 \r
 // Table 127 - TPM2B_SYM_KEY Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[MAX_SYM_KEY_BYTES];\r
+  UINT16    size;\r
+  BYTE      buffer[MAX_SYM_KEY_BYTES];\r
 } TPM2B_SYM_KEY;\r
 \r
 // Table 128 - TPMS_SYMCIPHER_PARMS Structure\r
 typedef struct {\r
-  TPMT_SYM_DEF_OBJECT sym;\r
+  TPMT_SYM_DEF_OBJECT    sym;\r
 } TPMS_SYMCIPHER_PARMS;\r
 \r
 // Table 129 - TPM2B_SENSITIVE_DATA Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[MAX_SYM_DATA];\r
+  UINT16    size;\r
+  BYTE      buffer[MAX_SYM_DATA];\r
 } TPM2B_SENSITIVE_DATA;\r
 \r
 // Table 130 - TPMS_SENSITIVE_CREATE Structure\r
 typedef struct {\r
-  TPM2B_AUTH           userAuth;\r
-  TPM2B_SENSITIVE_DATA data;\r
+  TPM2B_AUTH              userAuth;\r
+  TPM2B_SENSITIVE_DATA    data;\r
 } TPMS_SENSITIVE_CREATE;\r
 \r
 // Table 131 - TPM2B_SENSITIVE_CREATE Structure\r
 typedef struct {\r
-  UINT16                size;\r
-  TPMS_SENSITIVE_CREATE sensitive;\r
+  UINT16                   size;\r
+  TPMS_SENSITIVE_CREATE    sensitive;\r
 } TPM2B_SENSITIVE_CREATE;\r
 \r
 // Table 132 - TPMS_SCHEME_SIGHASH Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hashAlg;\r
+  TPMI_ALG_HASH    hashAlg;\r
 } TPMS_SCHEME_SIGHASH;\r
 \r
 // Table 133 - TPMI_ALG_KEYEDHASH_SCHEME Type\r
@@ -1314,20 +1313,20 @@ typedef TPMS_SCHEME_SIGHASH TPMS_SCHEME_HMAC;
 \r
 // Table 135 - TPMS_SCHEME_XOR Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hashAlg;\r
-  TPMI_ALG_KDF  kdf;\r
+  TPMI_ALG_HASH    hashAlg;\r
+  TPMI_ALG_KDF     kdf;\r
 } TPMS_SCHEME_XOR;\r
 \r
 // Table 136 - TPMU_SCHEME_KEYEDHASH Union\r
 typedef union {\r
-  TPMS_SCHEME_HMAC hmac;\r
+  TPMS_SCHEME_HMAC    hmac;\r
   TPMS_SCHEME_XOR  xor;\r
 } TPMU_SCHEME_KEYEDHASH;\r
 \r
 // Table 137 - TPMT_KEYEDHASH_SCHEME Structure\r
 typedef struct {\r
-  TPMI_ALG_KEYEDHASH_SCHEME scheme;\r
-  TPMU_SCHEME_KEYEDHASH     details;\r
+  TPMI_ALG_KEYEDHASH_SCHEME    scheme;\r
+  TPMU_SCHEME_KEYEDHASH        details;\r
 } TPMT_KEYEDHASH_SCHEME;\r
 \r
 // Table 138 - RSA_SIG_SCHEMES Types\r
@@ -1341,69 +1340,69 @@ typedef TPMS_SCHEME_SIGHASH TPMS_SCHEME_ECSCHNORR;
 \r
 // Table 140 - TPMS_SCHEME_ECDAA Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hashAlg;\r
-  UINT16        count;\r
+  TPMI_ALG_HASH    hashAlg;\r
+  UINT16           count;\r
 } TPMS_SCHEME_ECDAA;\r
 \r
 // Table 141 - TPMU_SIG_SCHEME Union\r
 typedef union {\r
-  TPMS_SCHEME_RSASSA    rsassa;\r
-  TPMS_SCHEME_RSAPSS    rsapss;\r
-  TPMS_SCHEME_ECDSA     ecdsa;\r
-  TPMS_SCHEME_ECDAA     ecdaa;\r
-  TPMS_SCHEME_ECSCHNORR ecSchnorr;\r
-  TPMS_SCHEME_HMAC      hmac;\r
-  TPMS_SCHEME_SIGHASH   any;\r
+  TPMS_SCHEME_RSASSA       rsassa;\r
+  TPMS_SCHEME_RSAPSS       rsapss;\r
+  TPMS_SCHEME_ECDSA        ecdsa;\r
+  TPMS_SCHEME_ECDAA        ecdaa;\r
+  TPMS_SCHEME_ECSCHNORR    ecSchnorr;\r
+  TPMS_SCHEME_HMAC         hmac;\r
+  TPMS_SCHEME_SIGHASH      any;\r
 } TPMU_SIG_SCHEME;\r
 \r
 // Table 142 - TPMT_SIG_SCHEME Structure\r
 typedef struct {\r
-  TPMI_ALG_SIG_SCHEME scheme;\r
-  TPMU_SIG_SCHEME     details;\r
+  TPMI_ALG_SIG_SCHEME    scheme;\r
+  TPMU_SIG_SCHEME        details;\r
 } TPMT_SIG_SCHEME;\r
 \r
 // Table 143 - TPMS_SCHEME_OAEP Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hashAlg;\r
+  TPMI_ALG_HASH    hashAlg;\r
 } TPMS_SCHEME_OAEP;\r
 \r
 // Table 144 - TPMS_SCHEME_ECDH Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hashAlg;\r
+  TPMI_ALG_HASH    hashAlg;\r
 } TPMS_SCHEME_ECDH;\r
 \r
 // Table 145 - TPMS_SCHEME_MGF1 Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hashAlg;\r
+  TPMI_ALG_HASH    hashAlg;\r
 } TPMS_SCHEME_MGF1;\r
 \r
 // Table 146 - TPMS_SCHEME_KDF1_SP800_56a Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hashAlg;\r
+  TPMI_ALG_HASH    hashAlg;\r
 } TPMS_SCHEME_KDF1_SP800_56a;\r
 \r
 // Table 147 - TPMS_SCHEME_KDF2 Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hashAlg;\r
+  TPMI_ALG_HASH    hashAlg;\r
 } TPMS_SCHEME_KDF2;\r
 \r
 // Table 148 - TPMS_SCHEME_KDF1_SP800_108 Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH hashAlg;\r
+  TPMI_ALG_HASH    hashAlg;\r
 } TPMS_SCHEME_KDF1_SP800_108;\r
 \r
 // Table 149 - TPMU_KDF_SCHEME Union\r
 typedef union {\r
-  TPMS_SCHEME_MGF1           mgf1;\r
-  TPMS_SCHEME_KDF1_SP800_56a kdf1_SP800_56a;\r
-  TPMS_SCHEME_KDF2           kdf2;\r
-  TPMS_SCHEME_KDF1_SP800_108 kdf1_sp800_108;\r
+  TPMS_SCHEME_MGF1              mgf1;\r
+  TPMS_SCHEME_KDF1_SP800_56a    kdf1_SP800_56a;\r
+  TPMS_SCHEME_KDF2              kdf2;\r
+  TPMS_SCHEME_KDF1_SP800_108    kdf1_sp800_108;\r
 } TPMU_KDF_SCHEME;\r
 \r
 // Table 150 - TPMT_KDF_SCHEME Structure\r
 typedef struct {\r
-  TPMI_ALG_KDF    scheme;\r
-  TPMU_KDF_SCHEME details;\r
+  TPMI_ALG_KDF       scheme;\r
+  TPMU_KDF_SCHEME    details;\r
 } TPMT_KDF_SCHEME;\r
 \r
 // Table 151 - TPMI_ALG_ASYM_SCHEME Type\r
@@ -1411,19 +1410,19 @@ typedef TPM_ALG_ID TPMI_ALG_ASYM_SCHEME;
 \r
 // Table 152 - TPMU_ASYM_SCHEME Union\r
 typedef union {\r
-  TPMS_SCHEME_RSASSA    rsassa;\r
-  TPMS_SCHEME_RSAPSS    rsapss;\r
-  TPMS_SCHEME_OAEP      oaep;\r
-  TPMS_SCHEME_ECDSA     ecdsa;\r
-  TPMS_SCHEME_ECDAA     ecdaa;\r
-  TPMS_SCHEME_ECSCHNORR ecSchnorr;\r
-  TPMS_SCHEME_SIGHASH   anySig;\r
+  TPMS_SCHEME_RSASSA       rsassa;\r
+  TPMS_SCHEME_RSAPSS       rsapss;\r
+  TPMS_SCHEME_OAEP         oaep;\r
+  TPMS_SCHEME_ECDSA        ecdsa;\r
+  TPMS_SCHEME_ECDAA        ecdaa;\r
+  TPMS_SCHEME_ECSCHNORR    ecSchnorr;\r
+  TPMS_SCHEME_SIGHASH      anySig;\r
 } TPMU_ASYM_SCHEME;\r
 \r
 // Table 153 - TPMT_ASYM_SCHEME Structure\r
 typedef struct {\r
-  TPMI_ALG_ASYM_SCHEME scheme;\r
-  TPMU_ASYM_SCHEME     details;\r
+  TPMI_ALG_ASYM_SCHEME    scheme;\r
+  TPMU_ASYM_SCHEME        details;\r
 } TPMT_ASYM_SCHEME;\r
 \r
 // Table 154 - TPMI_ALG_RSA_SCHEME Type\r
@@ -1431,8 +1430,8 @@ typedef TPM_ALG_ID TPMI_ALG_RSA_SCHEME;
 \r
 // Table 155 - TPMT_RSA_SCHEME Structure\r
 typedef struct {\r
-  TPMI_ALG_RSA_SCHEME scheme;\r
-  TPMU_ASYM_SCHEME    details;\r
+  TPMI_ALG_RSA_SCHEME    scheme;\r
+  TPMU_ASYM_SCHEME       details;\r
 } TPMT_RSA_SCHEME;\r
 \r
 // Table 156 - TPMI_ALG_RSA_DECRYPT Type\r
@@ -1440,14 +1439,14 @@ typedef TPM_ALG_ID TPMI_ALG_RSA_DECRYPT;
 \r
 // Table 157 - TPMT_RSA_DECRYPT Structure\r
 typedef struct {\r
-  TPMI_ALG_RSA_DECRYPT scheme;\r
-  TPMU_ASYM_SCHEME     details;\r
+  TPMI_ALG_RSA_DECRYPT    scheme;\r
+  TPMU_ASYM_SCHEME        details;\r
 } TPMT_RSA_DECRYPT;\r
 \r
 // Table 158 - TPM2B_PUBLIC_KEY_RSA Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[MAX_RSA_KEY_BYTES];\r
+  UINT16    size;\r
+  BYTE      buffer[MAX_RSA_KEY_BYTES];\r
 } TPM2B_PUBLIC_KEY_RSA;\r
 \r
 // Table 159 - TPMI_RSA_KEY_BITS Type\r
@@ -1455,26 +1454,26 @@ typedef TPM_KEY_BITS TPMI_RSA_KEY_BITS;
 \r
 // Table 160 - TPM2B_PRIVATE_KEY_RSA Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[MAX_RSA_KEY_BYTES/2];\r
+  UINT16    size;\r
+  BYTE      buffer[MAX_RSA_KEY_BYTES/2];\r
 } TPM2B_PRIVATE_KEY_RSA;\r
 \r
 // Table 161 - TPM2B_ECC_PARAMETER Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[MAX_ECC_KEY_BYTES];\r
+  UINT16    size;\r
+  BYTE      buffer[MAX_ECC_KEY_BYTES];\r
 } TPM2B_ECC_PARAMETER;\r
 \r
 // Table 162 - TPMS_ECC_POINT Structure\r
 typedef struct {\r
-  TPM2B_ECC_PARAMETER x;\r
-  TPM2B_ECC_PARAMETER y;\r
+  TPM2B_ECC_PARAMETER    x;\r
+  TPM2B_ECC_PARAMETER    y;\r
 } TPMS_ECC_POINT;\r
 \r
 // Table 163 -- TPM2B_ECC_POINT Structure <I/O>\r
 typedef struct {\r
-  UINT16         size;\r
-  TPMS_ECC_POINT point;\r
+  UINT16            size;\r
+  TPMS_ECC_POINT    point;\r
 } TPM2B_ECC_POINT;\r
 \r
 // Table 164 - TPMI_ALG_ECC_SCHEME Type\r
@@ -1485,74 +1484,74 @@ typedef TPM_ECC_CURVE TPMI_ECC_CURVE;
 \r
 // Table 166 - TPMT_ECC_SCHEME Structure\r
 typedef struct {\r
-  TPMI_ALG_ECC_SCHEME scheme;\r
-  TPMU_SIG_SCHEME     details;\r
+  TPMI_ALG_ECC_SCHEME    scheme;\r
+  TPMU_SIG_SCHEME        details;\r
 } TPMT_ECC_SCHEME;\r
 \r
 // Table 167 - TPMS_ALGORITHM_DETAIL_ECC Structure\r
 typedef struct {\r
-  TPM_ECC_CURVE       curveID;\r
-  UINT16              keySize;\r
-  TPMT_KDF_SCHEME     kdf;\r
-  TPMT_ECC_SCHEME     sign;\r
-  TPM2B_ECC_PARAMETER p;\r
-  TPM2B_ECC_PARAMETER a;\r
-  TPM2B_ECC_PARAMETER b;\r
-  TPM2B_ECC_PARAMETER gX;\r
-  TPM2B_ECC_PARAMETER gY;\r
-  TPM2B_ECC_PARAMETER n;\r
-  TPM2B_ECC_PARAMETER h;\r
+  TPM_ECC_CURVE          curveID;\r
+  UINT16                 keySize;\r
+  TPMT_KDF_SCHEME        kdf;\r
+  TPMT_ECC_SCHEME        sign;\r
+  TPM2B_ECC_PARAMETER    p;\r
+  TPM2B_ECC_PARAMETER    a;\r
+  TPM2B_ECC_PARAMETER    b;\r
+  TPM2B_ECC_PARAMETER    gX;\r
+  TPM2B_ECC_PARAMETER    gY;\r
+  TPM2B_ECC_PARAMETER    n;\r
+  TPM2B_ECC_PARAMETER    h;\r
 } TPMS_ALGORITHM_DETAIL_ECC;\r
 \r
 // Table 168 - TPMS_SIGNATURE_RSASSA Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH        hash;\r
-  TPM2B_PUBLIC_KEY_RSA sig;\r
+  TPMI_ALG_HASH           hash;\r
+  TPM2B_PUBLIC_KEY_RSA    sig;\r
 } TPMS_SIGNATURE_RSASSA;\r
 \r
 // Table 169 - TPMS_SIGNATURE_RSAPSS Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH        hash;\r
-  TPM2B_PUBLIC_KEY_RSA sig;\r
+  TPMI_ALG_HASH           hash;\r
+  TPM2B_PUBLIC_KEY_RSA    sig;\r
 } TPMS_SIGNATURE_RSAPSS;\r
 \r
 // Table 170 - TPMS_SIGNATURE_ECDSA Structure\r
 typedef struct {\r
-  TPMI_ALG_HASH       hash;\r
-  TPM2B_ECC_PARAMETER signatureR;\r
-  TPM2B_ECC_PARAMETER signatureS;\r
+  TPMI_ALG_HASH          hash;\r
+  TPM2B_ECC_PARAMETER    signatureR;\r
+  TPM2B_ECC_PARAMETER    signatureS;\r
 } TPMS_SIGNATURE_ECDSA;\r
 \r
 // Table 171 - TPMU_SIGNATURE Union\r
 typedef union {\r
-  TPMS_SIGNATURE_RSASSA rsassa;\r
-  TPMS_SIGNATURE_RSAPSS rsapss;\r
-  TPMS_SIGNATURE_ECDSA  ecdsa;\r
-  TPMS_SIGNATURE_ECDSA  sm2;\r
-  TPMS_SIGNATURE_ECDSA  ecdaa;\r
-  TPMS_SIGNATURE_ECDSA  ecschnorr;\r
-  TPMT_HA               hmac;\r
-  TPMS_SCHEME_SIGHASH   any;\r
+  TPMS_SIGNATURE_RSASSA    rsassa;\r
+  TPMS_SIGNATURE_RSAPSS    rsapss;\r
+  TPMS_SIGNATURE_ECDSA     ecdsa;\r
+  TPMS_SIGNATURE_ECDSA     sm2;\r
+  TPMS_SIGNATURE_ECDSA     ecdaa;\r
+  TPMS_SIGNATURE_ECDSA     ecschnorr;\r
+  TPMT_HA                  hmac;\r
+  TPMS_SCHEME_SIGHASH      any;\r
 } TPMU_SIGNATURE;\r
 \r
 // Table 172 - TPMT_SIGNATURE Structure\r
 typedef struct {\r
-  TPMI_ALG_SIG_SCHEME sigAlg;\r
-  TPMU_SIGNATURE      signature;\r
+  TPMI_ALG_SIG_SCHEME    sigAlg;\r
+  TPMU_SIGNATURE         signature;\r
 } TPMT_SIGNATURE;\r
 \r
 // Table 173 - TPMU_ENCRYPTED_SECRET Union\r
 typedef union {\r
-  BYTE ecc[sizeof(TPMS_ECC_POINT)];\r
-  BYTE rsa[MAX_RSA_KEY_BYTES];\r
-  BYTE symmetric[sizeof(TPM2B_DIGEST)];\r
-  BYTE keyedHash[sizeof(TPM2B_DIGEST)];\r
+  BYTE    ecc[sizeof (TPMS_ECC_POINT)];\r
+  BYTE    rsa[MAX_RSA_KEY_BYTES];\r
+  BYTE    symmetric[sizeof (TPM2B_DIGEST)];\r
+  BYTE    keyedHash[sizeof (TPM2B_DIGEST)];\r
 } TPMU_ENCRYPTED_SECRET;\r
 \r
 // Table 174 - TPM2B_ENCRYPTED_SECRET Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   secret[sizeof(TPMU_ENCRYPTED_SECRET)];\r
+  UINT16    size;\r
+  BYTE      secret[sizeof (TPMU_ENCRYPTED_SECRET)];\r
 } TPM2B_ENCRYPTED_SECRET;\r
 \r
 // 12 Key/Object Complex\r
@@ -1562,122 +1561,122 @@ typedef TPM_ALG_ID TPMI_ALG_PUBLIC;
 \r
 // Table 176 - TPMU_PUBLIC_ID Union\r
 typedef union {\r
-  TPM2B_DIGEST         keyedHash;\r
-  TPM2B_DIGEST         sym;\r
-  TPM2B_PUBLIC_KEY_RSA rsa;\r
-  TPMS_ECC_POINT       ecc;\r
+  TPM2B_DIGEST            keyedHash;\r
+  TPM2B_DIGEST            sym;\r
+  TPM2B_PUBLIC_KEY_RSA    rsa;\r
+  TPMS_ECC_POINT          ecc;\r
 } TPMU_PUBLIC_ID;\r
 \r
 // Table 177 - TPMS_KEYEDHASH_PARMS Structure\r
 typedef struct {\r
-  TPMT_KEYEDHASH_SCHEME scheme;\r
+  TPMT_KEYEDHASH_SCHEME    scheme;\r
 } TPMS_KEYEDHASH_PARMS;\r
 \r
 // Table 178 - TPMS_ASYM_PARMS Structure\r
 typedef struct {\r
-  TPMT_SYM_DEF_OBJECT symmetric;\r
-  TPMT_ASYM_SCHEME    scheme;\r
+  TPMT_SYM_DEF_OBJECT    symmetric;\r
+  TPMT_ASYM_SCHEME       scheme;\r
 } TPMS_ASYM_PARMS;\r
 \r
 // Table 179 - TPMS_RSA_PARMS Structure\r
 typedef struct {\r
-  TPMT_SYM_DEF_OBJECT symmetric;\r
-  TPMT_RSA_SCHEME     scheme;\r
-  TPMI_RSA_KEY_BITS   keyBits;\r
-  UINT32              exponent;\r
+  TPMT_SYM_DEF_OBJECT    symmetric;\r
+  TPMT_RSA_SCHEME        scheme;\r
+  TPMI_RSA_KEY_BITS      keyBits;\r
+  UINT32                 exponent;\r
 } TPMS_RSA_PARMS;\r
 \r
 // Table 180 - TPMS_ECC_PARMS Structure\r
 typedef struct {\r
-  TPMT_SYM_DEF_OBJECT symmetric;\r
-  TPMT_ECC_SCHEME     scheme;\r
-  TPMI_ECC_CURVE      curveID;\r
-  TPMT_KDF_SCHEME     kdf;\r
+  TPMT_SYM_DEF_OBJECT    symmetric;\r
+  TPMT_ECC_SCHEME        scheme;\r
+  TPMI_ECC_CURVE         curveID;\r
+  TPMT_KDF_SCHEME        kdf;\r
 } TPMS_ECC_PARMS;\r
 \r
 // Table 181 - TPMU_PUBLIC_PARMS Union\r
 typedef union {\r
-  TPMS_KEYEDHASH_PARMS keyedHashDetail;\r
-  TPMT_SYM_DEF_OBJECT  symDetail;\r
-  TPMS_RSA_PARMS       rsaDetail;\r
-  TPMS_ECC_PARMS       eccDetail;\r
-  TPMS_ASYM_PARMS      asymDetail;\r
+  TPMS_KEYEDHASH_PARMS    keyedHashDetail;\r
+  TPMT_SYM_DEF_OBJECT     symDetail;\r
+  TPMS_RSA_PARMS          rsaDetail;\r
+  TPMS_ECC_PARMS          eccDetail;\r
+  TPMS_ASYM_PARMS         asymDetail;\r
 } TPMU_PUBLIC_PARMS;\r
 \r
 // Table 182 - TPMT_PUBLIC_PARMS Structure\r
 typedef struct {\r
-  TPMI_ALG_PUBLIC   type;\r
-  TPMU_PUBLIC_PARMS parameters;\r
+  TPMI_ALG_PUBLIC      type;\r
+  TPMU_PUBLIC_PARMS    parameters;\r
 } TPMT_PUBLIC_PARMS;\r
 \r
 // Table 183 - TPMT_PUBLIC Structure\r
 typedef struct {\r
-  TPMI_ALG_PUBLIC   type;\r
-  TPMI_ALG_HASH     nameAlg;\r
-  TPMA_OBJECT       objectAttributes;\r
-  TPM2B_DIGEST      authPolicy;\r
-  TPMU_PUBLIC_PARMS parameters;\r
-  TPMU_PUBLIC_ID    unique;\r
+  TPMI_ALG_PUBLIC      type;\r
+  TPMI_ALG_HASH        nameAlg;\r
+  TPMA_OBJECT          objectAttributes;\r
+  TPM2B_DIGEST         authPolicy;\r
+  TPMU_PUBLIC_PARMS    parameters;\r
+  TPMU_PUBLIC_ID       unique;\r
 } TPMT_PUBLIC;\r
 \r
 // Table 184 - TPM2B_PUBLIC Structure\r
 typedef struct {\r
-  UINT16      size;\r
-  TPMT_PUBLIC publicArea;\r
+  UINT16         size;\r
+  TPMT_PUBLIC    publicArea;\r
 } TPM2B_PUBLIC;\r
 \r
 // Table 185 - TPM2B_PRIVATE_VENDOR_SPECIFIC Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[PRIVATE_VENDOR_SPECIFIC_BYTES];\r
+  UINT16    size;\r
+  BYTE      buffer[PRIVATE_VENDOR_SPECIFIC_BYTES];\r
 } TPM2B_PRIVATE_VENDOR_SPECIFIC;\r
 \r
 // Table 186 - TPMU_SENSITIVE_COMPOSITE Union\r
 typedef union {\r
-  TPM2B_PRIVATE_KEY_RSA         rsa;\r
-  TPM2B_ECC_PARAMETER           ecc;\r
-  TPM2B_SENSITIVE_DATA          bits;\r
-  TPM2B_SYM_KEY                 sym;\r
-  TPM2B_PRIVATE_VENDOR_SPECIFIC any;\r
+  TPM2B_PRIVATE_KEY_RSA            rsa;\r
+  TPM2B_ECC_PARAMETER              ecc;\r
+  TPM2B_SENSITIVE_DATA             bits;\r
+  TPM2B_SYM_KEY                    sym;\r
+  TPM2B_PRIVATE_VENDOR_SPECIFIC    any;\r
 } TPMU_SENSITIVE_COMPOSITE;\r
 \r
 // Table 187 - TPMT_SENSITIVE Structure\r
 typedef struct {\r
-  TPMI_ALG_PUBLIC          sensitiveType;\r
-  TPM2B_AUTH               authValue;\r
-  TPM2B_DIGEST             seedValue;\r
-  TPMU_SENSITIVE_COMPOSITE sensitive;\r
+  TPMI_ALG_PUBLIC             sensitiveType;\r
+  TPM2B_AUTH                  authValue;\r
+  TPM2B_DIGEST                seedValue;\r
+  TPMU_SENSITIVE_COMPOSITE    sensitive;\r
 } TPMT_SENSITIVE;\r
 \r
 // Table 188 - TPM2B_SENSITIVE Structure\r
 typedef struct {\r
-  UINT16         size;\r
-  TPMT_SENSITIVE sensitiveArea;\r
+  UINT16            size;\r
+  TPMT_SENSITIVE    sensitiveArea;\r
 } TPM2B_SENSITIVE;\r
 \r
 // Table 189 - _PRIVATE Structure\r
 typedef struct {\r
-  TPM2B_DIGEST   integrityOuter;\r
-  TPM2B_DIGEST   integrityInner;\r
-  TPMT_SENSITIVE sensitive;\r
+  TPM2B_DIGEST      integrityOuter;\r
+  TPM2B_DIGEST      integrityInner;\r
+  TPMT_SENSITIVE    sensitive;\r
 } _PRIVATE;\r
 \r
 // Table 190 - TPM2B_PRIVATE Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[sizeof(_PRIVATE)];\r
+  UINT16    size;\r
+  BYTE      buffer[sizeof (_PRIVATE)];\r
 } TPM2B_PRIVATE;\r
 \r
 // Table 191 - _ID_OBJECT Structure\r
 typedef struct {\r
-  TPM2B_DIGEST integrityHMAC;\r
-  TPM2B_DIGEST encIdentity;\r
+  TPM2B_DIGEST    integrityHMAC;\r
+  TPM2B_DIGEST    encIdentity;\r
 } _ID_OBJECT;\r
 \r
 // Table 192 - TPM2B_ID_OBJECT Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   credential[sizeof(_ID_OBJECT)];\r
+  UINT16    size;\r
+  BYTE      credential[sizeof (_ID_OBJECT)];\r
 } TPM2B_ID_OBJECT;\r
 \r
 // 13 NV Storage Structures\r
@@ -1686,118 +1685,117 @@ typedef struct {
 //\r
 // NOTE: Comment here to resolve conflict\r
 //\r
-//typedef struct {\r
+// typedef struct {\r
 //  UINT32 index : 22;\r
 //  UINT32 space : 2;\r
 //  UINT32 RH_NV : 8;\r
-//} TPM_NV_INDEX;\r
+// } TPM_NV_INDEX;\r
 \r
 // Table 195 - TPMA_NV Bits\r
 typedef struct {\r
-  UINT32 TPMA_NV_PPWRITE        : 1;\r
-  UINT32 TPMA_NV_OWNERWRITE     : 1;\r
-  UINT32 TPMA_NV_AUTHWRITE      : 1;\r
-  UINT32 TPMA_NV_POLICYWRITE    : 1;\r
-  UINT32 TPMA_NV_COUNTER        : 1;\r
-  UINT32 TPMA_NV_BITS           : 1;\r
-  UINT32 TPMA_NV_EXTEND         : 1;\r
-  UINT32 reserved7_9            : 3;\r
-  UINT32 TPMA_NV_POLICY_DELETE  : 1;\r
-  UINT32 TPMA_NV_WRITELOCKED    : 1;\r
-  UINT32 TPMA_NV_WRITEALL       : 1;\r
-  UINT32 TPMA_NV_WRITEDEFINE    : 1;\r
-  UINT32 TPMA_NV_WRITE_STCLEAR  : 1;\r
-  UINT32 TPMA_NV_GLOBALLOCK     : 1;\r
-  UINT32 TPMA_NV_PPREAD         : 1;\r
-  UINT32 TPMA_NV_OWNERREAD      : 1;\r
-  UINT32 TPMA_NV_AUTHREAD       : 1;\r
-  UINT32 TPMA_NV_POLICYREAD     : 1;\r
-  UINT32 reserved20_24          : 5;\r
-  UINT32 TPMA_NV_NO_DA          : 1;\r
-  UINT32 TPMA_NV_ORDERLY        : 1;\r
-  UINT32 TPMA_NV_CLEAR_STCLEAR  : 1;\r
-  UINT32 TPMA_NV_READLOCKED     : 1;\r
-  UINT32 TPMA_NV_WRITTEN        : 1;\r
-  UINT32 TPMA_NV_PLATFORMCREATE : 1;\r
-  UINT32 TPMA_NV_READ_STCLEAR   : 1;\r
+  UINT32    TPMA_NV_PPWRITE        : 1;\r
+  UINT32    TPMA_NV_OWNERWRITE     : 1;\r
+  UINT32    TPMA_NV_AUTHWRITE      : 1;\r
+  UINT32    TPMA_NV_POLICYWRITE    : 1;\r
+  UINT32    TPMA_NV_COUNTER        : 1;\r
+  UINT32    TPMA_NV_BITS           : 1;\r
+  UINT32    TPMA_NV_EXTEND         : 1;\r
+  UINT32    reserved7_9            : 3;\r
+  UINT32    TPMA_NV_POLICY_DELETE  : 1;\r
+  UINT32    TPMA_NV_WRITELOCKED    : 1;\r
+  UINT32    TPMA_NV_WRITEALL       : 1;\r
+  UINT32    TPMA_NV_WRITEDEFINE    : 1;\r
+  UINT32    TPMA_NV_WRITE_STCLEAR  : 1;\r
+  UINT32    TPMA_NV_GLOBALLOCK     : 1;\r
+  UINT32    TPMA_NV_PPREAD         : 1;\r
+  UINT32    TPMA_NV_OWNERREAD      : 1;\r
+  UINT32    TPMA_NV_AUTHREAD       : 1;\r
+  UINT32    TPMA_NV_POLICYREAD     : 1;\r
+  UINT32    reserved20_24          : 5;\r
+  UINT32    TPMA_NV_NO_DA          : 1;\r
+  UINT32    TPMA_NV_ORDERLY        : 1;\r
+  UINT32    TPMA_NV_CLEAR_STCLEAR  : 1;\r
+  UINT32    TPMA_NV_READLOCKED     : 1;\r
+  UINT32    TPMA_NV_WRITTEN        : 1;\r
+  UINT32    TPMA_NV_PLATFORMCREATE : 1;\r
+  UINT32    TPMA_NV_READ_STCLEAR   : 1;\r
 } TPMA_NV;\r
 \r
 // Table 196 - TPMS_NV_PUBLIC Structure\r
 typedef struct {\r
-  TPMI_RH_NV_INDEX nvIndex;\r
-  TPMI_ALG_HASH    nameAlg;\r
-  TPMA_NV          attributes;\r
-  TPM2B_DIGEST     authPolicy;\r
-  UINT16           dataSize;\r
+  TPMI_RH_NV_INDEX    nvIndex;\r
+  TPMI_ALG_HASH       nameAlg;\r
+  TPMA_NV             attributes;\r
+  TPM2B_DIGEST        authPolicy;\r
+  UINT16              dataSize;\r
 } TPMS_NV_PUBLIC;\r
 \r
 // Table 197 - TPM2B_NV_PUBLIC Structure\r
 typedef struct {\r
-  UINT16         size;\r
-  TPMS_NV_PUBLIC nvPublic;\r
+  UINT16            size;\r
+  TPMS_NV_PUBLIC    nvPublic;\r
 } TPM2B_NV_PUBLIC;\r
 \r
 // 14 Context Data\r
 \r
 // Table 198 - TPM2B_CONTEXT_SENSITIVE Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[MAX_CONTEXT_SIZE];\r
+  UINT16    size;\r
+  BYTE      buffer[MAX_CONTEXT_SIZE];\r
 } TPM2B_CONTEXT_SENSITIVE;\r
 \r
 // Table 199 - TPMS_CONTEXT_DATA Structure\r
 typedef struct {\r
-  TPM2B_DIGEST            integrity;\r
-  TPM2B_CONTEXT_SENSITIVE encrypted;\r
+  TPM2B_DIGEST               integrity;\r
+  TPM2B_CONTEXT_SENSITIVE    encrypted;\r
 } TPMS_CONTEXT_DATA;\r
 \r
 // Table 200 - TPM2B_CONTEXT_DATA Structure\r
 typedef struct {\r
-  UINT16 size;\r
-  BYTE   buffer[sizeof(TPMS_CONTEXT_DATA)];\r
+  UINT16    size;\r
+  BYTE      buffer[sizeof (TPMS_CONTEXT_DATA)];\r
 } TPM2B_CONTEXT_DATA;\r
 \r
 // Table 201 - TPMS_CONTEXT Structure\r
 typedef struct {\r
-  UINT64             sequence;\r
-  TPMI_DH_CONTEXT    savedHandle;\r
-  TPMI_RH_HIERARCHY  hierarchy;\r
-  TPM2B_CONTEXT_DATA contextBlob;\r
+  UINT64                sequence;\r
+  TPMI_DH_CONTEXT       savedHandle;\r
+  TPMI_RH_HIERARCHY     hierarchy;\r
+  TPM2B_CONTEXT_DATA    contextBlob;\r
 } TPMS_CONTEXT;\r
 \r
 // 15 Creation Data\r
 \r
 // Table 203 - TPMS_CREATION_DATA Structure\r
 typedef struct {\r
-  TPML_PCR_SELECTION pcrSelect;\r
-  TPM2B_DIGEST       pcrDigest;\r
-  TPMA_LOCALITY      locality;\r
-  TPM_ALG_ID         parentNameAlg;\r
-  TPM2B_NAME         parentName;\r
-  TPM2B_NAME         parentQualifiedName;\r
-  TPM2B_DATA         outsideInfo;\r
+  TPML_PCR_SELECTION    pcrSelect;\r
+  TPM2B_DIGEST          pcrDigest;\r
+  TPMA_LOCALITY         locality;\r
+  TPM_ALG_ID            parentNameAlg;\r
+  TPM2B_NAME            parentName;\r
+  TPM2B_NAME            parentQualifiedName;\r
+  TPM2B_DATA            outsideInfo;\r
 } TPMS_CREATION_DATA;\r
 \r
 // Table 204 - TPM2B_CREATION_DATA Structure\r
 typedef struct {\r
-  UINT16             size;\r
-  TPMS_CREATION_DATA creationData;\r
+  UINT16                size;\r
+  TPMS_CREATION_DATA    creationData;\r
 } TPM2B_CREATION_DATA;\r
 \r
-\r
 //\r
 // Command Header\r
 //\r
 typedef struct {\r
-  TPM_ST tag;\r
-  UINT32 paramSize;\r
-  TPM_CC commandCode;\r
+  TPM_ST    tag;\r
+  UINT32    paramSize;\r
+  TPM_CC    commandCode;\r
 } TPM2_COMMAND_HEADER;\r
 \r
 typedef struct {\r
-  TPM_ST tag;\r
-  UINT32 paramSize;\r
-  TPM_RC responseCode;\r
+  TPM_ST    tag;\r
+  UINT32    paramSize;\r
+  TPM_RC    responseCode;\r
 } TPM2_RESPONSE_HEADER;\r
 \r
 #pragma pack ()\r
@@ -1805,10 +1803,10 @@ typedef struct {
 //\r
 // TCG Algorithm Registry\r
 //\r
-#define HASH_ALG_SHA1    0x00000001\r
-#define HASH_ALG_SHA256  0x00000002\r
-#define HASH_ALG_SHA384  0x00000004\r
-#define HASH_ALG_SHA512  0x00000008\r
-#define HASH_ALG_SM3_256 0x00000010\r
+#define HASH_ALG_SHA1     0x00000001\r
+#define HASH_ALG_SHA256   0x00000002\r
+#define HASH_ALG_SHA384   0x00000004\r
+#define HASH_ALG_SHA512   0x00000008\r
+#define HASH_ALG_SM3_256  0x00000010\r
 \r
 #endif\r