diff options
author | Cristian Stoica <cristian.stoica@nxp.com> | 2016-01-25 13:33:46 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-08-12 11:41:02 -0300 |
commit | 0579a92e1ff03656e1c6089714a3be4244622ef0 (patch) | |
tree | 125a6912e920cd54ac31f2e2e44a57f227f048e6 /recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch | |
parent | b8e3085e4e9608b301121c7065c84a3e51b94c74 (diff) | |
download | meta-freescale-0579a92e1ff03656e1c6089714a3be4244622ef0.tar.gz |
openssl-qoriq: upgrade to 1.0.2h plus fsl patches
Based on oe-core openssl-1.0.2h, revision:
e49d337 meta: update patch metadata
extended with patches from fsl to enable more features.
Signed-off-by: Cristian Stoica <cristian.stoica@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 | 22 |
1 files changed, 12 insertions, 10 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 index c161e62f..f736e5c0 100644 --- 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 | |||
@@ -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.2h/crypto/evp/digest.c |
12 | +++ b/crypto/evp/digest.c | 12 | =================================================================== |
13 | @@ -199,7 +199,7 @@ | 13 | --- openssl-1.0.2h.orig/crypto/evp/digest.c |
14 | return 0; | 14 | +++ openssl-1.0.2h/crypto/evp/digest.c |
15 | } | 15 | @@ -211,7 +211,7 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, c |
16 | type = ctx->digest; | ||
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->md_data = NULL; |