diff options
Diffstat (limited to 'src/lib/libcrypto/evp/evp_enc.c')
-rw-r--r-- | src/lib/libcrypto/evp/evp_enc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c index 50403a7578..e8ca502633 100644 --- a/src/lib/libcrypto/evp/evp_enc.c +++ b/src/lib/libcrypto/evp/evp_enc.c | |||
@@ -78,7 +78,7 @@ void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx) | |||
78 | 78 | ||
79 | EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void) | 79 | EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void) |
80 | { | 80 | { |
81 | EVP_CIPHER_CTX *ctx=OPENSSL_malloc(sizeof *ctx); | 81 | EVP_CIPHER_CTX *ctx=malloc(sizeof *ctx); |
82 | if (ctx) | 82 | if (ctx) |
83 | EVP_CIPHER_CTX_init(ctx); | 83 | EVP_CIPHER_CTX_init(ctx); |
84 | return ctx; | 84 | return ctx; |
@@ -164,7 +164,7 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp | |||
164 | ctx->cipher=cipher; | 164 | ctx->cipher=cipher; |
165 | if (ctx->cipher->ctx_size) | 165 | if (ctx->cipher->ctx_size) |
166 | { | 166 | { |
167 | ctx->cipher_data=OPENSSL_malloc(ctx->cipher->ctx_size); | 167 | ctx->cipher_data=malloc(ctx->cipher->ctx_size); |
168 | if (!ctx->cipher_data) | 168 | if (!ctx->cipher_data) |
169 | { | 169 | { |
170 | EVPerr(EVP_F_EVP_CIPHERINIT_EX, ERR_R_MALLOC_FAILURE); | 170 | EVPerr(EVP_F_EVP_CIPHERINIT_EX, ERR_R_MALLOC_FAILURE); |
@@ -546,7 +546,7 @@ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) | |||
546 | if (ctx) | 546 | if (ctx) |
547 | { | 547 | { |
548 | EVP_CIPHER_CTX_cleanup(ctx); | 548 | EVP_CIPHER_CTX_cleanup(ctx); |
549 | OPENSSL_free(ctx); | 549 | free(ctx); |
550 | } | 550 | } |
551 | } | 551 | } |
552 | 552 | ||
@@ -561,7 +561,7 @@ int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c) | |||
561 | OPENSSL_cleanse(c->cipher_data, c->cipher->ctx_size); | 561 | OPENSSL_cleanse(c->cipher_data, c->cipher->ctx_size); |
562 | } | 562 | } |
563 | if (c->cipher_data) | 563 | if (c->cipher_data) |
564 | OPENSSL_free(c->cipher_data); | 564 | free(c->cipher_data); |
565 | #ifndef OPENSSL_NO_ENGINE | 565 | #ifndef OPENSSL_NO_ENGINE |
566 | if (c->engine) | 566 | if (c->engine) |
567 | /* The EVP_CIPHER we used belongs to an ENGINE, release the | 567 | /* The EVP_CIPHER we used belongs to an ENGINE, release the |
@@ -644,7 +644,7 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in) | |||
644 | 644 | ||
645 | if (in->cipher_data && in->cipher->ctx_size) | 645 | if (in->cipher_data && in->cipher->ctx_size) |
646 | { | 646 | { |
647 | out->cipher_data=OPENSSL_malloc(in->cipher->ctx_size); | 647 | out->cipher_data=malloc(in->cipher->ctx_size); |
648 | if (!out->cipher_data) | 648 | if (!out->cipher_data) |
649 | { | 649 | { |
650 | EVPerr(EVP_F_EVP_CIPHER_CTX_COPY,ERR_R_MALLOC_FAILURE); | 650 | EVPerr(EVP_F_EVP_CIPHER_CTX_COPY,ERR_R_MALLOC_FAILURE); |