mirrors/meta-secure-core
1
0
Fork 0
mirror of https://github.com/jiazhang0/meta-secure-core.git synced 2026-07-16 04:36:58 +00:00
Code Issues Projects Releases Wiki Activity

tpm-tools: refresh patch to fix QA WARNING

Browse Source 
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
This commit is contained in:
Hongxu Jia
2018-09-25 21:43:17 +08:00
committed by Jia Zhang
parent 139a9b656d
commit 896365daea
1 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch
+37 -20
View File
@@ -1,8 +1,21 @@
Index: tpm-tools-1.3.8/include/tpm_tspi.h
===================================================================
--- tpm-tools-1.3.8.orig/include/tpm_tspi.h 2011-08-17 08:20:35.000000000 -0400
+++ tpm-tools-1.3.8/include/tpm_tspi.h 2013-01-05 23:26:31.571598217 -0500
@@ -117,6 +117,10 @@
Subject: [PATCH] tpm tools extendpcr
Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
include/tpm_tspi.h | 4 ++
lib/tpm_tspi.c | 14 ++++
src/cmds/Makefile.am | 2 +
src/cmds/tpm_extendpcr.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 201 insertions(+)
create mode 100644 src/cmds/tpm_extendpcr.c
diff --git a/include/tpm_tspi.h b/include/tpm_tspi.h
index d1a86dc..d98921c 100644
--- a/include/tpm_tspi.h
+++ b/include/tpm_tspi.h
@@ -117,6 +117,10 @@ TSS_RESULT tpmPcrRead(TSS_HTPM a_hTpm, UINT32 a_Idx,
UINT32 *a_PcrSize, BYTE **a_PcrValue);
TSS_RESULT pcrcompositeSetPcrValue(TSS_HPCRS a_hPcrs, UINT32 a_Idx,
UINT32 a_PcrSize, BYTE *a_PcrValue);
@@ -13,11 +26,11 @@ Index: tpm-tools-1.3.8/include/tpm_tspi.h
#ifdef TSS_LIB_IS_12
TSS_RESULT unloadVersionInfo(UINT64 *offset, BYTE *blob, TPM_CAP_VERSION_INFO *v);
TSS_RESULT pcrcompositeSetPcrLocality(TSS_HPCRS a_hPcrs, UINT32 localityValue);
Index: tpm-tools-1.3.8/lib/tpm_tspi.c
===================================================================
--- tpm-tools-1.3.8.orig/lib/tpm_tspi.c 2011-08-17 08:20:35.000000000 -0400
+++ tpm-tools-1.3.8/lib/tpm_tspi.c 2013-01-05 23:27:37.731593490 -0500
@@ -594,6 +594,20 @@
diff --git a/lib/tpm_tspi.c b/lib/tpm_tspi.c
index 91184ae..bb94cac 100644
--- a/lib/tpm_tspi.c
+++ b/lib/tpm_tspi.c
@@ -594,6 +594,20 @@ pcrcompositeSetPcrValue(TSS_HPCRS a_hPcrs, UINT32 a_Idx,
return result;
}
@@ -38,10 +51,10 @@ Index: tpm-tools-1.3.8/lib/tpm_tspi.c
#ifdef TSS_LIB_IS_12
/*
* These getPasswd functions will wrap calls to the other functions and check to see if the TSS
Index: tpm-tools-1.3.8/src/cmds/Makefile.am
===================================================================
--- tpm-tools-1.3.8.orig/src/cmds/Makefile.am 2011-08-15 13:52:08.000000000 -0400
+++ tpm-tools-1.3.8/src/cmds/Makefile.am 2013-01-05 23:30:46.223593698 -0500
diff --git a/src/cmds/Makefile.am b/src/cmds/Makefile.am
index 27fc9ef..4f6d581 100644
--- a/src/cmds/Makefile.am
+++ b/src/cmds/Makefile.am
@@ -22,6 +22,7 @@
#
@@ -50,16 +63,17 @@ Index: tpm-tools-1.3.8/src/cmds/Makefile.am
tpm_unsealdata
if TSS_LIB_IS_12
@@ -33,4 +34,5 @@
LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto
@@ -33,4 +34,5 @@ endif
LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @INTLLIBS@
tpm_sealdata_SOURCES = tpm_sealdata.c
+tpm_extendpcr_SOURCES = tpm_extendpcr.c
tpm_unsealdata_SOURCES = tpm_unsealdata.c
Index: tpm-tools-1.3.8/src/cmds/tpm_extendpcr.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ tpm-tools-1.3.8/src/cmds/tpm_extendpcr.c 2013-01-05 23:37:43.403585514 -0500
diff --git a/src/cmds/tpm_extendpcr.c b/src/cmds/tpm_extendpcr.c
new file mode 100644
index 0000000..e19b271
--- /dev/null
+++ b/src/cmds/tpm_extendpcr.c
@@ -0,0 +1,181 @@
+/*
+ * The Initial Developer of the Original Code is International
@@ -242,3 +256,6 @@ Index: tpm-tools-1.3.8/src/cmds/tpm_extendpcr.c
+ BIO_free(bin);
+ return iRc;
+}
--
2.7.4