summaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2017-06-07 11:10:17 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2017-06-17 10:17:32 -0300
commit046a6c9877bf4b7aea01f0bfffb81c86a6c59501 (patch)
tree4588b62896d76d3e12880f0adab4718903d45f98 /recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
parent6f7ab0b43b3d9f8b4b48c7ff61ebcf97f0c1b08a (diff)
downloadmeta-freescale-046a6c9877bf4b7aea01f0bfffb81c86a6c59501.tar.gz
openssl-qoriq: Sync with oe-core recipe
Sync with oe-core recipe to make maintenance easier, copy all patches and let both openssl recipe more similar. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch')
-rw-r--r--recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch b/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
new file mode 100644
index 00000000..f736e5c0
--- /dev/null
+++ b/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch
@@ -0,0 +1,23 @@
1openssl: avoid NULL pointer dereference in EVP_DigestInit_ex()
2
3We should avoid accessing the type pointer if it's NULL,
4this could happen if ctx->digest is not NULL.
5
6Upstream-Status: Submitted
7http://www.mail-archive.com/openssl-dev@openssl.org/msg32860.html
8
9Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
10---
11Index: 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;