summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/bio/bss_acpt.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/bio/bss_acpt.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/bio/bss_acpt.c')
-rw-r--r--src/lib/libcrypto/bio/bss_acpt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index d7c151eaaa..161b5d01f8 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -137,7 +137,7 @@ static BIO_ACCEPT
137{ 137{
138 BIO_ACCEPT *ret; 138 BIO_ACCEPT *ret;
139 139
140 if ((ret = (BIO_ACCEPT *)OPENSSL_malloc(sizeof(BIO_ACCEPT))) == NULL) 140 if ((ret = (BIO_ACCEPT *)malloc(sizeof(BIO_ACCEPT))) == NULL)
141 return (NULL); 141 return (NULL);
142 142
143 memset(ret, 0, sizeof(BIO_ACCEPT)); 143 memset(ret, 0, sizeof(BIO_ACCEPT));
@@ -153,12 +153,12 @@ BIO_ACCEPT_free(BIO_ACCEPT *a)
153 return; 153 return;
154 154
155 if (a->param_addr != NULL) 155 if (a->param_addr != NULL)
156 OPENSSL_free(a->param_addr); 156 free(a->param_addr);
157 if (a->addr != NULL) 157 if (a->addr != NULL)
158 OPENSSL_free(a->addr); 158 free(a->addr);
159 if (a->bio_chain != NULL) 159 if (a->bio_chain != NULL)
160 BIO_free(a->bio_chain); 160 BIO_free(a->bio_chain);
161 OPENSSL_free(a); 161 free(a);
162} 162}
163 163
164static void 164static void
@@ -357,7 +357,7 @@ acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
357 if (num == 0) { 357 if (num == 0) {
358 b->init = 1; 358 b->init = 1;
359 if (data->param_addr != NULL) 359 if (data->param_addr != NULL)
360 OPENSSL_free(data->param_addr); 360 free(data->param_addr);
361 data->param_addr = BUF_strdup(ptr); 361 data->param_addr = BUF_strdup(ptr);
362 } else if (num == 1) { 362 } else if (num == 1) {
363 data->accept_nbio = (ptr != NULL); 363 data->accept_nbio = (ptr != NULL);