From 636cbe60117e5b61f5f1eca573e1a62dde38a93c Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 27 Apr 2015 20:43:27 -0700 Subject: 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 Signed-off-by: Richard Purdie --- ...NULL-pointer-dereference-in-dh_pub_encode.patch | 26 ---------------------- 1 file changed, 26 deletions(-) delete mode 100644 meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch (limited to 'meta/recipes-connectivity/openssl/openssl/openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch') 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 @@ -openssl: avoid NULL pointer dereference in dh_pub_encode()/dsa_pub_encode() - -We should avoid accessing the pointer if ASN1_STRING_new() -allocates memory failed. - -Upstream-Status: Submitted -http://www.mail-archive.com/openssl-dev@openssl.org/msg32859.html - -Signed-off-by: Xufeng Zhang ---- -Index: openssl-1.0.2/crypto/dh/dh_ameth.c -=================================================================== ---- openssl-1.0.2.orig/crypto/dh/dh_ameth.c -+++ openssl-1.0.2/crypto/dh/dh_ameth.c -@@ -161,6 +161,11 @@ static int dh_pub_encode(X509_PUBKEY *pk - dh = pkey->pkey.dh; - - str = ASN1_STRING_new(); -+ if (!str) { -+ DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); -+ goto err; -+ } -+ - str->length = i2d_dhp(pkey, dh, &str->data); - if (str->length <= 0) { - DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE); -- cgit v1.2.3-54-g00ecf