diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2014-04-17 13:37:51 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2014-04-17 13:37:51 +0000 |
| commit | 798a6f0972ce4f8ea25aa987dc43e626dc6d4087 (patch) | |
| tree | 557371c7b1514332c466ec6233d3e6af96c88520 /lib/libcrypto/dh/dh_ameth.c | |
| parent | eea79ffdb77e3dd4cdbd3f98ed1b44d9522496fa (diff) | |
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 'lib/libcrypto/dh/dh_ameth.c')
| -rw-r--r-- | lib/libcrypto/dh/dh_ameth.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libcrypto/dh/dh_ameth.c b/lib/libcrypto/dh/dh_ameth.c index 377caf96c93..d39f4b373d3 100644 --- a/lib/libcrypto/dh/dh_ameth.c +++ b/lib/libcrypto/dh/dh_ameth.c @@ -168,7 +168,7 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) err: if (penc) - OPENSSL_free(penc); + free(penc); if (pval) ASN1_STRING_free(pval); @@ -277,7 +277,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) err: if (dp != NULL) - OPENSSL_free(dp); + free(dp); if (params != NULL) ASN1_STRING_free(params); if (prkey != NULL) @@ -353,7 +353,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, else ktype = "PKCS#3 DH Parameters"; - m= OPENSSL_malloc(buf_len+10); + m= malloc(buf_len+10); if (m == NULL) { reason=ERR_R_MALLOC_FAILURE; @@ -384,7 +384,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, err: DHerr(DH_F_DO_DH_PRINT,reason); } - if (m != NULL) OPENSSL_free(m); + if (m != NULL) free(m); return(ret); } @@ -493,6 +493,7 @@ const EVP_PKEY_ASN1_METHOD dh_asn1_meth = dh_copy_parameters, dh_cmp_parameters, dh_param_print, + 0, int_dh_free, 0 |