diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-04-27 20:43:27 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-30 23:04:13 +0100 |
commit | 636cbe60117e5b61f5f1eca573e1a62dde38a93c (patch) | |
tree | 8c6565bac82ec158999dff193981718594c2e407 /meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch | |
parent | 2be3398005922111be89ef2af12f049b6880c684 (diff) | |
download | poky-636cbe60117e5b61f5f1eca573e1a62dde38a93c.tar.gz |
openssl: remove 3 patches
Removed:
- openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch
- upgate-vegsion-script-for-1.0.2.patch
Since they are already in the source.
- make-targets.patch
It removed test dir from DIRS, which is not needed any more since we
need build it.
(From OE-Core rev: 5fa533c69f92f2dd46c795509b0830b36413b814)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 26 |
1 files changed, 0 insertions, 26 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 d7047bbaac..0000000000 --- a/meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch +++ /dev/null | |||
@@ -1,26 +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 | Index: openssl-1.0.2/crypto/dh/dh_ameth.c | ||
12 | =================================================================== | ||
13 | --- openssl-1.0.2.orig/crypto/dh/dh_ameth.c | ||
14 | +++ openssl-1.0.2/crypto/dh/dh_ameth.c | ||
15 | @@ -161,6 +161,11 @@ static int dh_pub_encode(X509_PUBKEY *pk | ||
16 | dh = pkey->pkey.dh; | ||
17 | |||
18 | str = ASN1_STRING_new(); | ||
19 | + if (!str) { | ||
20 | + DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); | ||
21 | + goto err; | ||
22 | + } | ||
23 | + | ||
24 | str->length = i2d_dhp(pkey, dh, &str->data); | ||
25 | if (str->length <= 0) { | ||
26 | DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); | ||