Commit 92ffa83d authored by Matt Caswell's avatar Matt Caswell
Browse files

Encapsulate s->s3->wrec 



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

ssl/d1_pkt.c

+1 −1
Original line number Diff line number Diff line
@@ -1468,7 +1468,7 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf, 
    if (len == 0 && !create_empty_fragment)

        return 0;



    wr = &(s->s3->wrec);

    wr = RECORD_LAYER_get_wrec(&s->rlayer);

    sess = s->session;



    if ((sess == NULL) ||

ssl/record/rec_layer.h

+1 −0
Original line number Diff line number Diff line
@@ -133,3 +133,4 @@ typedef struct record_layer_st { 
#define RECORD_LAYER_get_rbuf(rl)               (&(rl)->rbuf)

#define RECORD_LAYER_get_wbuf(rl)               (&(rl)->wbuf)

#define RECORD_LAYER_get_rrec(rl)               (&(rl)->rrec)

#define RECORD_LAYER_get_wrec(rl)               (&(rl)->s->s3->wrec)

ssl/s3_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ int ssl3_enc(SSL *s, int send) 


    if (send) {

        ds = s->enc_write_ctx;

        rec = &(s->s3->wrec);

        rec = RECORD_LAYER_get_wrec(&s->rlayer);

        if (s->enc_write_ctx == NULL)

            enc = NULL;

        else
@@ -725,7 +725,7 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send) 
    int t;



    if (send) {

        rec = &(ssl->s3->wrec);

        rec = RECORD_LAYER_get_wrec(&ssl->rlayer);

        mac_sec = &(ssl->s3->write_mac_secret[0]);

        seq = &(ssl->s3->write_sequence[0]);

        hash = ssl->write_hash;

ssl/s3_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -3112,7 +3112,7 @@ int ssl3_new(SSL *s) 
        goto err;

    memset(s3, 0, sizeof *s3);

    s->s3 = s3;

    memset(s3->wrec.seq_num, 0, sizeof(s3->wrec.seq_num));

    SSL3_RECORD_clear(RECORD_LAYER_get_wrec(&s->rlayer));

    

#ifndef OPENSSL_NO_SRP

    if(!SSL_SRP_CTX_init(s))

ssl/s3_pkt.c

+2 −2
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ int ssl3_do_compress(SSL *ssl) 
    int i;

    SSL3_RECORD *wr;



    wr = &(ssl->s3->wrec);

    wr = RECORD_LAYER_get_wrec(&ssl->rlayer);

    i = COMP_compress_block(ssl->compress, wr->data,

                            SSL3_RT_MAX_COMPRESSED_LENGTH,

                            wr->input, (int)wr->length);
@@ -900,7 +900,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 
    if (len == 0 && !create_empty_fragment)

        return 0;



    wr = &(s->s3->wrec);

    wr = RECORD_LAYER_get_wrec(&s->rlayer);

    sess = s->session;



    if ((sess == NULL) ||