diff options
| author | beck <> | 2014-04-17 13:37:50 +0000 |
|---|---|---|
| committer | beck <> | 2014-04-17 13:37:50 +0000 |
| commit | bddb7c686e3d1aeb156722adc64b6c35ae720f87 (patch) | |
| tree | 7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/bio/bss_conn.c | |
| parent | ecec66222d758996a4ff2671ca5026d9ede5ef76 (diff) | |
| download | openbsd-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_conn.c')
| -rw-r--r-- | src/lib/libcrypto/bio/bss_conn.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c index db877b140b..78ce240648 100644 --- a/src/lib/libcrypto/bio/bss_conn.c +++ b/src/lib/libcrypto/bio/bss_conn.c | |||
| @@ -147,7 +147,7 @@ conn_state(BIO *b, BIO_CONNECT *c) | |||
| 147 | break; | 147 | break; |
| 148 | } | 148 | } |
| 149 | if (c->param_port != NULL) | 149 | if (c->param_port != NULL) |
| 150 | OPENSSL_free(c->param_port); | 150 | free(c->param_port); |
| 151 | c->param_port = BUF_strdup(p); | 151 | c->param_port = BUF_strdup(p); |
| 152 | } | 152 | } |
| 153 | } | 153 | } |
| @@ -293,7 +293,7 @@ BIO_CONNECT | |||
| 293 | { | 293 | { |
| 294 | BIO_CONNECT *ret; | 294 | BIO_CONNECT *ret; |
| 295 | 295 | ||
| 296 | if ((ret = (BIO_CONNECT *)OPENSSL_malloc(sizeof(BIO_CONNECT))) == NULL) | 296 | if ((ret = (BIO_CONNECT *)malloc(sizeof(BIO_CONNECT))) == NULL) |
| 297 | return (NULL); | 297 | return (NULL); |
| 298 | ret->state = BIO_CONN_S_BEFORE; | 298 | ret->state = BIO_CONN_S_BEFORE; |
| 299 | ret->param_hostname = NULL; | 299 | ret->param_hostname = NULL; |
| @@ -316,10 +316,10 @@ BIO_CONNECT_free(BIO_CONNECT *a) | |||
| 316 | return; | 316 | return; |
| 317 | 317 | ||
| 318 | if (a->param_hostname != NULL) | 318 | if (a->param_hostname != NULL) |
| 319 | OPENSSL_free(a->param_hostname); | 319 | free(a->param_hostname); |
| 320 | if (a->param_port != NULL) | 320 | if (a->param_port != NULL) |
| 321 | OPENSSL_free(a->param_port); | 321 | free(a->param_port); |
| 322 | OPENSSL_free(a); | 322 | free(a); |
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | BIO_METHOD | 325 | BIO_METHOD |
| @@ -470,11 +470,11 @@ conn_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 470 | b->init = 1; | 470 | b->init = 1; |
| 471 | if (num == 0) { | 471 | if (num == 0) { |
| 472 | if (data->param_hostname != NULL) | 472 | if (data->param_hostname != NULL) |
| 473 | OPENSSL_free(data->param_hostname); | 473 | free(data->param_hostname); |
| 474 | data->param_hostname = BUF_strdup(ptr); | 474 | data->param_hostname = BUF_strdup(ptr); |
| 475 | } else if (num == 1) { | 475 | } else if (num == 1) { |
| 476 | if (data->param_port != NULL) | 476 | if (data->param_port != NULL) |
| 477 | OPENSSL_free(data->param_port); | 477 | free(data->param_port); |
| 478 | data->param_port = BUF_strdup(ptr); | 478 | data->param_port = BUF_strdup(ptr); |
| 479 | } else if (num == 2) { | 479 | } else if (num == 2) { |
| 480 | char buf[16]; | 480 | char buf[16]; |
| @@ -483,7 +483,7 @@ conn_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 483 | (void) snprintf(buf, sizeof buf, "%d.%d.%d.%d", | 483 | (void) snprintf(buf, sizeof buf, "%d.%d.%d.%d", |
| 484 | p[0], p[1], p[2], p[3]); | 484 | p[0], p[1], p[2], p[3]); |
| 485 | if (data->param_hostname != NULL) | 485 | if (data->param_hostname != NULL) |
| 486 | OPENSSL_free(data->param_hostname); | 486 | free(data->param_hostname); |
| 487 | data->param_hostname = BUF_strdup(buf); | 487 | data->param_hostname = BUF_strdup(buf); |
| 488 | memcpy(&(data->ip[0]), ptr, 4); | 488 | memcpy(&(data->ip[0]), ptr, 4); |
| 489 | } else if (num == 3) { | 489 | } else if (num == 3) { |
| @@ -492,7 +492,7 @@ conn_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 492 | (void) snprintf(buf, sizeof buf, "%d", | 492 | (void) snprintf(buf, sizeof buf, "%d", |
| 493 | *(int *)ptr); | 493 | *(int *)ptr); |
| 494 | if (data->param_port != NULL) | 494 | if (data->param_port != NULL) |
| 495 | OPENSSL_free(data->param_port); | 495 | free(data->param_port); |
| 496 | data->param_port = BUF_strdup(buf); | 496 | data->param_port = BUF_strdup(buf); |
| 497 | data->port= *(int *)ptr; | 497 | data->port= *(int *)ptr; |
| 498 | } | 498 | } |
