Re: [ptxdist] [PATCH] tpm2-tss: Version bump. 2.3.1 -> 3.1.0

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Jan 28, 2022 at 06:22:19PM +0100, Christian Melki wrote:
> On 1/28/22 17:16, Michael Olbrich wrote:
> > On Thu, Jan 27, 2022 at 03:35:30PM +0100, Christian Melki wrote:
> >> Approx. 2,5 year worth of fixes.
> >> https://github.com/tpm2-software/tpm2-tss/releases
> >> Fixes CVE-2020-24455 (three times over).
> >> tpm2-tss now depends on JSON_C and LIBCURL.
> >> Remove changed configuration options.
> > 
> > Fails to build here:
> > 
> > checking for groupadd... no
> > configure: error: Missing required program 'groupadd': ensure it is installed and on PATH.
> > 
> > Adding a group should not be done during install anyways and it would fail,
> > so I think this should work:
> > 
> > TPM2_TSS_CONF_ENV := \
> > 	$(CROSS_ENV) \
> > 	GROUPADD=: \
> > 	USERADD=:
> > 
> > Michael
> > 
> 
> Didn't see that one coming. How abusive!
> From a makefile none the less.
> I have the required binaries on my development machine so I didn't notice.
> Now, I've tried your suggestion, but I can't see that it helps?
> 
> Looks like the entire thing goes about the binaries in a very static
> fashion.
> 
> ..
> define make_tss_user_and_group
>     (id -g tss 2>/dev/null || groupadd -r tss) && \
>     (id -u tss 2>/dev/null || useradd -r -g tss tss)
> endef

	@$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"

so any error here is ignored. We just need to get through the configure
check.

> ..and..
> 
> define set_tss_permissions
>     (chown -R tss:tss "$1") && \
>     (chmod -R 2775 "$1") && \
>     (setfacl -m default:group:tss:rwx "$1")
> endef
> ..

And 'make install' is called with fakeroot, so this will just be ignored as
well.

Michael

> 
> >> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> >> ---
> >>  rules/tpm2-tss.in   | 2 ++
> >>  rules/tpm2-tss.make | 7 ++-----
> >>  2 files changed, 4 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
> >> index dbb310072..75d32188c 100644
> >> --- a/rules/tpm2-tss.in
> >> +++ b/rules/tpm2-tss.in
> >> @@ -4,6 +4,8 @@ config TPM2_TSS
> >>  	tristate
> >>  	select HOST_AUTOTOOLS_AUTOCONF_ARCHIVE
> >>  	select OPENSSL
> >> +	select JSON_C
> >> +	select LIBCURL
> >>  	prompt "tpm2-tss"
> >>  	help
> >>  	  TPM2 Software stack library - TSS and TCTI libraries
> >> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
> >> index 768c64426..72aff609a 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.3.1
> >> -TPM2_TSS_MD5		:= 5744b10e3cef56df5d65b50f51fb3fe9
> >> +TPM2_TSS_VERSION	:= 3.1.0
> >> +TPM2_TSS_MD5		:= 4d04cf52fff4ee061bb3f7b4f4ea03b7
> >>  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)
> >> @@ -36,9 +36,6 @@ 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 \
> >> -- 
> >> 2.30.2
> >>
> >>
> >> _______________________________________________
> >> ptxdist mailing list
> >> ptxdist@pengutronix.de
> >> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@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
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de