mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1
@ 2019-11-27 15:34 Bastian Krause
  2019-11-27 15:34 ` [ptxdist] [PATCH 2/2] tpm2-tools: version bump 3.1.4 -> 4.1 Bastian Krause
  2019-11-28 11:36 ` [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1 Roland Hieber
  0 siblings, 2 replies; 5+ messages in thread
From: Bastian Krause @ 2019-11-27 15:34 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/tpm2-tss.make | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
index 4bdaef17e..fe84e606f 100644
--- a/rules/tpm2-tss.make
+++ b/rules/tpm2-tss.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
 #
 # Paths and names
 #
-TPM2_TSS_VERSION	:= 2.2.2
-TPM2_TSS_MD5		:= db341b66daab34cbb4d6a4e5a8745001
+TPM2_TSS_VERSION	:= 2.3.1
+TPM2_TSS_MD5		:= 5744b10e3cef56df5d65b50f51fb3fe9
 TPM2_TSS		:= tpm2-tss-$(TPM2_TSS_VERSION)
 TPM2_TSS_SUFFIX		:= tar.gz
 TPM2_TSS_URL		:= https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
@@ -34,15 +34,23 @@ TPM2_TSS_LICENSE_FILES	:= file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da
 TPM2_TSS_CONF_TOOL	:= autoconf
 TPM2_TSS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--enable-debug=info \
 	--disable-unit \
 	--enable-esapi \
 	--disable-tcti-device-async \
 	--disable-tcti-partial-reads \
 	--enable-tcti-device \
 	--enable-tcti-mssim \
+	--disable-tcti-fuzzing \
+	--disable-nodl \
 	--disable-integration \
-	--disable-debug \
+	--disable-valgrind \
+	--disable-valgrind-memcheck \
+	--disable-valgrind-helgrind \
+	--disable-valgrind-drd \
+	--disable-valgrind-sgcheck \
 	--disable-defaultflags \
+	--disable-weakcrypto \
 	--disable-doxygen-doc \
 	--disable-doxygen-dot \
 	--disable-doxygen-man \
@@ -56,6 +64,7 @@ TPM2_TSS_CONF_OPT	:= \
 	--disable-code-coverage \
 	--with-crypto=ossl \
 	--with-udevrulesdir=/usr/lib/udev/rules.d \
+	--with-fuzzing=none \
 	--without-gcov
 
 # ----------------------------------------------------------------------------
@@ -76,6 +85,9 @@ $(STATEDIR)/tpm2-tss.targetinstall:
 	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys)
 	@$(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)
+	@$(call install_link, tpm2-tss, ./libtss2-tcti-device.so.0.0.0, /usr/lib/libtss2-tcti-default.so)
+	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-rc)
 
 	@$(call install_alternative, tpm2-tss, 0, 0, 0644, \
 		/usr/lib/udev/rules.d/70-tpm-udev.rules)
