Commit 4e08d4a8 authored by Matt Caswell's avatar Matt Caswell
Browse files

Move s->s3->wrec to s>rlayer>wrec 



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

ssl/record/rec_layer.h

+3 −1
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ typedef struct record_layer_st { 
    SSL3_BUFFER wbuf;

    /* each decoded record goes in here */

    SSL3_RECORD rrec;

    /* goes out from here */

    SSL3_RECORD wrec;

} RECORD_LAYER;



#define RECORD_LAYER_set_ssl(rl, s)             ((rl)->s = (s))
@@ -133,4 +135,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)
 
#define RECORD_LAYER_get_wrec(rl)               (&(rl)->wrec)

ssl/s3_lib.c

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

    memset(s3, 0, sizeof *s3);

    s->s3 = s3;

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

    

#ifndef OPENSSL_NO_SRP

    if(!SSL_SRP_CTX_init(s))

ssl/ssl_lib.c

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ SSL *SSL_new(SSL_CTX *ctx) 


    RECORD_LAYER_set_ssl(&s->rlayer, s);

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

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



#ifndef OPENSSL_NO_KRB5

    s->kssl_ctx = kssl_ctx_new();

ssl/ssl_locl.h

+0 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,6 @@ typedef struct ssl3_state_st { 
    int empty_fragment_done;

    /* The value of 'extra' when the buffers were initialized */

    int init_extra;

    SSL3_RECORD wrec;           /* goes out from here */

    /*

     * storage for Alert/Handshake protocol data received but not yet

     * processed by ssl3_read_bytes: