* [Buildroot] [PATCH] package/tpm2-tss: wip: bump to version 2.3.3
@ 2020-02-20 21:45 Peter Korsgaard
2020-02-20 22:44 ` Peter Korsgaard
2020-02-23 8:40 ` Yann E. MORIN
0 siblings, 2 replies; 5+ messages in thread
From: Peter Korsgaard @ 2020-02-20 21:45 UTC (permalink / raw)
To: buildroot
Bugfix release, fixing a number of issues:
- Fixed mixing salted and unsalted sessions in the same ESAPI context
- Removed use of VLAs from TPML marshal code
- Added check for object node before calling compute_session_value function
- Fixed auth calculation in Esys_StartAuthSession called with optional parameters
- Fixed compute_encrypted_salt error handling in Esys_StartAuthSession
- Fixed exported symbols map for libtss2-mu
The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am with
content from a fuzz testing run (rather than an empty file as in earlier
releases), confusing autoreconf together with our
0001-configure-Only-use-CXX-when-fuzzing.patch.
Work around that by adding a post-patch hook to truncate the file. The
issue has been reported upstream and the release logic has been changed to
ensure this does not happen again for future releases:
https://github.com/tstruk/tpm2-tss/commit/d163041e3bafa23c0be89c82a99b8501634ebdb4
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/tpm2-tss/tpm2-tss.hash | 2 +-
package/tpm2-tss/tpm2-tss.mk | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash
index 0f78eb36b1..3b778d4f1e 100644
--- a/package/tpm2-tss/tpm2-tss.hash
+++ b/package/tpm2-tss/tpm2-tss.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 82929a0611f39246e09202702a61b54c980ab694626c1f5823520ddf75024fa6 tpm2-tss-2.3.2.tar.gz
+sha256 9d8c8866829e3ff5e1649ecd82498cb1329e0691139458e53b69e6061febe3d3 tpm2-tss-2.3.3.tar.gz
sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE
diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk
index 08090204ff..470020857a 100644
--- a/package/tpm2-tss/tpm2-tss.mk
+++ b/package/tpm2-tss/tpm2-tss.mk
@@ -4,7 +4,7 @@
#
################################################################################
-TPM2_TSS_VERSION = 2.3.2
+TPM2_TSS_VERSION = 2.3.3
TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)
TPM2_TSS_LICENSE = BSD-2-Clause
TPM2_TSS_LICENSE_FILES = LICENSE
@@ -17,4 +17,13 @@ TPM2_TSS_AUTORECONF = YES
# uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used
TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99"
+# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am
+# with content from a fuzz testing run rather than an empty file,
+# confusing autoreconf with
+# 0001-configure-Only-use-CXX-when-fuzzing.patch
+define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
+ truncate -s 0 $(@D)/Makefile-fuzz-generated.am
+endef
+TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
+
$(eval $(autotools-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] package/tpm2-tss: wip: bump to version 2.3.3
2020-02-20 21:45 [Buildroot] [PATCH] package/tpm2-tss: wip: bump to version 2.3.3 Peter Korsgaard
@ 2020-02-20 22:44 ` Peter Korsgaard
2020-02-23 8:40 ` Yann E. MORIN
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2020-02-20 22:44 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> Bugfix release, fixing a number of issues:
> - Fixed mixing salted and unsalted sessions in the same ESAPI context
> - Removed use of VLAs from TPML marshal code
> - Added check for object node before calling compute_session_value function
> - Fixed auth calculation in Esys_StartAuthSession called with optional parameters
> - Fixed compute_encrypted_salt error handling in Esys_StartAuthSession
> - Fixed exported symbols map for libtss2-mu
Ups, the 'wip' in the subject should be dropped now that I got feedback
from upstream.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] package/tpm2-tss: wip: bump to version 2.3.3
2020-02-20 21:45 [Buildroot] [PATCH] package/tpm2-tss: wip: bump to version 2.3.3 Peter Korsgaard
2020-02-20 22:44 ` Peter Korsgaard
@ 2020-02-23 8:40 ` Yann E. MORIN
2020-02-23 16:35 ` Peter Korsgaard
1 sibling, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2020-02-23 8:40 UTC (permalink / raw)
To: buildroot
Peter, All,
Title fixed.
On 2020-02-20 22:45 +0100, Peter Korsgaard spake thusly:
> Bugfix release, fixing a number of issues:
[--SNIP--]
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[--SNIP--]
> diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk
> index 08090204ff..470020857a 100644
> --- a/package/tpm2-tss/tpm2-tss.mk
> +++ b/package/tpm2-tss/tpm2-tss.mk
[--SNIP--]
> @@ -17,4 +17,13 @@ TPM2_TSS_AUTORECONF = YES
> # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used
> TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99"
>
> +# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am
> +# with content from a fuzz testing run rather than an empty file,
> +# confusing autoreconf with
> +# 0001-configure-Only-use-CXX-when-fuzzing.patch
> +define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
> + truncate -s 0 $(@D)/Makefile-fuzz-generated.am
Use of truncate is rather heavy-handed here...
printf '' >$(@D)/Makefile-fuzz-generated.am
But I just applied to master as-is, thanks.
Regards,
Yann E. MORIN.
> +endef
> +TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
> +
> $(eval $(autotools-package))
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH] package/tpm2-tss: wip: bump to version 2.3.3
2020-02-23 8:40 ` Yann E. MORIN
@ 2020-02-23 16:35 ` Peter Korsgaard
2020-02-23 17:21 ` Carlos Santos
0 siblings, 1 reply; 5+ messages in thread
From: Peter Korsgaard @ 2020-02-23 16:35 UTC (permalink / raw)
To: buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> Peter, All,
> Title fixed.
Thanks ;)
> On 2020-02-20 22:45 +0100, Peter Korsgaard spake thusly:
>> Bugfix release, fixing a number of issues:
> [--SNIP--]
>> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> [--SNIP--]
>> diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk
>> index 08090204ff..470020857a 100644
>> --- a/package/tpm2-tss/tpm2-tss.mk
>> +++ b/package/tpm2-tss/tpm2-tss.mk
> [--SNIP--]
>> @@ -17,4 +17,13 @@ TPM2_TSS_AUTORECONF = YES
>> # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used
>> TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99"
>>
>> +# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am
>> +# with content from a fuzz testing run rather than an empty file,
>> +# confusing autoreconf with
>> +# 0001-configure-Only-use-CXX-when-fuzzing.patch
>> +define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
>> + truncate -s 0 $(@D)/Makefile-fuzz-generated.am
> Use of truncate is rather heavy-handed here...
> printf '' >$(@D)/Makefile-fuzz-generated.am
True - But as truncate is part of coreutils it should be fine.
> But I just applied to master as-is, thanks.
Thanks!
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] package/tpm2-tss: wip: bump to version 2.3.3
2020-02-23 16:35 ` Peter Korsgaard
@ 2020-02-23 17:21 ` Carlos Santos
0 siblings, 0 replies; 5+ messages in thread
From: Carlos Santos @ 2020-02-23 17:21 UTC (permalink / raw)
To: buildroot
On Sun, Feb 23, 2020 at 1:35 PM Peter Korsgaard <peter@korsgaard.com> wrote:
>
> >>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
>
> > Peter, All,
> > Title fixed.
>
> Thanks ;)
>
> > On 2020-02-20 22:45 +0100, Peter Korsgaard spake thusly:
> >> Bugfix release, fixing a number of issues:
> > [--SNIP--]
> >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> > [--SNIP--]
> >> diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk
> >> index 08090204ff..470020857a 100644
> >> --- a/package/tpm2-tss/tpm2-tss.mk
> >> +++ b/package/tpm2-tss/tpm2-tss.mk
> > [--SNIP--]
> >> @@ -17,4 +17,13 @@ TPM2_TSS_AUTORECONF = YES
> >> # uses C99 code but forgets to pass -std=c99 when --disable-defaultflags is used
> >> TPM2_TSS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99"
> >>
> >> +# The 2.3.3 tarball accidently contains a Makefile-fuzz-generated.am
> >> +# with content from a fuzz testing run rather than an empty file,
> >> +# confusing autoreconf with
> >> +# 0001-configure-Only-use-CXX-when-fuzzing.patch
> >> +define TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
> >> + truncate -s 0 $(@D)/Makefile-fuzz-generated.am
>
> > Use of truncate is rather heavy-handed here...
> > printf '' >$(@D)/Makefile-fuzz-generated.am
>
> True - But as truncate is part of coreutils it should be fine.
: > $(@D)/Makefile-fuzz-generated.am
--
Carlos Santos <unixmania@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-02-23 17:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-20 21:45 [Buildroot] [PATCH] package/tpm2-tss: wip: bump to version 2.3.3 Peter Korsgaard
2020-02-20 22:44 ` Peter Korsgaard
2020-02-23 8:40 ` Yann E. MORIN
2020-02-23 16:35 ` Peter Korsgaard
2020-02-23 17:21 ` Carlos Santos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox