diff options
| author | jkim <jkim@FreeBSD.org> | 2014-10-15 19:59:43 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-10-15 19:59:43 +0000 |
| commit | 0b5b22505e1ef2430c5c6add5faa65f35be97ad4 (patch) | |
| tree | 97eced83822374c92f4921f85ffbe3d7a5208843 /crypto/openssl/crypto/dsa | |
| parent | 44cc4e9f2029f7ca83413a801230adbf8e00915d (diff) | |
| download | FreeBSD-src-0b5b22505e1ef2430c5c6add5faa65f35be97ad4.zip FreeBSD-src-0b5b22505e1ef2430c5c6add5faa65f35be97ad4.tar.gz | |
MFC: r273144, r273146
Merge OpenSSL 1.0.1j.
Relnotes: yes
Diffstat (limited to 'crypto/openssl/crypto/dsa')
| -rw-r--r-- | crypto/openssl/crypto/dsa/dsa_ameth.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/dsa/dsa_ameth.c b/crypto/openssl/crypto/dsa/dsa_ameth.c index 376156e..5af76ea 100644 --- a/crypto/openssl/crypto/dsa/dsa_ameth.c +++ b/crypto/openssl/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 } }; - |
