mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
@@ -0,0 +1,37 @@
|
||||
From 815f2bcbdfe5d9aff2cd3acbbb105daf1f5e9d7f Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
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 <fontaine.fabrice@gmail.com>
|
||||
[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
|
||||
|
||||
37
package/tpm2-tss/Config.in
Normal file
37
package/tpm2-tss/Config.in
Normal file
@@ -0,0 +1,37 @@
|
||||
config BR2_PACKAGE_TPM2_TSS
|
||||
bool "tpm2-tss"
|
||||
depends on !BR2_STATIC_LIBS # dlfcn.h
|
||||
select BR2_PACKAGE_LIBURIPARSER
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
|
||||
help
|
||||
OSS implementation of the Trusted Computing Group's (TCG) TPM2
|
||||
Software Stack (TSS). This stack consists of the following
|
||||
layers from top to bottom:
|
||||
|
||||
* System API (SAPI) as described in the system level API and
|
||||
TPM command transmission interface specification. This API
|
||||
is a 1-to-1 mapping of the TPM2 commands documented in Part
|
||||
3 of the TPM2 specification. Additionally there are
|
||||
asynchronous versions of each command. These asynchronous
|
||||
variants may be useful for integration into event-driven
|
||||
programming environments. Both the synchronous and
|
||||
asynchronous API are exposed through a single library:
|
||||
libtss2-sys.
|
||||
|
||||
* TPM Command Transmission Interface (TCTI) that is described
|
||||
in the same specification. This API provides a standard
|
||||
interface to transmit / receive TPM command / response
|
||||
buffers. It is expected that any number of libraries
|
||||
implementing the TCTI API will be implemented as a way to
|
||||
abstract various platform specific IPC mechanisms. Currently
|
||||
this repository provides two TCTI implementations:
|
||||
libtss2-tcti-device and libtss2-tcti-mssim. The prior should
|
||||
be used for direct access to the TPM through the Linux
|
||||
kernel driver. The later implements the protocol exposed by
|
||||
the Microsoft software TPM2 simulator.
|
||||
|
||||
https://github.com/tpm2-software/tpm2-tss
|
||||
|
||||
comment "tpm2-tss needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
3
package/tpm2-tss/tpm2-tss.hash
Normal file
3
package/tpm2-tss/tpm2-tss.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 bddfa4ab2ceb6394bcacf7db5d6419cbfabdb22702b6df75c59e60dd5f3fafb5 tpm2-tss-2.1.3.tar.gz
|
||||
sha256 f7da3c2da12cec3348bb7ee9e2a9e651a241450b2efb67da29d5a75ef2da058a LICENSE
|
||||
23
package/tpm2-tss/tpm2-tss.mk
Normal file
23
package/tpm2-tss/tpm2-tss.mk
Normal file
@@ -0,0 +1,23 @@
|
||||
################################################################################
|
||||
#
|
||||
# tpm2-tss
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TPM2_TSS_VERSION = 2.1.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
|
||||
TPM2_TSS_INSTALL_STAGING = YES
|
||||
TPM2_TSS_DEPENDENCIES = liburiparser openssl host-pkgconf
|
||||
TPM2_TSS_CONF_OPTS = --with-crypto=ossl --disable-doxygen-doc
|
||||
|
||||
# -fstack-protector-all and FORTIFY_SOURCE=2 is used by
|
||||
# default. Disable that so the BR2_SSP_* / BR2_FORTIFY_SOURCE_* options
|
||||
# in the toolchain wrapper and CFLAGS are used instead
|
||||
TPM2_TSS_CONF_ENV = \
|
||||
ax_cv_check_cflags___________Wall__Werror_______fstack_protector_all=no \
|
||||
ax_cv_check_ccppflags___________Wall__Werror_______U_FORTIFY_SOURCE=no \
|
||||
ax_cv_check_ccppflags___________Wall__Werror_______D_FORTIFY_SOURCE_2=no
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user