summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/ameth_lib.c
diff options
context:
space:
mode:
authordjm <>2010-10-01 22:54:21 +0000
committerdjm <>2010-10-01 22:54:21 +0000
commit76262f7bf9262f965142b1b2b2105cb279c5c696 (patch)
treebb3923b81f2ce34b1ad62684afdf1a94d904c185 /src/lib/libcrypto/asn1/ameth_lib.c
parent5bf424abe3e333358a0476841d2085fb5870dde9 (diff)
parent829fd51d4f8dde4a7f3bf54754f3c1d1a502f5e2 (diff)
downloadopenbsd-76262f7bf9262f965142b1b2b2105cb279c5c696.tar.gz
openbsd-76262f7bf9262f965142b1b2b2105cb279c5c696.tar.bz2
openbsd-76262f7bf9262f965142b1b2b2105cb279c5c696.zip
This commit was generated by cvs2git to track changes on a CVS vendor
branch.
Diffstat (limited to 'src/lib/libcrypto/asn1/ameth_lib.c')
-rw-r--r--src/lib/libcrypto/asn1/ameth_lib.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c
index 18957c669e..9a8b6cc222 100644
--- a/src/lib/libcrypto/asn1/ameth_lib.c
+++ b/src/lib/libcrypto/asn1/ameth_lib.c
@@ -301,6 +301,8 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
301 if (!ameth->info) 301 if (!ameth->info)
302 goto err; 302 goto err;
303 } 303 }
304 else
305 ameth->info = NULL;
304 306
305 if (pem_str) 307 if (pem_str)
306 { 308 {
@@ -308,6 +310,8 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
308 if (!ameth->pem_str) 310 if (!ameth->pem_str)
309 goto err; 311 goto err;
310 } 312 }
313 else
314 ameth->pem_str = NULL;
311 315
312 ameth->pub_decode = 0; 316 ameth->pub_decode = 0;
313 ameth->pub_encode = 0; 317 ameth->pub_encode = 0;