diff options
| author | Zhenhua Luo <zhenhua.luo@freescale.com> | 2015-08-26 19:04:11 +0800 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-19 15:03:16 -0300 |
| commit | 67df1cdca7fe5be0513d67e6abd45b973189ecfe (patch) | |
| tree | 7a395f22d97f31d2b90a8b84bb29e618a9d6523c /recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch | |
| parent | 1aab36553093098a5f5f19e08a7cfc1be77c889c (diff) | |
| download | meta-freescale-67df1cdca7fe5be0513d67e6abd45b973189ecfe.tar.gz | |
openssl-qoriq: rename the patch folder from openssl to openssl-qoriq
Fix the following build issues:
WARNING: Host distribution "Ubuntu-12.04" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution.
WARNING: Unable to get checksum for openssl-qoriq SRC_URI entry configure-targets.patch: file could not be found | ETA: 00:00:10
WARNING: Unable to get checksum for openssl-qoriq SRC_URI entry shared-libs.patch: file could not be found
WARNING: Unable to get checksum for openssl-qoriq SRC_URI entry oe-ldflags.patch: file could not be found
WARNING: Unable to get checksum for openssl-qoriq SRC_URI entry engines-install-in-libdir-ssl.patch: file could not be found
WARNING: Unable to get checksum for openssl-qoriq SRC_URI entry openssl-fix-link.patch: file could not be found
WARNING: Unable to get checksum for openssl-qoriq SRC_URI entry version-script.patch: file could not be found
WARNING: Unable to get checksum for openssl-qoriq SRC_URI entry pic.patch: file could not be found
...
ERROR: Fetcher failure: Unable to find file file://configure-targets.patch anywhere. The paths that were searched were:
/local/home/b19537/workspace/poky-os/meta-freescale/recipes-connectivity/openssl/openssl-qoriq-1.0.1i/poky
...
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch')
| -rw-r--r-- | recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch b/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch new file mode 100644 index 00000000..3e93fe4e --- /dev/null +++ b/recipes-connectivity/openssl/openssl-qoriq/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | openssl: avoid NULL pointer dereference in dh_pub_encode()/dsa_pub_encode() | ||
| 2 | |||
| 3 | We should avoid accessing the pointer if ASN1_STRING_new() | ||
| 4 | allocates memory failed. | ||
| 5 | |||
| 6 | Upstream-Status: Submitted | ||
| 7 | http://www.mail-archive.com/openssl-dev@openssl.org/msg32859.html | ||
| 8 | |||
| 9 | Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com> | ||
| 10 | --- | ||
| 11 | --- a/crypto/dh/dh_ameth.c | ||
| 12 | +++ b/crypto/dh/dh_ameth.c | ||
| 13 | @@ -139,6 +139,12 @@ | ||
| 14 | dh=pkey->pkey.dh; | ||
| 15 | |||
| 16 | str = ASN1_STRING_new(); | ||
| 17 | + if (!str) | ||
| 18 | + { | ||
| 19 | + DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); | ||
| 20 | + goto err; | ||
| 21 | + } | ||
| 22 | + | ||
| 23 | str->length = i2d_DHparams(dh, &str->data); | ||
| 24 | if (str->length <= 0) | ||
| 25 | { | ||
| 26 | --- a/crypto/dsa/dsa_ameth.c | ||
| 27 | +++ b/crypto/dsa/dsa_ameth.c | ||
| 28 | @@ -148,6 +148,11 @@ | ||
| 29 | { | ||
| 30 | ASN1_STRING *str; | ||
| 31 | str = ASN1_STRING_new(); | ||
| 32 | + if (!str) | ||
| 33 | + { | ||
| 34 | + DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE); | ||
| 35 | + goto err; | ||
| 36 | + } | ||
| 37 | str->length = i2d_DSAparams(dsa, &str->data); | ||
| 38 | if (str->length <= 0) | ||
| 39 | { | ||