mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 18:32:12 +02:00
openssl: Security fix via update to 1.0.2h
CVE-2016-2105 CVE-2016-2106 CVE-2016-2109 CVE-2016-2176 https://www.openssl.org/news/secadv/20160503.txt fixup openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch drop crypto_use_bigint_in_x86-64_perl.patch as that fix is in latest. (From OE-Core rev: c693f34f54257a8eca9fe8c5a9eee5647b7eeb0c) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
199b348d1d
commit
5ae5fc7e7b
@@ -8,16 +8,16 @@ http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html
|
||||
|
||||
Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
|
||||
---
|
||||
Index: openssl-1.0.2/crypto/evp/digest.c
|
||||
Index: openssl-1.0.2h/crypto/evp/digest.c
|
||||
===================================================================
|
||||
--- openssl-1.0.2.orig/crypto/evp/digest.c
|
||||
+++ openssl-1.0.2/crypto/evp/digest.c
|
||||
@@ -208,7 +208,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c
|
||||
return 0;
|
||||
--- openssl-1.0.2h.orig/crypto/evp/digest.c
|
||||
+++ openssl-1.0.2h/crypto/evp/digest.c
|
||||
@@ -211,7 +211,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c
|
||||
type = ctx->digest;
|
||||
}
|
||||
#endif
|
||||
- if (ctx->digest != type) {
|
||||
+ if (type && (ctx->digest != type)) {
|
||||
if (ctx->digest && ctx->digest->ctx_size)
|
||||
if (ctx->digest && ctx->digest->ctx_size) {
|
||||
OPENSSL_free(ctx->md_data);
|
||||
ctx->digest = type;
|
||||
ctx->md_data = NULL;
|
||||
|
||||
@@ -34,15 +34,13 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
|
||||
file://openssl-fix-des.pod-error.patch \
|
||||
file://Makefiles-ptest.patch \
|
||||
file://ptest-deps.patch \
|
||||
file://crypto_use_bigint_in_x86-64_perl.patch \
|
||||
file://openssl-1.0.2a-x32-asm.patch \
|
||||
file://ptest_makefile_deps.patch \
|
||||
file://configure-musl-target.patch \
|
||||
file://parallel.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "f3c710c045cdee5fd114feb69feba7aa"
|
||||
SRC_URI[sha256sum] = "b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33"
|
||||
SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0"
|
||||
SRC_URI[sha256sum] = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"
|
||||
|
||||
PACKAGES =+ "${PN}-engines"
|
||||
FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
|
||||
Reference in New Issue
Block a user