summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/buffer/buffer.c
diff options
context:
space:
mode:
authorbeck <>2014-04-17 13:37:50 +0000
committerbeck <>2014-04-17 13:37:50 +0000
commitbddb7c686e3d1aeb156722adc64b6c35ae720f87 (patch)
tree7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/buffer/buffer.c
parentecec66222d758996a4ff2671ca5026d9ede5ef76 (diff)
downloadopenbsd-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/buffer/buffer.c')
-rw-r--r--src/lib/libcrypto/buffer/buffer.c12
1 files changed, 6 insertions, 6 deletions
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
97int BUF_MEM_grow(BUF_MEM *str, size_t len) 97int 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)