Skip to contentSkip to conversation

package/tpm2-tss: wip: bump to version 2.3.3

PATCH New Peter Korsgaard 3 participants 5 messages Feb 20, 2020 – Feb 23, 2020

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/1 package/tpm2-tss: wip: bump to version 2.3.3

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 <[email protected]>
---
 package/tpm2-tss/tpm2-tss.hash |  2 +-
 package/tpm2-tss/tpm2-tss.mk   | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
package/tpm2-tss/tpm2-tss.hash +1 -1
index 0f78eb36b1..3b778d4f1e 100644
@@ -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
package/tpm2-tss/tpm2-tss.mk +10 -1
index 08090204ff..470020857a 100644
@@ -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))
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH 1/1 package/tpm2-tss: wip: bump to version 2.3.3

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> 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.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/tpm2-tss: wip: bump to version 2.3.3

In reply to Peter Korsgaard

Peter, All,

Title fixed.

On 2020-02-20 22:45 +0100, Peter Korsgaard spake thusly:

Quoted 1 line

Bugfix release, fixing a number of issues:

[--SNIP--]

Quoted 1 line
Signed-off-by Peter Korsgaard <[email protected]>

[--SNIP--]

package/tpm2-tss/tpm2-tss.mk

Quoted 4 lines
package/tpm2-tss/tpm2-tss.mk +0 -0
index 08090204ff..470020857a 100644

[--SNIP--]

package/tpm2-tss/tpm2-tss.mk TPM2_TSS_AUTORECONF = YES · line 25

Quoted 10 lines
package/tpm2-tss/tpm2-tss.mk +6 -0
@@ -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.

Quoted 11 lines
package/tpm2-tss/tpm2-tss.mk +3 -0
+endef
+TPM2_TSS_POST_PATCH_HOOKS += TPM2_TSS_TRUNCATE_MAKEFILE_FUZZ_GENERATED_AM
+
 $(eval $(autotools-package))
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
author
#3 lore raw

PATCH 1/1 package/tpm2-tss: wip: bump to version 2.3.3

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Peter, All,
Title fixed.

Thanks ;)

Quoted 22 lines

On 2020-02-20 22:45 +0100, Peter Korsgaard spake thusly:

Quoted 1 line

Bugfix release, fixing a number of issues:

[--SNIP--]

Quoted 1 line
Signed-off-by Peter Korsgaard <[email protected]>

[--SNIP--]

package/tpm2-tss/tpm2-tss.mk

Quoted 4 lines
package/tpm2-tss/tpm2-tss.mk +0 -0
index 08090204ff..470020857a 100644

[--SNIP--]

package/tpm2-tss/tpm2-tss.mk TPM2_TSS_AUTORECONF = YES · line 25

Quoted 10 lines
package/tpm2-tss/tpm2-tss.mk +0 -0
@@ -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"

package/tpm2-tss/tpm2-tss.mk +6 -0
+# 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...

Quoted 1 line
    printf '' >$(@D)/Makefile-fuzz-generated.am

True - But as truncate is part of coreutils it should be fine.

Quoted 1 line

But I just applied to master as-is, thanks.

Thanks!

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/1 package/tpm2-tss: wip: bump to version 2.3.3

Quoted 32 lines · Peter Korsgaard
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

"Yann" == Yann E MORIN <[email protected]> writes:

Peter, All,
Title fixed.

Thanks ;)

Quoted 22 lines

On 2020-02-20 22:45 +0100, Peter Korsgaard spake thusly:

Quoted 1 line

Bugfix release, fixing a number of issues:

[--SNIP--]

Quoted 1 line
Signed-off-by Peter Korsgaard <[email protected]>

[--SNIP--]

package/tpm2-tss/tpm2-tss.mk

Quoted 4 lines
package/tpm2-tss/tpm2-tss.mk +0 -0
index 08090204ff..470020857a 100644

[--SNIP--]

package/tpm2-tss/tpm2-tss.mk TPM2_TSS_AUTORECONF = YES · line 25

Quoted 10 lines
package/tpm2-tss/tpm2-tss.mk +0 -0
@@ -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"

package/tpm2-tss/tpm2-tss.mk +6 -0
+# 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...

Quoted 1 line
    printf '' >$(@D)/Makefile-fuzz-generated.am
Quoted 1 line

True - But as truncate is part of coreutils it should be fine.

    : > $(@D)/Makefile-fuzz-generated.am
Signature · 1 line
Carlos Santos <[email protected]>