-- 
2.24.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [ptxdist] [PATCH 2/2] tpm2-tools: version bump 3.1.4 -> 4.1
  2019-11-27 15:34 [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1 Bastian Krause
@ 2019-11-27 15:34 ` Bastian Krause
  2019-11-28 11:36 ` [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1 Roland Hieber
  1 sibling, 0 replies; 5+ messages in thread
From: Bastian Krause @ 2019-11-27 15:34 UTC (permalink / raw)
  To: ptxdist; +Cc: Bastian Krause

v3.1.4 was actually BSD-2-Clause licensed. v4.1 is now BSD-3-Clause, so
only fix the md5 sum.

See: https://github.com/tpm2-software/tpm2-tools/issues/1478

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/tpm2-tools.make | 73 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 61 insertions(+), 12 deletions(-)

diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make
index e7fb757ec..9fbb0cbc7 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		:= 3.1.4
-TPM2_TOOLS_MD5			:= 61b4a382d24c950148a3f5fe41ac2306
+TPM2_TOOLS_VERSION		:= 4.1
+TPM2_TOOLS_MD5			:= aecec22668233776922909f2ebf55e65
 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://LICENSE;md5=91b7c548d73ea16537799e8060cea819
+TPM2_TOOLS_LICENSE_FILES	:= file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -34,10 +34,12 @@ TPM2_TOOLS_LICENSE_FILES	:= file://LICENSE;md5=91b7c548d73ea16537799e8060cea819
 TPM2_TOOLS_CONF_TOOL	:= autoconf
 TPM2_TOOLS_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	--enable-debug=info \
 	--disable-code-coverage \
 	--disable-unit \
 	--enable-hardening \
-	--without-gcov
+	--without-gcov \
+	--without-bashcompdir
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -46,41 +48,88 @@ TPM2_TOOLS_CONF_OPT	:= \
 TPM2_TOOLS_PROGS := \
 	tpm2_activatecredential \
 	tpm2_certify \
+	tpm2_certifycreation \
+	tpm2_changeauth \
+	tpm2_changeeps \
+	tpm2_changepps \
+	tpm2_checkquote \
+	tpm2_clear \
+	tpm2_clearcontrol \
+	tpm2_clockrateadjust \
 	tpm2_create \
+	tpm2_createak \
+	tpm2_createek \
 	tpm2_createpolicy \
 	tpm2_createprimary \
 	tpm2_dictionarylockout \
+	tpm2_duplicate \
 	tpm2_encryptdecrypt \
 	tpm2_evictcontrol \
+	tpm2_flushcontext \
 	tpm2_getcap \
-	tpm2_getmanufec \
-	tpm2_getpubak \
-	tpm2_getpubek \
+	tpm2_getekcertificate \
 	tpm2_getrandom \
+	tpm2_gettestresult \
+	tpm2_gettime \
 	tpm2_hash \
+	tpm2_hierarchycontrol \
 	tpm2_hmac \
-	tpm2_listpersistent \
+	tpm2_import \
+	tpm2_incrementalselftest \
 	tpm2_load \
 	tpm2_loadexternal \
 	tpm2_makecredential \
+	tpm2_nvcertify \
 	tpm2_nvdefine \
-	tpm2_nvlist \
+	tpm2_nvextend \
+	tpm2_nvincrement \
 	tpm2_nvread \
 	tpm2_nvreadlock \
-	tpm2_nvrelease \
+	tpm2_nvreadpublic \
+	tpm2_nvsetbits \
+	tpm2_nvundefine \
 	tpm2_nvwrite \
+	tpm2_nvwritelock \
+	tpm2_pcrallocate \
 	tpm2_pcrevent \
 	tpm2_pcrextend \
-	tpm2_pcrlist \
+	tpm2_pcrread \
+	tpm2_pcrreset \
+	tpm2_policyauthorize \
+	tpm2_policyauthorizenv \
+	tpm2_policyauthvalue \
+	tpm2_policycommandcode \
+	tpm2_policycountertimer \
+	tpm2_policyduplicationselect \
+	tpm2_policylocality \
+	tpm2_policynamehash \
+	tpm2_policynv \
+	tpm2_policynvwritten \
+	tpm2_policyor \
+	tpm2_policypassword \
+	tpm2_policypcr \
+	tpm2_policyrestart \
+	tpm2_policysecret \
+	tpm2_policysigned \
+	tpm2_policytemplate \
+	tpm2_policyticket \
+	tpm2_print \
 	tpm2_quote \
 	tpm2_rc_decode \
+	tpm2_readclock \
 	tpm2_readpublic \
 	tpm2_rsadecrypt \
 	tpm2_rsaencrypt \
+	tpm2_selftest \
 	tpm2_send \
+	tpm2_setclock \
+	tpm2_setprimarypolicy \
+	tpm2_shutdown \
 	tpm2_sign \
+	tpm2_startauthsession \
 	tpm2_startup \
-	tpm2_takeownership \
+	tpm2_stirrandom \
+	tpm2_testparms \
 	tpm2_unseal \
 	tpm2_verifysignature
 
-- 
2.24.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1
  2019-11-27 15:34 [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1 Bastian Krause
  2019-11-27 15:34 ` [ptxdist] [PATCH 2/2] tpm2-tools: version bump 3.1.4 -> 4.1 Bastian Krause
@ 2019-11-28 11:36 ` Roland Hieber
  2019-11-28 13:33   ` Bastian Krause
  1 sibling, 1 reply; 5+ messages in thread
From: Roland Hieber @ 2019-11-28 11:36 UTC (permalink / raw)
  To: Bastian Krause; +Cc: ptxdist

On Wed, Nov 27, 2019 at 04:34:28PM +0100, Bastian Krause wrote:
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> ---
>  rules/tpm2-tss.make | 18 +++++++++++++++---
>  1 file changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
> index 4bdaef17e..fe84e606f 100644
> --- a/rules/tpm2-tss.make
> +++ b/rules/tpm2-tss.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
>  #
>  # Paths and names
>  #
> -TPM2_TSS_VERSION	:= 2.2.2
> -TPM2_TSS_MD5		:= db341b66daab34cbb4d6a4e5a8745001
> +TPM2_TSS_VERSION	:= 2.3.1
> +TPM2_TSS_MD5		:= 5744b10e3cef56df5d65b50f51fb3fe9
>  TPM2_TSS		:= tpm2-tss-$(TPM2_TSS_VERSION)
>  TPM2_TSS_SUFFIX		:= tar.gz
>  TPM2_TSS_URL		:= https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
> @@ -34,15 +34,23 @@ TPM2_TSS_LICENSE_FILES	:= file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da
>  TPM2_TSS_CONF_TOOL	:= autoconf
>  TPM2_TSS_CONF_OPT	:= \
>  	$(CROSS_AUTOCONF_USR) \
> +	--enable-debug=info \
>  	--disable-unit \
>  	--enable-esapi \
>  	--disable-tcti-device-async \
>  	--disable-tcti-partial-reads \
>  	--enable-tcti-device \
>  	--enable-tcti-mssim \
> +	--disable-tcti-fuzzing \
> +	--disable-nodl \
>  	--disable-integration \
> -	--disable-debug \
> +	--disable-valgrind \
> +	--disable-valgrind-memcheck \
> +	--disable-valgrind-helgrind \
> +	--disable-valgrind-drd \
> +	--disable-valgrind-sgcheck \
>  	--disable-defaultflags \
> +	--disable-weakcrypto \
>  	--disable-doxygen-doc \
>  	--disable-doxygen-dot \
>  	--disable-doxygen-man \
> @@ -56,6 +64,7 @@ TPM2_TSS_CONF_OPT	:= \
>  	--disable-code-coverage \
>  	--with-crypto=ossl \
>  	--with-udevrulesdir=/usr/lib/udev/rules.d \
> +	--with-fuzzing=none \
>  	--without-gcov
>  
>  # ----------------------------------------------------------------------------
> @@ -76,6 +85,9 @@ $(STATEDIR)/tpm2-tss.targetinstall:
>  	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys)
>  	@$(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)
> +	@$(call install_link, tpm2-tss, ./libtss2-tcti-device.so.0.0.0, /usr/lib/libtss2-tcti-default.so)

Oh? Is libtss2-tcti-default.so used anywhere? Or was it just renamed
between the versions?

 - Roland

> +	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-rc)
>  
>  	@$(call install_alternative, tpm2-tss, 0, 0, 0644, \
>  		/usr/lib/udev/rules.d/70-tpm-udev.rules)
> -- 
> 2.24.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1
  2019-11-28 11:36 ` [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1 Roland Hieber
@ 2019-11-28 13:33   ` Bastian Krause
  2019-11-28 14:00     ` Bastian Krause
  0 siblings, 1 reply; 5+ messages in thread
From: Bastian Krause @ 2019-11-28 13:33 UTC (permalink / raw)
  To: Roland Hieber; +Cc: ptxdist

On 11/28/19 12:36 PM, Roland Hieber wrote:
> On Wed, Nov 27, 2019 at 04:34:28PM +0100, Bastian Krause wrote:
>> Signed-off-by: Bastian Krause <bst@pengutronix.de>
>> ---
>>  rules/tpm2-tss.make | 18 +++++++++++++++---
>>  1 file changed, 15 insertions(+), 3 deletions(-)
>>
>> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
>> index 4bdaef17e..fe84e606f 100644
>> --- a/rules/tpm2-tss.make
>> +++ b/rules/tpm2-tss.make
>> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
>>  #
>>  # Paths and names
>>  #
>> -TPM2_TSS_VERSION	:= 2.2.2
>> -TPM2_TSS_MD5		:= db341b66daab34cbb4d6a4e5a8745001
>> +TPM2_TSS_VERSION	:= 2.3.1
>> +TPM2_TSS_MD5		:= 5744b10e3cef56df5d65b50f51fb3fe9
>>  TPM2_TSS		:= tpm2-tss-$(TPM2_TSS_VERSION)
>>  TPM2_TSS_SUFFIX		:= tar.gz
>>  TPM2_TSS_URL		:= https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
>> @@ -34,15 +34,23 @@ TPM2_TSS_LICENSE_FILES	:= file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da
>>  TPM2_TSS_CONF_TOOL	:= autoconf
>>  TPM2_TSS_CONF_OPT	:= \
>>  	$(CROSS_AUTOCONF_USR) \
>> +	--enable-debug=info \
>>  	--disable-unit \
>>  	--enable-esapi \
>>  	--disable-tcti-device-async \
>>  	--disable-tcti-partial-reads \
>>  	--enable-tcti-device \
>>  	--enable-tcti-mssim \
>> +	--disable-tcti-fuzzing \
>> +	--disable-nodl \
>>  	--disable-integration \
>> -	--disable-debug \
>> +	--disable-valgrind \
>> +	--disable-valgrind-memcheck \
>> +	--disable-valgrind-helgrind \
>> +	--disable-valgrind-drd \
>> +	--disable-valgrind-sgcheck \
>>  	--disable-defaultflags \
>> +	--disable-weakcrypto \
>>  	--disable-doxygen-doc \
>>  	--disable-doxygen-dot \
>>  	--disable-doxygen-man \
>> @@ -56,6 +64,7 @@ TPM2_TSS_CONF_OPT	:= \
>>  	--disable-code-coverage \
>>  	--with-crypto=ossl \
>>  	--with-udevrulesdir=/usr/lib/udev/rules.d \
>> +	--with-fuzzing=none \
>>  	--without-gcov
>>  
>>  # ----------------------------------------------------------------------------
>> @@ -76,6 +85,9 @@ $(STATEDIR)/tpm2-tss.targetinstall:
>>  	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys)
>>  	@$(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)
>> +	@$(call install_link, tpm2-tss, ./libtss2-tcti-device.so.0.0.0, /usr/lib/libtss2-tcti-default.so)
> 
> Oh? Is libtss2-tcti-default.so used anywhere? Or was it just renamed
> between the versions?

In v2.3.1:

https://github.com/tpm2-software/tpm2-tss/blob/master/src/tss2-tcti/tctildr-dl.c#L34

In v2.2.x:

https://github.com/tpm2-software/tpm2-tss/blob/2.2.x/src/tss2-esys/esys_tcti_default.c#L37

I am not sure which variant of TCTI[1] loading is desired. See this:

https://github.com/tpm2-software/tpm2-tss/blob/master/src/tss2-esys/esys_context.c#L25

Maybe someone has an opinion on this?

Regards,
Bastian

[1]
https://github.com/tpm2-software/tpm2-tools/blob/master/man/common/tcti.md

>> +	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-rc)
>>  
>>  	@$(call install_alternative, tpm2-tss, 0, 0, 0644, \
>>  		/usr/lib/udev/rules.d/70-tpm-udev.rules)
>> -- 
>> 2.24.0
>>
>>
>> _______________________________________________
>> ptxdist mailing list
>> ptxdist@pengutronix.de
>>
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1
  2019-11-28 13:33   ` Bastian Krause
@ 2019-11-28 14:00     ` Bastian Krause
  0 siblings, 0 replies; 5+ messages in thread
From: Bastian Krause @ 2019-11-28 14:00 UTC (permalink / raw)
  To: Roland Hieber; +Cc: ptxdist


On 11/28/19 2:33 PM, Bastian Krause wrote:
> On 11/28/19 12:36 PM, Roland Hieber wrote:
>> On Wed, Nov 27, 2019 at 04:34:28PM +0100, Bastian Krause wrote:
>>> Signed-off-by: Bastian Krause <bst@pengutronix.de>
>>> ---
>>>  rules/tpm2-tss.make | 18 +++++++++++++++---
>>>  1 file changed, 15 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
>>> index 4bdaef17e..fe84e606f 100644
>>> --- a/rules/tpm2-tss.make
>>> +++ b/rules/tpm2-tss.make
>>> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
>>>  #
>>>  # Paths and names
>>>  #
>>> -TPM2_TSS_VERSION	:= 2.2.2
>>> -TPM2_TSS_MD5		:= db341b66daab34cbb4d6a4e5a8745001
>>> +TPM2_TSS_VERSION	:= 2.3.1
>>> +TPM2_TSS_MD5		:= 5744b10e3cef56df5d65b50f51fb3fe9
>>>  TPM2_TSS		:= tpm2-tss-$(TPM2_TSS_VERSION)
>>>  TPM2_TSS_SUFFIX		:= tar.gz
>>>  TPM2_TSS_URL		:= https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
>>> @@ -34,15 +34,23 @@ TPM2_TSS_LICENSE_FILES	:= file://LICENSE;md5=500b2e742befc3da00684d8a1d5fd9da
>>>  TPM2_TSS_CONF_TOOL	:= autoconf
>>>  TPM2_TSS_CONF_OPT	:= \
>>>  	$(CROSS_AUTOCONF_USR) \
>>> +	--enable-debug=info \
>>>  	--disable-unit \
>>>  	--enable-esapi \
>>>  	--disable-tcti-device-async \
>>>  	--disable-tcti-partial-reads \
>>>  	--enable-tcti-device \
>>>  	--enable-tcti-mssim \
>>> +	--disable-tcti-fuzzing \
>>> +	--disable-nodl \
>>>  	--disable-integration \
>>> -	--disable-debug \
>>> +	--disable-valgrind \
>>> +	--disable-valgrind-memcheck \
>>> +	--disable-valgrind-helgrind \
>>> +	--disable-valgrind-drd \
>>> +	--disable-valgrind-sgcheck \
>>>  	--disable-defaultflags \
>>> +	--disable-weakcrypto \
>>>  	--disable-doxygen-doc \
>>>  	--disable-doxygen-dot \
>>>  	--disable-doxygen-man \
>>> @@ -56,6 +64,7 @@ TPM2_TSS_CONF_OPT	:= \
>>>  	--disable-code-coverage \
>>>  	--with-crypto=ossl \
>>>  	--with-udevrulesdir=/usr/lib/udev/rules.d \
>>> +	--with-fuzzing=none \
>>>  	--without-gcov
>>>  
>>>  # ----------------------------------------------------------------------------
>>> @@ -76,6 +85,9 @@ $(STATEDIR)/tpm2-tss.targetinstall:
>>>  	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys)
>>>  	@$(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)
>>> +	@$(call install_link, tpm2-tss, ./libtss2-tcti-device.so.0.0.0, /usr/lib/libtss2-tcti-default.so)
>>
>> Oh? Is libtss2-tcti-default.so used anywhere? Or was it just renamed
>> between the versions?
> 
> In v2.3.1:
> 
> https://github.com/tpm2-software/tpm2-tss/blob/master/src/tss2-tcti/tctildr-dl.c#L34
> 
> In v2.2.x:
> 
> https://github.com/tpm2-software/tpm2-tss/blob/2.2.x/src/tss2-esys/esys_tcti_default.c#L37
> 
> I am not sure which variant of TCTI[1] loading is desired. See this:
> 
> https://github.com/tpm2-software/tpm2-tss/blob/master/src/tss2-esys/esys_context.c#L25
> 
> Maybe someone has an opinion on this?

We've discussed this internally. Summary:

The TCTI loading order specified in [1] means actually:

- Library libtss2-tcti-default.so (link to the preferred TCTI)
- Library libtss2-tcti-tabrmd.so (tabrmd) -> package "tpm2-abrmd"
- Device /dev/tpmrm0 (kernel resident resource manager) -> via
libtss2-tcti-device
- Device /dev/tpm0 (hardware TPM) -> via libtss2-tcti-device
- TCP socket localhost:2321 (TPM simulator) -> via libtss2-tcti-mssim

So installing the libtss2-tcti-default->libtss2-tcti-device symlink is
counterproductive as it ignores tpm2-abrmd even if it is installed.
Without the symlink the order is:

- libtss2-tcti-tabrmd
- libtss2-tcti-device (tpmrm0)
- libtss2-tcti-device (tpm0)
- libtss2-tcti-mssim

I'll send a v2 without the symlink.

Regards,
Bastian

[1]
https://github.com/tpm2-software/tpm2-tss/blob/master/src/tss2-esys/esys_context.c#L25

> [1]
> https://github.com/tpm2-software/tpm2-tools/blob/master/man/common/tcti.md
> 
>>> +	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-rc)
>>>  
>>>  	@$(call install_alternative, tpm2-tss, 0, 0, 0644, \
>>>  		/usr/lib/udev/rules.d/70-tpm-udev.rules)
>>> -- 
>>> 2.24.0
>>>
>>>
>>> _______________________________________________
>>> ptxdist mailing list
>>> ptxdist@pengutronix.de
>>>
>>
> 
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-11-28 14:00 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-27 15:34 [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1 Bastian Krause
2019-11-27 15:34 ` [ptxdist] [PATCH 2/2] tpm2-tools: version bump 3.1.4 -> 4.1 Bastian Krause
2019-11-28 11:36 ` [ptxdist] [PATCH 1/2] tpm2-tss: version bump 2.2.2 -> 2.3.1 Roland Hieber
2019-11-28 13:33   ` Bastian Krause
2019-11-28 14:00     ` Bastian Krause

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox