Commit bbcd6d7f authored by Matt Caswell's avatar Matt Caswell
Browse files

Provide RECORD_LAYER_set_data function 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent f161995e

ssl/record/rec_layer.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ void RECORD_LAYER_clear(RECORD_LAYER *rl); 
void RECORD_LAYER_release(RECORD_LAYER *rl);

int RECORD_LAYER_read_pending(RECORD_LAYER *rl);

int RECORD_LAYER_write_pending(RECORD_LAYER *rl);

int RECORD_LAYER_set_data(RECORD_LAYER *rl, const unsigned char *buf, int len);

__owur int ssl23_read_bytes(SSL *s, int n);

__owur int ssl23_write_bytes(SSL *s);

__owur int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);

ssl/record/s3_pkt.c

+16 −0
Original line number Diff line number Diff line
@@ -178,6 +178,22 @@ int RECORD_LAYER_write_pending(RECORD_LAYER *rl) 
    return SSL3_BUFFER_get_left(&rl->wbuf) != 0;

}



int RECORD_LAYER_set_data(RECORD_LAYER *rl, const unsigned char *buf, int len)

{

    rl->s->packet_length = len;

    if(len != 0) {

        rl->s->rstate = SSL_ST_READ_HEADER;

        if (!SSL3_BUFFER_is_initialised(&rl->rbuf))

            if (!ssl3_setup_read_buffer(rl->s))

                return 0;

    }



    rl->s->packet = SSL3_BUFFER_get_buf(&rl->rbuf);

    SSL3_BUFFER_set_data(&rl->rbuf, buf, len);



    return 1;

}



int ssl3_read_n(SSL *s, int n, int max, int extend)

{

    /*

ssl/record/ssl3_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 


#include "../ssl_locl.h"



void SSL3_BUFFER_set_data(SSL3_BUFFER *b, unsigned char *d, int n)

void SSL3_BUFFER_set_data(SSL3_BUFFER *b, const unsigned char *d, int n)

{

    if(d != NULL)

        memcpy(b->buf, d, n);

ssl/record/ssl3_buffer.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ typedef struct ssl3_buffer_st { 
#define SSL3_BUFFER_get_left(b)             ((b)->left)

#define SSL3_BUFFER_is_initialised(b)       ((b)->buf != NULL)



void SSL3_BUFFER_set_data(SSL3_BUFFER *b, unsigned char *d, int n);

void SSL3_BUFFER_set_data(SSL3_BUFFER *b, const unsigned char *d, int n);

void SSL3_BUFFER_release(SSL3_BUFFER *b);

__owur int ssl3_setup_buffers(SSL *s);

__owur int ssl3_setup_read_buffer(SSL *s);

ssl/s23_clnt.c

+2 −7
Original line number Diff line number Diff line
@@ -573,13 +573,8 @@ static int ssl23_get_server_hello(SSL *s) 
        /*

         * put the 7 bytes we have read into the input buffer for SSLv3

         */

        s->rstate = SSL_ST_READ_HEADER;

        s->packet_length = n;

        if (!SSL3_BUFFER_is_initialised(RECORD_LAYER_get_rbuf(&s->rlayer)))

            if (!ssl3_setup_read_buffer(s))

        if(!RECORD_LAYER_set_data(&s->rlayer, buf, n))

            goto err;

        s->packet = SSL3_BUFFER_get_buf(RECORD_LAYER_get_rbuf(&s->rlayer));

        SSL3_BUFFER_set_data(RECORD_LAYER_get_rbuf(&s->rlayer), buf, n);



        s->handshake_func = s->method->ssl_connect;

    } else {