mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Encapsulate s->s3->wrec

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

2
ssl/d1_pkt.c
View File

@ -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) ||

1
ssl/record/rec_layer.h
View File

@ -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)

4
ssl/s3_enc.c
View File

@ -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;

2
ssl/s3_lib.c
View File

@ -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))

4
ssl/s3_pkt.c
View File

@ -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) ||

4
ssl/t1_enc.c
View File

@ -749,7 +749,7 @@ int tls1_enc(SSL *s, int send)
OPENSSL_assert(n >= 0);
}
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 {
@ -971,7 +971,7 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send)
int t;
if (send) {
rec = &(ssl->s3->wrec);
rec = RECORD_LAYER_get_wrec(&ssl->rlayer);
seq = &(ssl->s3->write_sequence[0]);
hash = ssl->write_hash;
} else {