commit 6ccf29012c4a31cb104e34ce3d7798f8914272cf
author Alex Chernyakhovsky <achernya@google.com> Sun Aug 03 17:35:20 2014 -0400
committer Adam Langley <agl@google.com> Mon Aug 04 20:14:51 2014 +0000
tree 19ef5c7584f33aea02947d6b35cde84ce9222f7d
parent 983f6bdb5888d7074d7ee67d5e3741bcf1027108

Remove use of freelist_{extract,insert}

With the removal of the freelist itself, these macros are
superfluous. Remove them in favore of OPENSSL_malloc and OPENSSL_free.

Change-Id: I4bfeff8ea087b9e16c7c32d7c1bdb7a07e7dd03e
Reviewed-on: https://boringssl-review.googlesource.com/1389
Reviewed-by: Adam Langley <agl@google.com>

ssl/s3_both.c

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 136a14d..9476b53 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -591,9 +591,6 @@
 	return(al);
 	}
 
-#define freelist_extract(c,fr,sz) OPENSSL_malloc(sz)
-#define freelist_insert(c,fr,sz,m) OPENSSL_free(m)
-
 int ssl3_setup_read_buffer(SSL *s)
 	{
 	unsigned char *p;
@@ -618,7 +615,7 @@
 			s->s3->init_extra = 1;
 			len += SSL3_RT_MAX_EXTRA;
 			}
-		if ((p=freelist_extract(s->ctx, 1, len)) == NULL)
+		if ((p=OPENSSL_malloc(len)) == NULL)
 			goto err;
 		s->s3->rbuf.buf = p;
 		s->s3->rbuf.len = len;
@@ -655,7 +652,7 @@
 			len += headerlen + align
 				+ SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD;
 
-		if ((p=freelist_extract(s->ctx, 0, len)) == NULL)
+		if ((p=OPENSSL_malloc(len)) == NULL)
 			goto err;
 		s->s3->wbuf.buf = p;
 		s->s3->wbuf.len = len;
@@ -682,7 +679,7 @@
 	{
 	if (s->s3->wbuf.buf != NULL)
 		{
-		freelist_insert(s->ctx, 0, s->s3->wbuf.len, s->s3->wbuf.buf);
+		OPENSSL_free(s->s3->wbuf.buf);
 		s->s3->wbuf.buf = NULL;
 		}
 	return 1;
@@ -692,7 +689,7 @@
 	{
 	if (s->s3->rbuf.buf != NULL)
 		{
-		freelist_insert(s->ctx, 1, s->s3->rbuf.len, s->s3->rbuf.buf);
+		OPENSSL_free(s->s3->rbuf.buf);
 		s->s3->rbuf.buf = NULL;
 		}
 	return 1;