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/libssl/src/crypto/bio/b_sock.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/libssl/src/crypto/bio/b_sock.c')
-rw-r--r-- | src/lib/libssl/src/crypto/bio/b_sock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c index b08226d52b..1ae9d96577 100644 --- a/src/lib/libssl/src/crypto/bio/b_sock.c +++ b/src/lib/libssl/src/crypto/bio/b_sock.c | |||
@@ -490,7 +490,7 @@ again: | |||
490 | ret = 1; | 490 | ret = 1; |
491 | err: | 491 | err: |
492 | if (str != NULL) | 492 | if (str != NULL) |
493 | OPENSSL_free(str); | 493 | free(str); |
494 | if ((ret == 0) && (s != -1)) { | 494 | if ((ret == 0) && (s != -1)) { |
495 | close(s); | 495 | close(s); |
496 | s = -1; | 496 | s = -1; |
@@ -591,9 +591,9 @@ BIO_accept(int sock, char **addr) | |||
591 | p = *addr; | 591 | p = *addr; |
592 | if (p) { | 592 | if (p) { |
593 | *p = '\0'; | 593 | *p = '\0'; |
594 | p = OPENSSL_realloc(p, nl); | 594 | p = realloc(p, nl); |
595 | } else { | 595 | } else { |
596 | p = OPENSSL_malloc(nl); | 596 | p = malloc(nl); |
597 | } | 597 | } |
598 | if (p == NULL) { | 598 | if (p == NULL) { |
599 | BIOerr(BIO_F_BIO_ACCEPT, ERR_R_MALLOC_FAILURE); | 599 | BIOerr(BIO_F_BIO_ACCEPT, ERR_R_MALLOC_FAILURE); |
@@ -609,7 +609,7 @@ BIO_accept(int sock, char **addr) | |||
609 | l = ntohl(sa.from.sa_in.sin_addr.s_addr); | 609 | l = ntohl(sa.from.sa_in.sin_addr.s_addr); |
610 | port = ntohs(sa.from.sa_in.sin_port); | 610 | port = ntohs(sa.from.sa_in.sin_port); |
611 | if (*addr == NULL) { | 611 | if (*addr == NULL) { |
612 | if ((p = OPENSSL_malloc(24)) == NULL) { | 612 | if ((p = malloc(24)) == NULL) { |
613 | BIOerr(BIO_F_BIO_ACCEPT, ERR_R_MALLOC_FAILURE); | 613 | BIOerr(BIO_F_BIO_ACCEPT, ERR_R_MALLOC_FAILURE); |
614 | goto end; | 614 | goto end; |
615 | } | 615 | } |