diff options
author | Brendan Le Foll <brendan.le.foll@intel.com> | 2015-03-24 18:14:58 +0000 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-07-06 20:19:39 +0200 |
commit | d5bf0a0a55a7f7b2c0b05a53f12efc30ab3e212b (patch) | |
tree | 0f12816bf8f15cbc2a1b3bd45c7fa50df9524ecc /meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch | |
parent | aafccf82fe53b9c7a7de4f9df2a6de221c513e22 (diff) | |
download | poky-d5bf0a0a55a7f7b2c0b05a53f12efc30ab3e212b.tar.gz |
openssl: Upgrade to 1.0.1m
Security update, some patches modified to apply correctly mostly due to
upstream changing indentation/styling
* configure-targets.patch updated
* fix-cipher-des-ede3-cfb1.patch updated
* openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch updated
* openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch removed as no
merged with 3942e7d9ebc262fa5c5c42aba0167e06d981f004 in upstream
(From OE-Core rev: 248dec5e550cfcaaaa479a5bff9b79ba5cd0765d)
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch b/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch deleted file mode 100644 index 3e93fe4e22..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
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 | { | ||