[openssl-dev] [openssl.org #4534] Re: [PATCH] Add missing NULL check in i2d_PrivateKey()

2016-05-05 Thread Matt Caswell via RT
Closing this ticket at request of submitter. Erroneous duplicate of #4533

Matt

-- 
Ticket here: http://rt.openssl.org/Ticket/Display.html?id=4534
Please log in as guest with password guest if prompted

-- 
openssl-dev mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-dev


[openssl-dev] [openssl.org #4534] Re: [PATCH] Add missing NULL check in i2d_PrivateKey()

2016-05-04 Thread Kurt Cancemi via RT
Attached is the patch to fix the issue

-- 
Ticket here: http://rt.openssl.org/Ticket/Display.html?id=4534
Please log in as guest with password guest if prompted

>From c27b3a648532388cf59ee55c41ad433c8f323542 Mon Sep 17 00:00:00 2001
From: Kurt Cancemi 
Date: Wed, 4 May 2016 17:34:23 -0400
Subject: [PATCH] Add missing NULL check in i2d_PrivateKey()

---
 crypto/asn1/i2d_pr.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/asn1/i2d_pr.c b/crypto/asn1/i2d_pr.c
index 7ca643f..8b6c92c 100644
--- a/crypto/asn1/i2d_pr.c
+++ b/crypto/asn1/i2d_pr.c
@@ -69,10 +69,12 @@ int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp)
 }
 if (a->ameth && a->ameth->priv_encode) {
 PKCS8_PRIV_KEY_INFO *p8 = EVP_PKEY2PKCS8(a);
+if (p8 == NULL)
+return -1;
 int ret = i2d_PKCS8_PRIV_KEY_INFO(p8, pp);
 PKCS8_PRIV_KEY_INFO_free(p8);
 return ret;
 }
 ASN1err(ASN1_F_I2D_PRIVATEKEY, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
-return (-1);
+return -1;
 }
-- 
2.8.0

-- 
openssl-dev mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-dev