generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2015-02-01 15:41:06 +00:00
parent 92ffa83d8b
commit 4e08d4a84c
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/record/rec_layer.h
View File

@ -125,6 +125,8 @@ typedef struct record_layer_st {
SSL3_BUFFER wbuf; SSL3_BUFFER wbuf;
/* each decoded record goes in here */ /* each decoded record goes in here */
SSL3_RECORD rrec; SSL3_RECORD rrec;
/* goes out from here */
SSL3_RECORD wrec;
} RECORD_LAYER; } RECORD_LAYER;
#define RECORD_LAYER_set_ssl(rl, s) ((rl)->s = (s)) #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_rbuf(rl) (&(rl)->rbuf)
#define RECORD_LAYER_get_wbuf(rl) (&(rl)->wbuf) #define RECORD_LAYER_get_wbuf(rl) (&(rl)->wbuf)
#define RECORD_LAYER_get_rrec(rl) (&(rl)->rrec) #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)

1
ssl/s3_lib.c
View File

@ -3112,7 +3112,6 @@ int ssl3_new(SSL *s)
goto err; goto err;
memset(s3, 0, sizeof *s3); memset(s3, 0, sizeof *s3);
s->s3 = s3; s->s3 = s3;
SSL3_RECORD_clear(RECORD_LAYER_get_wrec(&s->rlayer));
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
if(!SSL_SRP_CTX_init(s)) if(!SSL_SRP_CTX_init(s))

1
ssl/ssl_lib.c
View File

@ -304,6 +304,7 @@ SSL *SSL_new(SSL_CTX *ctx)
RECORD_LAYER_set_ssl(&s->rlayer, s); RECORD_LAYER_set_ssl(&s->rlayer, s);
SSL3_RECORD_clear(RECORD_LAYER_get_rrec(&s->rlayer)); SSL3_RECORD_clear(RECORD_LAYER_get_rrec(&s->rlayer));
SSL3_RECORD_clear(RECORD_LAYER_get_wrec(&s->rlayer));
#ifndef OPENSSL_NO_KRB5 #ifndef OPENSSL_NO_KRB5
s->kssl_ctx = kssl_ctx_new(); s->kssl_ctx = kssl_ctx_new();

1
ssl/ssl_locl.h
View File

@ -1241,7 +1241,6 @@ typedef struct ssl3_state_st {
int empty_fragment_done; int empty_fragment_done;
/* The value of 'extra' when the buffers were initialized */ /* The value of 'extra' when the buffers were initialized */
int init_extra; int init_extra;
SSL3_RECORD wrec; /* goes out from here */
/* /*
* storage for Alert/Handshake protocol data received but not yet * storage for Alert/Handshake protocol data received but not yet
* processed by ssl3_read_bytes: * processed by ssl3_read_bytes: