summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/asn1/ameth_lib.c
diff options
context:
space:
mode:
authorbeck <>2014-04-17 13:37:50 +0000
committerbeck <>2014-04-17 13:37:50 +0000
commitbddb7c686e3d1aeb156722adc64b6c35ae720f87 (patch)
tree7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/asn1/ameth_lib.c
parentecec66222d758996a4ff2671ca5026d9ede5ef76 (diff)
downloadopenbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.tar.gz
openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.tar.bz2
openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.zip
Change library to use intrinsic memory allocation functions instead of
OPENSSL_foo wrappers. This changes: OPENSSL_malloc->malloc OPENSSL_free->free OPENSSL_relloc->realloc OPENSSL_freeFunc->free
Diffstat (limited to 'src/lib/libcrypto/asn1/ameth_lib.c')
-rw-r--r--src/lib/libcrypto/asn1/ameth_lib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c
index a19e058fca..228392f1e6 100644
--- a/src/lib/libcrypto/asn1/ameth_lib.c
+++ b/src/lib/libcrypto/asn1/ameth_lib.c
@@ -289,7 +289,7 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
289 const char *pem_str, const char *info) 289 const char *pem_str, const char *info)
290 { 290 {
291 EVP_PKEY_ASN1_METHOD *ameth; 291 EVP_PKEY_ASN1_METHOD *ameth;
292 ameth = OPENSSL_malloc(sizeof(EVP_PKEY_ASN1_METHOD)); 292 ameth = malloc(sizeof(EVP_PKEY_ASN1_METHOD));
293 if (!ameth) 293 if (!ameth)
294 return NULL; 294 return NULL;
295 295
@@ -393,10 +393,10 @@ void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)
393 if (ameth && (ameth->pkey_flags & ASN1_PKEY_DYNAMIC)) 393 if (ameth && (ameth->pkey_flags & ASN1_PKEY_DYNAMIC))
394 { 394 {
395 if (ameth->pem_str) 395 if (ameth->pem_str)
396 OPENSSL_free(ameth->pem_str); 396 free(ameth->pem_str);
397 if (ameth->info) 397 if (ameth->info)
398 OPENSSL_free(ameth->info); 398 free(ameth->info);
399 OPENSSL_free(ameth); 399 free(ameth);
400 } 400 }
401 } 401 }
402 402