* [ptxdist] [PATCH] tpm2-tss: Enable fapi.
@ 2022-10-14 21:03 Christian Melki
2022-10-14 21:03 ` [ptxdist] [PATCH v2] tpm2-tools: Version bump. 5.2 -> 5.3 Christian Melki
2022-10-28 14:43 ` [ptxdist] [APPLIED] tpm2-tss: Enable fapi Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Christian Melki @ 2022-10-14 21:03 UTC (permalink / raw)
To: ptxdist
* Explicitly enable fapi and install the library.
This is needed by tpm2-tools fapi dependent binaries.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/tpm2-tss.make | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
index 7e0b4ff52..310ec8014 100644
--- a/rules/tpm2-tss.make
+++ b/rules/tpm2-tss.make
@@ -43,6 +43,7 @@ TPM2_TSS_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--enable-debug=info \
--disable-unit \
+ --enable-fapi \
--enable-tcti-device \
--enable-tcti-mssim \
--disable-tcti-fuzzing \
@@ -87,6 +88,7 @@ $(STATEDIR)/tpm2-tss.targetinstall:
@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-esys)
@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-mu)
@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys)
+ @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-fapi)
@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-device)
@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-mssim)
@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tctildr)
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH v2] tpm2-tools: Version bump. 5.2 -> 5.3
2022-10-14 21:03 [ptxdist] [PATCH] tpm2-tss: Enable fapi Christian Melki
@ 2022-10-14 21:03 ` Christian Melki
2022-10-28 14:43 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-28 14:43 ` [ptxdist] [APPLIED] tpm2-tss: Enable fapi Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Christian Melki @ 2022-10-14 21:03 UTC (permalink / raw)
To: ptxdist
https://github.com/tpm2-software/tpm2-tools/releases/tag/5.3
A lot of fixes and enhancements over the last year.
* License file moved from doc to docs. Contents is identical.
* Explicitly enable fapi for the new tools. Requires tpm2-tss fapi.
* Add tpm2 tools and a section for tss2 tools. Was missing previously.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/tpm2-tools.make | 51 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 48 insertions(+), 3 deletions(-)
diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make
index 357bb245e..2f18dd7fb 100644
--- a/rules/tpm2-tools.make
+++ b/rules/tpm2-tools.make
@@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools
#
# Paths and names
#
-TPM2_TOOLS_VERSION := 5.2
-TPM2_TOOLS_MD5 := 0057615ef43b9322d4577fc3bde0e8d6
+TPM2_TOOLS_VERSION := 5.3
+TPM2_TOOLS_MD5 := a319d4623f184b80851780b4e425208f
TPM2_TOOLS := tpm2-tools-$(TPM2_TOOLS_VERSION)
TPM2_TOOLS_SUFFIX := tar.gz
TPM2_TOOLS_URL := https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX)
TPM2_TOOLS_SOURCE := $(SRCDIR)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX)
TPM2_TOOLS_DIR := $(BUILDDIR)/$(TPM2_TOOLS)
TPM2_TOOLS_LICENSE := BSD-3-Clause
-TPM2_TOOLS_LICENSE_FILES := file://doc/LICENSE;md5=a846608d090aa64494c45fc147cc12e3
+TPM2_TOOLS_LICENSE_FILES := file://docs/LICENSE;md5=a846608d090aa64494c45fc147cc12e3
# ----------------------------------------------------------------------------
# Prepare
@@ -42,6 +42,7 @@ TPM2_TOOLS_CONF_OPT := \
--disable-code-coverage \
--disable-unit \
--enable-hardening \
+ --enable-fapi \
--without-gcov \
--without-bashcompdir
@@ -75,6 +76,7 @@ TPM2_TOOLS_TPM2_PROGS := \
tpm2_ecdhkeygen \
tpm2_ecdhzgen \
tpm2_ecephemeral \
+ tpm2_encodeobject \
tpm2_encryptdecrypt \
tpm2_eventlog \
tpm2_evictcontrol \
@@ -154,6 +156,45 @@ TPM2_TOOLS_TPM2_PROGS := \
tpm2_verifysignature \
tpm2_zgen2phase
+TPM2_TOOLS_TSS2_PROGS := \
+ tss2_authorizepolicy \
+ tss2_changeauth \
+ tss2_createkey \
+ tss2_createnv \
+ tss2_createseal \
+ tss2_decrypt \
+ tss2_delete \
+ tss2_encrypt \
+ tss2_exportkey \
+ tss2_exportpolicy \
+ tss2_getappdata \
+ tss2_getcertificate \
+ tss2_getdescription \
+ tss2_getinfo \
+ tss2_getplatformcertificates \
+ tss2_getrandom \
+ tss2_gettpm2object \
+ tss2_gettpmblobs \
+ tss2_import \
+ tss2_list \
+ tss2_nvextend \
+ tss2_nvincrement \
+ tss2_nvread \
+ tss2_nvsetbits \
+ tss2_nvwrite \
+ tss2_pcrextend \
+ tss2_pcrread \
+ tss2_provision \
+ tss2_quote \
+ tss2_setappdata \
+ tss2_setcertificate \
+ tss2_setdescription \
+ tss2_sign \
+ tss2_unseal \
+ tss2_verifyquote \
+ tss2_verifysignature \
+ tss2_writeauthorizenv
+
$(STATEDIR)/tpm2-tools.targetinstall:
@$(call targetinfo)
@@ -164,10 +205,14 @@ $(STATEDIR)/tpm2-tools.targetinstall:
@$(call install_fixup, tpm2-tools,DESCRIPTION,missing)
@$(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/tpm2)
+ @$(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/tss2)
@$(foreach prog, $(TPM2_TOOLS_TPM2_PROGS), \
@$(call install_link, tpm2-tools, tpm2, /usr/bin/$(prog))$(ptx/nl))
+ @$(foreach prog, $(TPM2_TOOLS_TSS2_PROGS), \
+ @$(call install_link, tpm2-tools, tss2, /usr/bin/$(prog))$(ptx/nl))
+
@$(call install_finish, tpm2-tools)
@$(call touch)
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] tpm2-tools: Version bump. 5.2 -> 5.3
2022-10-14 21:03 ` [ptxdist] [PATCH v2] tpm2-tools: Version bump. 5.2 -> 5.3 Christian Melki
@ 2022-10-28 14:43 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2022-10-28 14:43 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 1a19e42ea2ac6388f9eb2a43904a716808f31831.
Michael
[sent from post-receive hook]
On Fri, 28 Oct 2022 16:43:59 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> https://github.com/tpm2-software/tpm2-tools/releases/tag/5.3
> A lot of fixes and enhancements over the last year.
>
> * License file moved from doc to docs. Contents is identical.
> * Explicitly enable fapi for the new tools. Requires tpm2-tss fapi.
> * Add tpm2 tools and a section for tss2 tools. Was missing previously.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20221014210351.2257285-2-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make
> index eedef48158c4..42a473fb348a 100644
> --- a/rules/tpm2-tools.make
> +++ b/rules/tpm2-tools.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools
> #
> # Paths and names
> #
> -TPM2_TOOLS_VERSION := 5.2
> -TPM2_TOOLS_MD5 := 0057615ef43b9322d4577fc3bde0e8d6
> +TPM2_TOOLS_VERSION := 5.3
> +TPM2_TOOLS_MD5 := a319d4623f184b80851780b4e425208f
> TPM2_TOOLS := tpm2-tools-$(TPM2_TOOLS_VERSION)
> TPM2_TOOLS_SUFFIX := tar.gz
> TPM2_TOOLS_URL := https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX)
> TPM2_TOOLS_SOURCE := $(SRCDIR)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX)
> TPM2_TOOLS_DIR := $(BUILDDIR)/$(TPM2_TOOLS)
> TPM2_TOOLS_LICENSE := BSD-3-Clause
> -TPM2_TOOLS_LICENSE_FILES := file://doc/LICENSE;md5=a846608d090aa64494c45fc147cc12e3
> +TPM2_TOOLS_LICENSE_FILES := file://docs/LICENSE;md5=a846608d090aa64494c45fc147cc12e3
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -42,6 +42,7 @@ TPM2_TOOLS_CONF_OPT := \
> --disable-code-coverage \
> --disable-unit \
> --enable-hardening \
> + --enable-fapi \
> --without-gcov \
> --with-bashcompdir=/ignore
>
> @@ -75,6 +76,7 @@ TPM2_TOOLS_TPM2_PROGS := \
> tpm2_ecdhkeygen \
> tpm2_ecdhzgen \
> tpm2_ecephemeral \
> + tpm2_encodeobject \
> tpm2_encryptdecrypt \
> tpm2_eventlog \
> tpm2_evictcontrol \
> @@ -154,6 +156,45 @@ TPM2_TOOLS_TPM2_PROGS := \
> tpm2_verifysignature \
> tpm2_zgen2phase
>
> +TPM2_TOOLS_TSS2_PROGS := \
> + tss2_authorizepolicy \
> + tss2_changeauth \
> + tss2_createkey \
> + tss2_createnv \
> + tss2_createseal \
> + tss2_decrypt \
> + tss2_delete \
> + tss2_encrypt \
> + tss2_exportkey \
> + tss2_exportpolicy \
> + tss2_getappdata \
> + tss2_getcertificate \
> + tss2_getdescription \
> + tss2_getinfo \
> + tss2_getplatformcertificates \
> + tss2_getrandom \
> + tss2_gettpm2object \
> + tss2_gettpmblobs \
> + tss2_import \
> + tss2_list \
> + tss2_nvextend \
> + tss2_nvincrement \
> + tss2_nvread \
> + tss2_nvsetbits \
> + tss2_nvwrite \
> + tss2_pcrextend \
> + tss2_pcrread \
> + tss2_provision \
> + tss2_quote \
> + tss2_setappdata \
> + tss2_setcertificate \
> + tss2_setdescription \
> + tss2_sign \
> + tss2_unseal \
> + tss2_verifyquote \
> + tss2_verifysignature \
> + tss2_writeauthorizenv
> +
> $(STATEDIR)/tpm2-tools.targetinstall:
> @$(call targetinfo)
>
> @@ -164,10 +205,14 @@ $(STATEDIR)/tpm2-tools.targetinstall:
> @$(call install_fixup, tpm2-tools,DESCRIPTION,missing)
>
> @$(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/tpm2)
> + @$(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/tss2)
>
> @$(foreach prog, $(TPM2_TOOLS_TPM2_PROGS), \
> @$(call install_link, tpm2-tools, tpm2, /usr/bin/$(prog))$(ptx/nl))
>
> + @$(foreach prog, $(TPM2_TOOLS_TSS2_PROGS), \
> + @$(call install_link, tpm2-tools, tss2, /usr/bin/$(prog))$(ptx/nl))
> +
> @$(call install_finish, tpm2-tools)
>
> @$(call touch)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] tpm2-tss: Enable fapi.
2022-10-14 21:03 [ptxdist] [PATCH] tpm2-tss: Enable fapi Christian Melki
2022-10-14 21:03 ` [ptxdist] [PATCH v2] tpm2-tools: Version bump. 5.2 -> 5.3 Christian Melki
@ 2022-10-28 14:43 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2022-10-28 14:43 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as b52072eb2bfc495cbb39b6969f729e720029e195.
Michael
[sent from post-receive hook]
On Fri, 28 Oct 2022 16:43:55 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> * Explicitly enable fapi and install the library.
> This is needed by tpm2-tools fapi dependent binaries.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20221014210351.2257285-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
> index 7e0b4ff52609..310ec8014e9e 100644
> --- a/rules/tpm2-tss.make
> +++ b/rules/tpm2-tss.make
> @@ -43,6 +43,7 @@ TPM2_TSS_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> --enable-debug=info \
> --disable-unit \
> + --enable-fapi \
> --enable-tcti-device \
> --enable-tcti-mssim \
> --disable-tcti-fuzzing \
> @@ -87,6 +88,7 @@ $(STATEDIR)/tpm2-tss.targetinstall:
> @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-esys)
> @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-mu)
> @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys)
> + @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-fapi)
> @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-device)
> @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-mssim)
> @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tctildr)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-28 14:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-14 21:03 [ptxdist] [PATCH] tpm2-tss: Enable fapi Christian Melki
2022-10-14 21:03 ` [ptxdist] [PATCH v2] tpm2-tools: Version bump. 5.2 -> 5.3 Christian Melki
2022-10-28 14:43 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-10-28 14:43 ` [ptxdist] [APPLIED] tpm2-tss: Enable fapi Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox