From 3598de590a7e9812a2ff4eadfff87e15b5d010a8 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Tue, 11 Sep 2018 01:49:25 +0200 Subject: [PATCH] tpm2_getcap: restore tool output to print properties with TPM_PT prefix Commit ac9a5d787753 ("update to TSS version 2.0") updated tpm2-tss version to 2.0. On tpm2-tss, the TPM_PT_* constants where renamed to TPM2_PT_* but that commit also changed the output of the tpm2_getcap tool to match the name of the properties. Unfortunately this is a bacward incompatible change that could break users that were relying on the tpm2_getcap tool output. Restore the older output and also fix the tests that check these values. Fixes: #1175 Reported-by: Vilem Marsik Signed-off-by: Javier Martinez Canillas --- test/system/test_tpm2_dictionarylockout.sh | 6 +- test/system/test_tpm2_nv.sh | 2 +- test/system/test_tpm2_quote.sh | 2 +- tools/tpm2_getcap.c | 132 ++++++++++----------- 4 files changed, 71 insertions(+), 71 deletions(-) diff --git a/test/system/test_tpm2_dictionarylockout.sh b/test/system/test_tpm2_dictionarylockout.sh index a90854ac7ea6..d6dac227ed03 100755 --- a/test/system/test_tpm2_dictionarylockout.sh +++ b/test/system/test_tpm2_dictionarylockout.sh @@ -40,16 +40,16 @@ trap onerror ERR tpm2_dictionarylockout -s -n 5 -t 6 -l 7 -if [ "$(tpm2_getcap -c properties-variable | grep TPM2_PT_MAX_AUTH_FAIL | sed -e 's/TPM2_PT_MAX_AUTH_FAIL: \+//')" != "0x00000005" ];then +if [ "$(tpm2_getcap -c properties-variable | grep TPM_PT_MAX_AUTH_FAIL | sed -e 's/TPM_PT_MAX_AUTH_FAIL: \+//')" != "0x00000005" ]; then echo "Failure: setting up the number of allowed tries in the lockout parameters" exit 1 fi -if [ "$(tpm2_getcap -c properties-variable | grep TPM2_PT_LOCKOUT_INTERVAL | sed -e 's/TPM2_PT_LOCKOUT_INTERVAL: \+//')" != "0x00000006" ];then +if [ "$(tpm2_getcap -c properties-variable | grep TPM_PT_LOCKOUT_INTERVAL | sed -e 's/TPM_PT_LOCKOUT_INTERVAL: \+//')" != "0x00000006" ]; then echo "Failure: setting up the lockout period in the lockout parameters" fi -if [ "$(tpm2_getcap -c properties-variable | grep TPM2_PT_LOCKOUT_RECOVERY | sed -e 's/TPM2_PT_LOCKOUT_RECOVERY: \+//')" != "0x00000007" ];then +if [ "$(tpm2_getcap -c properties-variable | grep TPM_PT_LOCKOUT_RECOVERY | sed -e 's/TPM_PT_LOCKOUT_RECOVERY: \+//')" != "0x00000007" ]; then echo "Failure: setting up the lockout recovery period in the lockout parameters" fi diff --git a/test/system/test_tpm2_nv.sh b/test/system/test_tpm2_nv.sh index 3b486cc7c4e2..2db6522aae28 100755 --- a/test/system/test_tpm2_nv.sh +++ b/test/system/test_tpm2_nv.sh @@ -153,7 +153,7 @@ tpm2_nvrelease -Q -x 0x1500016 -a 0x40000001 # # Test large writes # -large_file_size=$(tpm2_getcap -c properties-fixed | grep TPM2_PT_NV_INDEX_MAX | sed -r -e 's/.*(0x[0-9a-f]+)/\1/g') +large_file_size=$(tpm2_getcap -c properties-fixed | grep TPM_PT_NV_INDEX_MAX | sed -r -e 's/.*(0x[0-9a-f]+)/\1/g') nv_test_index=0x1000000 # Create an nv space with attributes 1010 = TPMA_NV_PPWRITE and TPMA_NV_AUTHWRITE diff --git a/test/system/test_tpm2_quote.sh b/test/system/test_tpm2_quote.sh index 3c0a9af0acce..d845ea1bdb14 100755 --- a/test/system/test_tpm2_quote.sh +++ b/test/system/test_tpm2_quote.sh @@ -51,7 +51,7 @@ Handle_ak_quote=0x81010016 Handle_ek_quote=0x81010017 Handle_ak_quote2=0x81010018 -maxdigest=$(tpm2_getcap -c properties-fixed | grep TPM2_PT_MAX_DIGEST | sed -r -e 's/.*(0x[0-9a-f]+)/\1/g') +maxdigest=$(tpm2_getcap -c properties-fixed | grep TPM_PT_MAX_DIGEST | sed -r -e 's/.*(0x[0-9a-f]+)/\1/g') if ! [[ "$maxdigest" =~ ^(0x)*[0-9]+$ ]] ; then echo "error: not a number, got: \"$maxdigest\"" >&2 exit 1 diff --git a/tools/tpm2_getcap.c b/tools/tpm2_getcap.c index 6b3d8efbd620..29c6c3f9176f 100644 --- a/tools/tpm2_getcap.c +++ b/tools/tpm2_getcap.c @@ -196,7 +196,7 @@ get_uint32_as_chars (UINT32 value, void tpm2_tool_output_tpma_modes (TPMA_MODES modes) { - tpm2_tool_output ("TPM2_PT_MODES: 0x%08x\n", modes); + tpm2_tool_output ("TPM_PT_MODES: 0x%08x\n", modes); if (modes & TPMA_MODES_FIPS_140_2) tpm2_tool_output (" TPMA_MODES_FIPS_140_2\n"); if (modes& TPMA_MODES_RESERVED1_MASK) @@ -208,7 +208,7 @@ tpm2_tool_output_tpma_modes (TPMA_MODES modes) void dump_permanent_attrs (TPMA_PERMANENT attrs) { - tpm2_tool_output ("TPM2_PT_PERSISTENT:\n"); + tpm2_tool_output ("TPM_PT_PERSISTENT:\n"); tpm2_tool_output (" ownerAuthSet: %s\n", prop_str (attrs & TPMA_PERMANENT_OWNERAUTHSET)); tpm2_tool_output (" endorsementAuthSet: %s\n", prop_str (attrs & TPMA_PERMANENT_ENDORSEMENTAUTHSET)); tpm2_tool_output (" lockoutAuthSet: %s\n", prop_str (attrs & TPMA_PERMANENT_LOCKOUTAUTHSET)); @@ -224,7 +224,7 @@ dump_permanent_attrs (TPMA_PERMANENT attrs) void dump_startup_clear_attrs (TPMA_STARTUP_CLEAR attrs) { - tpm2_tool_output ("TPM2_PT_STARTUP_CLEAR:\n"); + tpm2_tool_output ("TPM_PT_STARTUP_CLEAR:\n"); tpm2_tool_output (" phEnable: %s\n", prop_str (attrs & TPMA_STARTUP_CLEAR_PHENABLE)); tpm2_tool_output (" shEnable: %s\n", prop_str (attrs & TPMA_STARTUP_CLEAR_SHENABLE)); tpm2_tool_output (" ehEnable: %s\n", prop_str (attrs & TPMA_STARTUP_CLEAR_EHENABLE)); @@ -248,30 +248,30 @@ dump_tpm_properties_fixed (TPMS_TAGGED_PROPERTY properties[], switch (property) { case TPM2_PT_FAMILY_INDICATOR: get_uint32_as_chars (value, buf); - tpm2_tool_output ("TPM2_PT_FAMILY_INDICATOR:\n" + tpm2_tool_output ("TPM_PT_FAMILY_INDICATOR:\n" " as UINT32: 0x08%x\n" " as string: \"%s\"\n", value, buf); break; case TPM2_PT_LEVEL: - tpm2_tool_output ("TPM2_PT_LEVEL: %d\n", value); + tpm2_tool_output ("TPM_PT_LEVEL: %d\n", value); break; case TPM2_PT_REVISION: - tpm2_tool_output ("TPM2_PT_REVISION: %.2f\n", (float)value / 100); + tpm2_tool_output ("TPM_PT_REVISION: %.2f\n", (float)value / 100); break; case TPM2_PT_DAY_OF_YEAR: - tpm2_tool_output ("TPM2_PT_DAY_OF_YEAR: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_DAY_OF_YEAR: 0x%08x\n", value); break; case TPM2_PT_YEAR: - tpm2_tool_output ("TPM2_PT_YEAR: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_YEAR: 0x%08x\n", value); break; case TPM2_PT_MANUFACTURER: - tpm2_tool_output ("TPM2_PT_MANUFACTURER: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_MANUFACTURER: 0x%08x\n", value); break; case TPM2_PT_VENDOR_STRING_1: get_uint32_as_chars (value, buf); - tpm2_tool_output ("TPM2_PT_VENDOR_STRING_1:\n" + tpm2_tool_output ("TPM_PT_VENDOR_STRING_1:\n" " as UINT32: 0x%08x\n" " as string: \"%s\"\n", value, @@ -279,7 +279,7 @@ dump_tpm_properties_fixed (TPMS_TAGGED_PROPERTY properties[], break; case TPM2_PT_VENDOR_STRING_2: get_uint32_as_chars (value, buf); - tpm2_tool_output ("TPM2_PT_VENDOR_STRING_2:\n" + tpm2_tool_output ("TPM_PT_VENDOR_STRING_2:\n" " as UINT32: 0x%08x\n" " as string: \"%s\"\n", value, @@ -287,7 +287,7 @@ dump_tpm_properties_fixed (TPMS_TAGGED_PROPERTY properties[], break; case TPM2_PT_VENDOR_STRING_3: get_uint32_as_chars (value, buf); - tpm2_tool_output ("TPM2_PT_VENDOR_STRING_3:\n" + tpm2_tool_output ("TPM_PT_VENDOR_STRING_3:\n" " as UINT32: 0x%08x\n" " as string: \"%s\"\n", value, @@ -295,113 +295,113 @@ dump_tpm_properties_fixed (TPMS_TAGGED_PROPERTY properties[], break; case TPM2_PT_VENDOR_STRING_4: get_uint32_as_chars (value, buf); - tpm2_tool_output ("TPM2_PT_VENDOR_STRING_4:\n" + tpm2_tool_output ("TPM_PT_VENDOR_STRING_4:\n" " as UINT32: 0x%08x\n" " as string: \"%s\"\n", value, buf); break; case TPM2_PT_VENDOR_TPM_TYPE: - tpm2_tool_output ("TPM2_PT_VENDOR_TPM_TYPE: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_VENDOR_TPM_TYPE: 0x%08x\n", value); break; case TPM2_PT_FIRMWARE_VERSION_1: - tpm2_tool_output ("TPM2_PT_FIRMWARE_VERSION_1: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_FIRMWARE_VERSION_1: 0x%08x\n", value); break; case TPM2_PT_FIRMWARE_VERSION_2: - tpm2_tool_output ("TPM2_PT_FIRMWARE_VERSION_2: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_FIRMWARE_VERSION_2: 0x%08x\n", value); break; case TPM2_PT_INPUT_BUFFER: - tpm2_tool_output ("TPM2_PT_INPUT_BUFFER: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_INPUT_BUFFER: 0x%08x\n", value); break; case TPM2_PT_TPM2_HR_TRANSIENT_MIN: - tpm2_tool_output ("TPM2_PT_TPM2_HR_TRANSIENT_MIN: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_TPM2_HR_TRANSIENT_MIN: 0x%08x\n", value); break; case TPM2_PT_TPM2_HR_PERSISTENT_MIN: - tpm2_tool_output ("TPM2_PT_TPM2_HR_PERSISTENT_MIN: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_TPM2_HR_PERSISTENT_MIN: 0x%08x\n", value); break; case TPM2_PT_HR_LOADED_MIN: - tpm2_tool_output ("TPM2_PT_HR_LOADED_MIN: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_HR_LOADED_MIN: 0x%08x\n", value); break; case TPM2_PT_ACTIVE_SESSIONS_MAX: - tpm2_tool_output ("TPM2_PT_ACTIVE_SESSIONS_MAX: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_ACTIVE_SESSIONS_MAX: 0x%08x\n", value); break; case TPM2_PT_PCR_COUNT: - tpm2_tool_output ("TPM2_PT_PCR_COUNT: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_PCR_COUNT: 0x%08x\n", value); break; case TPM2_PT_PCR_SELECT_MIN: - tpm2_tool_output ("TPM2_PT_PCR_SELECT_MIN: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_PCR_SELECT_MIN: 0x%08x\n", value); break; case TPM2_PT_CONTEXT_GAP_MAX: - tpm2_tool_output ("TPM2_PT_CONTEXT_GAP_MAX: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_CONTEXT_GAP_MAX: 0x%08x\n", value); break; case TPM2_PT_NV_COUNTERS_MAX: - tpm2_tool_output ("TPM2_PT_NV_COUNTERS_MAX: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_NV_COUNTERS_MAX: 0x%08x\n", value); break; case TPM2_PT_NV_INDEX_MAX: - tpm2_tool_output ("TPM2_PT_NV_INDEX_MAX: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_NV_INDEX_MAX: 0x%08x\n", value); break; case TPM2_PT_MEMORY: - tpm2_tool_output ("TPM2_PT_MEMORY: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_MEMORY: 0x%08x\n", value); break; case TPM2_PT_CLOCK_UPDATE: - tpm2_tool_output ("TPM2_PT_CLOCK_UPDATE: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_CLOCK_UPDATE: 0x%08x\n", value); break; case TPM2_PT_CONTEXT_HASH: /* this may be a TPM2_ALG_ID type */ - tpm2_tool_output ("TPM2_PT_CONTEXT_HASH: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_CONTEXT_HASH: 0x%08x\n", value); break; case TPM2_PT_CONTEXT_SYM: /* this is a TPM2_ALG_ID type */ - tpm2_tool_output ("TPM2_PT_CONTEXT_SYM: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_CONTEXT_SYM: 0x%08x\n", value); break; case TPM2_PT_CONTEXT_SYM_SIZE: - tpm2_tool_output ("TPM2_PT_CONTEXT_SYM_SIZE: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_CONTEXT_SYM_SIZE: 0x%08x\n", value); break; case TPM2_PT_ORDERLY_COUNT: - tpm2_tool_output ("TPM2_PT_ORDERLY_COUNT: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_ORDERLY_COUNT: 0x%08x\n", value); break; case TPM2_PT_MAX_COMMAND_SIZE: - tpm2_tool_output ("TPM2_PT_MAX_COMMAND_SIZE: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_MAX_COMMAND_SIZE: 0x%08x\n", value); break; case TPM2_PT_MAX_RESPONSE_SIZE: - tpm2_tool_output ("TPM2_PT_MAX_RESPONSE_SIZE: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_MAX_RESPONSE_SIZE: 0x%08x\n", value); break; case TPM2_PT_MAX_DIGEST: - tpm2_tool_output ("TPM2_PT_MAX_DIGEST: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_MAX_DIGEST: 0x%08x\n", value); break; case TPM2_PT_MAX_OBJECT_CONTEXT: - tpm2_tool_output ("TPM2_PT_MAX_OBJECT_CONTEXT: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_MAX_OBJECT_CONTEXT: 0x%08x\n", value); break; case TPM2_PT_MAX_SESSION_CONTEXT: - tpm2_tool_output ("TPM2_PT_MAX_SESSION_CONTEXT: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_MAX_SESSION_CONTEXT: 0x%08x\n", value); break; case TPM2_PT_PS_FAMILY_INDICATOR: - tpm2_tool_output ("TPM2_PT_PS_FAMILY_INDICATOR: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_PS_FAMILY_INDICATOR: 0x%08x\n", value); break; case TPM2_PT_PS_LEVEL: - tpm2_tool_output ("TPM2_PT_PS_LEVEL: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_PS_LEVEL: 0x%08x\n", value); break; case TPM2_PT_PS_REVISION: - tpm2_tool_output ("TPM2_PT_PS_REVISION: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_PS_REVISION: 0x%08x\n", value); break; case TPM2_PT_PS_DAY_OF_YEAR: - tpm2_tool_output ("TPM2_PT_PS_DAY_OF_YEAR: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_PS_DAY_OF_YEAR: 0x%08x\n", value); break; case TPM2_PT_PS_YEAR: - tpm2_tool_output ("TPM2_PT_PS_YEAR: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_PS_YEAR: 0x%08x\n", value); break; case TPM2_PT_SPLIT_MAX: - tpm2_tool_output ("TPM2_PT_SPLIT_MAX: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_SPLIT_MAX: 0x%08x\n", value); break; case TPM2_PT_TOTAL_COMMANDS: - tpm2_tool_output ("TPM2_PT_TOTAL_COMMANDS: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_TOTAL_COMMANDS: 0x%08x\n", value); break; case TPM2_PT_LIBRARY_COMMANDS: - tpm2_tool_output ("TPM2_PT_LIBRARY_COMMANDS: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_LIBRARY_COMMANDS: 0x%08x\n", value); break; case TPM2_PT_VENDOR_COMMANDS: - tpm2_tool_output ("TPM2_PT_VENDOR_COMMANDS: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_VENDOR_COMMANDS: 0x%08x\n", value); break; case TPM2_PT_NV_BUFFER_MAX: - tpm2_tool_output ("TPM2_PT_NV_BUFFER_MAX: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_NV_BUFFER_MAX: 0x%08x\n", value); break; case TPM2_PT_MODES: tpm2_tool_output_tpma_modes ((TPMA_MODES)value); @@ -429,61 +429,61 @@ dump_tpm_properties_var (TPMS_TAGGED_PROPERTY properties[], dump_startup_clear_attrs ((TPMA_STARTUP_CLEAR)value); break; case TPM2_PT_TPM2_HR_NV_INDEX: - tpm2_tool_output ("TPM2_PT_TPM2_HR_NV_INDEX: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_TPM2_HR_NV_INDEX: 0x%08x\n", value); break; case TPM2_PT_HR_LOADED: - tpm2_tool_output ("TPM2_PT_HR_LOADED: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_HR_LOADED: 0x%08x\n", value); break; case TPM2_PT_HR_LOADED_AVAIL: - tpm2_tool_output ("TPM2_PT_HR_LOADED_AVAIL: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_HR_LOADED_AVAIL: 0x%08x\n", value); break; case TPM2_PT_HR_ACTIVE: - tpm2_tool_output ("TPM2_PT_HR_ACTIVE: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_HR_ACTIVE: 0x%08x\n", value); break; case TPM2_PT_HR_ACTIVE_AVAIL: - tpm2_tool_output ("TPM2_PT_HR_ACTIVE_AVAIL: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_HR_ACTIVE_AVAIL: 0x%08x\n", value); break; case TPM2_PT_TPM2_HR_TRANSIENT_AVAIL: - tpm2_tool_output ("TPM2_PT_TPM2_HR_TRANSIENT_AVAIL: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_TPM2_HR_TRANSIENT_AVAIL: 0x%08x\n", value); break; case TPM2_PT_TPM2_HR_PERSISTENT: - tpm2_tool_output ("TPM2_PT_TPM2_HR_PERSISTENT: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_TPM2_HR_PERSISTENT: 0x%08x\n", value); break; case TPM2_PT_TPM2_HR_PERSISTENT_AVAIL: - tpm2_tool_output ("TPM2_PT_TPM2_HR_PERSISTENT_AVAIL: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_TPM2_HR_PERSISTENT_AVAIL: 0x%08x\n", value); break; case TPM2_PT_NV_COUNTERS: - tpm2_tool_output ("TPM2_PT_NV_COUNTERS: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_NV_COUNTERS: 0x%08x\n", value); break; case TPM2_PT_NV_COUNTERS_AVAIL: - tpm2_tool_output ("TPM2_PT_NV_COUNTERS_AVAIL: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_NV_COUNTERS_AVAIL: 0x%08x\n", value); break; case TPM2_PT_ALGORITHM_SET: - tpm2_tool_output ("TPM2_PT_ALGORITHM_SET: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_ALGORITHM_SET: 0x%08x\n", value); break; case TPM2_PT_LOADED_CURVES: - tpm2_tool_output ("TPM2_PT_LOADED_CURVES: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_LOADED_CURVES: 0x%08x\n", value); break; case TPM2_PT_LOCKOUT_COUNTER: - tpm2_tool_output ("TPM2_PT_LOCKOUT_COUNTER: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_LOCKOUT_COUNTER: 0x%08x\n", value); break; case TPM2_PT_MAX_AUTH_FAIL: - tpm2_tool_output ("TPM2_PT_MAX_AUTH_FAIL: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_MAX_AUTH_FAIL: 0x%08x\n", value); break; case TPM2_PT_LOCKOUT_INTERVAL: - tpm2_tool_output ("TPM2_PT_LOCKOUT_INTERVAL: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_LOCKOUT_INTERVAL: 0x%08x\n", value); break; case TPM2_PT_LOCKOUT_RECOVERY: - tpm2_tool_output ("TPM2_PT_LOCKOUT_RECOVERY: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_LOCKOUT_RECOVERY: 0x%08x\n", value); break; case TPM2_PT_NV_WRITE_RECOVERY: - tpm2_tool_output ("TPM2_PT_NV_WRITE_RECOVERY: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_NV_WRITE_RECOVERY: 0x%08x\n", value); break; case TPM2_PT_AUDIT_COUNTER_0: - tpm2_tool_output ("TPM2_PT_AUDIT_COUNTER_0: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_AUDIT_COUNTER_0: 0x%08x\n", value); break; case TPM2_PT_AUDIT_COUNTER_1: - tpm2_tool_output ("TPM2_PT_AUDIT_COUNTER_1: 0x%08x\n", value); + tpm2_tool_output ("TPM_PT_AUDIT_COUNTER_1: 0x%08x\n", value); break; default: LOG_ERR("Unknown property: 0x%08x\n", properties[i].property); -- 2.17.1