diff options
author | Changhyeok Bae <changhyeok.bae@gmail.com> | 2017-06-18 15:23:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-06 14:38:13 +0100 |
commit | d9cb7e713970452d0bd8f46418c82110c7acfe37 (patch) | |
tree | 0fb5a50ae4cef8a9dc11b7c077d10f6d3f0236e4 /meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch | |
parent | 838c5ba5bec907bd69875e690d8996d14f636c89 (diff) | |
download | poky-d9cb7e713970452d0bd8f46418c82110c7acfe37.tar.gz |
openssl: Upgrade 1.0.2k -> 1.0.2l
1. Dropped obsolete patches, because the new version contains them:
- fix-cipher-des-ede3-cfb1.patch
- openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
2. LICENSE checksum change due to copyright years and wording tweak.
3. Test binaries (x86-64) are included in source code. So remove those
only for ptest.
(From OE-Core rev: 64ec18d7e13d310e5e44080a04b3f2181ea96ae3)
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.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 | 23 |
1 files changed, 0 insertions, 23 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 deleted file mode 100644 index f736e5c098..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | openssl: avoid NULL pointer dereference in EVP_DigestInit_ex() | ||
2 | |||
3 | We should avoid accessing the type pointer if it's NULL, | ||
4 | this could happen if ctx->digest is not NULL. | ||
5 | |||
6 | Upstream-Status: Submitted | ||
7 | http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html | ||
8 | |||
9 | Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> | ||
10 | --- | ||
11 | Index: openssl-1.0.2h/crypto/evp/digest.c | ||
12 | =================================================================== | ||
13 | --- openssl-1.0.2h.orig/crypto/evp/digest.c | ||
14 | +++ openssl-1.0.2h/crypto/evp/digest.c | ||
15 | @@ -211,7 +211,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c | ||
16 | type = ctx->digest; | ||
17 | } | ||
18 | #endif | ||
19 | - if (ctx->digest != type) { | ||
20 | + if (type && (ctx->digest != type)) { | ||
21 | if (ctx->digest && ctx->digest->ctx_size) { | ||
22 | OPENSSL_free(ctx->md_data); | ||
23 | ctx->md_data = NULL; | ||