package/tpm2-tss: bump to version 2.3.2
PATCH 1/4 package/tpm2-tss: bump to version 2.3.2
- Drop patch (already in version)
- Update hash of license file (SPDX ID has been removed with
https://github.com/tpm2-software/tpm2-tss/commit/0dbc84ee45d0e4cd7eae528f53968f8877455aab)
--- ...ypes.c-fix-maybe-uninitialized-error.patch | 37 ------------------- package/tpm2-tss/tpm2-tss.hash | 4 +- package/tpm2-tss/tpm2-tss.mk | 2 +- 3 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 package/tpm2-tss/0001-tpm2b-types.c-fix-maybe-uninitialized-error.patch
package/tpm2-tss/0001-tpm2b-types.c-fix-maybe-uninitialized-error.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 815f2bcbdfe5d9aff2cd3acbbb105daf1f5e9d7f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Thu, 7 Feb 2019 09:58:07 +0100 -Subject: [PATCH] tpm2b-types.c: fix maybe-uninitialized error - -src/tss2-mu/tpm2b-types.c: In function 'Tss2_MU_TPM2B_ECC_POINT_Marshal': -src/tss2-mu/tpm2b-types.c:201:24: error: 'ptr' may be used uninitialized in this function [-Werror=maybe-uninitialized] - *(UINT16 *)ptr = HOST_TO_BE_16(buffer + local_offset - ptr - 2); \ - ^ -src/tss2-mu/tpm2b-types.c:152:12: note: 'ptr' was declared here - UINT8 *ptr; \ - -Fixes: - - http://autobuild.buildroot.org/results/8d7b6dad6602fe67338abc696bc4752dda8e9717 - -Signed-off-by: Fabrice Fontaine <[email protected]> -[Upstream status: https://github.com/tpm2-software/tpm2-tss/pull/1265] ---- - src/tss2-mu/tpm2b-types.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tss2-mu/tpm2b-types.c b/src/tss2-mu/tpm2b-types.c -index 9c1003ab..7632febb 100644 ---- a/src/tss2-mu/tpm2b-types.c -+++ b/src/tss2-mu/tpm2b-types.c -@@ -150,7 +150,7 @@ TSS2_RC Tss2_MU_##type##_Marshal(type const *src, uint8_t buffer[], \ - size_t buffer_size, size_t *offset) \ - { \ - size_t local_offset = 0; \ -- UINT8 *ptr; \ -+ UINT8 *ptr = NULL; \ - TSS2_RC rc; \ - \ - if (src == NULL) { \ --- -2.14.1 -
package/tpm2-tss/tpm2-tss.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed: -sha256 bddfa4ab2ceb6394bcacf7db5d6419cbfabdb22702b6df75c59e60dd5f3fafb5 tpm2-tss-2.1.3.tar.gz -sha256 f7da3c2da12cec3348bb7ee9e2a9e651a241450b2efb67da29d5a75ef2da058a LICENSE +sha256 82929a0611f39246e09202702a61b54c980ab694626c1f5823520ddf75024fa6 tpm2-tss-2.3.2.tar.gz +sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE
package/tpm2-tss/tpm2-tss.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 2.1.3 +TPM2_TSS_VERSION = 2.3.2 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
Signature · 1 line
2.24.0
PATCH 2/4 package/tpm2-totp: bump to version 0.2.0
Add patch to fix build failure with musl
--- ...-src-libtpm2-totp.c-include-endian.h.patch | 34 +++++++++++++++++++ package/tpm2-totp/tpm2-totp.hash | 2 +- package/tpm2-totp/tpm2-totp.mk | 2 +- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 package/tpm2-totp/0001-src-libtpm2-totp.c-include-endian.h.patch
package/tpm2-totp/0001-src-libtpm2-totp.c-include-endian.h.patch new file +34 -0
@@ -0,0 +1,34 @@ +From a69c50fc2b8c35814e195eacb01f0d60feb54dd1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sat, 14 Dec 2019 19:26:32 +0100 +Subject: [PATCH] src/libtpm2-totp.c: include <endian.h> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix the following build failure with musl: + +src/libtpm2-totp.c: In function ?tpm2totp_calculate?: +src/libtpm2-totp.c:826:11: warning: implicit declaration of function ?htobe64? [-Wimplicit-function-declaration] + tmp = htobe64(tmp); + ^~~~~~~ + +Signed-off-by: Fabrice Fontaine <[email protected]> +[Retrieved from: +https://github.com/tpm2-software/tpm2-totp/commit/a69c50fc2b8c35814e195eacb01f0d60feb54dd1] +--- + src/libtpm2-totp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libtpm2-totp.c b/src/libtpm2-totp.c +index a364b7a..2d3f00d 100644 +--- a/src/libtpm2-totp.c ++++ b/src/libtpm2-totp.c +@@ -8,6 +8,7 @@ + + #include <tpm2-totp.h> + ++#include <endian.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h>
package/tpm2-totp/tpm2-totp.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed: -sha256 2ce2a518c96540942b0e78bc73efaefb76a2784b7e2dd1b3f14e7d31d97b33b7 tpm2-totp-0.1.2.tar.gz +sha256 4bcb8b8ff320727f707841d839c242149649ad07edbced94f2984ade26a69d6c tpm2-totp-0.2.0.tar.gz sha256 67bc21a0bff2b0890307cfaa883bd3f5337f461eb6d8a612a015cea6d704e9ed LICENSE
package/tpm2-totp/tpm2-totp.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TOTP_VERSION = 0.1.2 +TPM2_TOTP_VERSION = 0.2.0 TPM2_TOTP_SITE = https://github.com/tpm2-software/tpm2-totp/releases/download/v$(TPM2_TOTP_VERSION) TPM2_TOTP_LICENSE = BSD-3-Clause TPM2_TOTP_LICENSE_FILES = LICENSE
Signature · 1 line
2.24.0
PATCH 2/4 package/tpm2-totp: bump to version 0.2.0
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Add patch to fix build failure with musl
Signed-off-by Fabrice Fontaine <[email protected]>
Committed, thanks.
I added a followup patch to explicitly disable doxygen / plymouth / initramfstools / mkinitrd suport and to use the --disable-defaultflags option like in tpm2-tss.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 3/4 package/tpm2-abrmd: bump to version 2.3.0
In reply to Fabrice FontaineDrop dbus dependency as it is not needed since version 2.2.0 and
https://github.com/tpm2-software/tpm2-abrmd/commit/c1d42c9ebefbfe36255603aca065944836c14610
--- package/tpm2-abrmd/Config.in | 5 ++--- package/tpm2-abrmd/tpm2-abrmd.hash | 2 +- package/tpm2-abrmd/tpm2-abrmd.mk | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-)
package/tpm2-abrmd/Config.in +2 -3
@@ -1,10 +1,9 @@ config BR2_PACKAGE_TPM2_ABRMD bool "tpm2-abrmd" depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 - depends on BR2_USE_MMU # dbus, libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # tpm2-tss - select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_TPM2_TSS help
package/tpm2-abrmd/tpm2-abrmd.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed: -sha256 ff0ed283b0300cd784d6bf2b042e167020f8443602974e53b924e9fd98a4b515 tpm2-abrmd-2.0.3.tar.gz +sha256 63cb59be1fd21e6ae233c37a0aa4a59883a4885a7bfd2c7e69979c5048518d50 tpm2-abrmd-2.3.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE
package/tpm2-abrmd/tpm2-abrmd.mk +2 -2
@@ -4,12 +4,12 @@ # ################################################################################ -TPM2_ABRMD_VERSION = 2.0.3 +TPM2_ABRMD_VERSION = 2.3.0 TPM2_ABRMD_SITE = https://github.com/tpm2-software/tpm2-abrmd/releases/download/$(TPM2_ABRMD_VERSION) TPM2_ABRMD_LICENSE = BSD-2-Clause TPM2_ABRMD_LICENSE_FILES = LICENSE TPM2_ABRMD_INSTALL_STAGING = YES -TPM2_ABRMD_DEPENDENCIES = dbus libglib2 tpm2-tss host-pkgconf +TPM2_ABRMD_DEPENDENCIES = libglib2 tpm2-tss host-pkgconf # -fstack-protector-all and FORTIFY_SOURCE=2 is used by # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options
Signature · 1 line
2.24.0
PATCH 3/4 package/tpm2-abrmd: bump to version 2.3.0
Quoted 47 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Drop dbus dependency as it is not needed since version 2.2.0 and
https://github.com/tpm2-software/tpm2-abrmd/commit/c1d42c9ebefbfe36255603aca065944836c14610Signed-off-by Fabrice Fontaine <[email protected]>--- package/tpm2-abrmd/Config.in | 5 ++--- package/tpm2-abrmd/tpm2-abrmd.hash | 2 +- package/tpm2-abrmd/tpm2-abrmd.mk | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-)package/tpm2-abrmd/Config.in +2
-3@@ -1,10 +1,9 @@ config BR2_PACKAGE_TPM2_ABRMD bool "tpm2-abrmd" depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 - depends on BR2_USE_MMU # dbus, libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_MMU # libglib2 depends on !BR2_STATIC_LIBS # tpm2-tss - select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_TPM2_TSS helppackage/tpm2-abrmd/tpm2-abrmd.hash +1
-1@@ -1,3 +1,3 @@ # Locally computed: -sha256 ff0ed283b0300cd784d6bf2b042e167020f8443602974e53b924e9fd98a4b515 tpm2-abrmd-2.0.3.tar.gz +sha256 63cb59be1fd21e6ae233c37a0aa4a59883a4885a7bfd2c7e69979c5048518d50 tpm2-abrmd-2.3.0.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSEpackage/tpm2-abrmd/tpm2-abrmd.mk +0
-1@@ -4,12 +4,12 @@ # ################################################################################ -TPM2_ABRMD_VERSION = 2.0.3
package/tpm2-abrmd/tpm2-abrmd.mk line 15
Quoted 10 lines
package/tpm2-abrmd/tpm2-abrmd.mk +2
-1+TPM2_ABRMD_VERSION = 2.3.0 TPM2_ABRMD_SITE = https://github.com/tpm2-software/tpm2-abrmd/releases/download/$(TPM2_ABRMD_VERSION) TPM2_ABRMD_LICENSE = BSD-2-Clause TPM2_ABRMD_LICENSE_FILES = LICENSE TPM2_ABRMD_INSTALL_STAGING = YES -TPM2_ABRMD_DEPENDENCIES = dbus libglib2 tpm2-tss host-pkgconf +TPM2_ABRMD_DEPENDENCIES = libglib2 tpm2-tss host-pkgconf # -fstack-protector-all and FORTIFY_SOURCE=2 is used by # default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options
Committed after changing it to use --disable-defaultflags, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/4 package/tpm2-tools: bump to version 4.1
In reply to Fabrice Fontaine- Drop patch (already in version)
- Update hash of license file (copyrights retained since version 4.0 and
https://github.com/tpm2-software/tpm2-tools/commit/e4b469724eaa6eff0a1ce3bce9fd2ab9e010cd3b)
--- ...-type-may-be-used-uninitialized-warn.patch | 36 ------------------- package/tpm2-tools/tpm2-tools.hash | 4 +-- package/tpm2-tools/tpm2-tools.mk | 2 +- 3 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch
package/tpm2-tools/0001-tpm2_certify-fix-type-may-be-used-uninitialized-warn.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 295cd8f7fb8e1a1ad8f64d981e99969a364d941e Mon Sep 17 00:00:00 2001 -From: Carlos Santos <[email protected]> -Date: Sat, 24 Mar 2018 22:46:46 -0300 -Subject: [PATCH] tpm2_certify: fix "'type' may be used uninitialized" warning - -get_key_type does not assign a value to 'type' on error conditions, -which makes the compiler believe that it will be used uninitialized in -the LOG_ERR call, in set_scheme. In practice this will never happen -because set_scheme returns immediately if get_key_type retuns false but -the compiler does not understand that logic and fails because warnings -are treated as errors. - -Adapted for version 3.1.3 from the change submitted upstream: - - https://github.com/tpm2-software/tpm2-tools/pull/954 - -Signed-off-by: Carlos Santos <[email protected]> ---- - tools/tpm2_certify.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/tpm2_certify.c b/tools/tpm2_certify.c -index 0575072..e562586 100644 ---- a/tools/tpm2_certify.c -+++ b/tools/tpm2_certify.c -@@ -98,6 +98,7 @@ static bool get_key_type(TSS2_SYS_CONTEXT *sapi_context, TPMI_DH_OBJECT object_h - &out_public, &name, &qualified_name, &sessions_data_out)); - if (rval != TPM2_RC_SUCCESS) { - LOG_ERR("TPM2_ReadPublic failed. Error Code: 0x%x", rval); -+ *type = TPM2_ALG_ERROR; - return false; - } - --- -2.19.1 -
package/tpm2-tools/tpm2-tools.hash +2 -2
@@ -1,3 +1,3 @@ # Locally computed: -sha256 2f515200e9a7958ee13015150f7958c8a332eb071c2564c33f81ebe32c4f6033 tpm2-tools-3.1.4.tar.gz -sha256 3d6b149c8b042bd5f3db678d587fbe55230d071ca084bd38dcae451679c6dd45 LICENSE +sha256 07ce37f552ed47f582fbc3423bc316fea64012ef15a92a25766a36534524dcf2 tpm2-tools-4.1.tar.gz +sha256 e10dce74279166bf7bc463eb6e462c2025bceb3e50cadfe865d92c1c3dc0bb21 LICENSE
package/tpm2-tools/tpm2-tools.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 3.1.4 +TPM2_TOOLS_VERSION = 4.1 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = LICENSE
Signature · 1 line
2.24.0
PATCH 4/4 package/tpm2-tools: bump to version 4.1
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
- Drop patch (already in version)
- Update hash of license file (copyrights retained since version 4.0 and
https://github.com/tpm2-software/tpm2-tools/commit/e4b469724eaa6eff0a1ce3bce9fd2ab9e010cd3b)Signed-off-by Fabrice Fontaine <[email protected]>+++
b/package/tpm2-tools/tpm2-tools.mk
package/tpm2-tools/tpm2-tools.mk line 10
Quoted 8 lines
package/tpm2-tools/tpm2-tools.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 3.1.4 +TPM2_TOOLS_VERSION = 4.1 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause TPM2_TOOLS_LICENSE_FILES = LICENSE
Committed after ensuring pandoc would not be detected so man pages are not built, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/4 package/tpm2-tss: bump to version 2.3.2
In reply to Fabrice FontaineQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Thanks, it was on my todo list for a while to bump the tpm2-* packages.
Quoted 8 lines
- Drop patch (already in version)
- Update hash of license file (SPDX ID has been removed with
https://github.com/tpm2-software/tpm2-tss/commit/0dbc84ee45d0e4cd7eae528f53968f8877455aab)Signed-off-by Fabrice Fontaine <[email protected]>+++
b/package/tpm2-tss/tpm2-tss.mk
package/tpm2-tss/tpm2-tss.mk line 10
Quoted 8 lines
package/tpm2-tss/tpm2-tss.mk +1
-1@@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 2.1.3 +TPM2_TSS_VERSION = 2.3.2 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
The ax_cv_check_* environment variables we were setting to get rid the hardcoded fstack-protector and _FORTIFY_SOURCE had changed upstream, but while looking at that I see they have introduced a nicer way to get rid of these hardcoded flags using --disable-defaultflags:
https://github.com/tpm2-software/tpm2-tss/commit/085755d44e5b953865eb4f2666063a7c773ea69d
So I reworked it to use that. This unfortunately also means that it doesn't add -std=c99, so I had to manually do that to fix the build.
Committed with those changes, thanks.
Signature · 1 line
Bye, Peter Korsgaard