summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch14
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2h.bb (renamed from meta/recipes-connectivity/openssl/openssl_1.0.2g.bb)6
2 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
index cebc8cf0d0..f736e5c098 100644
--- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
+++ b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
@@ -8,16 +8,16 @@ http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html
8 8
9Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> 9Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
10--- 10---
11Index: openssl-1.0.2/crypto/evp/digest.c 11Index: openssl-1.0.2h/crypto/evp/digest.c
12=================================================================== 12===================================================================
13--- openssl-1.0.2.orig/crypto/evp/digest.c 13--- openssl-1.0.2h.orig/crypto/evp/digest.c
14+++ openssl-1.0.2/crypto/evp/digest.c 14+++ openssl-1.0.2h/crypto/evp/digest.c
15@@ -208,7 +208,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c 15@@ -211,7 +211,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c
16 return 0; 16 type = ctx->digest;
17 } 17 }
18 #endif 18 #endif
19- if (ctx->digest != type) { 19- if (ctx->digest != type) {
20+ if (type && (ctx->digest != type)) { 20+ if (type && (ctx->digest != type)) {
21 if (ctx->digest && ctx->digest->ctx_size) 21 if (ctx->digest && ctx->digest->ctx_size) {
22 OPENSSL_free(ctx->md_data); 22 OPENSSL_free(ctx->md_data);
23 ctx->digest = type; 23 ctx->md_data = NULL;
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2g.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
index 290f129fc0..ae65992b4e 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2g.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2h.bb
@@ -34,15 +34,13 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
34 file://openssl-fix-des.pod-error.patch \ 34 file://openssl-fix-des.pod-error.patch \
35 file://Makefiles-ptest.patch \ 35 file://Makefiles-ptest.patch \
36 file://ptest-deps.patch \ 36 file://ptest-deps.patch \
37 file://crypto_use_bigint_in_x86-64_perl.patch \
38 file://openssl-1.0.2a-x32-asm.patch \ 37 file://openssl-1.0.2a-x32-asm.patch \
39 file://ptest_makefile_deps.patch \ 38 file://ptest_makefile_deps.patch \
40 file://configure-musl-target.patch \ 39 file://configure-musl-target.patch \
41 file://parallel.patch \ 40 file://parallel.patch \
42 " 41 "
43 42SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0"
44SRC_URI[md5sum] = "f3c710c045cdee5fd114feb69feba7aa" 43SRC_URI[sha256sum] = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"
45SRC_URI[sha256sum] = "b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33"
46 44
47PACKAGES =+ "${PN}-engines" 45PACKAGES =+ "${PN}-engines"
48FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" 46FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"