diff options
author | Ting Liu <ting.liu@nxp.com> | 2015-07-29 18:11:18 -0300 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@nxp.com> | 2016-06-23 10:58:51 +0800 |
commit | 4cc0cf8255a3726fe3f6cbbe1a877fe2fab7edc6 (patch) | |
tree | ed1a4cf255057afd5556c1f60fd63b7f1b414f6a /recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch | |
parent | 41d1478e1294d06f0cce58fe847c0b0f1706b808 (diff) | |
download | meta-fsl-ppc-4cc0cf8255a3726fe3f6cbbe1a877fe2fab7edc6.tar.gz |
openssl: rename to openssl-qoriq
The QorIQ version of openssl needs to use another recipe name and have
a common provider, which is than choosen for QorIQ-based machines.
The recipe is now called 'openssl-qoriq' and it provides openssl so
the preferrence is set just for QorIQ based machines.
Signed-off-by: Ting Liu <ting.liu@nxp.com>
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.patch | 21 |
1 files changed, 21 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 0000000..c161e62 --- /dev/null +++ b/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch | |||
@@ -0,0 +1,21 @@ | |||
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 | --- a/crypto/evp/digest.c | ||
12 | +++ b/crypto/evp/digest.c | ||
13 | @@ -199,7 +199,7 @@ | ||
14 | return 0; | ||
15 | } | ||
16 | #endif | ||
17 | - if (ctx->digest != type) | ||
18 | + if (type && (ctx->digest != type)) | ||
19 | { | ||
20 | if (ctx->digest && ctx->digest->ctx_size) | ||
21 | OPENSSL_free(ctx->md_data); | ||