1 files changed, 14 insertions, 27 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
index 3e93fe4e22..d7047bbaac 100644
--- 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
@@ -8,32 +8,19 @@ http://www.mail-archive.com/openssl-dev@openssl.org/msg32859.html
 
 Signed-off-by: Xufeng Zhang <xufeng.zhang@windriver.com>
 ---
---- a/crypto/dh/dh_ameth.c
-+++ b/crypto/dh/dh_ameth.c
-@@ -139,6 +139,12 @@
-        dh=pkey->pkey.dh;
+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 = ASN1_STRING_new();
++    if (!str) {
++        DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
++        goto err;
++    }
 +
-        str->length = i2d_DHparams(dh, &str->data);
-        if (str->length <= 0)
-                {
---- a/crypto/dsa/dsa_ameth.c
-+++ b/crypto/dsa/dsa_ameth.c
-@@ -148,6 +148,11 @@
-                {
-                ASN1_STRING *str;
-                str = ASN1_STRING_new();
-+               if (!str)
-+                       {
-+                       DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
-+                       goto err;
-+                       }
-                str->length = i2d_DSAparams(dsa, &str->data);
-                if (str->length <= 0)
-                        {
+     str->length = i2d_dhp(pkey, dh, &str->data);
+     if (str->length <= 0) {
+         DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);