mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-06-02 13:30:33 +00:00
Code Issues Projects Releases Wiki Activity

pcr-extend: fix building with openssl 1.1

Browse Source 
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2018-09-15 08:19:03 -07:00
parent 2e784636c9
commit 49a7a7a8e1
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-tpm/recipes-tpm/pcr-extend/files/fix_openssl11_build.patch
+45
View File
@@ -0,0 +1,45 @@
Enable building with openssl 1.1
Upstream-Status: Pending
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Index: git/src/pcr-extend.c
===================================================================
--- git.orig/src/pcr-extend.c
+++ git/src/pcr-extend.c
@@ -118,7 +118,7 @@ dump_buf (FILE *file, char *buf, size_t
static unsigned char*
sha1_file (FILE *file, unsigned int *hash_len)
{
- EVP_MD_CTX ctx = { 0 };
+ EVP_MD_CTX *ctx = EVP_MD_CTX_new();
unsigned char *buf = NULL, *hash = NULL;
size_t num_read = 0;
@@ -127,7 +127,7 @@ sha1_file (FILE *file, unsigned int *has
perror ("malloc:\n");
goto sha1_fail;
}
- if (EVP_DigestInit (&ctx, EVP_sha1 ()) == 0) {
+ if (EVP_DigestInit (ctx, EVP_sha1 ()) == 0) {
ERR_print_errors_fp (stderr);
goto sha1_fail;
}
@@ -135,7 +135,7 @@ sha1_file (FILE *file, unsigned int *has
num_read = fread (buf, 1, BUF_SIZE, file);
if (num_read <= 0)
break;
- if (EVP_DigestUpdate (&ctx, buf, num_read) == 0) {
+ if (EVP_DigestUpdate (ctx, buf, num_read) == 0) {
ERR_print_errors_fp (stderr);
goto sha1_fail;
}
@@ -149,7 +149,7 @@ sha1_file (FILE *file, unsigned int *has
perror ("calloc of hash buffer:\n");
goto sha1_fail;
}
- if (EVP_DigestFinal (&ctx, hash, hash_len) == 0) {
+ if (EVP_DigestFinal (ctx, hash, hash_len) == 0) {
ERR_print_errors_fp (stderr);
goto sha1_fail;
}
meta-tpm/recipes-tpm/pcr-extend/pcr-extend_git.bb
+2 -1
View File
@@ -9,7 +9,8 @@ DEPENDS = "libtspi"
PV = "0.1+git${SRCPV}" PV = "0.1+git${SRCPV}"
SRCREV = "c02ad8f628b3d99f6d4c087b402fe31a40ee6316" SRCREV = "c02ad8f628b3d99f6d4c087b402fe31a40ee6316"
SRC_URI = "git://github.com/flihp/pcr-extend.git " SRC_URI = "git://github.com/flihp/pcr-extend.git \
file://fix_openssl11_build.patch "
inherit autotools inherit autotools