diff options
author | beck <> | 2014-04-17 13:37:50 +0000 |
---|---|---|
committer | beck <> | 2014-04-17 13:37:50 +0000 |
commit | bddb7c686e3d1aeb156722adc64b6c35ae720f87 (patch) | |
tree | 7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/dh/dh_ameth.c | |
parent | ecec66222d758996a4ff2671ca5026d9ede5ef76 (diff) | |
download | openbsd-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/dh/dh_ameth.c')
-rw-r--r-- | src/lib/libcrypto/dh/dh_ameth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c index 02ec2d47b4..d39f4b373d 100644 --- a/src/lib/libcrypto/dh/dh_ameth.c +++ b/src/lib/libcrypto/dh/dh_ameth.c | |||
@@ -168,7 +168,7 @@ static int dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) | |||
168 | 168 | ||
169 | err: | 169 | err: |
170 | if (penc) | 170 | if (penc) |
171 | OPENSSL_free(penc); | 171 | free(penc); |
172 | if (pval) | 172 | if (pval) |
173 | ASN1_STRING_free(pval); | 173 | ASN1_STRING_free(pval); |
174 | 174 | ||
@@ -277,7 +277,7 @@ static int dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) | |||
277 | 277 | ||
278 | err: | 278 | err: |
279 | if (dp != NULL) | 279 | if (dp != NULL) |
280 | OPENSSL_free(dp); | 280 | free(dp); |
281 | if (params != NULL) | 281 | if (params != NULL) |
282 | ASN1_STRING_free(params); | 282 | ASN1_STRING_free(params); |
283 | if (prkey != NULL) | 283 | if (prkey != NULL) |
@@ -353,7 +353,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, | |||
353 | else | 353 | else |
354 | ktype = "PKCS#3 DH Parameters"; | 354 | ktype = "PKCS#3 DH Parameters"; |
355 | 355 | ||
356 | m= OPENSSL_malloc(buf_len+10); | 356 | m= malloc(buf_len+10); |
357 | if (m == NULL) | 357 | if (m == NULL) |
358 | { | 358 | { |
359 | reason=ERR_R_MALLOC_FAILURE; | 359 | reason=ERR_R_MALLOC_FAILURE; |
@@ -384,7 +384,7 @@ static int do_dh_print(BIO *bp, const DH *x, int indent, | |||
384 | err: | 384 | err: |
385 | DHerr(DH_F_DO_DH_PRINT,reason); | 385 | DHerr(DH_F_DO_DH_PRINT,reason); |
386 | } | 386 | } |
387 | if (m != NULL) OPENSSL_free(m); | 387 | if (m != NULL) free(m); |
388 | return(ret); | 388 | return(ret); |
389 | } | 389 | } |
390 | 390 | ||