diff --git a/.gitignore b/.gitignore index b0f95c9..b048714 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tpm2-tools-3.1.1.tar.gz +SOURCES/tpm2-tools-3.1.4.tar.gz diff --git a/.tpm2-tools.metadata b/.tpm2-tools.metadata index 5f8ecf9..5bbe2b2 100644 --- a/.tpm2-tools.metadata +++ b/.tpm2-tools.metadata @@ -1 +1 @@ -45ae47b5b223d48d0dbb2cebfe6ad59fa8ee5d5e SOURCES/tpm2-tools-3.1.1.tar.gz +e1415f53357b3caeab8c1f386d370cefe4e241dd SOURCES/tpm2-tools-3.1.4.tar.gz diff --git a/SOURCES/Revert-objectattrs-clear-before-or-ing-in-values.patch b/SOURCES/Revert-objectattrs-clear-before-or-ing-in-values.patch deleted file mode 100644 index de2f41f..0000000 --- a/SOURCES/Revert-objectattrs-clear-before-or-ing-in-values.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1f3451ee7b046a590b6dfc20b6af010166670ff7 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Thu, 12 Jul 2018 19:50:26 +0200 -Subject: [PATCH 1/1] Revert "objectattrs: clear before or'ing in values" - -This reverts commit e103bbf5117b0b62b358fd15f18f848854fcb0ee. - -The tpm2-tools 3.1.0 release contains a backward incompatible change that -was introduced by commit e103bbf5117 ("objectattrs: clear before or'ing -in values"), that changed the way that object attributes were specified. - -Before there were a set of default attributes and the user could specify -additional attributes to be used, but after the mentioned commit the user -must specify all attributes. - -This is a user visible change that changes the tools semantics, so is not -a suitable change for a MINOR version number increment, according to the -Semantic Versioning document (https://semver.org) since it breaks rule 2: - -2.MINOR version when you add functionality in a backwards-compatible manner - -Fixes: #1097 - -Signed-off-by: Javier Martinez Canillas ---- - lib/tpm2_attr_util.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/lib/tpm2_attr_util.c b/lib/tpm2_attr_util.c -index d461a744c0d..e43d03f9e0a 100644 ---- a/lib/tpm2_attr_util.c -+++ b/lib/tpm2_attr_util.c -@@ -501,7 +501,6 @@ bool tpm2_attr_util_nv_strtoattr(char *attribute_list, TPMA_NV *nvattrs) { - - bool tpm2_attr_util_obj_strtoattr(char *attribute_list, TPMA_OBJECT *objattrs) { - -- memset(objattrs, 0, sizeof(*objattrs)); - return common_strtoattr(attribute_list, objattrs, obj_attr_table, ARRAY_LEN(obj_attr_table)); - } - --- -2.17.1 - diff --git a/SOURCES/lib-tpm2_options-restore-TCTI-configuration-environm.patch b/SOURCES/lib-tpm2_options-restore-TCTI-configuration-environm.patch deleted file mode 100644 index ef80ef4..0000000 --- a/SOURCES/lib-tpm2_options-restore-TCTI-configuration-environm.patch +++ /dev/null @@ -1,216 +0,0 @@ -From 175e47711c72a8169f94b971c4e9973bbfb04efc Mon Sep 17 00:00:00 2001 -From: Joshua Lock -Date: Wed, 5 Sep 2018 23:21:21 +0100 -Subject: [PATCH] lib/tpm2_options: restore TCTI configuration environment - variables - -The port to TSS2.0 introduced a new unified environment variable to -configure a TCTI, TPM2TOOLS_ENV_TCTI. Unfortunately this also unwittingly -removed the old-style environment variable per TCTI configuration options, -which is a behavioural regression for the 3.x series of tpm2-tools. - -Restore the original TPM2TOOLS_* environment variables in addition to the -new style single environment variable. - -Fixes issue #1171 - -Signed-off-by: Joshua Lock ---- - lib/tpm2_options.c | 134 ++++++++++++++++++++++++++++++++++++--------- - 1 file changed, 107 insertions(+), 27 deletions(-) - -diff --git a/lib/tpm2_options.c b/lib/tpm2_options.c -index 751b0eee9819..2531948ecf74 100644 ---- a/lib/tpm2_options.c -+++ b/lib/tpm2_options.c -@@ -52,6 +52,10 @@ - #endif - - #define TPM2TOOLS_ENV_TCTI "TPM2TOOLS_TCTI" -+#define TPM2TOOLS_ENV_TCTI_NAME "TPM2TOOLS_TCTI_NAME" -+#define TPM2TOOLS_ENV_DEVICE "TPM2TOOLS_DEVICE_FILE" -+#define TPM2TOOLS_ENV_SOCK_ADDR "TPM2TOOLS_SOCKET_ADDRESS" -+#define TPM2TOOLS_ENV_SOCK_PORT "TPM2TOOLS_SOCKET_PORT" - #define TPM2TOOLS_ENV_ENABLE_ERRATA "TPM2TOOLS_ENABLE_ERRATA" - - tpm2_options *tpm2_options_new(const char *short_opts, size_t len, -@@ -136,13 +140,25 @@ void tpm2_options_free(tpm2_options *opts) { - } - typedef struct tcti_conf tcti_conf; - struct tcti_conf { -- const char *name; -- const char *opts; -+ char *name; -+ char *opts; - }; - -+/* -+ * Some tcti names changed in TSS 2.0, so in order to not break the -+ * expected options of the 3.X tools series map: -+ * - abrmd -> tabrmd -+ * - socket -> mssim -+ */ - static inline const char *fixup_name(const char *name) { - -- return !strcmp(name, "abrmd") ? "tabrmd" : name; -+ if (!strcmp(name, "abrmd")) { -+ return "tabrmd"; -+ } else if (!strcmp(name, "socket")) { -+ return "mssim"; -+ } -+ -+ return name; - } - - static const char *find_default_tcti(void) { -@@ -165,27 +181,14 @@ static const char *find_default_tcti(void) { - return NULL; - } - --static tcti_conf tcti_get_config(const char *optstr) { -- -- /* set up the default configuration */ -- tcti_conf conf = { -- .name = find_default_tcti() -- }; -- -- /* no tcti config supplied, get it from env */ -- if (!optstr) { -- optstr = getenv (TPM2TOOLS_ENV_TCTI); -- if (!optstr) { -- /* nothing user supplied, use default */ -- return conf; -- } -- } -+/* Parse new-style, TSS 2.0, environment variables */ -+static void parse_env_tcti(const char *optstr, tcti_conf *conf) { - - char *split = strchr(optstr, ':'); - if (!split) { - /* --tcti=device */ -- conf.name = fixup_name(optstr); -- return conf; -+ conf->name = strdup(fixup_name(optstr)); -+ return; - } - - /* -@@ -200,24 +203,99 @@ static tcti_conf tcti_get_config(const char *optstr) { - - /* Case A */ - if (!optstr[0] && !split[1]) { -- return conf; -+ return; - } - - /* Case B */ - if (!optstr[0]) { -- conf.opts = &split[1]; -- return conf; -+ conf->opts = strdup(&split[1]); -+ return; - } - - /* Case C */ - if (!split[1]) { -- conf.name = fixup_name(optstr); -- return conf; -+ conf->name = strdup(fixup_name(optstr)); -+ return; - } - - /* Case D */ -- conf.name = fixup_name(optstr); -- conf.opts = &split[1]; -+ conf->name = strdup(fixup_name(optstr)); -+ conf->opts = strdup(&split[1]); -+ return; -+} -+ -+static char* parse_device_tcti(void) { -+ const char *device = getenv(TPM2TOOLS_ENV_DEVICE); -+ return strdup(device); -+} -+ -+static char* parse_socket_tcti(void) { -+ -+ /* -+ * tpm2_tcti_ldr_load() expects conf->opts to be of the format -+ * "host=localhost,port=2321" for the mssim tcti -+ * -+ * Max IPV6 IP address, 45 characters (45) -+ * Ports are 16bit int, 5 characters (5) -+ * "host=", 5 characters (5) -+ * "port=", 5 characters (5) -+ * strlen = 60 -+ */ -+ size_t optlen = 60; -+ const char *host; -+ const char *port; -+ char *ret = malloc(optlen); -+ if (!ret) { -+ LOG_ERR ("OOM"); -+ return NULL; -+ } -+ -+ host = getenv(TPM2TOOLS_ENV_SOCK_ADDR); -+ port = getenv(TPM2TOOLS_ENV_SOCK_PORT); -+ -+ if (host && port) { -+ snprintf(ret, optlen, "host=%s,port=%s", host, port); -+ } else if (host) { -+ snprintf(ret, optlen, "host=%s", host); -+ } else if (port) { -+ snprintf(ret, optlen, "port=%s", port); -+ } -+ return ret; -+} -+ -+static tcti_conf tcti_get_config(const char *optstr) { -+ -+ tcti_conf conf = { -+ .name = NULL -+ }; -+ -+ /* no tcti config supplied, get it from env */ -+ if (!optstr) { -+ /* -+ * Check the "old" way of specifying TCTI, using a shared env var and -+ * per-tcti option variables. -+ */ -+ optstr = getenv (TPM2TOOLS_ENV_TCTI_NAME); -+ if (optstr) { -+ conf.name = strdup(fixup_name(optstr)); -+ if (!strcmp(conf.name, "mssim")) { -+ conf.opts = parse_socket_tcti(); -+ } else if (!strcmp(conf.name, "device")) { -+ conf.opts = parse_device_tcti(); -+ } -+ } else { -+ /* Check the new way of defining a TCTI using a shared env var */ -+ optstr = getenv (TPM2TOOLS_ENV_TCTI); -+ if (optstr) { -+ parse_env_tcti(optstr, &conf); -+ } -+ } -+ } -+ -+ if (!conf.name) { -+ conf.name = strdup(find_default_tcti()); -+ } -+ - return conf; - } - -@@ -418,6 +496,8 @@ tpm2_option_code tpm2_handle_options (int argc, char **argv, - if (!flags->enable_errata) { - flags->enable_errata = !!getenv (TPM2TOOLS_ENV_ENABLE_ERRATA); - } -+ free(conf.name); -+ free(conf.opts); - } - - rc = tpm2_option_code_continue; --- -2.17.1 - diff --git a/SOURCES/tpm2_getcap-restore-tool-output-to-print-properties-.patch b/SOURCES/tpm2_getcap-restore-tool-output-to-print-properties-.patch deleted file mode 100644 index 2f92f00..0000000 --- a/SOURCES/tpm2_getcap-restore-tool-output-to-print-properties-.patch +++ /dev/null @@ -1,397 +0,0 @@ -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 - diff --git a/SPECS/tpm2-tools.spec b/SPECS/tpm2-tools.spec index 8673838..97cd6c2 100644 --- a/SPECS/tpm2-tools.spec +++ b/SPECS/tpm2-tools.spec @@ -1,16 +1,12 @@ Name: tpm2-tools -Version: 3.1.1 -Release: 4%{?dist} +Version: 3.1.4 +Release: 5%{?dist} Summary: A TPM2.0 testing tool build upon TPM2.0-TSS License: BSD URL: https://github.com/tpm2-software/tpm2-tools Source0: https://github.com/tpm2-software/tpm2-tools/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch0: Revert-objectattrs-clear-before-or-ing-in-values.patch -Patch1: lib-tpm2_options-restore-TCTI-configuration-environm.patch -Patch2: tpm2_getcap-restore-tool-output-to-print-properties-.patch - BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: autoconf-archive @@ -48,6 +44,26 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss. %{_mandir}/man1/tpm2_*.1.gz %changelog +* Tue May 28 2019 Jerry Snitselaar - 3.1.4-5 +- Another dependency needed for CI gating +resolves: rhbz#1682417 + +* Tue May 28 2019 Jerry Snitselaar - 3.1.4-4 +- Fix CI dependency +resolves: rhbz#1682417 + +* Tue May 28 2019 Jerry Snitselaar - 3.1.4-3 +- Add CI gating test +resolves: rhbz#1682417 + +* Tue May 14 2019 Jerry Snitselaar - 3.1.4-2 +- Add initial CI gating support +resolves: rhbz#1682417 + +* Tue Apr 30 2019 Jerry Snitselaar - 3.1.4-1 +- Rebase to 3.1.4 release. +resolves: rhbz#1664498 + * Thu Nov 08 2018 Jerry Snitselaar - 3.1.1-4 - lib/tpm2_options: restore TCTI configuration environment variables - tpm2_getcap: restore tool output to print properties with TPM_PT prefix