diff options
| author | beck <> | 2014-04-17 13:37:50 +0000 |
|---|---|---|
| committer | beck <> | 2014-04-17 13:37:50 +0000 |
| commit | 6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd (patch) | |
| tree | 7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/evp/digest.c | |
| parent | 4d13fb9c7b5ac7311d7031173c21ab0121388413 (diff) | |
| download | openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.tar.gz openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.tar.bz2 openbsd-6aa5f85bab6ba5f9189fbc3d53a12e0f6dae48dd.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/digest.c')
| -rw-r--r-- | src/lib/libcrypto/evp/digest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/evp/digest.c b/src/lib/libcrypto/evp/digest.c index 782d3199a5..2fae68ef5e 100644 --- a/src/lib/libcrypto/evp/digest.c +++ b/src/lib/libcrypto/evp/digest.c | |||
| @@ -124,7 +124,7 @@ void EVP_MD_CTX_init(EVP_MD_CTX *ctx) | |||
| 124 | 124 | ||
| 125 | EVP_MD_CTX *EVP_MD_CTX_create(void) | 125 | EVP_MD_CTX *EVP_MD_CTX_create(void) |
| 126 | { | 126 | { |
| 127 | EVP_MD_CTX *ctx=OPENSSL_malloc(sizeof *ctx); | 127 | EVP_MD_CTX *ctx=malloc(sizeof *ctx); |
| 128 | 128 | ||
| 129 | if (ctx) | 129 | if (ctx) |
| 130 | EVP_MD_CTX_init(ctx); | 130 | EVP_MD_CTX_init(ctx); |
| @@ -198,12 +198,12 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl) | |||
| 198 | if (ctx->digest != type) | 198 | if (ctx->digest != type) |
| 199 | { | 199 | { |
| 200 | if (ctx->digest && ctx->digest->ctx_size) | 200 | if (ctx->digest && ctx->digest->ctx_size) |
| 201 | OPENSSL_free(ctx->md_data); | 201 | free(ctx->md_data); |
| 202 | ctx->digest=type; | 202 | ctx->digest=type; |
| 203 | if (!(ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) && type->ctx_size) | 203 | if (!(ctx->flags & EVP_MD_CTX_FLAG_NO_INIT) && type->ctx_size) |
| 204 | { | 204 | { |
| 205 | ctx->update = type->update; | 205 | ctx->update = type->update; |
| 206 | ctx->md_data=OPENSSL_malloc(type->ctx_size); | 206 | ctx->md_data=malloc(type->ctx_size); |
| 207 | if (ctx->md_data == NULL) | 207 | if (ctx->md_data == NULL) |
| 208 | { | 208 | { |
| 209 | EVPerr(EVP_F_EVP_DIGESTINIT_EX, | 209 | EVPerr(EVP_F_EVP_DIGESTINIT_EX, |
| @@ -298,7 +298,7 @@ int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in) | |||
| 298 | out->md_data = tmp_buf; | 298 | out->md_data = tmp_buf; |
| 299 | else | 299 | else |
| 300 | { | 300 | { |
| 301 | out->md_data=OPENSSL_malloc(out->digest->ctx_size); | 301 | out->md_data=malloc(out->digest->ctx_size); |
| 302 | if (!out->md_data) | 302 | if (!out->md_data) |
| 303 | { | 303 | { |
| 304 | EVPerr(EVP_F_EVP_MD_CTX_COPY_EX,ERR_R_MALLOC_FAILURE); | 304 | EVPerr(EVP_F_EVP_MD_CTX_COPY_EX,ERR_R_MALLOC_FAILURE); |
| @@ -347,7 +347,7 @@ void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx) | |||
| 347 | if (ctx) | 347 | if (ctx) |
| 348 | { | 348 | { |
| 349 | EVP_MD_CTX_cleanup(ctx); | 349 | EVP_MD_CTX_cleanup(ctx); |
| 350 | OPENSSL_free(ctx); | 350 | free(ctx); |
| 351 | } | 351 | } |
| 352 | } | 352 | } |
| 353 | 353 | ||
| @@ -364,7 +364,7 @@ int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx) | |||
| 364 | && !EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_REUSE)) | 364 | && !EVP_MD_CTX_test_flags(ctx, EVP_MD_CTX_FLAG_REUSE)) |
| 365 | { | 365 | { |
| 366 | OPENSSL_cleanse(ctx->md_data,ctx->digest->ctx_size); | 366 | OPENSSL_cleanse(ctx->md_data,ctx->digest->ctx_size); |
| 367 | OPENSSL_free(ctx->md_data); | 367 | free(ctx->md_data); |
| 368 | } | 368 | } |
| 369 | if (ctx->pctx) | 369 | if (ctx->pctx) |
| 370 | EVP_PKEY_CTX_free(ctx->pctx); | 370 | EVP_PKEY_CTX_free(ctx->pctx); |
