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/evp/pmeth_lib.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/evp/pmeth_lib.c')
-rw-r--r-- | src/lib/libcrypto/evp/pmeth_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c index acfa7b6f87..a9fb15fdfe 100644 --- a/src/lib/libcrypto/evp/pmeth_lib.c +++ b/src/lib/libcrypto/evp/pmeth_lib.c | |||
@@ -165,7 +165,7 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id) | |||
165 | return NULL; | 165 | return NULL; |
166 | } | 166 | } |
167 | 167 | ||
168 | ret = OPENSSL_malloc(sizeof(EVP_PKEY_CTX)); | 168 | ret = malloc(sizeof(EVP_PKEY_CTX)); |
169 | if (!ret) | 169 | if (!ret) |
170 | { | 170 | { |
171 | #ifndef OPENSSL_NO_ENGINE | 171 | #ifndef OPENSSL_NO_ENGINE |
@@ -200,7 +200,7 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id) | |||
200 | EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags) | 200 | EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags) |
201 | { | 201 | { |
202 | EVP_PKEY_METHOD *pmeth; | 202 | EVP_PKEY_METHOD *pmeth; |
203 | pmeth = OPENSSL_malloc(sizeof(EVP_PKEY_METHOD)); | 203 | pmeth = malloc(sizeof(EVP_PKEY_METHOD)); |
204 | if (!pmeth) | 204 | if (!pmeth) |
205 | return NULL; | 205 | return NULL; |
206 | 206 | ||
@@ -291,7 +291,7 @@ void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src) | |||
291 | void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth) | 291 | void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth) |
292 | { | 292 | { |
293 | if (pmeth && (pmeth->flags & EVP_PKEY_FLAG_DYNAMIC)) | 293 | if (pmeth && (pmeth->flags & EVP_PKEY_FLAG_DYNAMIC)) |
294 | OPENSSL_free(pmeth); | 294 | free(pmeth); |
295 | } | 295 | } |
296 | 296 | ||
297 | EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e) | 297 | EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e) |
@@ -317,7 +317,7 @@ EVP_PKEY_CTX *EVP_PKEY_CTX_dup(EVP_PKEY_CTX *pctx) | |||
317 | return 0; | 317 | return 0; |
318 | } | 318 | } |
319 | #endif | 319 | #endif |
320 | rctx = OPENSSL_malloc(sizeof(EVP_PKEY_CTX)); | 320 | rctx = malloc(sizeof(EVP_PKEY_CTX)); |
321 | if (!rctx) | 321 | if (!rctx) |
322 | return NULL; | 322 | return NULL; |
323 | 323 | ||
@@ -378,7 +378,7 @@ void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx) | |||
378 | * functional reference we held for this reason. */ | 378 | * functional reference we held for this reason. */ |
379 | ENGINE_finish(ctx->engine); | 379 | ENGINE_finish(ctx->engine); |
380 | #endif | 380 | #endif |
381 | OPENSSL_free(ctx); | 381 | free(ctx); |
382 | } | 382 | } |
383 | 383 | ||
384 | int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype, | 384 | int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype, |