From: Adam Langley <agl@chromium.org>
Date: Thu, 21 Feb 2013 22:11:55 +0000 (-0500)
Subject: RT3061: Don't SEGFAULT when trying to export a public DSA key as a private key.
X-Git-Tag: OpenSSL_1_0_1j~52
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=fe9b9a880fe9c793421fd3849cce1a32048d480f;hp=9f96ea4c2bb7c541f2a58f6d420d2b65731e4830

RT3061: Don't SEGFAULT when trying to export a public DSA key as a private key.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit e19c93811f0db499c98d2888f1c0c0ab65e6238a)
---

diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index 376156ec5e..5af76eade5 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -307,6 +307,12 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 	unsigned char *dp = NULL;
 	int dplen;
 
+	if (!pkey->pkey.dsa || !pkey->pkey.dsa->priv_key)
+		{
+		DSAerr(DSA_F_DSA_PRIV_ENCODE,DSA_R_MISSING_PARAMETERS);
+		goto err;
+		}
+
 	params = ASN1_STRING_new();
 
 	if (!params)
@@ -701,4 +707,3 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] =
 		old_dsa_priv_encode
 		}
 	};
-