Commit 5607b275 authored by Matt Caswell's avatar Matt Caswell
Browse files

Convert SSL3_RECORD_clear() and SSL3_RECORD_release() to size_t 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 7ee8627f

ssl/record/record_locl.h

+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ int ssl3_release_write_buffer(SSL *s); 
#define SSL3_RECORD_is_read(r)                  ((r)->read)

#define SSL3_RECORD_set_read(r)                 ((r)->read = 1)



void SSL3_RECORD_clear(SSL3_RECORD *r, unsigned int num_recs);

void SSL3_RECORD_release(SSL3_RECORD *r, unsigned int num_recs);

void SSL3_RECORD_clear(SSL3_RECORD *r, size_t);

void SSL3_RECORD_release(SSL3_RECORD *r, size_t num_recs);

void SSL3_RECORD_set_seq_num(SSL3_RECORD *r, const unsigned char *seq_num);

int ssl3_get_record(SSL *s);

__owur int ssl3_do_compress(SSL *ssl, SSL3_RECORD *wr);

ssl/record/ssl3_record.c

+4 −4
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ static const unsigned char ssl3_pad_2[48] = { 
/*

 * Clear the contents of an SSL3_RECORD but retain any memory allocated

 */

void SSL3_RECORD_clear(SSL3_RECORD *r, unsigned int num_recs)

void SSL3_RECORD_clear(SSL3_RECORD *r, size_t num_recs)

{

    unsigned char *comp;

    unsigned int i;

    size_t i;



    for (i = 0; i < num_recs; i++) {

        comp = r[i].comp;
@@ -46,9 +46,9 @@ void SSL3_RECORD_clear(SSL3_RECORD *r, unsigned int num_recs) 
    }

}



void SSL3_RECORD_release(SSL3_RECORD *r, unsigned int num_recs)

void SSL3_RECORD_release(SSL3_RECORD *r, size_t num_recs)

{

    unsigned int i;

    size_t i;



    for (i = 0; i < num_recs; i++) {

        OPENSSL_free(r[i].comp);