summaryrefslogtreecommitdiffstats
path: root/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch')
-rw-r--r--meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch b/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch
index f718f2e..2caaaf0 100644
--- a/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch
+++ b/meta-tpm/recipes-tpm/openssl-tpm-engine/files/0002-libtpm-support-env-TPM_SRK_PW.patch
@@ -9,20 +9,20 @@ use "env TPM_SRK_PW=#WELLKNOWN#" to set well known password.
9 9
10Signed-off-by: Junxian.Xiao <Junxian.Xiao@windriver.com> 10Signed-off-by: Junxian.Xiao <Junxian.Xiao@windriver.com>
11 11
12diff --git a/e_tpm.c b/e_tpm.c 12Index: git/src/e_tpm.c
13index f3e8bcf..7dcb75a 100644 13===================================================================
14--- a/e_tpm.c 14--- git.orig/src/e_tpm.c
15+++ b/e_tpm.c 15+++ git/src/e_tpm.c
16@@ -38,6 +38,8 @@ 16@@ -38,6 +38,8 @@
17
18 #include "e_tpm.h" 17 #include "e_tpm.h"
18 #include "ssl_compat.h"
19 19
20+#define TPM_WELL_KNOWN_KEY_LEN 20 /*well know key length is 20 bytes zero*/ 20+#define TPM_WELL_KNOWN_KEY_LEN 20 /*well know key length is 20 bytes zero*/
21+ 21+
22 //#define DLOPEN_TSPI 22 //#define DLOPEN_TSPI
23 23
24 #ifndef OPENSSL_NO_HW 24 #ifndef OPENSSL_NO_HW
25@@ -248,6 +250,10 @@ int tpm_load_srk(UI_METHOD *ui, void *cb_data) 25@@ -262,6 +264,10 @@ int tpm_load_srk(UI_METHOD *ui, void *cb
26 TSS_RESULT result; 26 TSS_RESULT result;
27 UINT32 authusage; 27 UINT32 authusage;
28 BYTE *auth; 28 BYTE *auth;
@@ -33,7 +33,7 @@ index f3e8bcf..7dcb75a 100644
33 33
34 if (hSRK != NULL_HKEY) { 34 if (hSRK != NULL_HKEY) {
35 DBGFN("SRK is already loaded."); 35 DBGFN("SRK is already loaded.");
36@@ -299,18 +305,36 @@ int tpm_load_srk(UI_METHOD *ui, void *cb_data) 36@@ -313,18 +319,36 @@ int tpm_load_srk(UI_METHOD *ui, void *cb
37 return 0; 37 return 0;
38 } 38 }
39 39