summaryrefslogtreecommitdiffstats
path: root/crypto/asn1
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-12-02 13:57:03 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-12-02 13:57:03 +0000
commitbe6076c0adfbef106a1fcb034b1fae4601cba0e7 (patch)
treee0d0af5831291062bb36a0148c9b925a884033a8 /crypto/asn1
parent6125e07d794624b01a5261cb567a9bbf60e53637 (diff)
PR: 2120
Submitted by: steve@openssl.org Initialize fields correctly if pem_str or info are NULL in EVP_PKEY_asn1_new().
Diffstat (limited to 'crypto/asn1')
-rw-r--r--crypto/asn1/ameth_lib.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 18957c669e..cd0e1f8fe5 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -301,6 +301,8 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
if (!ameth->info)
goto err;
}
+ else
+ ameth->info = NULL
if (pem_str)
{
@@ -308,6 +310,8 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
if (!ameth->pem_str)
goto err;
}
+ else
+ ameth->pem_str = NULL
ameth->pub_decode = 0;
ameth->pub_encode = 0;