From 896365daea9f61f8209aec71cca2c1adb5a5590c Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 25 Sep 2018 21:43:17 +0800 Subject: tpm-tools: refresh patch to fix QA WARNING Signed-off-by: Hongxu Jia --- .../tpm-tools/files/tpm-tools-extendpcr.patch | 57 ++++++++++++++-------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch b/meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch index ab5e683..1ba8e14 100644 --- a/meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch +++ b/meta-tpm/recipes-tpm/tpm-tools/files/tpm-tools-extendpcr.patch @@ -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 +--- + 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 + -- cgit v1.2.3-54-g00ecf