From bddb7c686e3d1aeb156722adc64b6c35ae720f87 Mon Sep 17 00:00:00 2001 From: beck <> Date: Thu, 17 Apr 2014 13:37:50 +0000 Subject: 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 --- src/lib/libcrypto/buffer/buf_str.c | 4 ++-- src/lib/libcrypto/buffer/buffer.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/lib/libcrypto/buffer') diff --git a/src/lib/libcrypto/buffer/buf_str.c b/src/lib/libcrypto/buffer/buf_str.c index 151f5ea971..ab5535f476 100644 --- a/src/lib/libcrypto/buffer/buf_str.c +++ b/src/lib/libcrypto/buffer/buf_str.c @@ -72,7 +72,7 @@ char *BUF_strndup(const char *str, size_t siz) if (str == NULL) return(NULL); - ret=OPENSSL_malloc(siz+1); + ret=malloc(siz+1); if (ret == NULL) { BUFerr(BUF_F_BUF_STRNDUP,ERR_R_MALLOC_FAILURE); @@ -88,7 +88,7 @@ void *BUF_memdup(const void *data, size_t siz) if (data == NULL) return(NULL); - ret=OPENSSL_malloc(siz); + ret=malloc(siz); if (ret == NULL) { BUFerr(BUF_F_BUF_MEMDUP,ERR_R_MALLOC_FAILURE); diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c index d4a4ce43b3..b52c59f8a3 100644 --- a/src/lib/libcrypto/buffer/buffer.c +++ b/src/lib/libcrypto/buffer/buffer.c @@ -69,7 +69,7 @@ BUF_MEM *BUF_MEM_new(void) { BUF_MEM *ret; - ret=OPENSSL_malloc(sizeof(BUF_MEM)); + ret=malloc(sizeof(BUF_MEM)); if (ret == NULL) { BUFerr(BUF_F_BUF_MEM_NEW,ERR_R_MALLOC_FAILURE); @@ -89,9 +89,9 @@ void BUF_MEM_free(BUF_MEM *a) if (a->data != NULL) { memset(a->data,0,(unsigned int)a->max); - OPENSSL_free(a->data); + free(a->data); } - OPENSSL_free(a); + free(a); } int BUF_MEM_grow(BUF_MEM *str, size_t len) @@ -118,9 +118,9 @@ int BUF_MEM_grow(BUF_MEM *str, size_t len) } n=(len+3)/3*4; if (str->data == NULL) - ret=OPENSSL_malloc(n); + ret=malloc(n); else - ret=OPENSSL_realloc(str->data,n); + ret=realloc(str->data,n); if (ret == NULL) { BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE); @@ -161,7 +161,7 @@ int BUF_MEM_grow_clean(BUF_MEM *str, size_t len) } n=(len+3)/3*4; if (str->data == NULL) - ret=OPENSSL_malloc(n); + ret=malloc(n); else ret=OPENSSL_realloc_clean(str->data,str->max,n); if (ret == NULL) -- cgit v1.2.3-55-g6feb