OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove use of freelist_{extract,insert}

Browse Source 
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>
This commit is contained in:
Alex Chernyakhovsky
2014-08-04 20:14:51 +00:00
committed by Adam Langley
parent 983f6bdb58
commit 6ccf29012c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ssl/s3_both.c
+4 -7
View File
@@ -591,9 +591,6 @@ int ssl_verify_alarm_type(long type)
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 @@ int ssl3_setup_read_buffer(SSL *s)
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 @@ int ssl3_setup_write_buffer(SSL *s)
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 @@ int ssl3_release_write_buffer(SSL *s)
{
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 @@ int ssl3_release_read_buffer(SSL *s)
{
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;