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/s3_both.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/s3_both.c')
-rw-r--r-- | src/lib/libssl/s3_both.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c index 5642e6c175..12b38c4596 100644 --- a/src/lib/libssl/s3_both.c +++ b/src/lib/libssl/s3_both.c | |||
@@ -650,7 +650,7 @@ ssl3_setup_read_buffer(SSL *s) | |||
650 | if (!(s->options & SSL_OP_NO_COMPRESSION)) | 650 | if (!(s->options & SSL_OP_NO_COMPRESSION)) |
651 | len += SSL3_RT_MAX_COMPRESSED_OVERHEAD; | 651 | len += SSL3_RT_MAX_COMPRESSED_OVERHEAD; |
652 | #endif | 652 | #endif |
653 | if ((p = OPENSSL_malloc(len)) == NULL) | 653 | if ((p = malloc(len)) == NULL) |
654 | goto err; | 654 | goto err; |
655 | s->s3->rbuf.buf = p; | 655 | s->s3->rbuf.buf = p; |
656 | s->s3->rbuf.len = len; | 656 | s->s3->rbuf.len = len; |
@@ -690,7 +690,7 @@ ssl3_setup_write_buffer(SSL *s) | |||
690 | len += headerlen + align + | 690 | len += headerlen + align + |
691 | SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD; | 691 | SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD; |
692 | 692 | ||
693 | if ((p = OPENSSL_malloc(len)) == NULL) | 693 | if ((p = malloc(len)) == NULL) |
694 | goto err; | 694 | goto err; |
695 | s->s3->wbuf.buf = p; | 695 | s->s3->wbuf.buf = p; |
696 | s->s3->wbuf.len = len; | 696 | s->s3->wbuf.len = len; |
@@ -718,7 +718,7 @@ int | |||
718 | ssl3_release_write_buffer(SSL *s) | 718 | ssl3_release_write_buffer(SSL *s) |
719 | { | 719 | { |
720 | if (s->s3->wbuf.buf != NULL) { | 720 | if (s->s3->wbuf.buf != NULL) { |
721 | OPENSSL_free(s->s3->wbuf.buf); | 721 | free(s->s3->wbuf.buf); |
722 | s->s3->wbuf.buf = NULL; | 722 | s->s3->wbuf.buf = NULL; |
723 | } | 723 | } |
724 | return 1; | 724 | return 1; |
@@ -728,7 +728,7 @@ int | |||
728 | ssl3_release_read_buffer(SSL *s) | 728 | ssl3_release_read_buffer(SSL *s) |
729 | { | 729 | { |
730 | if (s->s3->rbuf.buf != NULL) { | 730 | if (s->s3->rbuf.buf != NULL) { |
731 | OPENSSL_free(s->s3->rbuf.buf); | 731 | free(s->s3->rbuf.buf); |
732 | s->s3->rbuf.buf = NULL; | 732 | s->s3->rbuf.buf = NULL; |
733 | } | 733 | } |
734 | return 1; | 734 | return 1; |