diff options
author | Saul Wold <sgw@linux.intel.com> | 2015-03-04 09:46:48 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-10 10:47:46 +0000 |
commit | f5e4349011bd00aa47d142022dcdd1d1706a9655 (patch) | |
tree | 31b2c535de004b08968cfdb57ce085ca3b70eb83 /meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch | |
parent | 7c504b44ef593f97f5311d0d27f667e85a2eddbb (diff) | |
download | poky-f5e4349011bd00aa47d142022dcdd1d1706a9655.tar.gz |
openssl: Upgrade to 1.0.2
Rebased numerous patches
removed aarch64 initial work since it's part of upstream now
Imported a few additional patches from Debian to support the version-script
and blacklist additional bad certificates.
(From OE-Core rev: 10b689033551c37d6cafa284d82bdccd43f6113e)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch | 22 |
1 files changed, 12 insertions, 10 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 c161e62f62..cebc8cf0d0 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,14 +8,16 @@ http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html | |||
8 | 8 | ||
9 | Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> | 9 | Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> |
10 | --- | 10 | --- |
11 | --- a/crypto/evp/digest.c | 11 | Index: openssl-1.0.2/crypto/evp/digest.c |
12 | +++ b/crypto/evp/digest.c | 12 | =================================================================== |
13 | @@ -199,7 +199,7 @@ | 13 | --- openssl-1.0.2.orig/crypto/evp/digest.c |
14 | return 0; | 14 | +++ openssl-1.0.2/crypto/evp/digest.c |
15 | } | 15 | @@ -208,7 +208,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c |
16 | return 0; | ||
17 | } | ||
16 | #endif | 18 | #endif |
17 | - if (ctx->digest != type) | 19 | - if (ctx->digest != type) { |
18 | + if (type && (ctx->digest != type)) | 20 | + if (type && (ctx->digest != type)) { |
19 | { | 21 | if (ctx->digest && ctx->digest->ctx_size) |
20 | if (ctx->digest && ctx->digest->ctx_size) | 22 | OPENSSL_free(ctx->md_data); |
21 | OPENSSL_free(ctx->md_data); | 23 | ctx->digest = type; |