summaryrefslogtreecommitdiffstats
path: root/crypto/asn1/ameth_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-12-02 14:56:45 +0100
committerDr. Stephen Henson <steve@openssl.org>2009-12-02 14:56:45 +0100
commit5656f33cea22cc6be6d1ceac2a3807e9562bc90e (patch)
tree453b30df59c49b435ba67af8628e7050c793b55f /crypto/asn1/ameth_lib.c
parentOoops... (diff)
downloadopenssl-5656f33cea22cc6be6d1ceac2a3807e9562bc90e.tar.xz
openssl-5656f33cea22cc6be6d1ceac2a3807e9562bc90e.zip
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/ameth_lib.c')
-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;