summaryrefslogtreecommitdiffstats
path: root/crypto/dsa
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2014-08-22 15:16:00 +0200
committerEmilia Kasper <emilia@openssl.org>2014-08-22 15:23:33 +0200
commitbc46db60f170873cc323e78e71e582adfa0ddf7f (patch)
tree7322b0e3589ec889d8a5f15056012eb53ea73acb /crypto/dsa
parentd64c533a207f7b6d86c3bc8ffb053e5f4d0c1ca0 (diff)
RT3061: slightly amend patch
Add an extra NULL dereference check Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'crypto/dsa')
-rw-r--r--crypto/dsa/dsa_ameth.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c
index aa3f55e218..50273b03f3 100644
--- a/crypto/dsa/dsa_ameth.c
+++ b/crypto/dsa/dsa_ameth.c
@@ -307,7 +307,7 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
unsigned char *dp = NULL;
int dplen;
- if (!pkey->pkey.dsa->priv_key)
+ if (!pkey->pkey.dsa || !pkey->pkey.dsa->priv_key)
{
DSAerr(DSA_F_DSA_PRIV_ENCODE,DSA_R_MISSING_PARAMETERS);
goto err;
@@ -717,4 +717,3 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] =
old_dsa_priv_encode
}
};
-