diff options
| author | Adam Langley <agl@chromium.org> | 2013-02-21 17:11:55 -0500 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2014-08-22 15:25:18 +0200 |
| commit | fe9b9a880fe9c793421fd3849cce1a32048d480f (patch) | |
| tree | a46f843522e11e71a2daafa816812e8eb184d8f7 | |
| parent | 9f96ea4c2bb7c541f2a58f6d420d2b65731e4830 (diff) | |
| download | openssl-new-fe9b9a880fe9c793421fd3849cce1a32048d480f.tar.gz | |
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)
| -rw-r--r-- | crypto/dsa/dsa_ameth.c | 7 |
1 files changed, 6 insertions, 1 deletions
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 } }; - |