spec: fix TPM_PT hex values

Fixes: #24
joholl · Aug 20, 2024 · 4d5a8b0 · 4d5a8b0
1 parent f5084ec
commit 4d5a8b0
Showing 1 changed file with 49 additions and 47 deletions.
diff --git a/src/tpmstream/spec/structures/constants.py b/src/tpmstream/spec/structures/constants.py
@@ -345,42 +345,44 @@ class TPM_PT(UINT32):
     VENDOR_STRING_2 = 0x00000107
     VENDOR_STRING_3 = 0x00000108
     VENDOR_STRING_4 = 0x00000109
-    VENDOR_TPM_TYPE = 0x00000110
-    FIRMWARE_VERSION_1 = 0x00000111
-    FIRMWARE_VERSION_2 = 0x00000112
-    INPUT_BUFFER = 0x00000113
-    HR_TRANSIENT_MIN = 0x00000114
-    HR_PERSISTENT_MIN = 0x00000115
-    HR_LOADED_MIN = 0x00000116
-    ACTIVE_SESSIONS_MAX = 0x00000117
-    PCR_COUNT = 0x00000118
-    PCR_SELECT_MIN = 0x00000119
-    CONTEXT_GAP_MAX = 0x00000120
-    NV_COUNTERS_MAX = 0x00000122
-    NV_INDEX_MAX = 0x00000123
-    MEMORY = 0x00000124
-    CLOCK_UPDATE = 0x00000125
-    CONTEXT_HASH = 0x00000126
-    CONTEXT_SYM = 0x00000127
-    CONTEXT_SYM_SIZE = 0x00000128
-    ORDERLY_COUNT = 0x00000129
-    MAX_COMMAND_SIZE = 0x00000130
-    MAX_RESPONSE_SIZE = 0x00000131
-    MAX_DIGEST = 0x00000132
-    MAX_OBJECT_CONTEXT = 0x00000133
-    MAX_SESSION_CONTEXT = 0x00000134
-    PS_FAMILY_INDICATOR = 0x00000135
-    PS_LEVEL = 0x00000136
-    PS_REVISION = 0x00000137
-    PS_DAY_OF_YEAR = 0x00000138
-    PS_YEAR = 0x00000139
-    SPLIT_MAX = 0x00000140
-    TOTAL_COMMANDS = 0x00000141
-    LIBRARY_COMMANDS = 0x00000142
-    VENDOR_COMMANDS = 0x00000143
-    NV_BUFFER_MAX = 0x00000144
-    MODES = 0x00000145
-    MAX_CAP_BUFFER = 0x00000146
+    VENDOR_TPM_TYPE = 0x0000010a
+    FIRMWARE_VERSION_1 = 0x0000010b
+    FIRMWARE_VERSION_2 = 0x0000010c
+    INPUT_BUFFER = 0x0000010d
+    HR_TRANSIENT_MIN = 0x0000010e
+    HR_PERSISTENT_MIN = 0x0000010f
+    HR_LOADED_MIN = 0x00000110
+    ACTIVE_SESSIONS_MAX = 0x00000111
+    PCR_COUNT = 0x00000112
+    PCR_SELECT_MIN = 0x00000113
+    CONTEXT_GAP_MAX = 0x00000114
+    # gap
+    NV_COUNTERS_MAX = 0x00000116
+    NV_INDEX_MAX = 0x00000117
+    MEMORY = 0x00000118
+    CLOCK_UPDATE = 0x00000119
+    CONTEXT_HASH = 0x0000011a
+    CONTEXT_SYM = 0x0000011b
+    CONTEXT_SYM_SIZE = 0x0000011c
+    ORDERLY_COUNT = 0x0000011d
+    MAX_COMMAND_SIZE = 0x0000011e
+    MAX_RESPONSE_SIZE = 0x0000011f
+    MAX_DIGEST = 0x00000120
+    MAX_OBJECT_CONTEXT = 0x00000121
+    MAX_SESSION_CONTEXT = 0x00000122
+    PS_FAMILY_INDICATOR = 0x00000123
+    PS_LEVEL = 0x00000124
+    PS_REVISION = 0x00000125
+    PS_DAY_OF_YEAR = 0x00000126
+    PS_YEAR = 0x00000127
+    SPLIT_MAX = 0x00000128
+    TOTAL_COMMANDS = 0x00000129
+    LIBRARY_COMMANDS = 0x0000012a
+    VENDOR_COMMANDS = 0x0000012b
+    NV_BUFFER_MAX = 0x0000012c
+    MODES = 0x0000012d
+    MAX_CAP_BUFFER = 0x0000012e
+    # gap
     PERMANENT = 0x00000200
     STARTUP_CLEAR = 0x00000201
     HR_NV_INDEX = 0x00000202
@@ -391,17 +393,17 @@ class TPM_PT(UINT32):
     HR_TRANSIENT_AVAIL = 0x00000207
     HR_PERSISTENT = 0x00000208
     HR_PERSISTENT_AVAIL = 0x00000209
-    NV_COUNTERS = 0x00000210
-    NV_COUNTERS_AVAIL = 0x00000211
-    ALGORITHM_SET = 0x00000212
-    LOADED_CURVES = 0x00000213
-    LOCKOUT_COUNTER = 0x00000214
-    MAX_AUTH_FAIL = 0x00000215
-    LOCKOUT_INTERVAL = 0x00000216
-    LOCKOUT_RECOVERY = 0x00000217
-    NV_WRITE_RECOVERY = 0x00000218
-    AUDIT_COUNTER_0 = 0x00000219
-    AUDIT_COUNTER_1 = 0x00000220
+    NV_COUNTERS = 0x0000020a
+    NV_COUNTERS_AVAIL = 0x0000020b
+    ALGORITHM_SET = 0x0000020c
+    LOADED_CURVES = 0x0000020d
+    LOCKOUT_COUNTER = 0x0000020e
+    MAX_AUTH_FAIL = 0x0000020f
+    LOCKOUT_INTERVAL = 0x00000210
+    LOCKOUT_RECOVERY = 0x00000211
+    NV_WRITE_RECOVERY = 0x00000212
+    AUDIT_COUNTER_0 = 0x00000213
+    AUDIT_COUNTER_1 = 0x00000214
 
 
 @tpm_enum