diff options
Diffstat (limited to 'src/lib/libcrypto/buffer')
-rw-r--r-- | src/lib/libcrypto/buffer/buf_str.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/buffer/buffer.c | 12 |
2 files changed, 8 insertions, 8 deletions
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) | |||
72 | 72 | ||
73 | if (str == NULL) return(NULL); | 73 | if (str == NULL) return(NULL); |
74 | 74 | ||
75 | ret=OPENSSL_malloc(siz+1); | 75 | ret=malloc(siz+1); |
76 | if (ret == NULL) | 76 | if (ret == NULL) |
77 | { | 77 | { |
78 | BUFerr(BUF_F_BUF_STRNDUP,ERR_R_MALLOC_FAILURE); | 78 | BUFerr(BUF_F_BUF_STRNDUP,ERR_R_MALLOC_FAILURE); |
@@ -88,7 +88,7 @@ void *BUF_memdup(const void *data, size_t siz) | |||
88 | 88 | ||
89 | if (data == NULL) return(NULL); | 89 | if (data == NULL) return(NULL); |
90 | 90 | ||
91 | ret=OPENSSL_malloc(siz); | 91 | ret=malloc(siz); |
92 | if (ret == NULL) | 92 | if (ret == NULL) |
93 | { | 93 | { |
94 | BUFerr(BUF_F_BUF_MEMDUP,ERR_R_MALLOC_FAILURE); | 94 | 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) | |||
69 | { | 69 | { |
70 | BUF_MEM *ret; | 70 | BUF_MEM *ret; |
71 | 71 | ||
72 | ret=OPENSSL_malloc(sizeof(BUF_MEM)); | 72 | ret=malloc(sizeof(BUF_MEM)); |
73 | if (ret == NULL) | 73 | if (ret == NULL) |
74 | { | 74 | { |
75 | BUFerr(BUF_F_BUF_MEM_NEW,ERR_R_MALLOC_FAILURE); | 75 | BUFerr(BUF_F_BUF_MEM_NEW,ERR_R_MALLOC_FAILURE); |
@@ -89,9 +89,9 @@ void BUF_MEM_free(BUF_MEM *a) | |||
89 | if (a->data != NULL) | 89 | if (a->data != NULL) |
90 | { | 90 | { |
91 | memset(a->data,0,(unsigned int)a->max); | 91 | memset(a->data,0,(unsigned int)a->max); |
92 | OPENSSL_free(a->data); | 92 | free(a->data); |
93 | } | 93 | } |
94 | OPENSSL_free(a); | 94 | free(a); |
95 | } | 95 | } |
96 | 96 | ||
97 | int BUF_MEM_grow(BUF_MEM *str, size_t len) | 97 | int BUF_MEM_grow(BUF_MEM *str, size_t len) |
@@ -118,9 +118,9 @@ int BUF_MEM_grow(BUF_MEM *str, size_t len) | |||
118 | } | 118 | } |
119 | n=(len+3)/3*4; | 119 | n=(len+3)/3*4; |
120 | if (str->data == NULL) | 120 | if (str->data == NULL) |
121 | ret=OPENSSL_malloc(n); | 121 | ret=malloc(n); |
122 | else | 122 | else |
123 | ret=OPENSSL_realloc(str->data,n); | 123 | ret=realloc(str->data,n); |
124 | if (ret == NULL) | 124 | if (ret == NULL) |
125 | { | 125 | { |
126 | BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE); | 126 | 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) | |||
161 | } | 161 | } |
162 | n=(len+3)/3*4; | 162 | n=(len+3)/3*4; |
163 | if (str->data == NULL) | 163 | if (str->data == NULL) |
164 | ret=OPENSSL_malloc(n); | 164 | ret=malloc(n); |
165 | else | 165 | else |
166 | ret=OPENSSL_realloc_clean(str->data,str->max,n); | 166 | ret=OPENSSL_realloc_clean(str->data,str->max,n); |
167 | if (ret == NULL) | 167 | if (ret == NULL) |